From c6e22c3f8a7583c87ff8d74c8bf754555376fc45 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 14:48:37 +0600
Subject: [PATCH 001/755] Init

---
 .gitignore             |   1 +
 Cargo.toml             |  16 ++++
 LICENSE                |  22 ++++++
 src/attr.rs            |  64 ++++++++++++++++
 src/command.rs         |  54 ++++++++++++++
 src/enum_attributes.rs |  50 +++++++++++++
 src/lib.rs             | 166 +++++++++++++++++++++++++++++++++++++++++
 src/rename_rules.rs    |   6 ++
 8 files changed, 379 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Cargo.toml
 create mode 100644 LICENSE
 create mode 100644 src/attr.rs
 create mode 100644 src/command.rs
 create mode 100644 src/enum_attributes.rs
 create mode 100644 src/lib.rs
 create mode 100644 src/rename_rules.rs

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..2f7896d1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..dc70f0e3
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "teloxide-macros"
+version = "0.1.2"
+description = "The teloxide's macros for internal usage"
+authors = ["p0lunin <dmytro.polunin@gmail.com>"]
+license = "MIT"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+quote = "1.0.2"
+syn = "1.0.13"
+
+[lib]
+proc-macro = true
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..af7ef486
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+
+MIT License
+
+Copyright (c) 2019-2020 teloxide
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/attr.rs b/src/attr.rs
new file mode 100644
index 00000000..f57c1783
--- /dev/null
+++ b/src/attr.rs
@@ -0,0 +1,64 @@
+use syn::{
+    parse::{Parse, ParseStream},
+    LitStr, Token,
+};
+
+pub enum BotCommandAttribute {
+    Prefix,
+    Description,
+    RenameRule,
+}
+
+impl Parse for BotCommandAttribute {
+    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
+        let name_arg: syn::Ident = input.parse()?;
+        match name_arg.to_string().as_str() {
+            "prefix" => Ok(BotCommandAttribute::Prefix),
+            "description" => Ok(BotCommandAttribute::Description),
+            "rename" => Ok(BotCommandAttribute::RenameRule),
+            _ => Err(syn::Error::new(name_arg.span(), "unexpected argument")),
+        }
+    }
+}
+
+pub struct Attr {
+    name: BotCommandAttribute,
+    value: String,
+}
+
+impl Parse for Attr {
+    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
+        let name = input.parse::<BotCommandAttribute>()?;
+        input.parse::<Token![=]>()?;
+        let value = input.parse::<LitStr>()?.value();
+
+        Ok(Self { name, value })
+    }
+}
+
+impl Attr {
+    pub fn name(&self) -> &BotCommandAttribute {
+        &self.name
+    }
+
+    pub fn value(&self) -> String {
+        self.value.clone()
+    }
+}
+
+pub struct VecAttrs {
+    pub data: Vec<Attr>,
+}
+
+impl Parse for VecAttrs {
+    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
+        let mut data = vec![];
+        while !input.is_empty() {
+            data.push(input.parse()?);
+            if !input.is_empty() {
+                input.parse::<Token![,]>()?;
+            }
+        }
+        Ok(Self { data })
+    }
+}
diff --git a/src/command.rs b/src/command.rs
new file mode 100644
index 00000000..c3cc4609
--- /dev/null
+++ b/src/command.rs
@@ -0,0 +1,54 @@
+use crate::{
+    attr::{Attr, BotCommandAttribute},
+    rename_rules::rename_by_rule,
+};
+
+pub struct Command {
+    pub prefix: Option<String>,
+    pub description: Option<String>,
+    pub name: String,
+    pub renamed: bool,
+}
+
+impl Command {
+    pub fn try_from(attrs: &[Attr], name: &str) -> Result<Self, String> {
+        let attrs = parse_attrs(attrs)?;
+        let mut new_name = name.to_string();
+        let mut renamed = false;
+
+        let prefix = attrs.prefix;
+        let description = attrs.description;
+        let rename = attrs.rename;
+        if let Some(rename_rule) = rename {
+            new_name = rename_by_rule(name, &rename_rule);
+            renamed = true;
+        }
+        Ok(Self { prefix, description, name: new_name, renamed })
+    }
+}
+
+struct CommandAttrs {
+    prefix: Option<String>,
+    description: Option<String>,
+    rename: Option<String>,
+}
+
+fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
+    let mut prefix = None;
+    let mut description = None;
+    let mut rename_rule = None;
+
+    for attr in attrs {
+        match attr.name() {
+            BotCommandAttribute::Prefix => prefix = Some(attr.value()),
+            BotCommandAttribute::Description => {
+                description = Some(attr.value())
+            }
+            BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
+            #[allow(unreachable_patterns)]
+            _ => return Err("unexpected attribute".to_owned()),
+        }
+    }
+
+    Ok(CommandAttrs { prefix, description, rename: rename_rule })
+}
diff --git a/src/enum_attributes.rs b/src/enum_attributes.rs
new file mode 100644
index 00000000..7705e873
--- /dev/null
+++ b/src/enum_attributes.rs
@@ -0,0 +1,50 @@
+use crate::attr::{Attr, BotCommandAttribute};
+
+pub struct CommandEnum {
+    pub prefix: Option<String>,
+    pub description: Option<String>,
+    pub rename_rule: Option<String>,
+}
+
+impl CommandEnum {
+    pub fn try_from(attrs: &[Attr]) -> Result<Self, String> {
+        let attrs = parse_attrs(attrs)?;
+
+        let prefix = attrs.prefix;
+        let description = attrs.description;
+        let rename = attrs.rename;
+        if let Some(rename_rule) = &rename {
+            match rename_rule.as_str() {
+                "lowercase" => {}
+                _ => return Err("disallowed value".to_owned()),
+            }
+        }
+        Ok(Self { prefix, description, rename_rule: rename })
+    }
+}
+
+struct CommandAttrs {
+    prefix: Option<String>,
+    description: Option<String>,
+    rename: Option<String>,
+}
+
+fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
+    let mut prefix = None;
+    let mut description = None;
+    let mut rename_rule = None;
+
+    for attr in attrs {
+        match attr.name() {
+            BotCommandAttribute::Prefix => prefix = Some(attr.value()),
+            BotCommandAttribute::Description => {
+                description = Some(attr.value())
+            }
+            BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
+            #[allow(unreachable_patterns)]
+            _ => return Err("unexpected attribute".to_owned()),
+        }
+    }
+
+    Ok(CommandAttrs { prefix, description, rename: rename_rule })
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 00000000..d8f5866e
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,166 @@
+mod attr;
+mod command;
+mod enum_attributes;
+mod rename_rules;
+
+extern crate proc_macro;
+extern crate syn;
+use crate::{
+    attr::{Attr, VecAttrs},
+    command::Command,
+    enum_attributes::CommandEnum,
+    rename_rules::rename_by_rule,
+};
+use proc_macro::TokenStream;
+use quote::{quote, ToTokens};
+use syn::{parse_macro_input, DeriveInput};
+
+macro_rules! get_or_return {
+    ($($some:tt)*) => {
+        match $($some)* {
+            Ok(elem) => elem,
+            Err(e) => return e
+        };
+    }
+}
+
+#[proc_macro_derive(BotCommand, attributes(command))]
+pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(tokens as DeriveInput);
+
+    let data_enum: &syn::DataEnum = get_or_return!(get_enum_data(&input));
+
+    let enum_attrs: Vec<Attr> = get_or_return!(parse_attributes(&input.attrs));
+
+    let command_enum = match CommandEnum::try_from(enum_attrs.as_slice()) {
+        Ok(command_enum) => command_enum,
+        Err(e) => return compile_error(e),
+    };
+
+    let variants: Vec<&syn::Variant> =
+        data_enum.variants.iter().map(|attr| attr).collect();
+
+    let mut variant_infos = vec![];
+    for variant in variants.iter() {
+        let mut attrs = Vec::new();
+        for attr in &variant.attrs {
+            match attr.parse_args::<VecAttrs>() {
+                Ok(mut attrs_) => {
+                    attrs.append(attrs_.data.as_mut());
+                }
+                Err(e) => {
+                    return compile_error(e.to_compile_error());
+                }
+            }
+        }
+        match Command::try_from(attrs.as_slice(), &variant.ident.to_string()) {
+            Ok(command) => variant_infos.push(command),
+            Err(e) => return compile_error(e),
+        }
+    }
+
+    let variant_ident = variants.iter().map(|variant| &variant.ident);
+    let variant_name = variant_infos.iter().map(|info| {
+        if info.renamed {
+            info.name.clone()
+        } else if let Some(rename_rule) = &command_enum.rename_rule {
+            rename_by_rule(&info.name, rename_rule)
+        } else {
+            info.name.clone()
+        }
+    });
+    let variant_prefixes = variant_infos.iter().map(|info| {
+        if let Some(prefix) = &info.prefix {
+            prefix
+        } else if let Some(prefix) = &command_enum.prefix {
+            prefix
+        } else {
+            "/"
+        }
+    });
+    let variant_str1 = variant_prefixes
+        .zip(variant_name)
+        .map(|(prefix, command)| prefix.to_string() + command.as_str());
+    let variant_str2 = variant_str1.clone();
+    let variant_description = variant_infos.iter().map(|info| {
+        info.description
+            .as_deref()
+            .map(|e| format!(" - {}", e))
+            .unwrap_or(String::new())
+    });
+
+    let ident = &input.ident;
+
+    let global_description = if let Some(s) = &command_enum.description {
+        quote! { #s, "\n", }
+    } else {
+        quote! {}
+    };
+
+    let expanded = quote! {
+        impl BotCommand for #ident {
+            fn try_from(value: &str) -> Option<Self> {
+                match value {
+                    #(
+                        #variant_str1 => Some(Self::#variant_ident),
+                    )*
+                    _ => None
+                }
+            }
+            fn descriptions() -> String {
+                std::concat!(#global_description #(#variant_str2, #variant_description, '\n'),*).to_string()
+            }
+            fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
+             where
+                N: Into<String>
+             {
+                let mut words = s.split_whitespace();
+                let mut splited = words.next()?.split('@');
+                let command_raw = splited.next()?;
+                let bot = splited.next();
+                let bot_name = bot_name.into();
+                match bot {
+                    Some(name) if name == bot_name => {}
+                    None => {}
+                    _ => return None,
+                }
+                let command = Self::try_from(command_raw)?;
+                Some((command, words.collect()))
+            }
+        }
+    };
+    //for debug
+    //println!("{}", &expanded.to_string());
+    TokenStream::from(expanded)
+}
+
+fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
+    match &input.data {
+        syn::Data::Enum(data) => Ok(data),
+        _ => Err(compile_error("TelegramBotCommand allowed only for enums")),
+    }
+}
+
+fn parse_attributes(
+    input: &[syn::Attribute],
+) -> Result<Vec<Attr>, TokenStream> {
+    let mut enum_attrs = Vec::new();
+    for attr in input.iter() {
+        match attr.parse_args::<VecAttrs>() {
+            Ok(mut attrs_) => {
+                enum_attrs.append(attrs_.data.as_mut());
+            }
+            Err(e) => {
+                return Err(compile_error(e.to_compile_error()));
+            }
+        }
+    }
+    Ok(enum_attrs)
+}
+
+fn compile_error<T>(data: T) -> TokenStream
+where
+    T: ToTokens,
+{
+    TokenStream::from(quote! { compile_error!(#data) })
+}
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
new file mode 100644
index 00000000..ebba4eef
--- /dev/null
+++ b/src/rename_rules.rs
@@ -0,0 +1,6 @@
+pub fn rename_by_rule(input: &str, rule: &str) -> String {
+    match rule {
+        "lowercase" => input.to_string().to_lowercase(),
+        _ => rule.to_string(),
+    }
+}

From 416e2c4c545743b91f356a2d783671b99396bce3 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 14:49:39 +0600
Subject: [PATCH 002/755] Fix the description

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index dc70f0e3..f59d6c6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-macros"
 version = "0.1.2"
-description = "The teloxide's macros for internal usage"
+description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"
 edition = "2018"

From 07c3897f02524113766ae52a0b184ff6effadc12 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 14:54:06 +0600
Subject: [PATCH 003/755] Create rust.yml

---
 .github/workflows/rust.yml | 72 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/rust.yml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
new file mode 100644
index 00000000..0ec2a488
--- /dev/null
+++ b/.github/workflows/rust.yml
@@ -0,0 +1,72 @@
+on: [push, pull_request]
+
+name: Continuous integration
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: 
+          - stable
+          - beta
+          - nightly
+      
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy
+
+      - name: stable/beta build 
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        with:
+          command: build
+          args: --verbose --features ""
+
+      - name: nightly build 
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'nightly'
+        with:
+          command: build
+          args: --verbose --all-features
+
+      - name: stable/beta test 
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        with:
+          command: test
+          args: --verbose --features ""
+
+      - name: nightly test
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'nightly'
+        with:
+          command: test
+          args: --verbose --all-features
+
+      - name: fmt
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'nightly'
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: stable/beta clippy
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        with:
+          command: clippy
+          args: --all-targets --features "" -- -D warnings
+
+      - name: nightly clippy
+        uses: actions-rs/cargo@v1
+        if: matrix.rust == 'nightly'
+        with:
+          command: clippy
+          args: --all-targets --all-features -- -D warnings

From 65d7087e40608eceac459b5a22d46ad9f956581e Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 15:12:33 +0600
Subject: [PATCH 004/755] Create CHANGELOG.md

---
 CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..29db8040
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+### Changed
+ - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
+
+### Added
+ - This `CHANGELOG.md`.
+
+
+## [0.1.2] - 2020-02-24
+### Changed
+ - The same as v0.1.1, but fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility.
+
+
+## [0.2.0] - [YANKED]
+### Changed
+ - Fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility, but fairly soon I realised that semver recommends to use v0.1.2 instead.
+
+
+## [0.1.1] - 2020-02-23
+### Added
+ - The `LICENSE` file.
+### Changed
+ - Backwards compatibility is broken and was fixed in v0.1.2.
+
+
+## [0.1.0] - 2020-02-19
+### Added
+ - This project.

From 8d4116fcd8aab5fe6a48e105022a3ae49bafd614 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 15:13:18 +0600
Subject: [PATCH 005/755] Fix fmtcheck

---
 .gitignore             |  1 +
 src/command.rs         | 17 ++++++++++++-----
 src/enum_attributes.rs | 16 +++++++++++-----
 src/lib.rs             |  7 ++-----
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f7896d1..2c96eb1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 target/
+Cargo.lock
diff --git a/src/command.rs b/src/command.rs
index c3cc4609..921153ee 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -23,7 +23,12 @@ impl Command {
             new_name = rename_by_rule(name, &rename_rule);
             renamed = true;
         }
-        Ok(Self { prefix, description, name: new_name, renamed })
+        Ok(Self {
+            prefix,
+            description,
+            name: new_name,
+            renamed,
+        })
     }
 }
 
@@ -41,14 +46,16 @@ fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
     for attr in attrs {
         match attr.name() {
             BotCommandAttribute::Prefix => prefix = Some(attr.value()),
-            BotCommandAttribute::Description => {
-                description = Some(attr.value())
-            }
+            BotCommandAttribute::Description => description = Some(attr.value()),
             BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
             #[allow(unreachable_patterns)]
             _ => return Err("unexpected attribute".to_owned()),
         }
     }
 
-    Ok(CommandAttrs { prefix, description, rename: rename_rule })
+    Ok(CommandAttrs {
+        prefix,
+        description,
+        rename: rename_rule,
+    })
 }
diff --git a/src/enum_attributes.rs b/src/enum_attributes.rs
index 7705e873..728b80eb 100644
--- a/src/enum_attributes.rs
+++ b/src/enum_attributes.rs
@@ -19,7 +19,11 @@ impl CommandEnum {
                 _ => return Err("disallowed value".to_owned()),
             }
         }
-        Ok(Self { prefix, description, rename_rule: rename })
+        Ok(Self {
+            prefix,
+            description,
+            rename_rule: rename,
+        })
     }
 }
 
@@ -37,14 +41,16 @@ fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
     for attr in attrs {
         match attr.name() {
             BotCommandAttribute::Prefix => prefix = Some(attr.value()),
-            BotCommandAttribute::Description => {
-                description = Some(attr.value())
-            }
+            BotCommandAttribute::Description => description = Some(attr.value()),
             BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
             #[allow(unreachable_patterns)]
             _ => return Err("unexpected attribute".to_owned()),
         }
     }
 
-    Ok(CommandAttrs { prefix, description, rename: rename_rule })
+    Ok(CommandAttrs {
+        prefix,
+        description,
+        rename: rename_rule,
+    })
 }
diff --git a/src/lib.rs b/src/lib.rs
index d8f5866e..6cf20baa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -37,8 +37,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         Err(e) => return compile_error(e),
     };
 
-    let variants: Vec<&syn::Variant> =
-        data_enum.variants.iter().map(|attr| attr).collect();
+    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|attr| attr).collect();
 
     let mut variant_infos = vec![];
     for variant in variants.iter() {
@@ -141,9 +140,7 @@ fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
     }
 }
 
-fn parse_attributes(
-    input: &[syn::Attribute],
-) -> Result<Vec<Attr>, TokenStream> {
+fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<Attr>, TokenStream> {
     let mut enum_attrs = Vec::new();
     for attr in input.iter() {
         match attr.parse_args::<VecAttrs>() {

From 0b3e2994b20d48ad176f587e9ebb337403f5a36d Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 15:13:53 +0600
Subject: [PATCH 006/755] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29db8040..1f2f2f6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
  - This `CHANGELOG.md`.
+ - `.gitignore`.
 
 
 ## [0.1.2] - 2020-02-24

From 5abaeb2c003e21af70dfb1120820feb89f8764e0 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 24 Feb 2020 15:19:03 +0600
Subject: [PATCH 007/755] Fix Clippy

---
 .gitignore | 4 +++-
 src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c96eb1b..f940c081 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-target/
+target
 Cargo.lock
+.idea
+.vscode
diff --git a/src/lib.rs b/src/lib.rs
index 6cf20baa..fa3a408b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -85,7 +85,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         info.description
             .as_deref()
             .map(|e| format!(" - {}", e))
-            .unwrap_or(String::new())
+            .unwrap_or_default()
     });
 
     let ident = &input.ident;

From c238906b69fd33d6856f57c4f231e1e8cbf16897 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Mon, 24 Feb 2020 17:37:17 +0200
Subject: [PATCH 008/755] added impl_try_from function

---
 src/command.rs | 12 ++++++++++++
 src/lib.rs     | 30 ++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 921153ee..36496f26 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -2,6 +2,7 @@ use crate::{
     attr::{Attr, BotCommandAttribute},
     rename_rules::rename_by_rule,
 };
+use crate::enum_attributes::CommandEnum;
 
 pub struct Command {
     pub prefix: Option<String>,
@@ -30,6 +31,17 @@ impl Command {
             renamed,
         })
     }
+
+    pub fn get_matched_value(&self, global_parameters: &CommandEnum) -> String {
+        let prefix = if let Some(prefix) = &self.prefix {
+            prefix
+        } else if let Some(prefix) = &global_parameters.prefix {
+            prefix
+        } else {
+            "/"
+        };
+        String::from(prefix) + &self.name
+    }
 }
 
 struct CommandAttrs {
diff --git a/src/lib.rs b/src/lib.rs
index fa3a408b..cf532aa0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,7 +13,7 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput};
+use syn::{parse_macro_input, DeriveInput, Variant};
 
 macro_rules! get_or_return {
     ($($some:tt)*) => {
@@ -58,7 +58,6 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         }
     }
 
-    let variant_ident = variants.iter().map(|variant| &variant.ident);
     let variant_name = variant_infos.iter().map(|info| {
         if info.renamed {
             info.name.clone()
@@ -96,16 +95,11 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         quote! {}
     };
 
+    let fn_try_from = impl_try_parse_command(&variants, &variant_infos, &command_enum);
+
     let expanded = quote! {
         impl BotCommand for #ident {
-            fn try_from(value: &str) -> Option<Self> {
-                match value {
-                    #(
-                        #variant_str1 => Some(Self::#variant_ident),
-                    )*
-                    _ => None
-                }
-            }
+            #fn_try_from
             fn descriptions() -> String {
                 std::concat!(#global_description #(#variant_str2, #variant_description, '\n'),*).to_string()
             }
@@ -133,6 +127,22 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     TokenStream::from(expanded)
 }
 
+fn impl_try_parse_command(variants: &[&Variant], infos: &[Command], global: &CommandEnum) -> impl ToTokens {
+    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
+    let variant_ident = variants.iter().map(|variant| &variant.ident);
+
+    quote! {
+        fn try_from(value: &str) -> Option<Self> {
+            match value {
+                #(
+                    #matching_values => Some(Self::#variant_ident),
+                )*
+                _ => None
+            }
+        }
+    }
+}
+
 fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
     match &input.data {
         syn::Data::Enum(data) => Ok(data),

From 9dc6aab3db7b112c0c04c18c9f82451dc5e1cc91 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Mon, 24 Feb 2020 17:43:36 +0200
Subject: [PATCH 009/755] added impl_descriptions function

---
 src/lib.rs | 62 ++++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index cf532aa0..186ca75f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,7 +9,6 @@ use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
     enum_attributes::CommandEnum,
-    rename_rules::rename_by_rule,
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
@@ -58,51 +57,15 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         }
     }
 
-    let variant_name = variant_infos.iter().map(|info| {
-        if info.renamed {
-            info.name.clone()
-        } else if let Some(rename_rule) = &command_enum.rename_rule {
-            rename_by_rule(&info.name, rename_rule)
-        } else {
-            info.name.clone()
-        }
-    });
-    let variant_prefixes = variant_infos.iter().map(|info| {
-        if let Some(prefix) = &info.prefix {
-            prefix
-        } else if let Some(prefix) = &command_enum.prefix {
-            prefix
-        } else {
-            "/"
-        }
-    });
-    let variant_str1 = variant_prefixes
-        .zip(variant_name)
-        .map(|(prefix, command)| prefix.to_string() + command.as_str());
-    let variant_str2 = variant_str1.clone();
-    let variant_description = variant_infos.iter().map(|info| {
-        info.description
-            .as_deref()
-            .map(|e| format!(" - {}", e))
-            .unwrap_or_default()
-    });
-
     let ident = &input.ident;
 
-    let global_description = if let Some(s) = &command_enum.description {
-        quote! { #s, "\n", }
-    } else {
-        quote! {}
-    };
-
     let fn_try_from = impl_try_parse_command(&variants, &variant_infos, &command_enum);
+    let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
 
     let expanded = quote! {
         impl BotCommand for #ident {
             #fn_try_from
-            fn descriptions() -> String {
-                std::concat!(#global_description #(#variant_str2, #variant_description, '\n'),*).to_string()
-            }
+            #fn_descriptions
             fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
              where
                 N: Into<String>
@@ -143,6 +106,27 @@ fn impl_try_parse_command(variants: &[&Variant], infos: &[Command], global: &Com
     }
 }
 
+fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
+    let global_description = if let Some(s) = &global.description {
+        quote! { #s, "\n", }
+    } else {
+        quote! {}
+    };
+    let command = infos.iter().map(|c| c.get_matched_value(global));
+    let description = infos.iter().map(|info| {
+        info.description
+            .as_deref()
+            .map(|e| format!(" - {}", e))
+            .unwrap_or_default()
+    });
+
+    quote! {
+        fn descriptions() -> &'static str {
+            std::concat!(#global_description #(#command, #description, '\n'),*)
+        }
+    }
+}
+
 fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
     match &input.data {
         syn::Data::Enum(data) => Ok(data),

From fdf68463d959405704be66ebf62c83fe9fea0c17 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Mon, 24 Feb 2020 17:55:46 +0200
Subject: [PATCH 010/755] added impl_parse function

---
 src/lib.rs | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 186ca75f..4e445232 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -61,33 +61,17 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
 
     let fn_try_from = impl_try_parse_command(&variants, &variant_infos, &command_enum);
     let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
+    let fn_parse = impl_parse();
 
-    let expanded = quote! {
+    let trait_impl = quote! {
         impl BotCommand for #ident {
             #fn_try_from
             #fn_descriptions
-            fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
-             where
-                N: Into<String>
-             {
-                let mut words = s.split_whitespace();
-                let mut splited = words.next()?.split('@');
-                let command_raw = splited.next()?;
-                let bot = splited.next();
-                let bot_name = bot_name.into();
-                match bot {
-                    Some(name) if name == bot_name => {}
-                    None => {}
-                    _ => return None,
-                }
-                let command = Self::try_from(command_raw)?;
-                Some((command, words.collect()))
-            }
+            #fn_parse
         }
     };
-    //for debug
-    //println!("{}", &expanded.to_string());
-    TokenStream::from(expanded)
+
+    TokenStream::from(trait_impl)
 }
 
 fn impl_try_parse_command(variants: &[&Variant], infos: &[Command], global: &CommandEnum) -> impl ToTokens {
@@ -127,6 +111,28 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
     }
 }
 
+fn impl_parse() -> impl ToTokens {
+    quote! {
+         fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
+         where
+            N: Into<String>
+         {
+            let mut words = s.split_whitespace();
+            let mut splited = words.next()?.split('@');
+            let command_raw = splited.next()?;
+            let bot = splited.next();
+            let bot_name = bot_name.into();
+            match bot {
+                Some(name) if name == bot_name => {}
+                None => {}
+                _ => return None,
+            }
+            let command = Self::try_from(command_raw)?;
+            Some((command, words.collect()))
+        }
+    }
+}
+
 fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
     match &input.data {
         syn::Data::Enum(data) => Ok(data),

From 161300c739d25fe0bc6759fead397a099e1b5130 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 25 Feb 2020 02:26:30 +0600
Subject: [PATCH 011/755] Update CHANGELOG.md

---
 CHANGELOG.md | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f2f2f6a..be5f19e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,28 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
+ - Added the functionality to parse commands only with a correct bot's name.
 
 ### Added
  - This `CHANGELOG.md`.
  - `.gitignore`.
 
 
-## [0.1.2] - 2020-02-24
-### Changed
- - The same as v0.1.1, but fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility.
+## [0.1.2] - [YANKED]
+Invalid.
 
 
 ## [0.2.0] - [YANKED]
-### Changed
- - Fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility, but fairly soon I realised that semver recommends to use v0.1.2 instead.
+Invalid.
 
 
-## [0.1.1] - 2020-02-23
-### Added
- - The `LICENSE` file.
-### Changed
- - Backwards compatibility is broken and was fixed in v0.1.2.
-
+## [0.1.1] - [YANKED]
+Invalid.
 
 ## [0.1.0] - 2020-02-19
 ### Added

From 2d12e36a5c4c657c6b601b07b958fb895869baa5 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 25 Feb 2020 02:33:10 +0600
Subject: [PATCH 012/755] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be5f19e2..f4ea13fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
- - Added the functionality to parse commands only with a correct bot's name.
 
 ### Added
  - This `CHANGELOG.md`.
  - `.gitignore`.
+ - The functionality to parse commands only with a correct bot's name (breaks backwards compatibility).
 
 
 ## [0.1.2] - [YANKED]

From 215c1d502c26cfcd17db01f7c56896f3b74bf7e5 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 25 Feb 2020 03:20:21 +0600
Subject: [PATCH 013/755] Prepare to v0.2.1

---
 CHANGELOG.md | 2 +-
 Cargo.toml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4ea13fb..23c1e93f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.2.1] - 2020-02-25
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
 
diff --git a/Cargo.toml b/Cargo.toml
index f59d6c6c..2c5f5a64 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.1.2"
+version = "0.2.1"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From eea651a8a27bf538e23339b44127f77c55aecc6d Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Tue, 25 Feb 2020 12:09:58 +0200
Subject: [PATCH 014/755] added Readme.md

---
 Readme.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Readme.md

diff --git a/Readme.md b/Readme.md
new file mode 100644
index 00000000..04e9e074
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,39 @@
+# teloxide-macros
+The teloxide's procedural macros.
+
+## Example
+```rust
+use teloxide::utils::command::BotCommand;
+#[derive(BotCommand, PartialEq, Debug)]
+#[command(rename = "lowercase")]
+enum AdminCommand {
+    Mute,
+    Ban,
+}
+let (command, args) = AdminCommand::parse("/ban 5 h", "bot_name").unwrap();
+assert_eq!(command, AdminCommand::Ban);
+assert_eq!(args, vec!["5", "h"]);
+```
+## Enum attributes
+ 1. `#[command(rename = "rule")]`
+Rename all commands by rule. Allowed rules are `lowercase`. If you will not
+use this attribute, commands will be parsed by their original names.
+
+ 2. `#[command(prefix = "prefix")]`
+Change a prefix for all commands (the default is `/`).
+
+ 3. `#[command(description = "description")]`
+Add a sumary description of commands before all commands.
+
+## Variant attributes
+ 1. `#[command(rename = "rule")]`
+Rename one command by a rule. Allowed rules are `lowercase`, `%some_name%`,
+where `%some_name%` is any string, a new name.
+
+ 2. `#[command(prefix = "prefix")]`
+Change a prefix for one command (the default is `/`).
+
+ 3. `#[command(description = "description")]`
+Add a description of one command.
+
+All variant attributes overlap the `enum` attributes.
\ No newline at end of file

From db4b7b2d3cb68e37a130fc77141367f93920dc40 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 4 Mar 2020 18:29:23 +0200
Subject: [PATCH 015/755] added parsing unnamed fields

---
 src/command.rs      |  2 +-
 src/fields_parse.rs | 12 +++++++
 src/lib.rs          | 87 +++++++++++++++++++++++++--------------------
 3 files changed, 61 insertions(+), 40 deletions(-)
 create mode 100644 src/fields_parse.rs

diff --git a/src/command.rs b/src/command.rs
index 36496f26..244b34ac 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,8 +1,8 @@
+use crate::enum_attributes::CommandEnum;
 use crate::{
     attr::{Attr, BotCommandAttribute},
     rename_rules::rename_by_rule,
 };
-use crate::enum_attributes::CommandEnum;
 
 pub struct Command {
     pub prefix: Option<String>,
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
new file mode 100644
index 00000000..6c959a22
--- /dev/null
+++ b/src/fields_parse.rs
@@ -0,0 +1,12 @@
+extern crate quote;
+
+use quote::quote;
+use quote::ToTokens;
+use syn::FieldsUnnamed;
+
+pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__rt::TokenStream {
+    let iter = 0..data.unnamed.len();
+    quote! {
+        (#(FromStr::from_str(args.get(#iter)),)*)
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 4e445232..5bbc251f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,13 @@
 mod attr;
 mod command;
 mod enum_attributes;
+mod fields_parse;
 mod rename_rules;
 
 extern crate proc_macro;
+extern crate quote;
 extern crate syn;
+use crate::fields_parse::impl_parse_args_unnamed;
 use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
@@ -12,7 +15,7 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Variant};
+use syn::{parse_macro_input, DeriveInput, Fields, Variant};
 
 macro_rules! get_or_return {
     ($($some:tt)*) => {
@@ -36,10 +39,20 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         Err(e) => return compile_error(e),
     };
 
-    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|attr| attr).collect();
+    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|variant| variant).collect();
+
+    let mut vec_impl_create = vec![];
+    for variant in &variants {
+        match &variant.fields {
+            Fields::Unnamed(fields) => {
+                vec_impl_create.push(impl_parse_args_unnamed(fields));
+            }
+            _ => panic!("only unnamed fields"), // TODO: named fields
+        }
+    }
 
     let mut variant_infos = vec![];
-    for variant in variants.iter() {
+    for variant in &variants {
         let mut attrs = Vec::new();
         for attr in &variant.attrs {
             match attr.parse_args::<VecAttrs>() {
@@ -59,13 +72,11 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
 
     let ident = &input.ident;
 
-    let fn_try_from = impl_try_parse_command(&variants, &variant_infos, &command_enum);
     let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
-    let fn_parse = impl_parse();
+    let fn_parse = impl_parse(&variants, &variant_infos, &command_enum, &vec_impl_create);
 
     let trait_impl = quote! {
         impl BotCommand for #ident {
-            #fn_try_from
             #fn_descriptions
             #fn_parse
         }
@@ -74,23 +85,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     TokenStream::from(trait_impl)
 }
 
-fn impl_try_parse_command(variants: &[&Variant], infos: &[Command], global: &CommandEnum) -> impl ToTokens {
-    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
-    let variant_ident = variants.iter().map(|variant| &variant.ident);
-
-    quote! {
-        fn try_from(value: &str) -> Option<Self> {
-            match value {
-                #(
-                    #matching_values => Some(Self::#variant_ident),
-                )*
-                _ => None
-            }
-        }
-    }
-}
-
-fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
+fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__rt::TokenStream {
     let global_description = if let Some(s) = &global.description {
         quote! { #s, "\n", }
     } else {
@@ -111,25 +106,39 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
     }
 }
 
-fn impl_parse() -> impl ToTokens {
+fn impl_parse(
+    variants: &[&Variant],
+    infos: &[Command],
+    global: &CommandEnum,
+    variants_initialization: &[quote::__rt::TokenStream],
+) -> quote::__rt::TokenStream {
+    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
+    let variant_ident = variants.iter().map(|variant| &variant.ident);
+
     quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
+         fn parse<N>(s: &str, bot_name: N) -> Option<Self>
          where
-            N: Into<String>
+              N: Into<String>
          {
-            let mut words = s.split_whitespace();
-            let mut splited = words.next()?.split('@');
-            let command_raw = splited.next()?;
-            let bot = splited.next();
-            let bot_name = bot_name.into();
-            match bot {
-                Some(name) if name == bot_name => {}
-                None => {}
-                _ => return None,
-            }
-            let command = Self::try_from(command_raw)?;
-            Some((command, words.collect()))
-        }
+              let mut words = s.split_whitespace();
+              let mut splited = words.next()?.split('@');
+              let command_raw = splited.next()?;
+              let bot = splited.next();
+              let bot_name = bot_name.into();
+              match bot {
+                  Some(name) if name == bot_name => {}
+                  None => {}
+                  _ => return None,
+              }
+              let args: Vec<&str> = words.collect();
+              match command {
+                   #(
+                        #matching_values => Some(Self::#variant_ident #variants_initialization),
+                   )*
+                   _ => return None,
+              }
+              Some((command, words.collect()))
+         }
     }
 }
 

From 3c99d379efecb9bb6efa77923dd201b6630598c3 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 4 Mar 2020 18:33:54 +0200
Subject: [PATCH 016/755] added parsing unit variant

---
 src/fields_parse.rs | 1 -
 src/lib.rs          | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 6c959a22..6abff534 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,7 +1,6 @@
 extern crate quote;
 
 use quote::quote;
-use quote::ToTokens;
 use syn::FieldsUnnamed;
 
 pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__rt::TokenStream {
diff --git a/src/lib.rs b/src/lib.rs
index 5bbc251f..61ad2f63 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,6 +47,9 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
             Fields::Unnamed(fields) => {
                 vec_impl_create.push(impl_parse_args_unnamed(fields));
             }
+            Fields::Unit => {
+                vec_impl_create.push( quote! {});
+            }
             _ => panic!("only unnamed fields"), // TODO: named fields
         }
     }

From 5afd65226cdc76c5bf86f24ad4f3696432265a9d Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 4 Mar 2020 18:38:08 +0200
Subject: [PATCH 017/755] fix command

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

diff --git a/src/lib.rs b/src/lib.rs
index 61ad2f63..0a10d320 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -134,7 +134,7 @@ fn impl_parse(
                   _ => return None,
               }
               let args: Vec<&str> = words.collect();
-              match command {
+              match command_raw {
                    #(
                         #matching_values => Some(Self::#variant_ident #variants_initialization),
                    )*

From 801ee3a9c93e160da03c2c7475409a6f8f24759b Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 4 Mar 2020 18:40:02 +0200
Subject: [PATCH 018/755] fix return

---
 src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 0a10d320..c525117e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -138,9 +138,8 @@ fn impl_parse(
                    #(
                         #matching_values => Some(Self::#variant_ident #variants_initialization),
                    )*
-                   _ => return None,
+                   _ => None,
               }
-              Some((command, words.collect()))
          }
     }
 }

From 0ef5a59a1ab588a75e1cb921d2fa118bb79770f7 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Apr 2020 19:57:45 +0300
Subject: [PATCH 019/755] fixes and added type safe arguments

---
 src/command.rs         | 7 ++++++-
 src/enum_attributes.rs | 1 +
 src/fields_parse.rs    | 8 +++++---
 src/lib.rs             | 8 ++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 244b34ac..0c8bea10 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -40,7 +40,12 @@ impl Command {
         } else {
             "/"
         };
-        String::from(prefix) + &self.name
+        if let Some(rule) = &global_parameters.rename_rule {
+            String::from(prefix) + &rename_by_rule(&self.name, rule.as_str())
+        }
+        else {
+            String::from(prefix) + &self.name
+        }
     }
 }
 
diff --git a/src/enum_attributes.rs b/src/enum_attributes.rs
index 728b80eb..1ca59636 100644
--- a/src/enum_attributes.rs
+++ b/src/enum_attributes.rs
@@ -1,5 +1,6 @@
 use crate::attr::{Attr, BotCommandAttribute};
 
+#[derive(Debug)]
 pub struct CommandEnum {
     pub prefix: Option<String>,
     pub description: Option<String>,
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 6abff534..2eb1998d 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,11 +1,13 @@
 extern crate quote;
 
-use quote::quote;
+use quote::{quote};
 use syn::FieldsUnnamed;
 
 pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__rt::TokenStream {
     let iter = 0..data.unnamed.len();
-    quote! {
-        (#(FromStr::from_str(args.get(#iter)),)*)
+    let mut tokens = quote! {};
+    for _ in iter {
+        tokens.extend(quote! { CommandArgument::parse(&mut args)?, });
     }
+    quote! { (#tokens) }
 }
diff --git a/src/lib.rs b/src/lib.rs
index c525117e..01d6bc8e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -103,8 +103,8 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__rt::To
     });
 
     quote! {
-        fn descriptions() -> &'static str {
-            std::concat!(#global_description #(#command, #description, '\n'),*)
+        fn descriptions() -> String {
+            std::concat!(#global_description #(#command, #description, '\n'),*).to_string()
         }
     }
 }
@@ -123,7 +123,7 @@ fn impl_parse(
          where
               N: Into<String>
          {
-              let mut words = s.split_whitespace();
+              let mut words = s.splitn(2, ' ');
               let mut splited = words.next()?.split('@');
               let command_raw = splited.next()?;
               let bot = splited.next();
@@ -133,7 +133,7 @@ fn impl_parse(
                   None => {}
                   _ => return None,
               }
-              let args: Vec<&str> = words.collect();
+              let mut args = words.next().unwrap_or("").to_string();
               match command_raw {
                    #(
                         #matching_values => Some(Self::#variant_ident #variants_initialization),

From fd2665640885031fc11da8b33b7bee7ecb424a49 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Apr 2020 20:02:47 +0300
Subject: [PATCH 020/755] fix dependency

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f59d6c6c..2a98ddd6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-quote = "1.0.2"
+quote = "=1.0.2"
 syn = "1.0.13"
 
 [lib]

From 7f7b783da86de49a4d0cd379b84079dcb19d4277 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Apr 2020 20:09:02 +0300
Subject: [PATCH 021/755] fixes quote version

---
 Cargo.toml          | 2 +-
 src/fields_parse.rs | 2 +-
 src/lib.rs          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2a98ddd6..35f8e366 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-quote = "=1.0.2"
+quote = "1.0.3"
 syn = "1.0.13"
 
 [lib]
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 2eb1998d..39644477 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -3,7 +3,7 @@ extern crate quote;
 use quote::{quote};
 use syn::FieldsUnnamed;
 
-pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__rt::TokenStream {
+pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__private::TokenStream {
     let iter = 0..data.unnamed.len();
     let mut tokens = quote! {};
     for _ in iter {
diff --git a/src/lib.rs b/src/lib.rs
index 01d6bc8e..74b23d6d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -88,7 +88,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     TokenStream::from(trait_impl)
 }
 
-fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__rt::TokenStream {
+fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__private::TokenStream {
     let global_description = if let Some(s) = &global.description {
         quote! { #s, "\n", }
     } else {
@@ -113,8 +113,8 @@ fn impl_parse(
     variants: &[&Variant],
     infos: &[Command],
     global: &CommandEnum,
-    variants_initialization: &[quote::__rt::TokenStream],
-) -> quote::__rt::TokenStream {
+    variants_initialization: &[quote::__private::TokenStream],
+) -> quote::__private::TokenStream {
     let matching_values = infos.iter().map(|c| c.get_matched_value(global));
     let variant_ident = variants.iter().map(|variant| &variant.ident);
 

From af569e83560555d9e7e68e9a87e593dec50e8f2a Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Apr 2020 20:10:24 +0300
Subject: [PATCH 022/755] fmt

---
 src/command.rs      | 3 +--
 src/fields_parse.rs | 2 +-
 src/lib.rs          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 0c8bea10..047239c4 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -42,8 +42,7 @@ impl Command {
         };
         if let Some(rule) = &global_parameters.rename_rule {
             String::from(prefix) + &rename_by_rule(&self.name, rule.as_str())
-        }
-        else {
+        } else {
             String::from(prefix) + &self.name
         }
     }
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 39644477..af4a7f5f 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,6 +1,6 @@
 extern crate quote;
 
-use quote::{quote};
+use quote::quote;
 use syn::FieldsUnnamed;
 
 pub fn impl_parse_args_unnamed(data: &FieldsUnnamed) -> quote::__private::TokenStream {
diff --git a/src/lib.rs b/src/lib.rs
index 74b23d6d..7c1c919c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -48,7 +48,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
                 vec_impl_create.push(impl_parse_args_unnamed(fields));
             }
             Fields::Unit => {
-                vec_impl_create.push( quote! {});
+                vec_impl_create.push(quote! {});
             }
             _ => panic!("only unnamed fields"), // TODO: named fields
         }

From d27e741539f8980a7f5c2d7fb6154765d25ac4f1 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 30 May 2020 21:22:11 +0300
Subject: [PATCH 023/755] added typed commands for unnamed variants of enum

---
 src/attr.rs            |  4 ++
 src/command.rs         | 26 ++++++++----
 src/enum_attributes.rs | 40 +++++-------------
 src/fields_parse.rs    | 77 +++++++++++++++++++++++++++++++++++
 src/lib.rs             | 92 ++++++++++++++++++++++++------------------
 5 files changed, 162 insertions(+), 77 deletions(-)
 create mode 100644 src/fields_parse.rs

diff --git a/src/attr.rs b/src/attr.rs
index f57c1783..949e1659 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -7,6 +7,8 @@ pub enum BotCommandAttribute {
     Prefix,
     Description,
     RenameRule,
+    CustomParser,
+    Separator,
 }
 
 impl Parse for BotCommandAttribute {
@@ -16,6 +18,8 @@ impl Parse for BotCommandAttribute {
             "prefix" => Ok(BotCommandAttribute::Prefix),
             "description" => Ok(BotCommandAttribute::Description),
             "rename" => Ok(BotCommandAttribute::RenameRule),
+            "parse_with" => Ok(BotCommandAttribute::CustomParser),
+            "separator" => Ok(BotCommandAttribute::Separator),
             _ => Err(syn::Error::new(name_arg.span(), "unexpected argument")),
         }
     }
diff --git a/src/command.rs b/src/command.rs
index 36496f26..0aa11fb9 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,12 +1,14 @@
+use crate::enum_attributes::CommandEnum;
+use crate::fields_parse::ParserType;
 use crate::{
     attr::{Attr, BotCommandAttribute},
     rename_rules::rename_by_rule,
 };
-use crate::enum_attributes::CommandEnum;
 
 pub struct Command {
     pub prefix: Option<String>,
     pub description: Option<String>,
+    pub parser: Option<ParserType>,
     pub name: String,
     pub renamed: bool,
 }
@@ -20,6 +22,7 @@ impl Command {
         let prefix = attrs.prefix;
         let description = attrs.description;
         let rename = attrs.rename;
+        let parser = attrs.parser;
         if let Some(rename_rule) = rename {
             new_name = rename_by_rule(name, &rename_rule);
             renamed = true;
@@ -27,6 +30,7 @@ impl Command {
         Ok(Self {
             prefix,
             description,
+            parser,
             name: new_name,
             renamed,
         })
@@ -44,24 +48,28 @@ impl Command {
     }
 }
 
-struct CommandAttrs {
-    prefix: Option<String>,
-    description: Option<String>,
-    rename: Option<String>,
+pub struct CommandAttrs {
+    pub(crate) prefix: Option<String>,
+    pub(crate) description: Option<String>,
+    pub(crate) rename: Option<String>,
+    pub(crate) parser: Option<ParserType>,
+    pub(crate) separator: Option<String>,
 }
 
-fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
+pub fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
     let mut prefix = None;
     let mut description = None;
     let mut rename_rule = None;
+    let mut parser = None;
+    let mut separator = None;
 
     for attr in attrs {
         match attr.name() {
             BotCommandAttribute::Prefix => prefix = Some(attr.value()),
             BotCommandAttribute::Description => description = Some(attr.value()),
             BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
-            #[allow(unreachable_patterns)]
-            _ => return Err("unexpected attribute".to_owned()),
+            BotCommandAttribute::CustomParser => parser = Some(ParserType::parse(&attr.value())),
+            BotCommandAttribute::Separator => separator = Some(attr.value()),
         }
     }
 
@@ -69,5 +77,7 @@ fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
         prefix,
         description,
         rename: rename_rule,
+        parser,
+        separator,
     })
 }
diff --git a/src/enum_attributes.rs b/src/enum_attributes.rs
index 728b80eb..92086683 100644
--- a/src/enum_attributes.rs
+++ b/src/enum_attributes.rs
@@ -1,9 +1,12 @@
-use crate::attr::{Attr, BotCommandAttribute};
+use crate::attr::Attr;
+use crate::command::parse_attrs;
+use crate::fields_parse::ParserType;
 
 pub struct CommandEnum {
     pub prefix: Option<String>,
     pub description: Option<String>,
     pub rename_rule: Option<String>,
+    pub parser_type: ParserType,
 }
 
 impl CommandEnum {
@@ -13,6 +16,12 @@ impl CommandEnum {
         let prefix = attrs.prefix;
         let description = attrs.description;
         let rename = attrs.rename;
+        let separator = attrs.separator;
+        let mut parser = attrs.parser.unwrap_or(ParserType::Default);
+        match (&mut parser, &separator) {
+            (ParserType::Split { separator }, Some(s)) => *separator = Some(s.clone()),
+            _ => {}
+        }
         if let Some(rename_rule) = &rename {
             match rename_rule.as_str() {
                 "lowercase" => {}
@@ -23,34 +32,7 @@ impl CommandEnum {
             prefix,
             description,
             rename_rule: rename,
+            parser_type: parser,
         })
     }
 }
-
-struct CommandAttrs {
-    prefix: Option<String>,
-    description: Option<String>,
-    rename: Option<String>,
-}
-
-fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
-    let mut prefix = None;
-    let mut description = None;
-    let mut rename_rule = None;
-
-    for attr in attrs {
-        match attr.name() {
-            BotCommandAttribute::Prefix => prefix = Some(attr.value()),
-            BotCommandAttribute::Description => description = Some(attr.value()),
-            BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
-            #[allow(unreachable_patterns)]
-            _ => return Err("unexpected attribute".to_owned()),
-        }
-    }
-
-    Ok(CommandAttrs {
-        prefix,
-        description,
-        rename: rename_rule,
-    })
-}
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
new file mode 100644
index 00000000..d641d657
--- /dev/null
+++ b/src/fields_parse.rs
@@ -0,0 +1,77 @@
+extern crate quote;
+
+use quote::__private::Span;
+use quote::{quote, ToTokens};
+use syn::FieldsUnnamed;
+
+#[derive(Debug)]
+pub enum ParserType {
+    Default,
+    Split { separator: Option<String> },
+    Custom(String),
+}
+
+impl ParserType {
+    pub fn parse(data: &str) -> Self {
+        match data {
+            "default" => ParserType::Default,
+            "split" => ParserType::Split { separator: None },
+            s => ParserType::Custom(s.to_owned()),
+        }
+    }
+}
+
+pub fn impl_parse_args_unnamed(
+    data: &FieldsUnnamed,
+    variant: impl ToTokens,
+    parser_type: &ParserType,
+) -> quote::__private::TokenStream {
+    let function_to_parse = match parser_type {
+        ParserType::Default => {
+            match data.unnamed.len() {
+                1 => {
+                    quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::UncorrectFormat)?,)) ) }
+                }
+                _ => quote! { compile_error!("Expected 1 argument") },
+            }
+        }
+        ParserType::Split { separator } => parser_with_separator(
+            &separator.clone().unwrap_or(" ".to_owned()),
+            data.unnamed.len(),
+        ),
+        ParserType::Custom(s) => {
+            let ident = syn::Ident::new(&s, Span::call_site());
+            quote! { #ident }
+        }
+    };
+    let get_arguments = quote! { let arguments = #function_to_parse(args)?; };
+    let iter = 0..data.unnamed.len();
+    let mut initialization = quote! {};
+    for i in iter {
+        initialization.extend(quote! { arguments.#i, })
+    }
+    let res = quote! {
+        {
+            #get_arguments
+            #variant(#initialization)
+        }
+    };
+    res
+}
+
+fn parser_with_separator(separator: &str, count_args: usize) -> quote::__private::TokenStream {
+    let inner = quote! { let splited = s.split(#separator).collect::<Vec<_>>(); };
+    let mut inner2 = quote! {};
+    for i in 0..count_args {
+        inner2.extend(
+            quote! { FromStr::from_str(splited[#i]).map_err(|_|ParseError::UncorrectFormat)?, },
+        )
+    }
+    let res = quote! {
+        (|s: String| {
+            #inner
+            Ok((#inner2))
+        })
+    };
+    res
+}
diff --git a/src/lib.rs b/src/lib.rs
index 4e445232..dc6c1b69 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,13 @@
 mod attr;
 mod command;
 mod enum_attributes;
+mod fields_parse;
 mod rename_rules;
 
 extern crate proc_macro;
+extern crate quote;
 extern crate syn;
+use crate::fields_parse::impl_parse_args_unnamed;
 use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
@@ -12,7 +15,7 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Variant};
+use syn::{parse_macro_input, DeriveInput, Fields};
 
 macro_rules! get_or_return {
     ($($some:tt)*) => {
@@ -36,7 +39,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         Err(e) => return compile_error(e),
     };
 
-    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|attr| attr).collect();
+    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|variant| variant).collect();
 
     let mut variant_infos = vec![];
     for variant in variants.iter() {
@@ -57,15 +60,29 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         }
     }
 
+    let mut vec_impl_create = vec![];
+    for (variant, info) in variants.iter().zip(variant_infos.iter()) {
+        let var = &variant.ident;
+        let variantt = quote! { Self::#var };
+        match &variant.fields {
+            Fields::Unnamed(fields) => {
+                let parser = info.parser.as_ref().unwrap_or(&command_enum.parser_type);
+                vec_impl_create.push(impl_parse_args_unnamed(fields, variantt, parser));
+            }
+            Fields::Unit => {
+                vec_impl_create.push(variantt);
+            }
+            _ => panic!("only unnamed fields"), // TODO: named fields
+        }
+    }
+
     let ident = &input.ident;
 
-    let fn_try_from = impl_try_parse_command(&variants, &variant_infos, &command_enum);
     let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
-    let fn_parse = impl_parse();
+    let fn_parse = impl_parse(&variant_infos, &command_enum, &vec_impl_create);
 
     let trait_impl = quote! {
         impl BotCommand for #ident {
-            #fn_try_from
             #fn_descriptions
             #fn_parse
         }
@@ -74,23 +91,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     TokenStream::from(trait_impl)
 }
 
-fn impl_try_parse_command(variants: &[&Variant], infos: &[Command], global: &CommandEnum) -> impl ToTokens {
-    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
-    let variant_ident = variants.iter().map(|variant| &variant.ident);
-
-    quote! {
-        fn try_from(value: &str) -> Option<Self> {
-            match value {
-                #(
-                    #matching_values => Some(Self::#variant_ident),
-                )*
-                _ => None
-            }
-        }
-    }
-}
-
-fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
+fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__private::TokenStream {
     let global_description = if let Some(s) = &global.description {
         quote! { #s, "\n", }
     } else {
@@ -105,31 +106,42 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> impl ToTokens {
     });
 
     quote! {
-        fn descriptions() -> &'static str {
-            std::concat!(#global_description #(#command, #description, '\n'),*)
+        fn descriptions() -> String {
+            std::concat!(#global_description #(#command, #description, '\n'),*).to_string()
         }
     }
 }
 
-fn impl_parse() -> impl ToTokens {
+fn impl_parse(
+    infos: &[Command],
+    global: &CommandEnum,
+    variants_initialization: &[quote::__private::TokenStream],
+) -> quote::__private::TokenStream {
+    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
+
     quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Option<(Self, Vec<&str>)>
+         fn parse<N>(s: &str, bot_name: N) -> Result<Self, ParseError>
          where
-            N: Into<String>
+              N: Into<String>
          {
-            let mut words = s.split_whitespace();
-            let mut splited = words.next()?.split('@');
-            let command_raw = splited.next()?;
-            let bot = splited.next();
-            let bot_name = bot_name.into();
-            match bot {
-                Some(name) if name == bot_name => {}
-                None => {}
-                _ => return None,
-            }
-            let command = Self::try_from(command_raw)?;
-            Some((command, words.collect()))
-        }
+              let mut words = s.splitn(2, ' ');
+              let mut splited = words.next().ok_or(ParseError::UncorrectFormat)?.split('@');
+              let command_raw = splited.next().ok_or(ParseError::UncorrectFormat)?;
+              let bot = splited.next();
+              let bot_name = bot_name.into();
+              match bot {
+                  Some(name) if name == bot_name => {}
+                  None => {}
+                  Some(n) => return Err(ParseError::WrongBotName(n.to_string())),
+              }
+              let mut args = words.next().unwrap_or("").to_string();
+              match command_raw {
+                   #(
+                        #matching_values => Ok(#variants_initialization),
+                   )*
+                   _ => Err(ParseError::UncorrectCommand(command_raw.to_string())),
+              }
+         }
     }
 }
 

From 3f21329c3df74ca485afcc1357098aad1c4dd6f3 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Mon, 1 Jun 2020 21:13:30 +0300
Subject: [PATCH 024/755] added parsing of named fields

---
 src/command.rs      |  7 +++--
 src/fields_parse.rs | 62 ++++++++++++++++++++++++++++++---------------
 src/lib.rs          |  8 ++++--
 3 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index bf99ddf3..fd201f4f 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -4,7 +4,6 @@ use crate::{
     attr::{Attr, BotCommandAttribute},
     rename_rules::rename_by_rule,
 };
-use crate::enum_attributes::CommandEnum;
 
 pub struct Command {
     pub prefix: Option<String>,
@@ -45,7 +44,11 @@ impl Command {
         } else {
             "/"
         };
-        String::from(prefix) + &self.name
+        if let Some(rule) = &global_parameters.rename_rule {
+            String::from(prefix) + &rename_by_rule(&self.name, rule.as_str())
+        } else {
+            String::from(prefix) + &self.name
+        }
     }
 }
 
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index d641d657..e06f421a 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -2,7 +2,7 @@ extern crate quote;
 
 use quote::__private::Span;
 use quote::{quote, ToTokens};
-use syn::FieldsUnnamed;
+use syn::{FieldsUnnamed, FieldsNamed};
 
 #[derive(Debug)]
 pub enum ParserType {
@@ -26,25 +26,7 @@ pub fn impl_parse_args_unnamed(
     variant: impl ToTokens,
     parser_type: &ParserType,
 ) -> quote::__private::TokenStream {
-    let function_to_parse = match parser_type {
-        ParserType::Default => {
-            match data.unnamed.len() {
-                1 => {
-                    quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::UncorrectFormat)?,)) ) }
-                }
-                _ => quote! { compile_error!("Expected 1 argument") },
-            }
-        }
-        ParserType::Split { separator } => parser_with_separator(
-            &separator.clone().unwrap_or(" ".to_owned()),
-            data.unnamed.len(),
-        ),
-        ParserType::Custom(s) => {
-            let ident = syn::Ident::new(&s, Span::call_site());
-            quote! { #ident }
-        }
-    };
-    let get_arguments = quote! { let arguments = #function_to_parse(args)?; };
+    let get_arguments = create_parser(parser_type, data.unnamed.len());
     let iter = 0..data.unnamed.len();
     let mut initialization = quote! {};
     for i in iter {
@@ -59,6 +41,46 @@ pub fn impl_parse_args_unnamed(
     res
 }
 
+pub fn impl_parse_args_named(
+    data: &FieldsNamed,
+    variant: impl ToTokens,
+    parser_type: &ParserType,
+) -> quote::__private::TokenStream {
+    let get_arguments = create_parser(parser_type, data.named.len());
+    let i = 0..data.named.len();
+    let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
+    let res = quote! {
+        {
+            #get_arguments
+            #variant { #(#name: arguments.#i),* }
+        }
+    };
+    res
+}
+
+
+fn create_parser(parser_type: &ParserType, count_args: usize) -> quote::__private::TokenStream {
+    let function_to_parse = match parser_type {
+        ParserType::Default => {
+            match count_args {
+                1 => {
+                    quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::UncorrectFormat)?,)) ) }
+                }
+                _ => quote! { compile_error!("Expected 1 argument") },
+            }
+        }
+        ParserType::Split { separator } => parser_with_separator(
+            &separator.clone().unwrap_or(" ".to_owned()),
+            count_args,
+        ),
+        ParserType::Custom(s) => {
+            let ident = syn::Ident::new(&s, Span::call_site());
+            quote! { #ident }
+        }
+    };
+    quote! { let arguments = #function_to_parse(args)?; }
+}
+
 fn parser_with_separator(separator: &str, count_args: usize) -> quote::__private::TokenStream {
     let inner = quote! { let splited = s.split(#separator).collect::<Vec<_>>(); };
     let mut inner2 = quote! {};
diff --git a/src/lib.rs b/src/lib.rs
index dc6c1b69..aba3f73b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@ mod rename_rules;
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
-use crate::fields_parse::impl_parse_args_unnamed;
+use crate::fields_parse::{impl_parse_args_unnamed, impl_parse_args_named};
 use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
@@ -72,7 +72,10 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
             Fields::Unit => {
                 vec_impl_create.push(variantt);
             }
-            _ => panic!("only unnamed fields"), // TODO: named fields
+            Fields::Named(named) => {
+                let parser = info.parser.as_ref().unwrap_or(&command_enum.parser_type);
+                vec_impl_create.push(impl_parse_args_named(named, variantt, parser));
+            }
         }
     }
 
@@ -124,6 +127,7 @@ fn impl_parse(
          where
               N: Into<String>
          {
+              use std::str::FromStr;
               let mut words = s.splitn(2, ' ');
               let mut splited = words.next().ok_or(ParseError::UncorrectFormat)?.split('@');
               let command_raw = splited.next().ok_or(ParseError::UncorrectFormat)?;

From a918eb4e507f8a4d83f6151a17db2c982339ab5b Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Mon, 1 Jun 2020 22:33:51 +0300
Subject: [PATCH 025/755] refactoring + fmt

---
 src/command.rs                              |  2 +-
 src/{enum_attributes.rs => command_enum.rs} |  0
 src/fields_parse.rs                         | 42 +++++++++++++--------
 src/lib.rs                                  | 12 +++---
 4 files changed, 33 insertions(+), 23 deletions(-)
 rename src/{enum_attributes.rs => command_enum.rs} (100%)

diff --git a/src/command.rs b/src/command.rs
index fd201f4f..8a5f3a3a 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,4 +1,4 @@
-use crate::enum_attributes::CommandEnum;
+use crate::command_enum::CommandEnum;
 use crate::fields_parse::ParserType;
 use crate::{
     attr::{Attr, BotCommandAttribute},
diff --git a/src/enum_attributes.rs b/src/command_enum.rs
similarity index 100%
rename from src/enum_attributes.rs
rename to src/command_enum.rs
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index e06f421a..3b38c38f 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -2,7 +2,7 @@ extern crate quote;
 
 use quote::__private::Span;
 use quote::{quote, ToTokens};
-use syn::{FieldsUnnamed, FieldsNamed};
+use syn::{FieldsNamed, FieldsUnnamed};
 
 #[derive(Debug)]
 pub enum ParserType {
@@ -58,41 +58,51 @@ pub fn impl_parse_args_named(
     res
 }
 
-
 fn create_parser(parser_type: &ParserType, count_args: usize) -> quote::__private::TokenStream {
     let function_to_parse = match parser_type {
-        ParserType::Default => {
-            match count_args {
-                1 => {
-                    quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::UncorrectFormat)?,)) ) }
-                }
-                _ => quote! { compile_error!("Expected 1 argument") },
+        ParserType::Default => match count_args {
+            1 => {
+                quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::IncorrectFormat)?,)) ) }
             }
+            _ => quote! { compile_error!("Expected 1 argument") },
+        },
+        ParserType::Split { separator } => {
+            parser_with_separator(&separator.clone().unwrap_or(" ".to_owned()), count_args)
         }
-        ParserType::Split { separator } => parser_with_separator(
-            &separator.clone().unwrap_or(" ".to_owned()),
-            count_args,
-        ),
         ParserType::Custom(s) => {
             let ident = syn::Ident::new(&s, Span::call_site());
             quote! { #ident }
         }
     };
-    quote! { let arguments = #function_to_parse(args)?; }
+    quote! {
+        let arguments = #function_to_parse(args)?;
+    }
 }
 
 fn parser_with_separator(separator: &str, count_args: usize) -> quote::__private::TokenStream {
-    let inner = quote! { let splited = s.split(#separator).collect::<Vec<_>>(); };
+    let inner = quote! { let mut splited = s.split(#separator); };
     let mut inner2 = quote! {};
     for i in 0..count_args {
         inner2.extend(
-            quote! { FromStr::from_str(splited[#i]).map_err(|_|ParseError::UncorrectFormat)?, },
+            quote! { FromStr::from_str(splited.next().ok_or(ParseError::TooFewArguments {
+                expected: #count_args,
+                found: #i,
+                message: format!("Expected but not found arg number {}", #i + 1),
+            })?).map_err(|_|ParseError::IncorrectFormat)?, },
         )
     }
     let res = quote! {
         (|s: String| {
             #inner
-            Ok((#inner2))
+            let res = (#inner2);
+            match splited.next() {
+                Some(d) => Err(ParseError::TooManyArguments {
+                    expected: #count_args,
+                    found: #count_args + 1,
+                    message: format!("Excess argument: {}", d),
+                }),
+                None => Ok(res)
+            }
         })
     };
     res
diff --git a/src/lib.rs b/src/lib.rs
index aba3f73b..ad083f9b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,17 +1,17 @@
 mod attr;
 mod command;
-mod enum_attributes;
+mod command_enum;
 mod fields_parse;
 mod rename_rules;
 
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
-use crate::fields_parse::{impl_parse_args_unnamed, impl_parse_args_named};
+use crate::fields_parse::{impl_parse_args_named, impl_parse_args_unnamed};
 use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
-    enum_attributes::CommandEnum,
+    command_enum::CommandEnum,
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
@@ -129,8 +129,8 @@ fn impl_parse(
          {
               use std::str::FromStr;
               let mut words = s.splitn(2, ' ');
-              let mut splited = words.next().ok_or(ParseError::UncorrectFormat)?.split('@');
-              let command_raw = splited.next().ok_or(ParseError::UncorrectFormat)?;
+              let mut splited = words.next().expect("First item will be always.").split('@');
+              let command_raw = splited.next().expect("First item will be always.");
               let bot = splited.next();
               let bot_name = bot_name.into();
               match bot {
@@ -143,7 +143,7 @@ fn impl_parse(
                    #(
                         #matching_values => Ok(#variants_initialization),
                    )*
-                   _ => Err(ParseError::UncorrectCommand(command_raw.to_string())),
+                   _ => Err(ParseError::UnknownCommand(command_raw.to_string())),
               }
          }
     }

From 4e6e6afc3edc419eab2f62dcc36f2708ccafc2c7 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Tue, 2 Jun 2020 21:11:23 +0300
Subject: [PATCH 026/755] import error into scope of parse function

---
 src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index ad083f9b..c789d14a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -123,11 +123,13 @@ fn impl_parse(
     let matching_values = infos.iter().map(|c| c.get_matched_value(global));
 
     quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Result<Self, ParseError>
+         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::ParseError>
          where
               N: Into<String>
          {
               use std::str::FromStr;
+              use teloxide::utils::ParseError;
+
               let mut words = s.splitn(2, ' ');
               let mut splited = words.next().expect("First item will be always.").split('@');
               let command_raw = splited.next().expect("First item will be always.");

From 87cbcf11407107734099b6d008fa7a659ce43df4 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 6 Jun 2020 20:12:18 +0300
Subject: [PATCH 027/755] fix

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c789d14a..49b1e1ae 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -123,12 +123,12 @@ fn impl_parse(
     let matching_values = infos.iter().map(|c| c.get_matched_value(global));
 
     quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::ParseError>
+         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::command::ParseError>
          where
               N: Into<String>
          {
               use std::str::FromStr;
-              use teloxide::utils::ParseError;
+              use teloxide::utils::command::ParseError;
 
               let mut words = s.splitn(2, ' ');
               let mut splited = words.next().expect("First item will be always.").split('@');

From 9fa60a75964dddc59ac36544db2788c8b983778f Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 24 Jun 2020 19:13:56 +0300
Subject: [PATCH 028/755] fixed rust could not infer types

---
 src/fields_parse.rs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 3b38c38f..163b4f4e 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -2,7 +2,7 @@ extern crate quote;
 
 use quote::__private::Span;
 use quote::{quote, ToTokens};
-use syn::{FieldsNamed, FieldsUnnamed};
+use syn::{FieldsNamed, FieldsUnnamed, Type};
 
 #[derive(Debug)]
 pub enum ParserType {
@@ -26,7 +26,7 @@ pub fn impl_parse_args_unnamed(
     variant: impl ToTokens,
     parser_type: &ParserType,
 ) -> quote::__private::TokenStream {
-    let get_arguments = create_parser(parser_type, data.unnamed.len());
+    let get_arguments = create_parser(parser_type, data.unnamed.iter().map(|f| &f.ty), data.unnamed.len());
     let iter = 0..data.unnamed.len();
     let mut initialization = quote! {};
     for i in iter {
@@ -46,7 +46,7 @@ pub fn impl_parse_args_named(
     variant: impl ToTokens,
     parser_type: &ParserType,
 ) -> quote::__private::TokenStream {
-    let get_arguments = create_parser(parser_type, data.named.len());
+    let get_arguments = create_parser(parser_type, data.named.iter().map(|f| &f.ty), data.named.len());
     let i = 0..data.named.len();
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
@@ -58,16 +58,16 @@ pub fn impl_parse_args_named(
     res
 }
 
-fn create_parser(parser_type: &ParserType, count_args: usize) -> quote::__private::TokenStream {
+fn create_parser<'a>(parser_type: &ParserType, types: impl Iterator<Item = &'a Type>, count_args: usize) -> quote::__private::TokenStream {
     let function_to_parse = match parser_type {
         ParserType::Default => match count_args {
             1 => {
-                quote! { (|s: String| Ok((FromStr::from_str(&s).map_err(|_|ParseError::IncorrectFormat)?,)) ) }
+                quote! { (|s: String| Ok((s,))) }
             }
             _ => quote! { compile_error!("Expected 1 argument") },
         },
         ParserType::Split { separator } => {
-            parser_with_separator(&separator.clone().unwrap_or(" ".to_owned()), count_args)
+            parser_with_separator(&separator.clone().unwrap_or(" ".to_owned()), types, count_args)
         }
         ParserType::Custom(s) => {
             let ident = syn::Ident::new(&s, Span::call_site());
@@ -79,18 +79,17 @@ fn create_parser(parser_type: &ParserType, count_args: usize) -> quote::__privat
     }
 }
 
-fn parser_with_separator(separator: &str, count_args: usize) -> quote::__private::TokenStream {
+fn parser_with_separator<'a>(separator: &str, types: impl Iterator<Item = &'a Type>, count_args: usize) -> quote::__private::TokenStream {
     let inner = quote! { let mut splited = s.split(#separator); };
-    let mut inner2 = quote! {};
-    for i in 0..count_args {
-        inner2.extend(
-            quote! { FromStr::from_str(splited.next().ok_or(ParseError::TooFewArguments {
-                expected: #count_args,
-                found: #i,
-                message: format!("Expected but not found arg number {}", #i + 1),
-            })?).map_err(|_|ParseError::IncorrectFormat)?, },
-        )
-    }
+    let i = 0..count_args;
+    let inner2 =
+        quote! { 
+                #(#types::from_str(splited.next().ok_or(ParseError::TooFewArguments {
+                    expected: #count_args,
+                    found: #i,
+                    message: format!("Expected but not found arg number {}", #i + 1),
+                })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error> = e.into(); e }))?,)*
+            };
     let res = quote! {
         (|s: String| {
             #inner

From 4ce3d96e2032784244d8ce662759d4857bc5b0c1 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 24 Jun 2020 19:14:31 +0300
Subject: [PATCH 029/755] fmt

---
 src/fields_parse.rs | 47 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 163b4f4e..d6ca9c2d 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -26,7 +26,11 @@ pub fn impl_parse_args_unnamed(
     variant: impl ToTokens,
     parser_type: &ParserType,
 ) -> quote::__private::TokenStream {
-    let get_arguments = create_parser(parser_type, data.unnamed.iter().map(|f| &f.ty), data.unnamed.len());
+    let get_arguments = create_parser(
+        parser_type,
+        data.unnamed.iter().map(|f| &f.ty),
+        data.unnamed.len(),
+    );
     let iter = 0..data.unnamed.len();
     let mut initialization = quote! {};
     for i in iter {
@@ -46,7 +50,11 @@ pub fn impl_parse_args_named(
     variant: impl ToTokens,
     parser_type: &ParserType,
 ) -> quote::__private::TokenStream {
-    let get_arguments = create_parser(parser_type, data.named.iter().map(|f| &f.ty), data.named.len());
+    let get_arguments = create_parser(
+        parser_type,
+        data.named.iter().map(|f| &f.ty),
+        data.named.len(),
+    );
     let i = 0..data.named.len();
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
@@ -58,7 +66,11 @@ pub fn impl_parse_args_named(
     res
 }
 
-fn create_parser<'a>(parser_type: &ParserType, types: impl Iterator<Item = &'a Type>, count_args: usize) -> quote::__private::TokenStream {
+fn create_parser<'a>(
+    parser_type: &ParserType,
+    types: impl Iterator<Item = &'a Type>,
+    count_args: usize,
+) -> quote::__private::TokenStream {
     let function_to_parse = match parser_type {
         ParserType::Default => match count_args {
             1 => {
@@ -66,9 +78,11 @@ fn create_parser<'a>(parser_type: &ParserType, types: impl Iterator<Item = &'a T
             }
             _ => quote! { compile_error!("Expected 1 argument") },
         },
-        ParserType::Split { separator } => {
-            parser_with_separator(&separator.clone().unwrap_or(" ".to_owned()), types, count_args)
-        }
+        ParserType::Split { separator } => parser_with_separator(
+            &separator.clone().unwrap_or(" ".to_owned()),
+            types,
+            count_args,
+        ),
         ParserType::Custom(s) => {
             let ident = syn::Ident::new(&s, Span::call_site());
             quote! { #ident }
@@ -79,17 +93,20 @@ fn create_parser<'a>(parser_type: &ParserType, types: impl Iterator<Item = &'a T
     }
 }
 
-fn parser_with_separator<'a>(separator: &str, types: impl Iterator<Item = &'a Type>, count_args: usize) -> quote::__private::TokenStream {
+fn parser_with_separator<'a>(
+    separator: &str,
+    types: impl Iterator<Item = &'a Type>,
+    count_args: usize,
+) -> quote::__private::TokenStream {
     let inner = quote! { let mut splited = s.split(#separator); };
     let i = 0..count_args;
-    let inner2 =
-        quote! { 
-                #(#types::from_str(splited.next().ok_or(ParseError::TooFewArguments {
-                    expected: #count_args,
-                    found: #i,
-                    message: format!("Expected but not found arg number {}", #i + 1),
-                })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error> = e.into(); e }))?,)*
-            };
+    let inner2 = quote! {
+        #(#types::from_str(splited.next().ok_or(ParseError::TooFewArguments {
+            expected: #count_args,
+            found: #i,
+            message: format!("Expected but not found arg number {}", #i + 1),
+        })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error> = e.into(); e }))?,)*
+    };
     let res = quote! {
         (|s: String| {
             #inner

From f47cd173be22ac9a07e96613bcc9cf5de8765a68 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Fri, 3 Jul 2020 20:42:58 +0300
Subject: [PATCH 030/755] prepare changelog to update to 0.3.0

---
 CHANGELOG.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f2f2f6a..85a7b6c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+Nothing
+
+## [0.3.0] - 2020-07-03
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
+ - Now parsing of arguments happens using special function. There are 3 possible variants:
+   - Using `default` parser, which only put all text in one String field.
+   - Using `split` parser, which split all text by `separator` (by default is whitespace) and then use FromStr::from_str to construct value.
+   - Using custom separator.
+ - Now function `parse` return Result<T, ParseError> instead of Option<T>.
 
 ### Added
  - This `CHANGELOG.md`.
  - `.gitignore`.
-
+ - `#[parse_with]` attribute.
+ - `#[separator='%sep%']` attribute.
 
 ## [0.1.2] - 2020-02-24
 ### Changed

From 3357bd5947dd97e3e0a09e15b89a693d1b27d473 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Fri, 3 Jul 2020 20:47:03 +0300
Subject: [PATCH 031/755] fixed clippy errors

---
 src/command_enum.rs | 5 ++---
 src/fields_parse.rs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/command_enum.rs b/src/command_enum.rs
index f09721cb..0bfc1cdc 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -19,9 +19,8 @@ impl CommandEnum {
         let rename = attrs.rename;
         let separator = attrs.separator;
         let mut parser = attrs.parser.unwrap_or(ParserType::Default);
-        match (&mut parser, &separator) {
-            (ParserType::Split { separator }, Some(s)) => *separator = Some(s.clone()),
-            _ => {}
+        if let (ParserType::Split { separator }, Some(s)) = (&mut parser, &separator) {
+            *separator = Some(s.clone())
         }
         if let Some(rename_rule) = &rename {
             match rename_rule.as_str() {
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index d6ca9c2d..d6410353 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -79,7 +79,7 @@ fn create_parser<'a>(
             _ => quote! { compile_error!("Expected 1 argument") },
         },
         ParserType::Split { separator } => parser_with_separator(
-            &separator.clone().unwrap_or(" ".to_owned()),
+            &separator.clone().unwrap_or_else(|| " ".to_owned()),
             types,
             count_args,
         ),

From cf2347214a40f1c70e85fb0ca697dcf6f6d4ac39 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Fri, 3 Jul 2020 20:50:26 +0300
Subject: [PATCH 032/755] changed readme

---
 Readme.md | 128 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 114 insertions(+), 14 deletions(-)

diff --git a/Readme.md b/Readme.md
index 04e9e074..72737dc5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,23 +1,27 @@
 # teloxide-macros
 The teloxide's procedural macros.
 
-## Example
+# Example
 ```rust
 use teloxide::utils::command::BotCommand;
+
+type UnitOfTime = u8;
+
 #[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase")]
+#[command(rename = "lowercase", parse_with = "split")]
 enum AdminCommand {
-    Mute,
-    Ban,
+    Mute(UnitOfTime, char),
+    Ban(UnitOfTime, char),
 }
-let (command, args) = AdminCommand::parse("/ban 5 h", "bot_name").unwrap();
-assert_eq!(command, AdminCommand::Ban);
-assert_eq!(args, vec!["5", "h"]);
+
+let command = AdminCommand::parse("/ban 5 h", "bot_name").unwrap();
+assert_eq!(command, AdminCommand::Ban(5, 'h'));
 ```
+
 ## Enum attributes
  1. `#[command(rename = "rule")]`
-Rename all commands by rule. Allowed rules are `lowercase`. If you will not
-use this attribute, commands will be parsed by their original names.
+Rename all commands by `rule`. Allowed rules are `lowercase`. If you will
+not use this attribute, commands will be parsed by their original names.
 
  2. `#[command(prefix = "prefix")]`
 Change a prefix for all commands (the default is `/`).
@@ -25,15 +29,111 @@ Change a prefix for all commands (the default is `/`).
  3. `#[command(description = "description")]`
 Add a sumary description of commands before all commands.
 
+ 4. `#[command(parse_with = "parser")]`
+Change the parser of arguments. Possible values:
+   - `default` - the same as the unspecified parser. It only puts all text
+   after the first space into the first argument, which must implement
+   [`FromStr`].
+
+### Example
+```rust
+use teloxide::utils::command::BotCommand;
+
+#[derive(BotCommand, PartialEq, Debug)]
+#[command(rename = "lowercase")]
+enum Command {
+    Text(String),
+}
+
+let command = Command::parse("/text hello my dear friend!", "").unwrap();
+assert_eq!(command, Command::Text("hello my dear friend!".to_string()));
+```
+
+ - `split` - separates a messsage by a given separator (the default is the
+   space character) and parses each part into the corresponding arguments,
+   which must implement [`FromStr`].
+
+### Example
+```rust
+use teloxide::utils::command::BotCommand;
+
+#[derive(BotCommand, PartialEq, Debug)]
+#[command(rename = "lowercase", parse_with = "split")]
+enum Command {
+    Nums(u8, u16, i32),
+}
+
+let command = Command::parse("/nums 1 32 -5", "").unwrap();
+assert_eq!(command, Command::Nums(1, 32, -5));
+```
+
+5. `#[command(separator = "sep")]`
+Specify separator used by the `split` parser. It will be ignored when
+accompanied by another type of parsers.
+
+### Example
+```rust
+use teloxide::utils::command::BotCommand;
+
+#[derive(BotCommand, PartialEq, Debug)]
+#[command(rename = "lowercase", parse_with = "split", separator = "|")]
+enum Command {
+    Nums(u8, u16, i32),
+}
+
+let command = Command::parse("/nums 1|32|5", "").unwrap();
+assert_eq!(command, Command::Nums(1, 32, 5));
+```
+
 ## Variant attributes
+All variant attributes override the corresponding `enum` attributes.
+
  1. `#[command(rename = "rule")]`
 Rename one command by a rule. Allowed rules are `lowercase`, `%some_name%`,
 where `%some_name%` is any string, a new name.
 
- 2. `#[command(prefix = "prefix")]`
-Change a prefix for one command (the default is `/`).
+ 2. `#[command(parse_with = "parser")]`
+One more option is available for variants.
+   - `custom_parser` - your own parser of the signature `fn(String) ->
+   Result<Tuple, ParseError>`, where `Tuple` corresponds to the variant's
+arguments.
 
- 3. `#[command(description = "description")]`
-Add a description of one command.
+### Example
+```rust
+use teloxide::utils::command::{BotCommand, ParseError};
 
-All variant attributes overlap the `enum` attributes.
\ No newline at end of file
+fn accept_two_digits(input: String) -> Result<(u8,), ParseError> {
+    match input.len() {
+        2 => {
+            let num = input
+                .parse::<u8>()
+                .map_err(|e| ParseError::IncorrectFormat(e.into()))?;
+            Ok((num,))
+        }
+        len => Err(ParseError::Custom(
+            format!("Only 2 digits allowed, not {}", len).into(),
+        )),
+    }
+}
+
+#[derive(BotCommand, PartialEq, Debug)]
+#[command(rename = "lowercase")]
+enum Command {
+    #[command(parse_with = "accept_two_digits")]
+    Num(u8),
+}
+
+let command = Command::parse("/num 12", "").unwrap();
+assert_eq!(command, Command::Num(12));
+let command = Command::parse("/num 333", "");
+assert!(command.is_err());
+```
+
+ 3. `#[command(prefix = "prefix")]`
+ 4. `#[command(description = "description")]`
+ 5. `#[command(separator = "sep")]`
+
+Analogous to the descriptions above.
+
+[`FromStr`]: https://doc.rust-lang.org/std/str/trait.FromStr.html
+[`BotCommand`]: crate::utils::command::BotCommand

From 7a05f021bd4e8707f3f59318d1969b9ba4a36101 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Fri, 3 Jul 2020 20:55:25 +0300
Subject: [PATCH 033/755] delete readme

---
 Readme.md | 139 ------------------------------------------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 Readme.md

diff --git a/Readme.md b/Readme.md
deleted file mode 100644
index 72737dc5..00000000
--- a/Readme.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# teloxide-macros
-The teloxide's procedural macros.
-
-# Example
-```rust
-use teloxide::utils::command::BotCommand;
-
-type UnitOfTime = u8;
-
-#[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase", parse_with = "split")]
-enum AdminCommand {
-    Mute(UnitOfTime, char),
-    Ban(UnitOfTime, char),
-}
-
-let command = AdminCommand::parse("/ban 5 h", "bot_name").unwrap();
-assert_eq!(command, AdminCommand::Ban(5, 'h'));
-```
-
-## Enum attributes
- 1. `#[command(rename = "rule")]`
-Rename all commands by `rule`. Allowed rules are `lowercase`. If you will
-not use this attribute, commands will be parsed by their original names.
-
- 2. `#[command(prefix = "prefix")]`
-Change a prefix for all commands (the default is `/`).
-
- 3. `#[command(description = "description")]`
-Add a sumary description of commands before all commands.
-
- 4. `#[command(parse_with = "parser")]`
-Change the parser of arguments. Possible values:
-   - `default` - the same as the unspecified parser. It only puts all text
-   after the first space into the first argument, which must implement
-   [`FromStr`].
-
-### Example
-```rust
-use teloxide::utils::command::BotCommand;
-
-#[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase")]
-enum Command {
-    Text(String),
-}
-
-let command = Command::parse("/text hello my dear friend!", "").unwrap();
-assert_eq!(command, Command::Text("hello my dear friend!".to_string()));
-```
-
- - `split` - separates a messsage by a given separator (the default is the
-   space character) and parses each part into the corresponding arguments,
-   which must implement [`FromStr`].
-
-### Example
-```rust
-use teloxide::utils::command::BotCommand;
-
-#[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase", parse_with = "split")]
-enum Command {
-    Nums(u8, u16, i32),
-}
-
-let command = Command::parse("/nums 1 32 -5", "").unwrap();
-assert_eq!(command, Command::Nums(1, 32, -5));
-```
-
-5. `#[command(separator = "sep")]`
-Specify separator used by the `split` parser. It will be ignored when
-accompanied by another type of parsers.
-
-### Example
-```rust
-use teloxide::utils::command::BotCommand;
-
-#[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase", parse_with = "split", separator = "|")]
-enum Command {
-    Nums(u8, u16, i32),
-}
-
-let command = Command::parse("/nums 1|32|5", "").unwrap();
-assert_eq!(command, Command::Nums(1, 32, 5));
-```
-
-## Variant attributes
-All variant attributes override the corresponding `enum` attributes.
-
- 1. `#[command(rename = "rule")]`
-Rename one command by a rule. Allowed rules are `lowercase`, `%some_name%`,
-where `%some_name%` is any string, a new name.
-
- 2. `#[command(parse_with = "parser")]`
-One more option is available for variants.
-   - `custom_parser` - your own parser of the signature `fn(String) ->
-   Result<Tuple, ParseError>`, where `Tuple` corresponds to the variant's
-arguments.
-
-### Example
-```rust
-use teloxide::utils::command::{BotCommand, ParseError};
-
-fn accept_two_digits(input: String) -> Result<(u8,), ParseError> {
-    match input.len() {
-        2 => {
-            let num = input
-                .parse::<u8>()
-                .map_err(|e| ParseError::IncorrectFormat(e.into()))?;
-            Ok((num,))
-        }
-        len => Err(ParseError::Custom(
-            format!("Only 2 digits allowed, not {}", len).into(),
-        )),
-    }
-}
-
-#[derive(BotCommand, PartialEq, Debug)]
-#[command(rename = "lowercase")]
-enum Command {
-    #[command(parse_with = "accept_two_digits")]
-    Num(u8),
-}
-
-let command = Command::parse("/num 12", "").unwrap();
-assert_eq!(command, Command::Num(12));
-let command = Command::parse("/num 333", "");
-assert!(command.is_err());
-```
-
- 3. `#[command(prefix = "prefix")]`
- 4. `#[command(description = "description")]`
- 5. `#[command(separator = "sep")]`
-
-Analogous to the descriptions above.
-
-[`FromStr`]: https://doc.rust-lang.org/std/str/trait.FromStr.html
-[`BotCommand`]: crate::utils::command::BotCommand

From d21dcd678cb4e76e48f38e02670c978654df333e Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 3 Jul 2020 23:59:10 +0600
Subject: [PATCH 034/755] Update Cargo.toml

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6342ee71..1d497962 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.2.1"
+version = "0.3.0"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 8be96a34889ce5866986675b135562a4c4044c61 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 4 Jul 2020 00:05:40 +0600
Subject: [PATCH 035/755] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a7b6c1..f581075d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,15 @@ Nothing
    - Using custom separator.
  - Now function `parse` return Result<T, ParseError> instead of Option<T>.
 
+## [0.2.1] - 2020-02-25
+### Changed
+ - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
+
+### Added
+ - This `CHANGELOG.md`.
+ - `.gitignore`.
+ - The functionality to parse commands only with a correct bot's name (breaks backwards compatibility).
+
 ### Added
  - This `CHANGELOG.md`.
  - `.gitignore`.

From 449a82d8394d26e8c7973e5d96c38d5b47037eb2 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 4 Jul 2020 00:07:56 +0600
Subject: [PATCH 036/755] Update CHANGELOG.md

---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f581075d..bac4a87a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,12 @@ Nothing
    - Using custom separator.
  - Now function `parse` return Result<T, ParseError> instead of Option<T>.
 
+### Added
+ - This `CHANGELOG.md`.
+ - `.gitignore`.
+ - `#[parse_with]` attribute.
+ - `#[separator='%sep%']` attribute.
+
 ## [0.2.1] - 2020-02-25
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
@@ -25,12 +31,6 @@ Nothing
  - `.gitignore`.
  - The functionality to parse commands only with a correct bot's name (breaks backwards compatibility).
 
-### Added
- - This `CHANGELOG.md`.
- - `.gitignore`.
- - `#[parse_with]` attribute.
- - `#[separator='%sep%']` attribute.
-
 ## [0.1.2] - 2020-02-24
 ### Changed
  - The same as v0.1.1, but fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility.

From 7d5d070bd795d0ff35aa5a2211104b91d7a680d7 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 4 Jul 2020 10:37:13 +0300
Subject: [PATCH 037/755] added option to remove command from description

---
 src/lib.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 49b1e1ae..1a16ccd1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -104,13 +104,19 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__privat
     let description = infos.iter().map(|info| {
         info.description
             .as_deref()
-            .map(|e| format!(" - {}", e))
+            .map(|e| if e != "off" { format!(" - {}", e) } else { e.to_string() })
             .unwrap_or_default()
     });
+    let result_iter = command.zip(description).map(|(c, d)| {
+        match &d == "off" {
+            true => quote! {},
+            false => quote! { #c, #d, '\n', }
+        }
+    });
 
     quote! {
         fn descriptions() -> String {
-            std::concat!(#global_description #(#command, #description, '\n'),*).to_string()
+            std::concat!(#global_description #(#result_iter)*).to_string()
         }
     }
 }

From 00513c74609cba999d4c7692a6bbf8fb86ab7fec Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 4 Jul 2020 10:39:28 +0300
Subject: [PATCH 038/755] changed changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bac4a87a..23a69c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-Nothing
+## [0.3.1]
+### Added
+ - Now you can remove command from showing in descriptions by defining `description` attribute as `"off"`.
 
 ## [0.3.0] - 2020-07-03
 ### Changed

From 8eda469fc9ed0ff8eea30648ec23ae929730c11b Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 4 Jul 2020 10:39:41 +0300
Subject: [PATCH 039/755] up version to 0.3.1

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1d497962..557f7802 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.3.0"
+version = "0.3.1"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From bc388ca06ec584cfee10178846f2dd078f09182d Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 4 Jul 2020 10:42:19 +0300
Subject: [PATCH 040/755] fix clippy errors

---
 src/lib.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 1a16ccd1..50bb9b02 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -108,9 +108,10 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__privat
             .unwrap_or_default()
     });
     let result_iter = command.zip(description).map(|(c, d)| {
-        match &d == "off" {
-            true => quote! {},
-            false => quote! { #c, #d, '\n', }
+        if &d == "off" {
+            quote! {}
+        } else {
+            quote! { #c, #d, '\n', }
         }
     });
 

From 5f3436204415c64ac3c2963a216a4adc04d112db Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 4 Jul 2020 10:43:56 +0300
Subject: [PATCH 041/755] fmt

---
 src/lib.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 50bb9b02..1e9c9d51 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -104,7 +104,13 @@ fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__privat
     let description = infos.iter().map(|info| {
         info.description
             .as_deref()
-            .map(|e| if e != "off" { format!(" - {}", e) } else { e.to_string() })
+            .map(|e| {
+                if e != "off" {
+                    format!(" - {}", e)
+                } else {
+                    e.to_string()
+                }
+            })
             .unwrap_or_default()
     });
     let result_iter = command.zip(description).map(|(c, d)| {

From c5fcfd21fdc09b5e316aed6509f33a8fbd0ac60f Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 4 Jul 2020 13:56:27 +0600
Subject: [PATCH 042/755] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a69c31..d0a00d67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.1]
+## [0.3.1] - 2020-07-04
 ### Added
  - Now you can remove command from showing in descriptions by defining `description` attribute as `"off"`.
 

From 4b91245eae9d384a8d656f965a449f2ec15e09e3 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Fri, 10 Jul 2020 13:30:48 +0300
Subject: [PATCH 043/755] added bounds for Error

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

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index d6410353..dffaf9f9 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -105,7 +105,7 @@ fn parser_with_separator<'a>(
             expected: #count_args,
             found: #i,
             message: format!("Expected but not found arg number {}", #i + 1),
-        })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error> = e.into(); e }))?,)*
+        })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error + Send + Sync + 'static> = e.into(); e }))?,)*
     };
     let res = quote! {
         (|s: String| {

From ec9c540839730be08dbb150b1ef49973e071b19c Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Thu, 23 Jul 2020 23:56:25 +0600
Subject: [PATCH 044/755] Add #[handler], #[bot_dialogue]

---
 Cargo.toml |  2 +-
 src/lib.rs | 43 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 557f7802..b9af08b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 quote = "1.0.3"
-syn = "1.0.13"
+syn = { version = "1.0.13",  features = ["full"] }
 
 [lib]
 proc-macro = true
diff --git a/src/lib.rs b/src/lib.rs
index 1e9c9d51..9c26f972 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,5 @@
+// TODO: refactor this shit.
+
 mod attr;
 mod command;
 mod command_enum;
@@ -15,7 +17,46 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Fields};
+use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
+
+use std::fmt::Write;
+
+#[proc_macro_attribute]
+pub fn handler(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    item
+}
+
+#[proc_macro_attribute]
+pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemEnum);
+    let mut dispatch_fn = "".to_owned();
+
+    write!(dispatch_fn, "impl {0} {{ pub fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> TransitionOut<{0}> {{ match self {{", input.ident).unwrap();
+
+    for variant in input.variants.iter() {
+        if let Some(handler) = variant
+            .attrs
+            .iter()
+            .find(|attr| match attr.path.get_ident() {
+                Some(ident) => ident == "handler",
+                None => false,
+            })
+        {
+            let mut handler_fn = handler.tokens.to_string()[1..].to_owned();
+            handler_fn.pop();
+
+            write!(
+                dispatch_fn,
+                "{}::{}(state) => {}(cx, state).await,",
+                input.ident, variant.ident, handler_fn
+            )
+            .unwrap();
+        }
+    }
+
+    write!(dispatch_fn, "}} }} }}").unwrap();
+    dispatch_fn.parse().unwrap()
+}
 
 macro_rules! get_or_return {
     ($($some:tt)*) => {

From 17a9b4d3dffa5f87a53e1649becabaf7553fe653 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 00:22:52 +0600
Subject: [PATCH 045/755] Fix errors

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

diff --git a/src/lib.rs b/src/lib.rs
index 9c26f972..19aa1462 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,7 +31,7 @@ pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
-    write!(dispatch_fn, "impl {0} {{ pub fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> TransitionOut<{0}> {{ match self {{", input.ident).unwrap();
+    write!(dispatch_fn, "impl {} {{ pub async fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> TransitionOut<Self> {{ match self {{", input.ident).unwrap();
 
     for variant in input.variants.iter() {
         if let Some(handler) = variant

From a18ef6fc9431ddcb44de8c8219242fd6cad4cf2b Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 00:32:30 +0600
Subject: [PATCH 046/755] Describe a full path to TransitionOut

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

diff --git a/src/lib.rs b/src/lib.rs
index 19aa1462..a0634fb6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,7 +31,7 @@ pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
-    write!(dispatch_fn, "impl {} {{ pub async fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> TransitionOut<Self> {{ match self {{", input.ident).unwrap();
+    write!(dispatch_fn, "impl {} {{ pub async fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> teloxide::dispatching::dialogue::TransitionOut<Self> {{ match self {{", input.ident).unwrap();
 
     for variant in input.variants.iter() {
         if let Some(handler) = variant

From 15e8e95952b3a72a7f9aefcdaa6614292657ab69 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 00:49:34 +0600
Subject: [PATCH 047/755] Generate an enumeration itself too

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index a0634fb6..066b53eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,9 +28,11 @@ pub fn handler(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
 #[proc_macro_attribute]
 pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    let item_cloned = item.clone();
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
+    write!(dispatch_fn, "{}", item_cloned).unwrap();
     write!(dispatch_fn, "impl {} {{ pub async fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> teloxide::dispatching::dialogue::TransitionOut<Self> {{ match self {{", input.ident).unwrap();
 
     for variant in input.variants.iter() {

From 40ab1b19c25cd6d860cf4d2eaa937260a49ef6c6 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 18:04:47 +0600
Subject: [PATCH 048/755] Derive BotDialogue

---
 src/lib.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 066b53eb..abab604d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,19 +21,12 @@ use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
 
 use std::fmt::Write;
 
-#[proc_macro_attribute]
-pub fn handler(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    item
-}
-
-#[proc_macro_attribute]
-pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
-    let item_cloned = item.clone();
+#[proc_macro_derive(BotDialogue, attributes(handler))]
+pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
-    write!(dispatch_fn, "{}", item_cloned).unwrap();
-    write!(dispatch_fn, "impl {} {{ pub async fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> teloxide::dispatching::dialogue::TransitionOut<Self> {{ match self {{", input.ident).unwrap();
+    write!(dispatch_fn, "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> futures::future::BoxFuture<'static, teloxide::dispatching::dialogue::TransitionOut<Self>> {{ futures::future::FutureExt::boxed(async {{ match self {{", input.ident).unwrap();
 
     for variant in input.variants.iter() {
         if let Some(handler) = variant
@@ -56,7 +49,7 @@ pub fn bot_dialogue(_attr: TokenStream, item: TokenStream) -> TokenStream {
         }
     }
 
-    write!(dispatch_fn, "}} }} }}").unwrap();
+    write!(dispatch_fn, "}} }}) }} }}").unwrap();
     dispatch_fn.parse().unwrap()
 }
 

From f0ab748cce9a9e918a73722902b4c4c3c5e00e12 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 18:29:30 +0600
Subject: [PATCH 049/755] Use #[transition] instead of #[handler]

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

diff --git a/src/lib.rs b/src/lib.rs
index abab604d..ba772054 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,7 +21,7 @@ use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
 
 use std::fmt::Write;
 
-#[proc_macro_derive(BotDialogue, attributes(handler))]
+#[proc_macro_derive(BotDialogue, attributes(transition))]
 pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();

From 878e4370af5bcf7ae71fa250b7bdbb55c81501bf Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 19:28:02 +0600
Subject: [PATCH 050/755] Use TransitionIn

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

diff --git a/src/lib.rs b/src/lib.rs
index ba772054..cedccd6d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,7 +26,7 @@ pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
-    write!(dispatch_fn, "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn dispatch(self, cx: teloxide::dispatching::UpdateWithCx<teloxide::types::Message>) -> futures::future::BoxFuture<'static, teloxide::dispatching::dialogue::TransitionOut<Self>> {{ futures::future::FutureExt::boxed(async {{ match self {{", input.ident).unwrap();
+    write!(dispatch_fn, "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn dispatch(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> futures::future::BoxFuture<'static, teloxide::dispatching::dialogue::TransitionOut<Self>> {{ futures::future::FutureExt::boxed(async {{ match self {{", input.ident).unwrap();
 
     for variant in input.variants.iter() {
         if let Some(handler) = variant

From 22f8d22a54eca0e2eb53e21bf2a32f0caa095fdd Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 19:30:40 +0600
Subject: [PATCH 051/755] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a00d67..d61f6809 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Added
+ - `#[derive(BotDialogue)]` with `#[transition(<your transition fn)]`.
+
 ## [0.3.1] - 2020-07-04
 ### Added
  - Now you can remove command from showing in descriptions by defining `description` attribute as `"off"`.

From d249858a4c81db6d4dfa94e03401d0a6a5a7faae Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 19:31:48 +0600
Subject: [PATCH 052/755] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d61f6809..49359c8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
  - `#[derive(BotDialogue)]` with `#[transition(<your transition fn)]`.
 
+### Removed
+ - The `dev` branch.
+
 ## [0.3.1] - 2020-07-04
 ### Added
  - Now you can remove command from showing in descriptions by defining `description` attribute as `"off"`.

From bcb5d291d01732ebe6c92d34d0eba3def754db96 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 19:35:08 +0600
Subject: [PATCH 053/755] Check for 'transition', not 'handler'

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

diff --git a/src/lib.rs b/src/lib.rs
index cedccd6d..bf2e7712 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,7 +33,7 @@ pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
             .attrs
             .iter()
             .find(|attr| match attr.path.get_ident() {
-                Some(ident) => ident == "handler",
+                Some(ident) => ident == "transition",
                 None => false,
             })
         {

From bf173dec8ac1d9866058c8c2c91cc6719e89cce9 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 24 Jul 2020 19:36:22 +0600
Subject: [PATCH 054/755] Add rustfmt.toml

---
 rustfmt.toml        |  7 +++++
 src/command.rs      | 20 ++++++-------
 src/command_enum.rs |  8 +++---
 src/fields_parse.rs |  3 +-
 src/lib.rs          | 68 ++++++++++++++++++++++++++++-----------------
 5 files changed, 64 insertions(+), 42 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..1907f64f
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,7 @@
+format_code_in_doc_comments = true
+wrap_comments = true
+format_strings = true
+max_width = 80
+merge_imports = true
+use_small_heuristics = "Max"
+use_field_init_shorthand = true
diff --git a/src/command.rs b/src/command.rs
index 8a5f3a3a..31aa092e 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,7 +1,7 @@
-use crate::command_enum::CommandEnum;
-use crate::fields_parse::ParserType;
 use crate::{
     attr::{Attr, BotCommandAttribute},
+    command_enum::CommandEnum,
+    fields_parse::ParserType,
     rename_rules::rename_by_rule,
 };
 
@@ -27,13 +27,7 @@ impl Command {
             new_name = rename_by_rule(name, &rename_rule);
             renamed = true;
         }
-        Ok(Self {
-            prefix,
-            description,
-            parser,
-            name: new_name,
-            renamed,
-        })
+        Ok(Self { prefix, description, parser, name: new_name, renamed })
     }
 
     pub fn get_matched_value(&self, global_parameters: &CommandEnum) -> String {
@@ -70,9 +64,13 @@ pub fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
     for attr in attrs {
         match attr.name() {
             BotCommandAttribute::Prefix => prefix = Some(attr.value()),
-            BotCommandAttribute::Description => description = Some(attr.value()),
+            BotCommandAttribute::Description => {
+                description = Some(attr.value())
+            }
             BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
-            BotCommandAttribute::CustomParser => parser = Some(ParserType::parse(&attr.value())),
+            BotCommandAttribute::CustomParser => {
+                parser = Some(ParserType::parse(&attr.value()))
+            }
             BotCommandAttribute::Separator => separator = Some(attr.value()),
         }
     }
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 0bfc1cdc..e3c7e531 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,6 +1,4 @@
-use crate::attr::Attr;
-use crate::command::parse_attrs;
-use crate::fields_parse::ParserType;
+use crate::{attr::Attr, command::parse_attrs, fields_parse::ParserType};
 
 #[derive(Debug)]
 pub struct CommandEnum {
@@ -19,7 +17,9 @@ impl CommandEnum {
         let rename = attrs.rename;
         let separator = attrs.separator;
         let mut parser = attrs.parser.unwrap_or(ParserType::Default);
-        if let (ParserType::Split { separator }, Some(s)) = (&mut parser, &separator) {
+        if let (ParserType::Split { separator }, Some(s)) =
+            (&mut parser, &separator)
+        {
             *separator = Some(s.clone())
         }
         if let Some(rename_rule) = &rename {
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index dffaf9f9..56e2a80d 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,7 +1,6 @@
 extern crate quote;
 
-use quote::__private::Span;
-use quote::{quote, ToTokens};
+use quote::{__private::Span, quote, ToTokens};
 use syn::{FieldsNamed, FieldsUnnamed, Type};
 
 #[derive(Debug)]
diff --git a/src/lib.rs b/src/lib.rs
index bf2e7712..b961d30c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,11 +9,11 @@ mod rename_rules;
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
-use crate::fields_parse::{impl_parse_args_named, impl_parse_args_unnamed};
 use crate::{
     attr::{Attr, VecAttrs},
     command::Command,
     command_enum::CommandEnum,
+    fields_parse::{impl_parse_args_named, impl_parse_args_unnamed},
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
@@ -26,13 +26,20 @@ pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
-    write!(dispatch_fn, "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn dispatch(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> futures::future::BoxFuture<'static, teloxide::dispatching::dialogue::TransitionOut<Self>> {{ futures::future::FutureExt::boxed(async {{ match self {{", input.ident).unwrap();
+    write!(
+        dispatch_fn,
+        "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn \
+         dispatch(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> \
+         futures::future::BoxFuture<'static, \
+         teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
+         futures::future::FutureExt::boxed(async {{ match self {{",
+        input.ident
+    )
+    .unwrap();
 
     for variant in input.variants.iter() {
-        if let Some(handler) = variant
-            .attrs
-            .iter()
-            .find(|attr| match attr.path.get_ident() {
+        if let Some(handler) =
+            variant.attrs.iter().find(|attr| match attr.path.get_ident() {
                 Some(ident) => ident == "transition",
                 None => false,
             })
@@ -75,7 +82,8 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         Err(e) => return compile_error(e),
     };
 
-    let variants: Vec<&syn::Variant> = data_enum.variants.iter().map(|variant| variant).collect();
+    let variants: Vec<&syn::Variant> =
+        data_enum.variants.iter().map(|variant| variant).collect();
 
     let mut variant_infos = vec![];
     for variant in variants.iter() {
@@ -102,15 +110,19 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         let variantt = quote! { Self::#var };
         match &variant.fields {
             Fields::Unnamed(fields) => {
-                let parser = info.parser.as_ref().unwrap_or(&command_enum.parser_type);
-                vec_impl_create.push(impl_parse_args_unnamed(fields, variantt, parser));
+                let parser =
+                    info.parser.as_ref().unwrap_or(&command_enum.parser_type);
+                vec_impl_create
+                    .push(impl_parse_args_unnamed(fields, variantt, parser));
             }
             Fields::Unit => {
                 vec_impl_create.push(variantt);
             }
             Fields::Named(named) => {
-                let parser = info.parser.as_ref().unwrap_or(&command_enum.parser_type);
-                vec_impl_create.push(impl_parse_args_named(named, variantt, parser));
+                let parser =
+                    info.parser.as_ref().unwrap_or(&command_enum.parser_type);
+                vec_impl_create
+                    .push(impl_parse_args_named(named, variantt, parser));
             }
         }
     }
@@ -130,25 +142,29 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     TokenStream::from(trait_impl)
 }
 
-fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> quote::__private::TokenStream {
+fn impl_descriptions(
+    infos: &[Command],
+    global: &CommandEnum,
+) -> quote::__private::TokenStream {
     let global_description = if let Some(s) = &global.description {
         quote! { #s, "\n", }
     } else {
         quote! {}
     };
     let command = infos.iter().map(|c| c.get_matched_value(global));
-    let description = infos.iter().map(|info| {
-        info.description
-            .as_deref()
-            .map(|e| {
-                if e != "off" {
-                    format!(" - {}", e)
-                } else {
-                    e.to_string()
-                }
-            })
-            .unwrap_or_default()
-    });
+    let description =
+        infos.iter().map(|info| {
+            info.description
+                .as_deref()
+                .map(|e| {
+                    if e != "off" {
+                        format!(" - {}", e)
+                    } else {
+                        e.to_string()
+                    }
+                })
+                .unwrap_or_default()
+        });
     let result_iter = command.zip(description).map(|(c, d)| {
         if &d == "off" {
             quote! {}
@@ -207,7 +223,9 @@ fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
     }
 }
 
-fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<Attr>, TokenStream> {
+fn parse_attributes(
+    input: &[syn::Attribute],
+) -> Result<Vec<Attr>, TokenStream> {
     let mut enum_attrs = Vec::new();
     for attr in input.iter() {
         match attr.parse_args::<VecAttrs>() {

From 6e91f7f79641bb6cf899964ded9c0c3e14190165 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Jul 2020 16:27:39 +0300
Subject: [PATCH 055/755] removed suffix in generated code

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

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index dffaf9f9..c8bdc7c6 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -55,7 +55,7 @@ pub fn impl_parse_args_named(
         data.named.iter().map(|f| &f.ty),
         data.named.len(),
     );
-    let i = 0..data.named.len();
+    let i = (0..data.named.len()).map(|u| syn::Index::from(u));
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
         {

From a934061fb537a9bbdb9cb608f133efc20bd85ae3 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Jul 2020 16:55:35 +0300
Subject: [PATCH 056/755] removed suffix in generated code (2)

---
 src/fields_parse.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index c8bdc7c6..508ff383 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -31,7 +31,7 @@ pub fn impl_parse_args_unnamed(
         data.unnamed.iter().map(|f| &f.ty),
         data.unnamed.len(),
     );
-    let iter = 0..data.unnamed.len();
+    let iter = (0..data.unnamed.len()).map( syn::Index::from);
     let mut initialization = quote! {};
     for i in iter {
         initialization.extend(quote! { arguments.#i, })
@@ -55,7 +55,7 @@ pub fn impl_parse_args_named(
         data.named.iter().map(|f| &f.ty),
         data.named.len(),
     );
-    let i = (0..data.named.len()).map(|u| syn::Index::from(u));
+    let i = (0..data.named.len()).map(syn::Index::from);
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
         {

From 055a4d09cb75fd7c04bdc5315ce80d1d29314242 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Sat, 25 Jul 2020 16:57:51 +0300
Subject: [PATCH 057/755] fmt

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

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 508ff383..10b775fc 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -31,7 +31,7 @@ pub fn impl_parse_args_unnamed(
         data.unnamed.iter().map(|f| &f.ty),
         data.unnamed.len(),
     );
-    let iter = (0..data.unnamed.len()).map( syn::Index::from);
+    let iter = (0..data.unnamed.len()).map(syn::Index::from);
     let mut initialization = quote! {};
     for i in iter {
         initialization.extend(quote! { arguments.#i, })

From 2c17d2f7a3098598e5d8ec88bd102ef6a3a50238 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 25 Jul 2020 22:33:56 +0600
Subject: [PATCH 058/755] Implement a nicer approach with transitions

---
 CHANGELOG.md |  2 +-
 Cargo.toml   |  3 +-
 src/lib.rs   | 88 +++++++++++++++++++++++++++++++++++++++-------------
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49359c8f..bdf726b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 
 ### Added
- - `#[derive(BotDialogue)]` with `#[transition(<your transition fn)]`.
+ - `#[derive(Transition)]` with `#[teloxide(transition)]`.
 
 ### Removed
  - The `dev` branch.
diff --git a/Cargo.toml b/Cargo.toml
index b9af08b5..2cf0f842 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-quote = "1.0.3"
+quote = "1.0.7"
+proc-macro2 = "1.0.19"
 syn = { version = "1.0.13",  features = ["full"] }
 
 [lib]
diff --git a/src/lib.rs b/src/lib.rs
index b961d30c..d6ce22ec 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,19 +17,73 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
+use syn::{
+    parse_macro_input, DeriveInput, Fields, FnArg, ItemEnum, ItemFn, ReturnType,
+};
 
 use std::fmt::Write;
 
-#[proc_macro_derive(BotDialogue, attributes(transition))]
-pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
+#[proc_macro_attribute]
+pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
+    match attr.to_string().as_ref() {
+        "transition" => {
+            let item_cloned = item.clone();
+            let input = parse_macro_input!(item as ItemFn);
+            let params = input.sig.inputs.iter().collect::<Vec<&FnArg>>();
+
+            if params.len() != 2 {
+                panic!(
+                    "An transition function must accept two parameters: a \
+                     state type and TransitionIn"
+                );
+            }
+
+            // This is actually used inside the quite! { ... } below.
+            #[allow(unused_variables)]
+            let state_type = match params[0] {
+                FnArg::Typed(pat_type) => &pat_type.ty,
+                _ => unreachable!(),
+            };
+            let fn_name = input.sig.ident;
+            let fn_return_type = match input.sig.output {
+                ReturnType::Type(_arrow, _type) => _type,
+                _ => panic!(
+                    "A subtransition must return TransitionOut<your dialogue \
+                     type>"
+                ),
+            };
+            let item = proc_macro2::TokenStream::from(item_cloned);
+
+            let impl_transition = quote! {
+                impl teloxide::dispatching::dialogue::SubTransition<
+                <#fn_return_type as teloxide::dispatching::dialogue::SubTransitionOutputType>::Output>
+                    for #state_type {
+                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn)
+                        -> futures::future::BoxFuture<'static, #fn_return_type> {
+                                #item
+
+                                futures::future::FutureExt::boxed(#fn_name(self, cx))
+                            }
+                }
+            };
+
+            impl_transition.into()
+        }
+        _ => {
+            panic!("Unrecognised attribute '{}'", attr);
+        }
+    }
+}
+
+#[proc_macro_derive(Transition)]
+pub fn derive_transition(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
     write!(
         dispatch_fn,
-        "impl teloxide::dispatching::dialogue::BotDialogue for {} {{ fn \
-         dispatch(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> \
+        "impl teloxide::dispatching::dialogue::Transition for {} {{ fn \
+         react(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> \
          futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
          futures::future::FutureExt::boxed(async {{ match self {{",
@@ -38,22 +92,14 @@ pub fn derive_bot_dialogue(item: TokenStream) -> TokenStream {
     .unwrap();
 
     for variant in input.variants.iter() {
-        if let Some(handler) =
-            variant.attrs.iter().find(|attr| match attr.path.get_ident() {
-                Some(ident) => ident == "transition",
-                None => false,
-            })
-        {
-            let mut handler_fn = handler.tokens.to_string()[1..].to_owned();
-            handler_fn.pop();
-
-            write!(
-                dispatch_fn,
-                "{}::{}(state) => {}(cx, state).await,",
-                input.ident, variant.ident, handler_fn
-            )
-            .unwrap();
-        }
+        write!(
+            dispatch_fn,
+            "{}::{}(state) => \
+             teloxide::dispatching::dialogue::SubTransition::react(state, \
+             cx).await,",
+            input.ident, variant.ident
+        )
+        .unwrap();
     }
 
     write!(dispatch_fn, "}} }}) }} }}").unwrap();

From 117690514d9b50ac34ef130c4f6253b183cc4528 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sun, 26 Jul 2020 22:53:37 +0600
Subject: [PATCH 059/755] Respect an auxiliary parameter

---
 src/lib.rs | 63 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index d6ce22ec..30583ba8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,8 @@ use crate::{
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 use syn::{
-    parse_macro_input, DeriveInput, Fields, FnArg, ItemEnum, ItemFn, ReturnType,
+    parse_macro_input, DeriveInput, Fields, FnArg, ItemEnum, ItemFn,
+    ReturnType, Type,
 };
 
 use std::fmt::Write;
@@ -31,10 +32,10 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
             let input = parse_macro_input!(item as ItemFn);
             let params = input.sig.inputs.iter().collect::<Vec<&FnArg>>();
 
-            if params.len() != 2 {
+            if params.len() != 2 && params.len() != 3 {
                 panic!(
-                    "An transition function must accept two parameters: a \
-                     state type and TransitionIn"
+                    "An transition function must accept two/three parameters: \
+                     a state type, TransitionIn, and an optional data."
                 );
             }
 
@@ -52,17 +53,34 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
                      type>"
                 ),
             };
+            let aux_param_type = match params.get(2) {
+                Some(data_param_type) => match *data_param_type {
+                    FnArg::Typed(typed) => typed.ty.clone(),
+                    _ => unreachable!(),
+                },
+                None => {
+                    let unit_type = proc_macro::TokenStream::from(quote! {()});
+                    Box::new(parse_macro_input!(unit_type as Type))
+                }
+            };
+            let call_fn = match params.get(2) {
+                Some(_) => {
+                    quote! {  #fn_name(self, cx, aux) }
+                }
+                None => quote! { #fn_name(self, cx) },
+            };
+
             let item = proc_macro2::TokenStream::from(item_cloned);
 
             let impl_transition = quote! {
-                impl teloxide::dispatching::dialogue::SubTransition<
-                <#fn_return_type as teloxide::dispatching::dialogue::SubTransitionOutputType>::Output>
-                    for #state_type {
-                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn)
+                impl teloxide::dispatching::dialogue::SubTransition for #state_type {
+                    type Aux = #aux_param_type;
+                    type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubTransitionOutputType>::Output;
+
+                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: #aux_param_type)
                         -> futures::future::BoxFuture<'static, #fn_return_type> {
                                 #item
-
-                                futures::future::FutureExt::boxed(#fn_name(self, cx))
+                                futures::future::FutureExt::boxed(#call_fn)
                             }
                 }
             };
@@ -82,11 +100,28 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
 
     write!(
         dispatch_fn,
-        "impl teloxide::dispatching::dialogue::Transition for {} {{ fn \
-         react(self, cx: teloxide::dispatching::dialogue::TransitionIn) -> \
+        "impl teloxide::dispatching::dialogue::Transition<<{0} as \
+         teloxide::dispatching::dialogue::SubTransition>::Aux> for {1} {{ fn \
+         react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: \
+         <{0} as teloxide::dispatching::dialogue::SubTransition>::Aux) -> \
          futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
          futures::future::FutureExt::boxed(async {{ match self {{",
+        // .unwrap() because empty enumerations are not yet allowed in stable
+        // Rust.
+        match &input.variants.iter().next().unwrap().fields {
+            Fields::Unnamed(fields) => {
+                fields
+                    .unnamed
+                    .iter()
+                    .next()
+                    .unwrap()
+                    .ty
+                    .to_token_stream()
+                    .to_string()
+            }
+            _ => panic!("Only one unnamed field per variant is allowed"),
+        },
         input.ident
     )
     .unwrap();
@@ -95,8 +130,8 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
         write!(
             dispatch_fn,
             "{}::{}(state) => \
-             teloxide::dispatching::dialogue::SubTransition::react(state, \
-             cx).await,",
+             teloxide::dispatching::dialogue::SubTransition::react(state, cx, \
+             aux).await,",
             input.ident, variant.ident
         )
         .unwrap();

From 58c71b523b7ac0ba7ea2a97185b4be8fe0c9af86 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sun, 26 Jul 2020 23:01:15 +0600
Subject: [PATCH 060/755] Refactor a little bit

---
 src/lib.rs | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 30583ba8..379746b3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -98,6 +98,24 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     let mut dispatch_fn = "".to_owned();
 
+    let enum_name = input.ident;
+    let field_type_of_first_variant =
+        match &input.variants.iter().next().unwrap().fields {
+            Fields::Unnamed(fields) => {
+                fields
+                    .unnamed
+                    .iter()
+                    .next()
+                    // .unwrap() because empty enumerations are not yet allowed
+                    // in stable Rust.
+                    .unwrap()
+                    .ty
+                    .to_token_stream()
+                    .to_string()
+            }
+            _ => panic!("Only one unnamed field per variant is allowed"),
+        };
+
     write!(
         dispatch_fn,
         "impl teloxide::dispatching::dialogue::Transition<<{0} as \
@@ -107,22 +125,7 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
          futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
          futures::future::FutureExt::boxed(async {{ match self {{",
-        // .unwrap() because empty enumerations are not yet allowed in stable
-        // Rust.
-        match &input.variants.iter().next().unwrap().fields {
-            Fields::Unnamed(fields) => {
-                fields
-                    .unnamed
-                    .iter()
-                    .next()
-                    .unwrap()
-                    .ty
-                    .to_token_stream()
-                    .to_string()
-            }
-            _ => panic!("Only one unnamed field per variant is allowed"),
-        },
-        input.ident
+        field_type_of_first_variant, enum_name
     )
     .unwrap();
 
@@ -132,7 +135,7 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
             "{}::{}(state) => \
              teloxide::dispatching::dialogue::SubTransition::react(state, cx, \
              aux).await,",
-            input.ident, variant.ident
+            enum_name, variant.ident
         )
         .unwrap();
     }

From a21513353ea8e9b5ea03eaa1e62963c20e4ceddd Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sun, 26 Jul 2020 23:17:41 +0600
Subject: [PATCH 061/755] Fix Clippy

---
 src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 379746b3..c01519c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -166,8 +166,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         Err(e) => return compile_error(e),
     };
 
-    let variants: Vec<&syn::Variant> =
-        data_enum.variants.iter().map(|variant| variant).collect();
+    let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
 
     let mut variant_infos = vec![];
     for variant in variants.iter() {

From cdd988afe9d7339ad5d3eacb0916366ba17447e9 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:13:00 +0600
Subject: [PATCH 062/755] async { ... } -> async move { ... }

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

diff --git a/src/lib.rs b/src/lib.rs
index c01519c0..c7d516b7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -124,7 +124,7 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
          <{0} as teloxide::dispatching::dialogue::SubTransition>::Aux) -> \
          futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
-         futures::future::FutureExt::boxed(async {{ match self {{",
+         futures::future::FutureExt::boxed(async move {{ match self {{",
         field_type_of_first_variant, enum_name
     )
     .unwrap();

From 5f89c46b397581164fb9cd9b825094e082ec2869 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:25:56 +0600
Subject: [PATCH 063/755] Respect type Aux in Transition

---
 src/lib.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c7d516b7..0f6675f1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -118,11 +118,10 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
 
     write!(
         dispatch_fn,
-        "impl teloxide::dispatching::dialogue::Transition<<{0} as \
-         teloxide::dispatching::dialogue::SubTransition>::Aux> for {1} {{ fn \
+        "impl teloxide::dispatching::dialogue::Transition for {1} {{type Aux \
+         = <{0} as teloxide::dispatching::dialogue::SubTransition>::Aux;fn \
          react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: \
-         <{0} as teloxide::dispatching::dialogue::SubTransition>::Aux) -> \
-         futures::future::BoxFuture<'static, \
+         Self::Aux) -> futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
          futures::future::FutureExt::boxed(async move {{ match self {{",
         field_type_of_first_variant, enum_name

From 7a755bfc2f698443af990b8b117b73ebe16362d1 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:45:12 +0600
Subject: [PATCH 064/755] Document #[derive(Transition)] and
 #[teloxide(transition)]

---
 src/lib.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 0f6675f1..358c3bc7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,6 +24,30 @@ use syn::{
 
 use std::fmt::Write;
 
+/// The docs is below.
+///
+/// The only accepted form at the current moment is `#[teloxide(transition)]` on
+/// an asynchronous function. Either this:
+///
+/// ```no_compile
+/// #[teloxide(transition)]
+/// async fn my_transition(state: MyState, cx: TransitionIn, ans: T) -> TransitionOut<MyDialogue> {
+///     todo!()
+/// }
+/// ```
+///
+/// Or this:
+///
+/// ```no_compile
+/// #[teloxide(transition)]
+/// async fn my_transition(state: MyState, cx: TransitionIn) -> TransitionOut<MyDialogue> {
+///     todo!()
+/// }
+/// ```
+///
+/// Notice the presence/absence of `ans: T`. In the first case, it generates
+/// `impl SubTransition for MyState { type Aux = T; type Dialogue = MyDialogue;
+/// ... }`. In the second case, the `Aux` type defaults to `()`.
 #[proc_macro_attribute]
 pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
     match attr.to_string().as_ref() {
@@ -93,6 +117,12 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
     }
 }
 
+/// The docs is below.
+///
+/// All the variants must be of the form `VariantName(MyStateType)`, and
+/// `MyStateType` must implement `SubTransition`. All `MyStateType`s must have
+/// the same `SubTransition::Aux`, which will be also used in the generated
+/// implementation.
 #[proc_macro_derive(Transition)]
 pub fn derive_transition(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);

From 2ae87a76ae072f4a5c01d5cac9e83cafbb6f69d9 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:49:40 +0600
Subject: [PATCH 065/755] SubTransition -> Subtransition

---
 src/lib.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 358c3bc7..00f7eee7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -97,9 +97,9 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
             let item = proc_macro2::TokenStream::from(item_cloned);
 
             let impl_transition = quote! {
-                impl teloxide::dispatching::dialogue::SubTransition for #state_type {
+                impl teloxide::dispatching::dialogue::Subtransition for #state_type {
                     type Aux = #aux_param_type;
-                    type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubTransitionOutputType>::Output;
+                    type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Output;
 
                     fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: #aux_param_type)
                         -> futures::future::BoxFuture<'static, #fn_return_type> {
@@ -120,8 +120,8 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
 /// The docs is below.
 ///
 /// All the variants must be of the form `VariantName(MyStateType)`, and
-/// `MyStateType` must implement `SubTransition`. All `MyStateType`s must have
-/// the same `SubTransition::Aux`, which will be also used in the generated
+/// `MyStateType` must implement `Subtransition`. All `MyStateType`s must have
+/// the same `Subtransition::Aux`, which will be also used in the generated
 /// implementation.
 #[proc_macro_derive(Transition)]
 pub fn derive_transition(item: TokenStream) -> TokenStream {
@@ -149,7 +149,7 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
     write!(
         dispatch_fn,
         "impl teloxide::dispatching::dialogue::Transition for {1} {{type Aux \
-         = <{0} as teloxide::dispatching::dialogue::SubTransition>::Aux;fn \
+         = <{0} as teloxide::dispatching::dialogue::Subtransition>::Aux;fn \
          react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: \
          Self::Aux) -> futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
@@ -162,7 +162,7 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
         write!(
             dispatch_fn,
             "{}::{}(state) => \
-             teloxide::dispatching::dialogue::SubTransition::react(state, cx, \
+             teloxide::dispatching::dialogue::Subtransition::react(state, cx, \
              aux).await,",
             enum_name, variant.ident
         )

From e2e0c838a57c86086ea6577fde4fab238f83b45e Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:51:02 +0600
Subject: [PATCH 066/755] #[teloxide(transition)] -> #[teloxide(subtransition)]

---
 CHANGELOG.md |  2 +-
 src/lib.rs   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdf726b3..c7a6863c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 
 ### Added
- - `#[derive(Transition)]` with `#[teloxide(transition)]`.
+ - `#[derive(Transition)]` with `#[teloxide(subtransition)]`.
 
 ### Removed
  - The `dev` branch.
diff --git a/src/lib.rs b/src/lib.rs
index 00f7eee7..68fcf6cd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,11 +26,11 @@ use std::fmt::Write;
 
 /// The docs is below.
 ///
-/// The only accepted form at the current moment is `#[teloxide(transition)]` on
-/// an asynchronous function. Either this:
+/// The only accepted form at the current moment is `#[teloxide(subtransition)]`
+/// on an asynchronous function. Either this:
 ///
 /// ```no_compile
-/// #[teloxide(transition)]
+/// #[teloxide(subtransition)]
 /// async fn my_transition(state: MyState, cx: TransitionIn, ans: T) -> TransitionOut<MyDialogue> {
 ///     todo!()
 /// }
@@ -39,7 +39,7 @@ use std::fmt::Write;
 /// Or this:
 ///
 /// ```no_compile
-/// #[teloxide(transition)]
+/// #[teloxide(subtransition)]
 /// async fn my_transition(state: MyState, cx: TransitionIn) -> TransitionOut<MyDialogue> {
 ///     todo!()
 /// }
@@ -51,7 +51,7 @@ use std::fmt::Write;
 #[proc_macro_attribute]
 pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
     match attr.to_string().as_ref() {
-        "transition" => {
+        "subtransition" => {
             let item_cloned = item.clone();
             let input = parse_macro_input!(item as ItemFn);
             let params = input.sig.inputs.iter().collect::<Vec<&FnArg>>();

From 37c32743a850686a2cacc5748894e989dc9a0311 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:58:08 +0600
Subject: [PATCH 067/755] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a6863c..eceacff6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## [0.3.2] - 2020-07-27
 
 ### Added
  - `#[derive(Transition)]` with `#[teloxide(subtransition)]`.

From 36f83f1093572f9eb2d89c0ac3cc14c3167de6b1 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 27 Jul 2020 00:58:32 +0600
Subject: [PATCH 068/755] Update Cargo.toml

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2cf0f842..3e294160 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.3.1"
+version = "0.3.2"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 0d6ede03a931bd945cc6055fcce7e6c878d8c0b4 Mon Sep 17 00:00:00 2001
From: Kirill Mironov <k.mironov@albato.ru>
Date: Fri, 31 Jul 2020 23:56:32 +0300
Subject: [PATCH 069/755] Unpair TransitionOut from concrete Error type

---
 src/lib.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 68fcf6cd..587cea0e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -100,6 +100,7 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
                 impl teloxide::dispatching::dialogue::Subtransition for #state_type {
                     type Aux = #aux_param_type;
                     type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Output;
+                    type Error = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Error;
 
                     fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: #aux_param_type)
                         -> futures::future::BoxFuture<'static, #fn_return_type> {
@@ -149,11 +150,13 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
     write!(
         dispatch_fn,
         "impl teloxide::dispatching::dialogue::Transition for {1} {{type Aux \
-         = <{0} as teloxide::dispatching::dialogue::Subtransition>::Aux;fn \
+         = <{0} as teloxide::dispatching::dialogue::Subtransition>::Aux;type \
+         Error = <{0} as \
+         teloxide::dispatching::dialogue::Subtransition>::Error;fn \
          react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: \
          Self::Aux) -> futures::future::BoxFuture<'static, \
-         teloxide::dispatching::dialogue::TransitionOut<Self>> {{ \
-         futures::future::FutureExt::boxed(async move {{ match self {{",
+         teloxide::dispatching::dialogue::TransitionOut<Self, Self::Error>> \
+         {{ futures::future::FutureExt::boxed(async move {{ match self {{",
         field_type_of_first_variant, enum_name
     )
     .unwrap();

From 30024d7792b27e1bf9fcdb61c6fe8555d6f0ee2a Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 1 Aug 2020 17:49:14 +0600
Subject: [PATCH 070/755] Update the docs

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 587cea0e..5744c436 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -122,8 +122,8 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// All the variants must be of the form `VariantName(MyStateType)`, and
 /// `MyStateType` must implement `Subtransition`. All `MyStateType`s must have
-/// the same `Subtransition::Aux`, which will be also used in the generated
-/// implementation.
+/// the same `Subtransition::Aux` and `Subtransition::Error`, which will be also
+/// used in the generated implementation.
 #[proc_macro_derive(Transition)]
 pub fn derive_transition(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);

From 4b683d7c90b5a5d1c6d73ee3ed7dfefe3bf65e16 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Thu, 6 Aug 2020 16:40:41 +0300
Subject: [PATCH 071/755] Initial commit

---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..84a1b0b0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 teloxide
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 7891fa02bf6f5164d2cf0ae3ec96a8f7695c7e29 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Aug 2020 18:04:50 +0300
Subject: [PATCH 072/755] Initial commit

---
 .github/workflows/ci.yml | 86 ++++++++++++++++++++++++++++++++++++++++
 .gitignore               |  2 +
 Cargo.toml               | 26 ++++++++++++
 README.md                |  3 ++
 netlify.toml             | 12 ++++++
 src/lib.rs               | 12 ++++++
 6 files changed, 141 insertions(+)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .gitignore
 create mode 100644 Cargo.toml
 create mode 100644 README.md
 create mode 100644 netlify.toml
 create mode 100644 src/lib.rs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..4790ad17
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,86 @@
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+name: Continuous integration
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust: 
+          - stable
+          - beta
+          - nightly
+    
+        include:
+          - rust: stable
+            features: ""
+          - rust: beta
+            features: ""
+          - rust: nightly
+            features: "--all-features"
+
+    steps:
+      - uses: actions/checkout@v1
+        
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      
+      - name: build 
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --verbose ${{ matrix.features }}
+      
+      - name: test 
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --verbose ${{ matrix.features }}
+
+  clippy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: clippy
+
+      - name: clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-targets --all-features -- -D warnings
+
+  style:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+
+      - name: fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..96ef6c0b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/target
+Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 00000000..57b4c75c
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "teloxide-core"
+version = "0.1.0"
+edition = "2018"
+authors = [
+    "Temirkhan Myrzamadi <hirrolot@gmail.com>",
+    "Waffle Lapkin <waffle.lapkin@gmail.com>",
+    "p0lunin <dmytro.polunin@gmail.com>",
+    "Mishko torop'izhko",
+    "Mr-Andersen",
+    "Sergey Levitin <selevit@gmail.com>",
+    "Rustem B. <bakirov.com@yandex.ru>",
+    "Alexey Fedechkin <aleksey-fedechkin@rambler.ru>"
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+[features]
+# features those require nightly compiler
+nightly = []
+
+[package.metadata."docs.rs"]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..8026aea2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# teloxide-core
+
+Core part of `teloxide` library.
\ No newline at end of file
diff --git a/netlify.toml b/netlify.toml
new file mode 100644
index 00000000..ecb9c8fb
--- /dev/null
+++ b/netlify.toml
@@ -0,0 +1,12 @@
+[build]
+# Directory (relative to root of your repo) that contains the deploy-ready
+# HTML files and assets generated by the build. If a base directory has
+# been specified, include it in the publish directory path.
+publish = "target/doc"
+
+# Default build command.
+command = 'curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly --profile minimal && source $HOME/.cargo/env && RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --no-deps --all-features'
+
+[[redirects]]
+  from = "/*"
+  to = "/teloxide_core"
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 00000000..1adb08cb
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,12 @@
+//! Core part of `teloxide` library.
+// TODO: expand docs
+
+// we pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
+//
+// To properly build docs of this crate run
+// ```console
+// $ RUSTDOCFLAGS="--cfg docsrs" cargo doc --open --all-features
+// ```
+#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg))]
+#![forbid(unsafe_code)]
+#![deny(missing_docs)]

From a70cb4e00861b40d3409b1eea68a9ec4e87f3a16 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Aug 2020 19:39:40 +0300
Subject: [PATCH 073/755] Move core code from teloxide

---
 CHANGELOG.md                                  |   25 +
 Cargo.toml                                    |   14 +
 rustfmt.toml                                  |    6 +
 src/bot/api.rs                                | 1691 ++++++++++++++++
 src/bot/download.rs                           |   65 +
 src/bot/mod.rs                                |  240 +++
 src/errors.rs                                 |  515 +++++
 src/lib.rs                                    |   43 +-
 src/net/download.rs                           |   49 +
 src/net/mod.rs                                |   61 +
 src/net/request.rs                            |   63 +
 src/net/telegram_response.rs                  |   70 +
 src/requests/all/add_sticker_to_set.rs        |  109 +
 src/requests/all/answer_callback_query.rs     |  101 +
 src/requests/all/answer_inline_query.rs       |  146 ++
 src/requests/all/answer_pre_checkout_query.rs |   82 +
 src/requests/all/answer_shipping_query.rs     |   86 +
 src/requests/all/create_new_sticker_set.rs    |  134 ++
 src/requests/all/delete_chat_photo.rs         |   50 +
 src/requests/all/delete_chat_sticker_set.rs   |   55 +
 src/requests/all/delete_message.rs            |   67 +
 src/requests/all/delete_sticker_from_set.rs   |   47 +
 src/requests/all/delete_webhook.rs            |   37 +
 .../all/edit_inline_message_caption.rs        |   83 +
 .../all/edit_inline_message_live_location.rs  |   77 +
 src/requests/all/edit_inline_message_media.rs |   78 +
 .../all/edit_inline_message_reply_markup.rs   |   62 +
 src/requests/all/edit_inline_message_text.rs  |   98 +
 src/requests/all/edit_message_caption.rs      |   91 +
 .../all/edit_message_live_location.rs         |   91 +
 src/requests/all/edit_message_media.rs        |   85 +
 src/requests/all/edit_message_reply_markup.rs |   69 +
 src/requests/all/edit_message_text.rs         |  107 +
 src/requests/all/export_chat_invite_link.rs   |   65 +
 src/requests/all/forward_message.rs           |   81 +
 src/requests/all/get_chat.rs                  |   50 +
 src/requests/all/get_chat_administrators.rs   |   53 +
 src/requests/all/get_chat_member.rs           |   55 +
 src/requests/all/get_chat_members_count.rs    |   48 +
 src/requests/all/get_file.rs                  |   62 +
 src/requests/all/get_game_high_scores.rs      |   63 +
 src/requests/all/get_me.rs                    |   33 +
 src/requests/all/get_my_commands.rs           |   33 +
 src/requests/all/get_sticker_set.rs           |   47 +
 src/requests/all/get_updates.rs               |  108 +
 src/requests/all/get_user_profile_photos.rs   |   58 +
 src/requests/all/get_webhook_info.rs          |   38 +
 src/requests/all/kick_chat_member.rs          |   72 +
 src/requests/all/leave_chat.rs                |   48 +
 src/requests/all/mod.rs                       |  152 ++
 src/requests/all/pin_chat_message.rs          |   69 +
 src/requests/all/promote_chat_member.rs       |  134 ++
 src/requests/all/restrict_chat_member.rs      |   76 +
 src/requests/all/send_animation.rs            |  175 ++
 src/requests/all/send_audio.rs                |  200 ++
 src/requests/all/send_chat_action.rs          |  105 +
 src/requests/all/send_contact.rs              |  129 ++
 src/requests/all/send_dice.rs                 |   94 +
 src/requests/all/send_document.rs             |  154 ++
 src/requests/all/send_game.rs                 |   92 +
 src/requests/all/send_invoice.rs              |  299 +++
 src/requests/all/send_location.rs             |  110 ++
 src/requests/all/send_media_group.rs          |   85 +
 src/requests/all/send_message.rs              |  121 ++
 src/requests/all/send_photo.rs                |  138 ++
 src/requests/all/send_poll.rs                 |  217 ++
 src/requests/all/send_sticker.rs              |  113 ++
 src/requests/all/send_venue.rs                |  159 ++
 src/requests/all/send_video.rs                |  200 ++
 src/requests/all/send_video_note.rs           |  152 ++
 src/requests/all/send_voice.rs                |  156 ++
 .../set_chat_administrator_custom_title.rs    |   75 +
 src/requests/all/set_chat_description.rs      |   62 +
 src/requests/all/set_chat_permissions.rs      |   58 +
 src/requests/all/set_chat_photo.rs            |   58 +
 src/requests/all/set_chat_sticker_set.rs      |   64 +
 src/requests/all/set_chat_title.rs            |   63 +
 src/requests/all/set_game_score.rs            |   89 +
 src/requests/all/set_my_commands.rs           |   50 +
 .../all/set_sticker_position_in_set.rs        |   56 +
 src/requests/all/set_sticker_set_thumb.rs     |   73 +
 src/requests/all/set_webhook.rs               |  114 ++
 .../all/stop_inline_message_live_location.rs  |   62 +
 .../all/stop_message_live_location.rs         |   70 +
 src/requests/all/stop_poll.rs                 |   66 +
 src/requests/all/unban_chat_member.rs         |   58 +
 src/requests/all/unpin_chat_message.rs        |   52 +
 src/requests/all/upload_sticker_file.rs       |   55 +
 src/requests/form_builder.rs                  |  156 ++
 src/requests/mod.rs                           |   32 +
 src/requests/utils.rs                         |   31 +
 src/types/allowed_update.rs                   |   14 +
 src/types/animation.rs                        |  165 ++
 src/types/audio.rs                            |  152 ++
 src/types/bot_command.rs                      |   42 +
 src/types/callback_game.rs                    |   13 +
 src/types/callback_query.rs                   |  158 ++
 src/types/chat.rs                             |  353 ++++
 src/types/chat_action.rs                      |   17 +
 src/types/chat_id.rs                          |   39 +
 src/types/chat_member.rs                      |  262 +++
 src/types/chat_permissions.rs                 |   48 +
 src/types/chat_photo.rs                       |   82 +
 src/types/chosen_inline_result.rs             |   85 +
 src/types/contact.rs                          |   79 +
 src/types/dice.rs                             |   38 +
 src/types/dice_emoji.rs                       |   16 +
 src/types/document.rs                         |   92 +
 src/types/encrypted_credentials.rs            |   94 +
 src/types/encrypted_passport_element.rs       |  794 ++++++++
 src/types/file.rs                             |   75 +
 src/types/force_reply.rs                      |   41 +
 src/types/game.rs                             |  106 +
 src/types/game_high_score.rs                  |   40 +
 src/types/inline_keyboard_button.rs           |  135 ++
 src/types/inline_keyboard_markup.rs           |  109 +
 src/types/inline_query.rs                     |   74 +
 src/types/inline_query_result.rs              |  102 +
 src/types/inline_query_result_article.rs      |  128 ++
 src/types/inline_query_result_audio.rs        |  133 ++
 src/types/inline_query_result_cached_audio.rs |   96 +
 .../inline_query_result_cached_document.rs    |  121 ++
 src/types/inline_query_result_cached_gif.rs   |  109 +
 .../inline_query_result_cached_mpeg4_gif.rs   |  101 +
 src/types/inline_query_result_cached_photo.rs |  120 ++
 .../inline_query_result_cached_sticker.rs     |   70 +
 src/types/inline_query_result_cached_video.rs |  121 ++
 src/types/inline_query_result_cached_voice.rs |  109 +
 src/types/inline_query_result_contact.rs      |  140 ++
 src/types/inline_query_result_document.rs     |  138 ++
 src/types/inline_query_result_game.rs         |   55 +
 src/types/inline_query_result_gif.rs          |  148 ++
 src/types/inline_query_result_location.rs     |  128 ++
 src/types/inline_query_result_mpeg4_gif.rs    |  149 ++
 src/types/inline_query_result_photo.rs        |  152 ++
 src/types/inline_query_result_venue.rs        |  157 ++
 src/types/inline_query_result_video.rs        |  182 ++
 src/types/inline_query_result_voice.rs        |  119 ++
 src/types/input_file.rs                       |  101 +
 src/types/input_media.rs                      |  511 +++++
 src/types/input_message_content.rs            |  318 +++
 src/types/invoice.rs                          |   91 +
 src/types/keyboard_button.rs                  |  156 ++
 src/types/keyboard_button_poll_type.rs        |   24 +
 src/types/label_price.rs                      |   56 +
 src/types/location.rs                         |   28 +
 src/types/login_url.rs                        |   54 +
 src/types/mask_position.rs                    |   58 +
 src/types/me.rs                               |   57 +
 src/types/message.rs                          | 1753 +++++++++++++++++
 src/types/message_entity.rs                   |  162 ++
 src/types/mod.rs                              |  194 ++
 src/types/non_telegram_types/country_code.rs  |  254 +++
 src/types/non_telegram_types/currency.rs      |   89 +
 src/types/non_telegram_types/mime_wrapper.rs  |   44 +
 src/types/non_telegram_types/mod.rs           |    7 +
 src/types/order_info.rs                       |   72 +
 src/types/parse_mode.rs                       |  189 ++
 src/types/passport_data.rs                    |   40 +
 src/types/passport_element_error.rs           |  558 ++++++
 src/types/passport_file.rs                    |   66 +
 src/types/photo_size.rs                       |   94 +
 src/types/poll.rs                             |  250 +++
 src/types/poll_answer.rs                      |   48 +
 src/types/poll_type.rs                        |    9 +
 src/types/pre_checkout_query.rs               |  108 +
 src/types/reply_keyboard_markup.rs            |   98 +
 src/types/reply_keyboard_remove.rs            |   52 +
 src/types/reply_markup.rs                     |   27 +
 src/types/response_parameters.rs              |   43 +
 src/types/send_invoice.rs                     |  229 +++
 src/types/shipping_address.rs                 |  100 +
 src/types/shipping_option.rs                  |   71 +
 src/types/shipping_query.rs                   |   63 +
 src/types/sticker.rs                          |  135 ++
 src/types/sticker_set.rs                      |   89 +
 src/types/sticker_type.rs                     |   26 +
 src/types/successful_payment.rs               |  112 ++
 src/types/target_message.rs                   |   17 +
 src/types/unit_false.rs                       |   76 +
 src/types/unit_true.rs                        |   79 +
 src/types/update.rs                           |  299 +++
 src/types/user.rs                             |  132 ++
 src/types/user_profile_photos.rs              |   40 +
 src/types/venue.rs                            |   74 +
 src/types/video.rs                            |  108 +
 src/types/video_note.rs                       |   89 +
 src/types/voice.rs                            |   74 +
 src/types/webhook_info.rs                     |   98 +
 189 files changed, 23207 insertions(+), 1 deletion(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 rustfmt.toml
 create mode 100644 src/bot/api.rs
 create mode 100644 src/bot/download.rs
 create mode 100644 src/bot/mod.rs
 create mode 100644 src/errors.rs
 create mode 100644 src/net/download.rs
 create mode 100644 src/net/mod.rs
 create mode 100644 src/net/request.rs
 create mode 100644 src/net/telegram_response.rs
 create mode 100644 src/requests/all/add_sticker_to_set.rs
 create mode 100644 src/requests/all/answer_callback_query.rs
 create mode 100644 src/requests/all/answer_inline_query.rs
 create mode 100644 src/requests/all/answer_pre_checkout_query.rs
 create mode 100644 src/requests/all/answer_shipping_query.rs
 create mode 100644 src/requests/all/create_new_sticker_set.rs
 create mode 100644 src/requests/all/delete_chat_photo.rs
 create mode 100644 src/requests/all/delete_chat_sticker_set.rs
 create mode 100644 src/requests/all/delete_message.rs
 create mode 100644 src/requests/all/delete_sticker_from_set.rs
 create mode 100644 src/requests/all/delete_webhook.rs
 create mode 100644 src/requests/all/edit_inline_message_caption.rs
 create mode 100644 src/requests/all/edit_inline_message_live_location.rs
 create mode 100644 src/requests/all/edit_inline_message_media.rs
 create mode 100644 src/requests/all/edit_inline_message_reply_markup.rs
 create mode 100644 src/requests/all/edit_inline_message_text.rs
 create mode 100644 src/requests/all/edit_message_caption.rs
 create mode 100644 src/requests/all/edit_message_live_location.rs
 create mode 100644 src/requests/all/edit_message_media.rs
 create mode 100644 src/requests/all/edit_message_reply_markup.rs
 create mode 100644 src/requests/all/edit_message_text.rs
 create mode 100644 src/requests/all/export_chat_invite_link.rs
 create mode 100644 src/requests/all/forward_message.rs
 create mode 100644 src/requests/all/get_chat.rs
 create mode 100644 src/requests/all/get_chat_administrators.rs
 create mode 100644 src/requests/all/get_chat_member.rs
 create mode 100644 src/requests/all/get_chat_members_count.rs
 create mode 100644 src/requests/all/get_file.rs
 create mode 100644 src/requests/all/get_game_high_scores.rs
 create mode 100644 src/requests/all/get_me.rs
 create mode 100644 src/requests/all/get_my_commands.rs
 create mode 100644 src/requests/all/get_sticker_set.rs
 create mode 100644 src/requests/all/get_updates.rs
 create mode 100644 src/requests/all/get_user_profile_photos.rs
 create mode 100644 src/requests/all/get_webhook_info.rs
 create mode 100644 src/requests/all/kick_chat_member.rs
 create mode 100644 src/requests/all/leave_chat.rs
 create mode 100644 src/requests/all/mod.rs
 create mode 100644 src/requests/all/pin_chat_message.rs
 create mode 100644 src/requests/all/promote_chat_member.rs
 create mode 100644 src/requests/all/restrict_chat_member.rs
 create mode 100644 src/requests/all/send_animation.rs
 create mode 100644 src/requests/all/send_audio.rs
 create mode 100644 src/requests/all/send_chat_action.rs
 create mode 100644 src/requests/all/send_contact.rs
 create mode 100644 src/requests/all/send_dice.rs
 create mode 100644 src/requests/all/send_document.rs
 create mode 100644 src/requests/all/send_game.rs
 create mode 100644 src/requests/all/send_invoice.rs
 create mode 100644 src/requests/all/send_location.rs
 create mode 100644 src/requests/all/send_media_group.rs
 create mode 100644 src/requests/all/send_message.rs
 create mode 100644 src/requests/all/send_photo.rs
 create mode 100644 src/requests/all/send_poll.rs
 create mode 100644 src/requests/all/send_sticker.rs
 create mode 100644 src/requests/all/send_venue.rs
 create mode 100644 src/requests/all/send_video.rs
 create mode 100644 src/requests/all/send_video_note.rs
 create mode 100644 src/requests/all/send_voice.rs
 create mode 100644 src/requests/all/set_chat_administrator_custom_title.rs
 create mode 100644 src/requests/all/set_chat_description.rs
 create mode 100644 src/requests/all/set_chat_permissions.rs
 create mode 100644 src/requests/all/set_chat_photo.rs
 create mode 100644 src/requests/all/set_chat_sticker_set.rs
 create mode 100644 src/requests/all/set_chat_title.rs
 create mode 100644 src/requests/all/set_game_score.rs
 create mode 100644 src/requests/all/set_my_commands.rs
 create mode 100644 src/requests/all/set_sticker_position_in_set.rs
 create mode 100644 src/requests/all/set_sticker_set_thumb.rs
 create mode 100644 src/requests/all/set_webhook.rs
 create mode 100644 src/requests/all/stop_inline_message_live_location.rs
 create mode 100644 src/requests/all/stop_message_live_location.rs
 create mode 100644 src/requests/all/stop_poll.rs
 create mode 100644 src/requests/all/unban_chat_member.rs
 create mode 100644 src/requests/all/unpin_chat_message.rs
 create mode 100644 src/requests/all/upload_sticker_file.rs
 create mode 100644 src/requests/form_builder.rs
 create mode 100644 src/requests/mod.rs
 create mode 100644 src/requests/utils.rs
 create mode 100644 src/types/allowed_update.rs
 create mode 100644 src/types/animation.rs
 create mode 100644 src/types/audio.rs
 create mode 100644 src/types/bot_command.rs
 create mode 100644 src/types/callback_game.rs
 create mode 100644 src/types/callback_query.rs
 create mode 100644 src/types/chat.rs
 create mode 100644 src/types/chat_action.rs
 create mode 100644 src/types/chat_id.rs
 create mode 100644 src/types/chat_member.rs
 create mode 100644 src/types/chat_permissions.rs
 create mode 100644 src/types/chat_photo.rs
 create mode 100644 src/types/chosen_inline_result.rs
 create mode 100644 src/types/contact.rs
 create mode 100644 src/types/dice.rs
 create mode 100644 src/types/dice_emoji.rs
 create mode 100644 src/types/document.rs
 create mode 100644 src/types/encrypted_credentials.rs
 create mode 100644 src/types/encrypted_passport_element.rs
 create mode 100644 src/types/file.rs
 create mode 100644 src/types/force_reply.rs
 create mode 100644 src/types/game.rs
 create mode 100644 src/types/game_high_score.rs
 create mode 100644 src/types/inline_keyboard_button.rs
 create mode 100644 src/types/inline_keyboard_markup.rs
 create mode 100644 src/types/inline_query.rs
 create mode 100644 src/types/inline_query_result.rs
 create mode 100644 src/types/inline_query_result_article.rs
 create mode 100644 src/types/inline_query_result_audio.rs
 create mode 100644 src/types/inline_query_result_cached_audio.rs
 create mode 100644 src/types/inline_query_result_cached_document.rs
 create mode 100644 src/types/inline_query_result_cached_gif.rs
 create mode 100644 src/types/inline_query_result_cached_mpeg4_gif.rs
 create mode 100644 src/types/inline_query_result_cached_photo.rs
 create mode 100644 src/types/inline_query_result_cached_sticker.rs
 create mode 100644 src/types/inline_query_result_cached_video.rs
 create mode 100644 src/types/inline_query_result_cached_voice.rs
 create mode 100644 src/types/inline_query_result_contact.rs
 create mode 100644 src/types/inline_query_result_document.rs
 create mode 100644 src/types/inline_query_result_game.rs
 create mode 100644 src/types/inline_query_result_gif.rs
 create mode 100644 src/types/inline_query_result_location.rs
 create mode 100644 src/types/inline_query_result_mpeg4_gif.rs
 create mode 100644 src/types/inline_query_result_photo.rs
 create mode 100644 src/types/inline_query_result_venue.rs
 create mode 100644 src/types/inline_query_result_video.rs
 create mode 100644 src/types/inline_query_result_voice.rs
 create mode 100644 src/types/input_file.rs
 create mode 100644 src/types/input_media.rs
 create mode 100644 src/types/input_message_content.rs
 create mode 100644 src/types/invoice.rs
 create mode 100644 src/types/keyboard_button.rs
 create mode 100644 src/types/keyboard_button_poll_type.rs
 create mode 100644 src/types/label_price.rs
 create mode 100644 src/types/location.rs
 create mode 100644 src/types/login_url.rs
 create mode 100644 src/types/mask_position.rs
 create mode 100644 src/types/me.rs
 create mode 100644 src/types/message.rs
 create mode 100644 src/types/message_entity.rs
 create mode 100644 src/types/mod.rs
 create mode 100644 src/types/non_telegram_types/country_code.rs
 create mode 100644 src/types/non_telegram_types/currency.rs
 create mode 100644 src/types/non_telegram_types/mime_wrapper.rs
 create mode 100644 src/types/non_telegram_types/mod.rs
 create mode 100644 src/types/order_info.rs
 create mode 100644 src/types/parse_mode.rs
 create mode 100644 src/types/passport_data.rs
 create mode 100644 src/types/passport_element_error.rs
 create mode 100644 src/types/passport_file.rs
 create mode 100644 src/types/photo_size.rs
 create mode 100644 src/types/poll.rs
 create mode 100644 src/types/poll_answer.rs
 create mode 100644 src/types/poll_type.rs
 create mode 100644 src/types/pre_checkout_query.rs
 create mode 100644 src/types/reply_keyboard_markup.rs
 create mode 100644 src/types/reply_keyboard_remove.rs
 create mode 100644 src/types/reply_markup.rs
 create mode 100644 src/types/response_parameters.rs
 create mode 100644 src/types/send_invoice.rs
 create mode 100644 src/types/shipping_address.rs
 create mode 100644 src/types/shipping_option.rs
 create mode 100644 src/types/shipping_query.rs
 create mode 100644 src/types/sticker.rs
 create mode 100644 src/types/sticker_set.rs
 create mode 100644 src/types/sticker_type.rs
 create mode 100644 src/types/successful_payment.rs
 create mode 100644 src/types/target_message.rs
 create mode 100644 src/types/unit_false.rs
 create mode 100644 src/types/unit_true.rs
 create mode 100644 src/types/update.rs
 create mode 100644 src/types/user.rs
 create mode 100644 src/types/user_profile_photos.rs
 create mode 100644 src/types/venue.rs
 create mode 100644 src/types/video.rs
 create mode 100644 src/types/video_note.rs
 create mode 100644 src/types/voice.rs
 create mode 100644 src/types/webhook_info.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..738c0045
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [unreleased]
+
+### Added
+
+- Move core code here from the [`teloxide`] main repo, for older changes see it's [`CHANGELOG.md`].
+  - Following modules were moved:
+    - `bot`
+    - `requests` [except `requests::respond` function]
+    - `types`
+    - `errors`
+    - `net` [private] 
+  - `client_from_env` was moved from `teloxide::utils` to crate root of `teloxide-core`
+  - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>` 
+    (instead of `Vec<Result<Update, (Value, serde_json::Error)>>`)
+  
+
+[`teloxide`]: https://github.com/teloxide/teloxide
+[`CHANGELOG.md`]: https://github.com/teloxide/teloxide/blob/master/CHANGELOG.md
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 57b4c75c..48a598d0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,20 @@ authors = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+futures = "0.3.5"
+tokio = { version = "0.2.21", features = ["fs", "stream"] }
+tokio-util = "0.3.1"
+bytes = "0.5.5"
+async-trait = "0.1.36"
+reqwest = { version = "0.10.6", features = ["json", "stream"] }
+
+serde = { version = "1.0.114", features = ["derive"] }
+serde_json = "1.0.55"
+serde_with_macros = "1.1.0"
+
+derive_more = "0.99.9"
+mime = "0.3.16"
+thiserror = "1.0.20"
 
 [features]
 # features those require nightly compiler
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 00000000..c61c5a92
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,6 @@
+format_code_in_doc_comments = true
+wrap_comments = true
+format_strings = true
+merge_imports = true
+use_small_heuristics = "Max"
+use_field_init_shorthand = true
diff --git a/src/bot/api.rs b/src/bot/api.rs
new file mode 100644
index 00000000..8fe0fc80
--- /dev/null
+++ b/src/bot/api.rs
@@ -0,0 +1,1691 @@
+use crate::{
+    requests::{
+        AddStickerToSet, AnswerCallbackQuery, AnswerInlineQuery, AnswerPreCheckoutQuery,
+        AnswerShippingQuery, CreateNewStickerSet, DeleteChatPhoto, DeleteChatStickerSet,
+        DeleteMessage, DeleteStickerFromSet, DeleteWebhook, EditInlineMessageCaption,
+        EditInlineMessageLiveLocation, EditInlineMessageMedia, EditInlineMessageReplyMarkup,
+        EditInlineMessageText, EditMessageCaption, EditMessageLiveLocation, EditMessageMedia,
+        EditMessageReplyMarkup, EditMessageText, ExportChatInviteLink, ForwardMessage, GetChat,
+        GetChatAdministrators, GetChatMember, GetChatMembersCount, GetFile, GetGameHighScores,
+        GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUserProfilePhotos, GetWebhookInfo,
+        KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember, RestrictChatMember,
+        SendAnimation, SendAudio, SendChatAction, SendChatActionKind, SendContact, SendDice,
+        SendDocument, SendGame, SendInvoice, SendLocation, SendMediaGroup, SendMessage, SendPhoto,
+        SendPoll, SendSticker, SendVenue, SendVideo, SendVideoNote, SendVoice,
+        SetChatAdministratorCustomTitle, SetChatDescription, SetChatPermissions, SetChatPhoto,
+        SetChatStickerSet, SetChatTitle, SetGameScore, SetMyCommands, SetStickerPositionInSet,
+        SetStickerSetThumb, SetWebhook, StopInlineMessageLiveLocation, StopMessageLiveLocation,
+        StopPoll, UnbanChatMember, UnpinChatMessage, UploadStickerFile,
+    },
+    types::{
+        BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        LabeledPrice, ParseMode, StickerType, TargetMessage,
+    },
+    Bot,
+};
+
+impl Bot {
+    /// Use this method to receive incoming updates using long polling ([wiki]).
+    ///
+    /// **Notes:**
+    /// 1. This method will not work if an outgoing webhook is set up.
+    /// 2. In order to avoid getting duplicate updates,
+    ///    recalculate offset after each server response.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getupdates).
+    ///
+    /// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
+    pub fn get_updates(&self) -> GetUpdates {
+        GetUpdates::new(self.clone())
+    }
+
+    /// Use this method to specify a url and receive incoming updates via an
+    /// outgoing webhook.
+    ///
+    /// Whenever there is an update for the bot, we will send an
+    /// HTTPS POST request to the specified url, containing a JSON-serialized
+    /// [`Update`]. In case of an unsuccessful request, we will give up after a
+    /// reasonable amount of attempts.
+    ///
+    /// If you'd like to make sure that the Webhook request comes from Telegram,
+    /// we recommend using a secret path in the URL, e.g.
+    /// `https://www.example.com/<token>`. Since nobody else knows your bot‘s
+    /// token, you can be pretty sure it’s us.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setwebhook).
+    ///
+    /// # Params
+    ///   - `url`: HTTPS url to send updates to.
+    ///
+    /// Use an empty string to remove webhook integration.
+    ///
+    /// [`Update`]: crate::types::Update
+    pub fn set_webhook<U>(&self, url: U) -> SetWebhook
+    where
+        U: Into<String>,
+    {
+        SetWebhook::new(self.clone(), url)
+    }
+
+    /// Use this method to remove webhook integration if you decide to switch
+    /// back to [Bot::get_updates].
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#deletewebhook).
+    ///
+    /// [Bot::get_updates]: crate::Bot::get_updates
+    pub fn delete_webhook(&self) -> DeleteWebhook {
+        DeleteWebhook::new(self.clone())
+    }
+
+    /// Use this method to get current webhook status.
+    ///
+    /// If the bot is using [`Bot::get_updates`], will return an object with the
+    /// url field empty.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getwebhookinfo).
+    ///
+    /// [`Bot::get_updates`]: crate::Bot::get_updates
+    pub fn get_webhook_info(&self) -> GetWebhookInfo {
+        GetWebhookInfo::new(self.clone())
+    }
+
+    /// A simple method for testing your bot's auth token. Requires no
+    /// parameters.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getme).
+    pub fn get_me(&self) -> GetMe {
+        GetMe::new(self.clone())
+    }
+
+    /// Use this method to send text messages.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendmessage).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `text`: Text of the message to be sent.
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_message<C, T>(&self, chat_id: C, text: T) -> SendMessage
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendMessage::new(self.clone(), chat_id, text),
+            SendMessage::parse_mode,
+        )
+    }
+
+    /// Use this method to forward messages of any kind.
+    ///
+    /// [`The official docs`](https://core.telegram.org/bots/api#forwardmessage).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `from_chat_id`: Unique identifier for the chat where the original
+    ///     message was sent (or channel username in the format
+    ///     `@channelusername`).
+    ///   - `message_id`: Message identifier in the chat specified in
+    ///     [`from_chat_id`].
+    ///
+    /// [`from_chat_id`]: ForwardMessage::from_chat_id
+    pub fn forward_message<C, F>(
+        &self,
+        chat_id: C,
+        from_chat_id: F,
+        message_id: i32,
+    ) -> ForwardMessage
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>,
+    {
+        ForwardMessage::new(self.clone(), chat_id, from_chat_id, message_id)
+    }
+
+    /// Use this method to send photos.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendphoto).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `photo`: Photo to send.
+    ///
+    /// Pass [`InputFile::File`] to send a photo that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> SendPhoto
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendPhoto::new(self.clone(), chat_id, photo),
+            SendPhoto::parse_mode,
+        )
+    }
+
+    ///
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> SendAudio
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendAudio::new(self.clone(), chat_id, audio),
+            SendAudio::parse_mode,
+        )
+    }
+
+    /// Use this method to send general files.
+    ///
+    /// Bots can currently send files of any type of up to 50 MB in size, this
+    /// limit may be changed in the future.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#senddocument).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `document`: File to send.
+    ///
+    /// Pass a file_id as String to send a file that exists on the
+    /// Telegram servers (recommended), pass an HTTP URL as a String for
+    /// Telegram to get a file from the Internet, or upload a new one using
+    /// `multipart/form-data`. [More info on Sending Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_document<C>(&self, chat_id: C, document: InputFile) -> SendDocument
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendDocument::new(self.clone(), chat_id, document),
+            SendDocument::parse_mode,
+        )
+    }
+
+    /// Use this method to send video files, Telegram clients support mp4 videos
+    /// (other formats may be sent as Document).
+    ///
+    /// Bots can currently send video files of up to 50 MB in size, this
+    /// limit may be changed in the future.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendvideo).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `video`: Video to sent.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_video<C>(&self, chat_id: C, video: InputFile) -> SendVideo
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendVideo::new(self.clone(), chat_id, video),
+            SendVideo::parse_mode,
+        )
+    }
+
+    /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video
+    /// without sound).
+    ///
+    /// Bots can currently send animation files of up to 50 MB in size, this
+    /// limit may be changed in the future.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendanimation).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `animation`: Animation to send.
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> SendAnimation
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendAnimation::new(self.clone(), chat_id, animation),
+            SendAnimation::parse_mode,
+        )
+    }
+
+    /// Use this method to send audio files, if you want Telegram clients to
+    /// display the file as a playable voice message.
+    ///
+    /// For this to work, your audio must be in an .ogg file encoded with OPUS
+    /// (other formats may be sent as [`Audio`] or [`Document`]). Bots can
+    /// currently send voice messages of up to 50 MB in size, this limit may
+    /// be changed in the future.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendvoice).
+    ///
+    /// [`Audio`]: crate::types::Audio
+    /// [`Document`]: crate::types::Document
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `voice`: Audio file to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> SendVoice
+    where
+        C: Into<ChatId>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendVoice::new(self.clone(), chat_id, voice),
+            SendVoice::parse_mode,
+        )
+    }
+
+    /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up
+    /// to 1 minute long. Use this method to send video messages.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendvideonote).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `video_note`: Video note to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on the Telegram
+    /// servers (recommended), pass an [`InputFile::Url`] for Telegram to get a
+    /// .webp file from the Internet, or upload a new one using
+    /// [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [v.4.0]: https://telegram.org/blog/video-messages-and-telescope
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+
+    pub fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> SendVideoNote
+    where
+        C: Into<ChatId>,
+    {
+        SendVideoNote::new(self.clone(), chat_id, video_note)
+    }
+
+    /// Use this method to send a group of photos or videos as an album.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendmediagroup).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `media`: A JSON-serialized array describing photos and videos to be
+    ///     sent, must include 2–10 items.
+    pub fn send_media_group<C, M>(&self, chat_id: C, media: M) -> SendMediaGroup
+    where
+        C: Into<ChatId>,
+        M: Into<Vec<InputMedia>>,
+    {
+        SendMediaGroup::new(self.clone(), chat_id, media)
+    }
+
+    /// Use this method to send point on the map.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendlocation).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `latitude`: Latitude of the location.
+    ///   - `longitude`: Latitude of the location.
+    pub fn send_location<C>(&self, chat_id: C, latitude: f32, longitude: f32) -> SendLocation
+    where
+        C: Into<ChatId>,
+    {
+        SendLocation::new(self.clone(), chat_id, latitude, longitude)
+    }
+
+    /// Use this method to edit live location messages.
+    ///
+    /// A location can be edited until its live_period expires or editing is
+    /// explicitly disabled by a call to stopMessageLiveLocation. On success,
+    /// the edited [`Message`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
+    ///
+    /// [`Message`]: crate::types::Message
+    ///
+    /// # Params
+    ///   - `latitude`: Latitude of new location.
+    ///   - `longitude`: Longitude of new location.
+    pub fn edit_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        latitude: f32,
+        longitude: f32,
+    ) -> EditMessageLiveLocation
+    where
+        C: Into<ChatId>,
+    {
+        EditMessageLiveLocation::new(self.clone(), chat_id, message_id, latitude, longitude)
+    }
+
+    /// Use this method to edit live location messages sent via the bot.
+    ///
+    /// A location can be edited until its live_period expires or editing is
+    /// explicitly disabled by a call to stopMessageLiveLocation. On success,
+    /// [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
+    ///
+    /// [`True`]: crate::types::True
+    ///
+    /// # Params
+    ///   - `latitude`: Latitude of new location.
+    ///   - `longitude`: Longitude of new location.
+    pub fn edit_inline_message_live_location<I>(
+        &self,
+        inline_message_id: I,
+        latitude: f32,
+        longitude: f32,
+    ) -> EditInlineMessageLiveLocation
+    where
+        I: Into<String>,
+    {
+        EditInlineMessageLiveLocation::new(self.clone(), inline_message_id, latitude, longitude)
+    }
+
+    /// Use this method to stop updating a live location message before
+    /// `live_period` expires.
+    ///
+    /// On success, the sent [`Message`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
+    ///
+    /// [`Message`]: crate::types::Message
+    pub fn stop_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+    ) -> StopMessageLiveLocation
+    where
+        C: Into<ChatId>,
+    {
+        StopMessageLiveLocation::new(self.clone(), chat_id, message_id)
+    }
+
+    /// Use this method to stop updating a live location message (sent via the
+    /// bot) before `live_period` expires.
+    ///
+    /// On success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
+    ///
+    /// [`True`]: crate::types::True
+    pub fn stop_inline_message_live_location<I>(
+        &self,
+        inline_message_id: I,
+    ) -> StopInlineMessageLiveLocation
+    where
+        I: Into<String>,
+    {
+        StopInlineMessageLiveLocation::new(self.clone(), inline_message_id)
+    }
+
+    /// Use this method to send information about a venue.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendvenue).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///  - `latitude`: Latitude of the venue.
+    ///  - `longitude`: Longitude of the venue.
+    ///  - `title`: Name of the venue.
+    ///  - `address`: Address of the venue.
+    pub fn send_venue<C, T, A>(
+        &self,
+        chat_id: C,
+        latitude: f32,
+        longitude: f32,
+        title: T,
+        address: A,
+    ) -> SendVenue
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+        A: Into<String>,
+    {
+        SendVenue::new(self.clone(), chat_id, latitude, longitude, title, address)
+    }
+
+    /// Use this method to send phone contacts.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendcontact).
+    ///
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `phone_number`: Contact's phone number.
+    ///   - `first_name`: Contact's first name.
+    pub fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> SendContact
+    where
+        C: Into<ChatId>,
+        P: Into<String>,
+        F: Into<String>,
+    {
+        SendContact::new(self.clone(), chat_id, phone_number, first_name)
+    }
+
+    /// Use this method to send a native poll. A native poll can't be sent to a
+    /// private chat.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendpoll).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `question`: Poll question, 1-255 characters.
+    ///   - `options`: List of answer options, 2-10 strings 1-100 characters
+    ///     each.
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] ([`SendPoll::explanation_parse_mode`]) if
+    /// specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    /// [`SendPoll::explanation_parse_mode`]:
+    /// [`SendPoll::explanation_parse_mode`]:
+    /// crate::types::SendPoll::explanation_parse_mode
+    pub fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> SendPoll
+    where
+        C: Into<ChatId>,
+        Q: Into<String>,
+        O: Into<Vec<String>>,
+    {
+        self.with_default_parse_mode_if_specified(
+            SendPoll::new(self.clone(), chat_id, question, options),
+            SendPoll::explanation_parse_mode,
+        )
+    }
+
+    /// Use this method when you need to tell the user that something is
+    /// happening on the bot's side.
+    ///
+    /// The status is set for 5 seconds or less (when a message arrives from
+    /// your bot, Telegram clients clear its typing status).
+    ///
+    /// ## Note
+    /// Example: The [ImageBot] needs some time to process a request and upload
+    /// the image. Instead of sending a text message along the lines of
+    /// “Retrieving image, please wait…”, the bot may use
+    /// [`Bot::send_chat_action`] with `action = upload_photo`. The user
+    /// will see a `sending photo` status for the bot.
+    ///
+    /// We only recommend using this method when a response from the bot will
+    /// take a **noticeable** amount of time to arrive.
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///
+    /// [ImageBot]: https://t.me/imagebot
+    /// [`Bot::send_chat_action`]: crate::Bot::send_chat_action
+    pub fn send_chat_action<C>(&self, chat_id: C, action: SendChatActionKind) -> SendChatAction
+    where
+        C: Into<ChatId>,
+    {
+        SendChatAction::new(self.clone(), chat_id, action)
+    }
+
+    /// Use this method to get a list of profile pictures for a user.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getuserprofilephotos).
+    ///
+    /// # Params
+    ///   - `user_id`: Unique identifier of the target user.
+    pub fn get_user_profile_photos(&self, user_id: i32) -> GetUserProfilePhotos {
+        GetUserProfilePhotos::new(self.clone(), user_id)
+    }
+
+    /// Use this method to get basic info about a file and prepare it for
+    /// downloading.
+    ///
+    /// For the moment, bots can download files of up to `20MB` in size.
+    ///
+    /// The file can then be downloaded via the link
+    /// `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>`
+    /// is taken from the response. It is guaranteed that the link will be valid
+    /// for at least `1` hour. When the link expires, a new one can be requested
+    /// by calling [`GetFile`] again.
+    ///
+    /// **Note**: This function may not preserve the original file name and MIME
+    /// type. You should save the file's MIME type and name (if available) when
+    /// the [`File`] object is received.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getfile).
+    ///
+    /// # Params
+    ///   - `file_id`: File identifier to get info about.
+    ///
+    /// [`File`]: crate::types::File
+    /// [`GetFile`]: self::GetFile
+    pub fn get_file<F>(&self, file_id: F) -> GetFile
+    where
+        F: Into<String>,
+    {
+        GetFile::new(self.clone(), file_id)
+    }
+
+    /// Use this method to kick a user from a group, a supergroup or a channel.
+    ///
+    /// In the case of supergroups and channels, the user will not be able to
+    /// return to the group on their own using invite links, etc., unless
+    /// [unbanned] first. The bot must be an administrator in the chat for
+    /// this to work and must have the appropriate admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#kickchatmember).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    ///
+    /// [unbanned]: crate::Bot::unban_chat_member
+    pub fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> KickChatMember
+    where
+        C: Into<ChatId>,
+    {
+        KickChatMember::new(self.clone(), chat_id, user_id)
+    }
+
+    /// Use this method to unban a previously kicked user in a supergroup or
+    /// channel. The user will **not** return to the group or channel
+    /// automatically, but will be able to join via link, etc. The bot must
+    /// be an administrator for this to work.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#unbanchatmember).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    pub fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> UnbanChatMember
+    where
+        C: Into<ChatId>,
+    {
+        UnbanChatMember::new(self.clone(), chat_id, user_id)
+    }
+
+    /// Use this method to restrict a user in a supergroup.
+    ///
+    /// The bot must be an administrator in the supergroup for this to work and
+    /// must have the appropriate admin rights. Pass `true` for all
+    /// permissions to lift restrictions from a user.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#restrictchatmember).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    ///   - `permissions`: New user permissions.
+    pub fn restrict_chat_member<C>(
+        &self,
+        chat_id: C,
+        user_id: i32,
+        permissions: ChatPermissions,
+    ) -> RestrictChatMember
+    where
+        C: Into<ChatId>,
+    {
+        RestrictChatMember::new(self.clone(), chat_id, user_id, permissions)
+    }
+
+    /// Use this method to promote or demote a user in a supergroup or a
+    /// channel.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the appropriate admin rights. Pass False for all boolean
+    /// parameters to demote a user.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#promotechatmember).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    pub fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> PromoteChatMember
+    where
+        C: Into<ChatId>,
+    {
+        PromoteChatMember::new(self.clone(), chat_id, user_id)
+    }
+
+    /// Use this method to set default chat permissions for all members.
+    ///
+    /// The bot must be an administrator in the group or a supergroup for this
+    /// to work and must have the can_restrict_members admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchatpermissions).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `permissions`: New default chat permissions.
+    pub fn set_chat_permissions<C>(
+        &self,
+        chat_id: C,
+        permissions: ChatPermissions,
+    ) -> SetChatPermissions
+    where
+        C: Into<ChatId>,
+    {
+        SetChatPermissions::new(self.clone(), chat_id, permissions)
+    }
+
+    /// Use this method to generate a new invite link for a chat; any previously
+    /// generated link is revoked.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the appropriate admin rights.
+    ///
+    /// # Note
+    /// Each administrator in a chat generates their own invite links. Bots
+    /// can't use invite links generated by other administrators. If you
+    /// want your bot to work with invite links, it will need to generate
+    /// its own link using [`Bot::export_chat_invite_link`] – after this the
+    /// link will become available to the bot via the [`Bot::get_chat`]
+    /// method. If your bot needs to generate a new invite link replacing
+    /// its previous one, use [`Bot::export_chat_invite_link`] again.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#exportchatinvitelink).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///
+    /// [`Bot::export_chat_invite_link`]: crate::Bot::export_chat_invite_link
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub fn export_chat_invite_link<C>(&self, chat_id: C) -> ExportChatInviteLink
+    where
+        C: Into<ChatId>,
+    {
+        ExportChatInviteLink::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to set a new profile photo for the chat.
+    ///
+    /// Photos can't be changed for private chats. The bot must be an
+    /// administrator in the chat for this to work and must have the
+    /// appropriate admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchatphoto).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `photo`: New chat photo, uploaded using `multipart/form-data`.
+    pub fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> SetChatPhoto
+    where
+        C: Into<ChatId>,
+    {
+        SetChatPhoto::new(self.clone(), chat_id, photo)
+    }
+
+    /// Use this method to delete a chat photo. Photos can't be changed for
+    /// private chats. The bot must be an administrator in the chat for this
+    /// to work and must have the appropriate admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#deletechatphoto).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn delete_chat_photo<C>(&self, chat_id: C) -> DeleteChatPhoto
+    where
+        C: Into<ChatId>,
+    {
+        DeleteChatPhoto::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to change the title of a chat.
+    ///
+    /// Titles can't be changed for private chats. The bot must be an
+    /// administrator in the chat for this to work and must have the
+    /// appropriate admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchattitle).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `title`: New chat title, 1-255 characters.
+    pub fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> SetChatTitle
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        SetChatTitle::new(self.clone(), chat_id, title)
+    }
+
+    /// Use this method to change the description of a group, a supergroup or a
+    /// channel.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the appropriate admin rights.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchatdescription).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn set_chat_description<C>(&self, chat_id: C) -> SetChatDescription
+    where
+        C: Into<ChatId>,
+    {
+        SetChatDescription::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to pin a message in a group, a supergroup, or a channel.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the `can_pin_messages` admin right in the supergroup or
+    /// `can_edit_messages` admin right in the channel.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#pinchatmessage).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `message_id`: Identifier of a message to pin.
+    pub fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> PinChatMessage
+    where
+        C: Into<ChatId>,
+    {
+        PinChatMessage::new(self.clone(), chat_id, message_id)
+    }
+
+    /// Use this method to unpin a message in a group, a supergroup, or a
+    /// channel.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the `can_pin_messages` admin right in the supergroup or
+    /// `can_edit_messages` admin right in the channel.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#unpinchatmessage).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn unpin_chat_message<C>(&self, chat_id: C) -> UnpinChatMessage
+    where
+        C: Into<ChatId>,
+    {
+        UnpinChatMessage::new(self.clone(), chat_id)
+    }
+
+    /// Use this method for your bot to leave a group, supergroup or channel.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#leavechat).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn leave_chat<C>(&self, chat_id: C) -> LeaveChat
+    where
+        C: Into<ChatId>,
+    {
+        LeaveChat::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to get up to date information about the chat (current
+    /// name of the user for one-on-one conversations, current username of a
+    /// user, group or channel, etc.).
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getchat).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn get_chat<C>(&self, chat_id: C) -> GetChat
+    where
+        C: Into<ChatId>,
+    {
+        GetChat::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to get a list of administrators in a chat.
+    ///
+    /// If the chat is a group or a supergroup and no administrators were
+    /// appointed, only the creator will be returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getchatadministrators).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn get_chat_administrators<C>(&self, chat_id: C) -> GetChatAdministrators
+    where
+        C: Into<ChatId>,
+    {
+        GetChatAdministrators::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to get the number of members in a chat.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getchatmemberscount).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    pub fn get_chat_members_count<C>(&self, chat_id: C) -> GetChatMembersCount
+    where
+        C: Into<ChatId>,
+    {
+        GetChatMembersCount::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to get information about a member of a chat.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getchatmember).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup or channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    pub fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> GetChatMember
+    where
+        C: Into<ChatId>,
+    {
+        GetChatMember::new(self.clone(), chat_id, user_id)
+    }
+
+    /// Use this method to set a new group sticker set for a supergroup.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the appropriate admin rights. Use the field can_set_sticker_set
+    /// optionally returned in getChat requests to check if the bot can use
+    /// this method.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchatstickerset).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup (in the format `@supergroupusername`).
+    ///   - `sticker_set_name`: Name of the sticker set to be set as the group
+    ///     sticker set.
+    pub fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> SetChatStickerSet
+    where
+        C: Into<ChatId>,
+        S: Into<String>,
+    {
+        SetChatStickerSet::new(self.clone(), chat_id, sticker_set_name)
+    }
+
+    /// Use this method to delete a group sticker set from a supergroup.
+    ///
+    /// The bot must be an administrator in the chat for this to work and must
+    /// have the appropriate admin rights. Use the field
+    /// `can_set_sticker_set` optionally returned in [`Bot::get_chat`]
+    /// requests to check if the bot can use this method.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#deletechatstickerset).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target supergroup (in the format `@supergroupusername`).
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub fn delete_chat_sticker_set<C>(&self, chat_id: C) -> DeleteChatStickerSet
+    where
+        C: Into<ChatId>,
+    {
+        DeleteChatStickerSet::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to send answers to callback queries sent from [inline
+    /// keyboards].
+    ///
+    /// The answer will be displayed to the user as a notification at
+    /// the top of the chat screen or as an alert.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#answercallbackquery).
+    ///
+    /// # Params
+    ///   - `callback_query_id`: Unique identifier for the query to be answered.
+    ///
+    /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn answer_callback_query<C>(&self, callback_query_id: C) -> AnswerCallbackQuery
+    where
+        C: Into<String>,
+    {
+        AnswerCallbackQuery::new(self.clone(), callback_query_id)
+    }
+
+    /// Use this method to edit text and game messages.
+    ///
+    /// On success, the edited [`Message`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
+    ///
+    /// [`Message`]: crate::types::Message
+    ///
+    /// # Params
+    ///
+    ///  - `chat_id`: Unique identifier for the target chat or username of the
+    ///    target channel (in the format `@channelusername`).
+    ///  - `message_id`: Identifier of the message to edit.
+    ///  - `text`: New text of the message.
+    ///
+    /// # Notes
+    ///
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> EditMessageText
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        match self.parse_mode {
+            None => EditMessageText::new(self.clone(), chat_id, message_id, text),
+            Some(parse_mode) => {
+                EditMessageText::new(self.clone(), chat_id, message_id, text).parse_mode(parse_mode)
+            }
+        }
+    }
+
+    /// Use this method to edit text and game messages sent via the bot.
+    ///
+    /// On success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
+    ///
+    /// [`True`]: crate::types::True
+    ///
+    /// # Params
+    ///
+    ///  - `inline_message_id`: Identifier of the inline message.
+    ///  - `text`: New text of the message.
+    ///
+    /// # Notes
+    ///
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn edit_inline_message_text<I, T>(
+        &self,
+        inline_message_id: I,
+        text: T,
+    ) -> EditInlineMessageText
+    where
+        I: Into<String>,
+        T: Into<String>,
+    {
+        match self.parse_mode {
+            None => EditInlineMessageText::new(self.clone(), inline_message_id, text),
+            Some(parse_mode) => EditInlineMessageText::new(self.clone(), inline_message_id, text)
+                .parse_mode(parse_mode),
+        }
+    }
+
+    /// Use this method to edit captions of messages sent via the bot.
+    ///
+    /// On success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
+    ///
+    /// [`True`]: crate::types::True
+    ///
+    /// # Notes
+    ///
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> EditMessageCaption
+    where
+        C: Into<ChatId>,
+    {
+        match self.parse_mode {
+            None => EditMessageCaption::new(self.clone(), chat_id, message_id),
+            Some(parse_mode) => {
+                EditMessageCaption::new(self.clone(), chat_id, message_id).parse_mode(parse_mode)
+            }
+        }
+    }
+
+    /// Use this method to edit captions of messages sent via the bot.
+    ///
+    /// On success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
+    ///
+    /// [`True`]: crate::types::True
+    ///
+    /// # Notes
+    /// Uses [a default parse mode] if specified in [`BotBuilder`].
+    ///
+    /// [a default parse mode]: crate::BotBuilder::parse_mode
+    /// [`BotBuilder`]: crate::BotBuilder
+    pub fn edit_inline_message_caption<I>(&self, inline_message_id: I) -> EditInlineMessageCaption
+    where
+        I: Into<String>,
+    {
+        match self.parse_mode {
+            None => EditInlineMessageCaption::new(self.clone(), inline_message_id),
+            Some(parse_mode) => EditInlineMessageCaption::new(self.clone(), inline_message_id)
+                .parse_mode(parse_mode),
+        }
+    }
+
+    /// Use this method to edit animation, audio, document, photo, or video
+    /// messages.
+    ///
+    /// If a message is a part of a message album, then it can be edited only to
+    /// a photo or a video. Otherwise, message type can be changed
+    /// arbitrarily. On success, the edited [`Message`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
+    ///
+    /// [`Message`]: crate::types::Message
+    pub fn edit_message_media<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        media: InputMedia,
+    ) -> EditMessageMedia
+    where
+        C: Into<ChatId>,
+    {
+        EditMessageMedia::new(self.clone(), chat_id, message_id, media)
+    }
+
+    /// Use this method to edit animation, audio, document, photo, or video
+    /// messages sent via the bot.
+    ///
+    /// If a message is a part of a message album, then it can be edited only to
+    /// a photo or a video. Otherwise, message type can be changed
+    /// arbitrarily. When this method is used, new file can't be uploaded.
+    /// Use previously uploaded file via its `file_id` or specify a URL. On
+    /// success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
+    ///
+    /// [`True`]: crate::types::True
+    pub fn edit_inline_message_media<I>(
+        &self,
+        inline_message_id: I,
+        media: InputMedia,
+    ) -> EditInlineMessageMedia
+    where
+        I: Into<String>,
+    {
+        EditInlineMessageMedia::new(self.clone(), inline_message_id, media)
+    }
+
+    /// Use this method to edit only the reply markup of messages.
+    ///
+    /// On success, the edited [`Message`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
+    ///
+    /// [`Message`]: crate::types::Message
+    pub fn edit_message_reply_markup<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+    ) -> EditMessageReplyMarkup
+    where
+        C: Into<ChatId>,
+    {
+        EditMessageReplyMarkup::new(self.clone(), chat_id, message_id)
+    }
+
+    /// Use this method to edit only the reply markup of messages sent via the
+    /// bot.
+    ///
+    /// On success, [`True`] is returned.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`True`]: crate::types::True
+    pub fn edit_inline_message_reply_markup<I>(
+        &self,
+        inline_message_id: I,
+    ) -> EditInlineMessageReplyMarkup
+    where
+        I: Into<String>,
+    {
+        EditInlineMessageReplyMarkup::new(self.clone(), inline_message_id)
+    }
+
+    /// Use this method to stop a poll which was sent by the bot.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#stoppoll).
+    ///
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target channel (in the format `@channelusername`).
+    ///   - `message_id`: Identifier of the original message with the poll.
+    pub fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> StopPoll
+    where
+        C: Into<ChatId>,
+    {
+        StopPoll::new(self.clone(), chat_id, message_id)
+    }
+
+    /// Use this method to delete a message, including service messages.
+    ///
+    /// The limitations are:
+    ///  - A message can only be deleted if it was sent less than 48 hours ago.
+    ///  - Bots can delete outgoing messages in private chats, groups, and
+    ///    supergroups.
+    ///  - Bots can delete incoming messages in private chats.
+    ///  - Bots granted can_post_messages permissions can delete outgoing
+    ///    messages in channels.
+    ///  - If the bot is an administrator of a group, it can delete any message
+    ///    there.
+    ///  - If the bot has can_delete_messages permission in a supergroup or a
+    ///    channel, it can delete any message there.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#deletemessage).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target channel (in the format `@channelusername`).
+    ///   - `message_id`: Identifier of the message to delete.
+    pub fn delete_message<C>(&self, chat_id: C, message_id: i32) -> DeleteMessage
+    where
+        C: Into<ChatId>,
+    {
+        DeleteMessage::new(self.clone(), chat_id, message_id)
+    }
+
+    /// Use this method to send static .WEBP or [animated] .TGS stickers.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendsticker).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target channel (in the format `@channelusername`).
+    ///   - `sticker`: Sticker to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on the Telegram
+    /// servers (recommended), pass an [`InputFile::Url`] for Telegram to get a
+    /// .webp file from the Internet, or upload a new one using
+    /// [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [animated]: https://telegram.org/blog/animated-stickers
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> SendSticker
+    where
+        C: Into<ChatId>,
+    {
+        SendSticker::new(self.clone(), chat_id, sticker)
+    }
+
+    /// Use this method to get a sticker set.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getstickerset).
+    ///
+    /// # Params
+    ///   - `name`: Name of the sticker set.
+    pub fn get_sticker_set<N>(&self, name: N) -> GetStickerSet
+    where
+        N: Into<String>,
+    {
+        GetStickerSet::new(self.clone(), name)
+    }
+
+    /// Use this method to upload a .png file with a sticker for later use in
+    /// [`Bot::create_new_sticker_set`] and [`Bot::add_sticker_to_set`] methods
+    /// (can be used multiple times).
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#uploadstickerfile).
+    ///
+    /// # Params
+    ///   - `user_id`: User identifier of sticker file owner.
+    ///   - `png_sticker`: **Png** image with the sticker, must be up to 512
+    ///     kilobytes in size, dimensions must not exceed 512px, and either
+    ///     width or height must be exactly 512px. [More info on Sending Files
+    ///     »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    /// [`Bot::create_new_sticker_set`]: crate::Bot::create_new_sticker_set
+    /// [`Bot::add_sticker_to_set`]: crate::Bot::add_sticker_to_set
+    pub fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> UploadStickerFile {
+        UploadStickerFile::new(self.clone(), user_id, png_sticker)
+    }
+
+    /// Use this method to create new sticker set owned by a user. The bot will
+    /// be able to edit the created sticker set.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#createnewstickerset).
+    ///
+    /// # Params
+    ///   - `user_id`: User identifier of created sticker set owner.
+    ///   - `name`: Short name of sticker set, to be used in `t.me/addstickers/`
+    ///     URLs (e.g., animals). Can contain only english letters, digits and
+    ///     underscores.
+    ///
+    /// Must begin with a letter, can't contain consecutive underscores and must
+    /// end in `_by_<bot username>`. `<bot_username>` is case insensitive. 1-64
+    /// characters.
+    ///   - `title`: Sticker set title, 1-64 characters.
+    pub fn create_new_sticker_set<N, T, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        title: T,
+        sticker_type: StickerType,
+        emojis: E,
+    ) -> CreateNewStickerSet
+    where
+        N: Into<String>,
+        T: Into<String>,
+        E: Into<String>,
+    {
+        CreateNewStickerSet::new(self.clone(), user_id, name, title, sticker_type, emojis)
+    }
+
+    /// Use this method to add a new sticker to a set created by the bot.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#addstickertoset).
+    ///
+    /// # Params
+    ///   - `user_id`: User identifier of sticker set owner.
+    ///   - `name`: Sticker set name.
+    ///   - `emojis`: One or more emoji corresponding to the sticker.
+    pub fn add_sticker_to_set<N, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        sticker_type: StickerType,
+        emojis: E,
+    ) -> AddStickerToSet
+    where
+        N: Into<String>,
+        E: Into<String>,
+    {
+        AddStickerToSet::new(self.clone(), user_id, name, sticker_type, emojis)
+    }
+
+    /// Use this method to move a sticker in a set created by the bot to a
+    /// specific position.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setstickerpositioninset).
+    ///
+    /// # Params
+    ///   - `sticker`: File identifier of the sticker.
+    ///   - `position`: New sticker position in the set, zero-based.
+    pub fn set_sticker_position_in_set<S>(
+        &self,
+        sticker: S,
+        position: i32,
+    ) -> SetStickerPositionInSet
+    where
+        S: Into<String>,
+    {
+        SetStickerPositionInSet::new(self.clone(), sticker, position)
+    }
+
+    /// Use this method to delete a sticker from a set created by the bot.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#deletestickerfromset).
+    ///
+    /// # Params
+    ///   - `sticker`: File identifier of the sticker.
+    pub fn delete_sticker_from_set<S>(&self, sticker: S) -> DeleteStickerFromSet
+    where
+        S: Into<String>,
+    {
+        DeleteStickerFromSet::new(self.clone(), sticker)
+    }
+
+    /// Use this method to send answers to an inline query.
+    ///
+    /// No more than **50** results per query are allowed.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#answerinlinequery).
+    ///
+    /// # Params
+    ///   - `inline_query_id`: Unique identifier for the answered query.
+    ///   - `results`: A JSON-serialized array of results for the inline query.
+    pub fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> AnswerInlineQuery
+    where
+        I: Into<String>,
+        R: Into<Vec<InlineQueryResult>>,
+    {
+        AnswerInlineQuery::new(self.clone(), inline_query_id, results)
+    }
+
+    /// Use this method to send invoices.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendinvoice).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target private chat.
+    ///   - `title`: Product name, 1-32 characters.
+    ///   - `description`: Product description, 1-255 characters.
+    ///   - `payload`: Bot-defined invoice payload, 1-128 bytes. This will not
+    ///     be displayed to the user, use for your internal processes.
+    ///   - `provider_token`: Payments provider token, obtained via
+    ///     [@Botfather].
+    ///   - `start_parameter`: Unique deep-linking parameter that can be used to
+    ///     generate this invoice when used as a start parameter.
+    ///   - `currency`: Three-letter ISO 4217 currency code, see [more on
+    ///     currencies].
+    ///   - `prices`: Price breakdown, a list of components (e.g. product price,
+    ///     tax, discount, delivery cost, delivery tax, bonus, etc.).
+    ///
+    /// [more on currencies]: https://core.telegram.org/bots/payments#supported-currencies
+    /// [@Botfather]: https://t.me/botfather
+    #[allow(clippy::too_many_arguments)]
+    pub fn send_invoice<T, D, Pl, Pt, S, C, Pr>(
+        &self,
+        chat_id: i32,
+        title: T,
+        description: D,
+        payload: Pl,
+        provider_token: Pt,
+        start_parameter: S,
+        currency: C,
+        prices: Pr,
+    ) -> SendInvoice
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pl: Into<String>,
+        Pt: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pr: Into<Vec<LabeledPrice>>,
+    {
+        SendInvoice::new(
+            self.clone(),
+            chat_id,
+            title,
+            description,
+            payload,
+            provider_token,
+            start_parameter,
+            currency,
+            prices,
+        )
+    }
+
+    /// Once the user has confirmed their payment and shipping details, the Bot
+    /// API sends the final confirmation in the form of an [`Update`] with
+    /// the field `pre_checkout_query`. Use this method to respond to such
+    /// pre-checkout queries. Note: The Bot API must receive an answer
+    /// within 10 seconds after the pre-checkout query was sent.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
+    ///
+    /// # Params
+    ///   - `shipping_query_id`: Unique identifier for the query to be answered.
+    ///   - `ok`: Specify `true` if delivery to the specified address is
+    ///     possible and `false` if there are any problems (for example, if
+    ///     delivery to the specified address is not possible).
+    ///
+    /// [`Update`]: crate::types::Update
+    pub fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> AnswerShippingQuery
+    where
+        S: Into<String>,
+    {
+        AnswerShippingQuery::new(self.clone(), shipping_query_id, ok)
+    }
+
+    /// Once the user has confirmed their payment and shipping details, the Bot
+    /// API sends the final confirmation in the form of an [`Update`] with
+    /// the field `pre_checkout_query`. Use this method to respond to such
+    /// pre-checkout queries. Note: The Bot API must receive an answer
+    /// within 10 seconds after the pre-checkout query was sent.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
+    ///
+    /// # Params
+    ///   - `pre_checkout_query_id`: Unique identifier for the query to be
+    ///     answered.
+    ///   - `ok`: Specify `true` if everything is alright (goods are available,
+    ///     etc.) and the bot is ready to proceed with the order. Use False if
+    ///     there are any problems.
+    ///
+    /// [`Update`]: crate::types::Update
+    pub fn answer_pre_checkout_query<P>(
+        &self,
+        pre_checkout_query_id: P,
+        ok: bool,
+    ) -> AnswerPreCheckoutQuery
+    where
+        P: Into<String>,
+    {
+        AnswerPreCheckoutQuery::new(self.clone(), pre_checkout_query_id, ok)
+    }
+
+    /// Use this method to send a game.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#sendgame).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat.
+    ///   - `game_short_name`: Short name of the game, serves as the unique
+    ///     identifier for the game. Set up your games via [@Botfather].
+    ///
+    /// [@Botfather]: https://t.me/botfather
+    pub fn send_game<G>(&self, chat_id: i32, game_short_name: G) -> SendGame
+    where
+        G: Into<String>,
+    {
+        SendGame::new(self.clone(), chat_id, game_short_name)
+    }
+
+    /// Use this method to set the score of the specified user in a game.
+    ///
+    /// On success, if the message was sent by the bot, returns the edited
+    /// [`Message`], otherwise returns [`True`]. Returns an error, if the new
+    /// score is not greater than the user's current score in the chat and
+    /// force is `false`.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setgamescore).
+    ///
+    /// # Params
+    ///   - `target`: Target message, either chat id and message id or inline
+    ///     message id.
+    ///   - `user_id`: User identifier.
+    ///   - `score`: New score, must be non-negative.
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`True`]: crate::types::True
+    pub fn set_game_score<T>(&self, target: T, user_id: i32, score: i32) -> SetGameScore
+    where
+        T: Into<TargetMessage>,
+    {
+        SetGameScore::new(self.clone(), target, user_id, score)
+    }
+
+    /// Use this method to get data for high score tables.
+    ///
+    /// Will return the score of the specified user and several of his neighbors
+    /// in a game.
+    ///
+    /// # Note
+    /// This method will currently return scores for the target user, plus two
+    /// of his closest neighbors on each side. Will also return the top
+    /// three users if the user and his neighbors are not among them. Please
+    /// note that this behavior is subject to change.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getgamehighscores).
+    ///
+    /// # Params
+    ///   - `target`: Target message, either chat id and message id or inline
+    ///     message id.
+    ///   - `user_id`: Target user id.
+    pub fn get_game_high_scores<T>(&self, target: T, user_id: i32) -> GetGameHighScores
+    where
+        T: Into<TargetMessage>,
+    {
+        GetGameHighScores::new(self.clone(), target, user_id)
+    }
+
+    /// Use this method to set a custom title for an administrator in a
+    /// supergroup promoted by the bot.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setchatadministratorcustomtitle).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target channel (in the format `@channelusername`).
+    ///   - `user_id`: Unique identifier of the target user.
+    ///   - `custom_title`: New custom title for the administrator; 0-16
+    ///     characters, emoji are not allowed.
+    pub fn set_chat_administrator_custom_title<C, CT>(
+        &self,
+        chat_id: C,
+        user_id: i32,
+        custom_title: CT,
+    ) -> SetChatAdministratorCustomTitle
+    where
+        C: Into<ChatId>,
+        CT: Into<String>,
+    {
+        SetChatAdministratorCustomTitle::new(self.clone(), chat_id, user_id, custom_title)
+    }
+
+    /// Use this method to send an animated emoji that will display a random
+    /// value.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#senddice).
+    ///
+    /// # Params
+    ///   - `chat_id`: Unique identifier for the target chat or username of the
+    ///     target channel  (in the format `@channelusername`).
+    pub fn send_dice<C>(&self, chat_id: C) -> SendDice
+    where
+        C: Into<ChatId>,
+    {
+        SendDice::new(self.clone(), chat_id)
+    }
+
+    /// Use this method to get the current list of the bot's commands.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#getmycommands).
+    pub fn get_my_commands(&self) -> GetMyCommands {
+        GetMyCommands::new(self.clone())
+    }
+
+    /// Use this method to change the list of the bot's commands.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setmycommands).
+    ///
+    /// # Params
+    ///    - `commands`: A JSON-serialized list of bot commands to be set as the
+    ///      list of the bot's commands. At most 100 commands can be specified.
+    pub fn set_my_commands<C>(&self, commands: C) -> SetMyCommands
+    where
+        C: Into<Vec<BotCommand>>,
+    {
+        SetMyCommands::new(self.clone(), commands)
+    }
+
+    /// Use this method to set the thumbnail of a sticker set. Animated
+    /// thumbnails can be set for animated sticker sets only.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#setstickersetthumb).
+    ///
+    /// # Params
+    ///    - `name`: Sticker set name.
+    ///    - `user_id`: User identifier of the sticker set owner.
+    pub fn set_sticker_set_thumb<S>(&self, name: S, user_id: i32) -> SetStickerSetThumb
+    where
+        S: Into<String>,
+    {
+        SetStickerSetThumb::new(self.clone(), name, user_id)
+    }
+
+    fn with_default_parse_mode_if_specified<Builder>(
+        &self,
+        builder: Builder,
+        f: fn(Builder, ParseMode) -> Builder,
+    ) -> Builder {
+        match self.parse_mode {
+            None => builder,
+            Some(parse_mode) => f(builder, parse_mode),
+        }
+    }
+}
diff --git a/src/bot/download.rs b/src/bot/download.rs
new file mode 100644
index 00000000..7035cfe7
--- /dev/null
+++ b/src/bot/download.rs
@@ -0,0 +1,65 @@
+use tokio::io::AsyncWrite;
+
+#[cfg(feature = "unstable-stream")]
+use ::{bytes::Bytes, tokio::stream::Stream};
+
+#[cfg(feature = "unstable-stream")]
+use crate::net::download_file_stream;
+use crate::{bot::Bot, net::download_file, DownloadError};
+
+impl Bot {
+    /// Download a file from Telegram into `destination`.
+    ///
+    /// `path` can be obtained from [`Bot::get_file`].
+    ///
+    /// To download as a stream of chunks, see [`Bot::download_file_stream`].
+    ///
+    /// ## Examples
+    ///
+    /// ```no_run
+    /// use teloxide::types::File as TgFile;
+    /// use tokio::fs::File;
+    /// # use teloxide::RequestError;
+    /// use teloxide::{requests::Request, Bot};
+    ///
+    /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
+    /// let bot = Bot::new("TOKEN");
+    /// let mut file = File::create("/home/waffle/Pictures/test.png").await?;
+    ///
+    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
+    /// bot.download_file(&file_path, &mut file).await?;
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// [`Bot::get_file`]: crate::Bot::get_file
+    /// [`Bot::download_file_stream`]: crate::Bot::download_file_stream
+    pub async fn download_file<D>(
+        &self,
+        path: &str,
+        destination: &mut D,
+    ) -> Result<(), DownloadError>
+    where
+        D: AsyncWrite + Unpin,
+    {
+        download_file(&self.client, &self.token, path, destination).await
+    }
+
+    /// Download a file from Telegram.
+    ///
+    /// `path` can be obtained from the [`Bot::get_file`].
+    ///
+    /// To download into [`AsyncWrite`] (e.g. [`tokio::fs::File`]), see
+    /// [`Bot::download_file`].
+    ///
+    /// [`Bot::get_file`]: crate::bot::Bot::get_file
+    /// [`AsyncWrite`]: tokio::io::AsyncWrite
+    /// [`tokio::fs::File`]: tokio::fs::File
+    /// [`Bot::download_file`]: crate::Bot::download_file
+    #[cfg(feature = "unstable-stream")]
+    pub async fn download_file_stream(
+        &self,
+        path: &str,
+    ) -> Result<impl Stream<Item = Result<Bytes, reqwest::Error>>, reqwest::Error> {
+        download_file_stream(&self.client, &self.token, path).await
+    }
+}
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
new file mode 100644
index 00000000..617ed664
--- /dev/null
+++ b/src/bot/mod.rs
@@ -0,0 +1,240 @@
+use crate::types::ParseMode;
+use reqwest::{
+    header::{HeaderMap, CONNECTION},
+    Client, ClientBuilder,
+};
+use std::{sync::Arc, time::Duration};
+
+mod api;
+mod download;
+
+pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
+pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
+
+/// A requests sender.
+///
+/// No need to put it into [`Arc`], because it's already in.
+///
+/// [`Arc`]: std::sync::Arc
+#[derive(Debug, Clone)]
+pub struct Bot {
+    token: Arc<str>,
+    client: Client,
+    parse_mode: Option<ParseMode>,
+}
+
+impl Bot {
+    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` & `TELOXIDE_PROXY`
+    /// environmental variables (a bot's token & a proxy) and the default
+    /// [`reqwest::Client`].
+    ///
+    /// This function passes the value of `TELOXIDE_PROXY` into
+    /// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
+    /// client.
+    ///
+    /// # Panics
+    ///  - If cannot get the `TELOXIDE_TOKEN`  environmental variable.
+    ///  - If it cannot create [`reqwest::Client`].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
+    /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
+    #[must_use]
+    pub fn from_env() -> Self {
+        BotBuilder::new().build()
+    }
+
+    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
+    /// bot's token) and your [`reqwest::Client`].
+    ///
+    /// # Panics
+    /// If cannot get the `TELOXIDE_TOKEN` environmental variable.
+    ///
+    /// # Caution
+    /// Your custom client might not be configured correctly to be able to work
+    /// in long time durations, see [issue 223].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
+    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+    #[deprecated]
+    #[allow(deprecated)]
+    pub fn from_env_with_client(client: Client) -> Self {
+        Self::with_client(&get_env(TELOXIDE_TOKEN), client)
+    }
+
+    /// Creates a new `Bot` with the specified token and the default
+    /// [`reqwest::Client`].
+    ///
+    /// # Panics
+    /// If it cannot create [`reqwest::Client`].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/latest/reqwest/struct.Client.html
+    #[deprecated]
+    #[allow(deprecated)]
+    pub fn new<S>(token: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self::with_client(token, build_sound_bot())
+    }
+
+    /// Creates a new `Bot` with the specified token and your
+    /// [`reqwest::Client`].
+    ///
+    /// # Caution
+    /// Your custom client might not be configured correctly to be able to work
+    /// in long time durations, see [issue 223].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/latest/reqwest/struct.Client.html
+    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+    #[deprecated]
+    #[allow(deprecated)]
+    pub fn with_client<S>(token: S, client: Client) -> Self
+    where
+        S: Into<String>,
+    {
+        Self {
+            token: Into::<Arc<str>>::into(Into::<String>::into(token)),
+            client,
+            parse_mode: None,
+        }
+    }
+}
+
+/// Returns a builder with safe settings.
+///
+/// By "safe settings" I mean that a client will be able to work in long time
+/// durations, see the [issue 223].
+///
+/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+pub(crate) fn sound_bot() -> ClientBuilder {
+    let mut headers = HeaderMap::new();
+    headers.insert(CONNECTION, "keep-alive".parse().unwrap());
+
+    let connect_timeout = Duration::from_secs(5);
+    let timeout = 10;
+
+    ClientBuilder::new()
+        .connect_timeout(connect_timeout)
+        .timeout(Duration::from_secs(connect_timeout.as_secs() + timeout + 2))
+        .tcp_nodelay_(true)
+        .default_headers(headers)
+}
+
+pub(crate) fn build_sound_bot() -> Client {
+    sound_bot().build().expect("creating reqwest::Client")
+}
+
+fn get_env(env: &'static str) -> String {
+    std::env::var(env).unwrap_or_else(|_| panic!("Cannot get the {} env variable", env))
+}
+
+impl Bot {
+    pub fn token(&self) -> &str {
+        &self.token
+    }
+
+    pub fn client(&self) -> &Client {
+        &self.client
+    }
+}
+
+/// A builder of [`Bot`], supporting some extra settings.
+///
+/// [`Bot`] crate::Bot
+#[derive(Debug, Default)]
+pub struct BotBuilder {
+    token: Option<String>,
+    client: Option<Client>,
+    parse_mode: Option<ParseMode>,
+}
+
+impl BotBuilder {
+    #[must_use]
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Specifies a custom HTTPS client. Otherwise, the default will be used.
+    ///
+    /// # Caution
+    ///  - Your custom client might not be configured correctly to be able to
+    ///    work
+    /// in long time durations, see [issue 223].
+    ///
+    ///  - If this method is used, the `TELOXIDE_PROXY` environmental variable
+    ///    won't be extracted in [`BotBuilder::build`].
+    ///
+    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+    /// [`BotBuilder::build`]: crate::BotBuilder::build
+    #[must_use]
+    pub fn client(mut self, client: Client) -> Self {
+        self.client = Some(client);
+        self
+    }
+
+    /// Specified a custom token.
+    ///
+    /// Otherwise, a token will be extracted from the `TELOXIDE_TOKEN`
+    /// environmental variable.
+    #[must_use]
+    pub fn token<S>(mut self, token: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.token = Some(token.into());
+        self
+    }
+
+    /// Specifies [`ParseMode`], which will be used during all calls to:
+    ///
+    ///  - [`send_message`]
+    ///  - [`send_photo`]
+    ///  - [`send_video`]
+    ///  - [`send_audio`]
+    ///  - [`send_document`]
+    ///  - [`send_animation`]
+    ///  - [`send_voice`]
+    ///  - [`send_poll`]
+    ///  - [`edit_message_text`]
+    ///  - [`edit_message_caption`]
+    ///
+    /// [`send_message`]: crate::Bot::send_message
+    /// [`send_photo`]: crate::Bot::send_photo
+    /// [`send_video`]: crate::Bot::send_video
+    /// [`send_audio`]: crate::Bot::send_audio
+    /// [`send_document`]: crate::Bot::send_document
+    /// [`send_animation`]: crate::Bot::send_animation
+    /// [`send_voice`]: crate::Bot::send_voice
+    /// [`send_poll`]: crate::Bot::send_poll
+    /// [`edit_message_text`]: crate::Bot::edit_message_text
+    /// [`edit_message_caption`]: crate::Bot::edit_message_caption
+    #[must_use]
+    pub fn parse_mode(mut self, parse_mode: ParseMode) -> Self {
+        self.parse_mode = Some(parse_mode);
+        self
+    }
+
+    /// Builds [`Bot`].
+    ///
+    /// This method will attempt to build a new client with a proxy, specified
+    /// in the `TELOXIDE_PROXY` (passed into [`reqwest::Proxy::all`])
+    /// environmental variable, if a client haven't been specified. If
+    /// `TELOXIDE_PROXY` is unspecified, it'll use no proxy.
+    ///
+    /// # Panics
+    ///  - If cannot get the `TELOXIDE_TOKEN` environmental variable.
+    ///  - If it cannot create [`reqwest::Client`].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
+    ///
+    /// [`Bot`]: crate::Bot
+    /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
+    #[must_use]
+    pub fn build(self) -> Bot {
+        Bot {
+            client: self.client.unwrap_or_else(crate::client_from_env),
+            token: self.token.unwrap_or_else(|| get_env(TELOXIDE_TOKEN)).into(),
+            parse_mode: self.parse_mode,
+        }
+    }
+}
diff --git a/src/errors.rs b/src/errors.rs
new file mode 100644
index 00000000..466cc501
--- /dev/null
+++ b/src/errors.rs
@@ -0,0 +1,515 @@
+use derive_more::From;
+use reqwest::StatusCode;
+use serde::Deserialize;
+use thiserror::Error;
+
+/// An error caused by downloading a file.
+#[derive(Debug, Error, From)]
+pub enum DownloadError {
+    #[error("A network error: {0}")]
+    NetworkError(#[source] reqwest::Error),
+
+    #[error("An I/O error: {0}")]
+    Io(#[source] std::io::Error),
+}
+
+/// An error caused by sending a request to Telegram.
+#[derive(Debug, Error)]
+pub enum RequestError {
+    #[error("A Telegram's error #{status_code}: {kind:?}")]
+    ApiError { status_code: StatusCode, kind: ApiErrorKind },
+
+    /// The group has been migrated to a supergroup with the specified
+    /// identifier.
+    #[error("The group has been migrated to a supergroup with ID #{0}")]
+    MigrateToChatId(i64),
+
+    /// In case of exceeding flood control, the number of seconds left to wait
+    /// before the request can be repeated.
+    #[error("Retry after {0} seconds")]
+    RetryAfter(i32),
+
+    #[error("A network error: {0}")]
+    NetworkError(#[source] reqwest::Error),
+
+    #[error("An error while parsing JSON: {0}")]
+    InvalidJson(#[source] serde_json::Error),
+}
+
+/// A kind of an API error.
+///
+/// If you receive [`ApiErrorKind::Unknown`], please [open an issue] with
+/// the description of the error.
+///
+/// [`ApiErrorKind::Unknown`]: crate::ApiErrorKind::Unknown
+/// [open an issue]: https://github.com/teloxide/teloxide/issues/new
+#[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
+#[serde(untagged)]
+pub enum ApiErrorKind {
+    Known(KnownApiErrorKind),
+    Unknown(String),
+}
+
+/// A kind of a known API error.
+#[derive(Debug, Deserialize, PartialEq, Copy, Hash, Eq, Clone)]
+pub enum KnownApiErrorKind {
+    /// Occurs when the bot tries to send message to user who blocked the bot.
+    #[serde(rename = "Forbidden: bot was blocked by the user")]
+    BotBlocked,
+
+    /// Occurs when bot tries to modify a message without modification content.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message is not modified: specified new message content and \
+                      reply markup are exactly the same as a current content and reply markup \
+                      of the message")]
+    MessageNotModified,
+
+    /// Occurs when bot tries to forward or delete a message which was deleted.
+    ///
+    /// May happen in methods:
+    /// 1. [`ForwardMessage`]
+    /// 2. [`DeleteMessage`]
+    ///
+    /// [`ForwardMessage`]: crate::requests::ForwardMessage
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
+    MessageIdInvalid,
+
+    /// Occurs when bot tries to forward a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`ForwardMessage`]
+    ///
+    /// [`ForwardMessage`]: crate::requests::ForwardMessage
+    #[serde(rename = "Bad Request: message to forward not found")]
+    MessageToForwardNotFound,
+
+    /// Occurs when bot tries to delete a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`DeleteMessage`]
+    ///
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: message to delete not found")]
+    MessageToDeleteNotFound,
+
+    /// Occurs when bot tries to send a text message without text.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: message text is empty")]
+    MessageTextIsEmpty,
+
+    /// Occurs when bot tries to edit a message after long time.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message can't be edited")]
+    MessageCantBeEdited,
+
+    /// Occurs when bot tries to delete a someone else's message in group where
+    /// it does not have enough rights.
+    ///
+    /// May happen in methods:
+    /// 1. [`DeleteMessage`]
+    ///
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: message can't be deleted")]
+    MessageCantBeDeleted,
+
+    /// Occurs when bot tries to edit a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message to edit not found")]
+    MessageToEditNotFound,
+
+    /// Occurs when bot tries to reply to a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: reply message not found")]
+    MessageToReplyNotFound,
+
+    /// Occurs when bot tries to
+    #[serde(rename = "Bad Request: message identifier is not specified")]
+    MessageIdentifierNotSpecified,
+
+    /// Occurs when bot tries to send a message with text size greater then
+    /// 4096 symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: message is too long")]
+    MessageIsTooLong,
+
+    /// Occurs when bot tries to send media group with more than 10 items.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMediaGroup`]
+    ///
+    /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
+    #[serde(rename = "Bad Request: Too much messages to send as an album")]
+    ToMuchMessages,
+
+    /// Occurs when bot tries to stop poll that has already been stopped.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll has already been closed")]
+    PollHasAlreadyClosed,
+
+    /// Occurs when bot tries to send poll with less than 2 options.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll must have at least 2 option")]
+    PollMustHaveMoreOptions,
+
+    /// Occurs when bot tries to send poll with more than 10 options.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll can't have more than 10 options")]
+    PollCantHaveMoreOptions,
+
+    /// Occurs when bot tries to send poll with empty option (without text).
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll options must be non-empty")]
+    PollOptionsMustBeNonEmpty,
+
+    /// Occurs when bot tries to send poll with empty question (without text).
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll question must be non-empty")]
+    PollQuestionMustBeNonEmpty,
+
+    /// Occurs when bot tries to send poll with total size of options more than
+    /// 100 symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll options length must not exceed 100")]
+    PollOptionsLengthTooLong,
+
+    /// Occurs when bot tries to send poll with question size more than 255
+    /// symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll question length must not exceed 255")]
+    PollQuestionLengthTooLong,
+
+    /// Occurs when bot tries to stop poll with message without poll.
+    ///
+    /// May happen in methods:
+    /// 1. [`StopPoll`]
+    ///
+    /// [`StopPoll`]: crate::requests::StopPoll
+    #[serde(rename = "Bad Request: message with poll to stop not found")]
+    MessageWithPollNotFound,
+
+    /// Occurs when bot tries to stop poll with message without poll.
+    ///
+    /// May happen in methods:
+    /// 1. [`StopPoll`]
+    ///
+    /// [`StopPoll`]: crate::requests::StopPoll
+    #[serde(rename = "Bad Request: message is not a poll")]
+    MessageIsNotAPoll,
+
+    /// Occurs when bot tries to send a message to chat in which it is not a
+    /// member.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: chat not found")]
+    ChatNotFound,
+
+    /// Occurs when bot tries to send method with unknown user_id.
+    ///
+    /// May happen in methods:
+    /// 1. [`getUserProfilePhotos`]
+    ///
+    /// [`getUserProfilePhotos`]:
+    /// crate::requests::GetUserProfilePhotos
+    #[serde(rename = "Bad Request: user not found")]
+    UserNotFound,
+
+    /// Occurs when bot tries to send [`SetChatDescription`] with same text as
+    /// in the current description.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetChatDescription`]
+    ///
+    /// [`SetChatDescription`]: crate::requests::SetChatDescription
+    #[serde(rename = "Bad Request: chat description is not modified")]
+    ChatDescriptionIsNotModified,
+
+    /// Occurs when bot tries to answer to query after timeout expire.
+    ///
+    /// May happen in methods:
+    /// 1. [`AnswerCallbackQuery`]
+    ///
+    /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
+    #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
+                      invalid")]
+    InvalidQueryID,
+
+    /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
+    /// url.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
+    ButtonURLInvalid,
+
+    /// Occurs when bot tries to send button with data size more than 64 bytes.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
+    ButtonDataInvalid,
+
+    /// Occurs when bot tries to send button with data size == 0.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
+                      unallowed in the inline keyboard")]
+    TextButtonsAreUnallowed,
+
+    /// Occurs when bot tries to get file by wrong file id.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetFile`]
+    ///
+    /// [`GetFile`]: crate::requests::GetFile
+    #[serde(rename = "Bad Request: wrong file id")]
+    WrongFileID,
+
+    /// Occurs when bot tries to do some with group which was deactivated.
+    #[serde(rename = "Bad Request: group is deactivated")]
+    GroupDeactivated,
+
+    /// Occurs when bot tries to set chat photo from file ID
+    ///
+    /// May happen in methods:
+    /// 1. [`SetChatPhoto`]
+    ///
+    /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
+    #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
+    PhotoAsInputFileRequired,
+
+    /// Occurs when bot tries to add sticker to stickerset by invalid name.
+    ///
+    /// May happen in methods:
+    /// 1. [`AddStickerToSet`]
+    ///
+    /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
+    #[serde(rename = "Bad Request: STICKERSET_INVALID")]
+    InvalidStickersSet,
+
+    /// Occurs when bot tries to pin a message without rights to pin in this
+    /// chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`PinChatMessage`]
+    ///
+    /// [`PinChatMessage`]: crate::requests::PinChatMessage
+    #[serde(rename = "Bad Request: not enough rights to pin a message")]
+    NotEnoughRightsToPinMessage,
+
+    /// Occurs when bot tries to use method in group which is allowed only in a
+    /// supergroup or channel.
+    #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
+    MethodNotAvailableInPrivateChats,
+
+    /// Occurs when bot tries to demote chat creator.
+    ///
+    /// May happen in methods:
+    /// 1. [`PromoteChatMember`]
+    ///
+    /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
+    #[serde(rename = "Bad Request: can't demote chat creator")]
+    CantDemoteChatCreator,
+
+    /// Occurs when bot tries to restrict self in group chats.
+    ///
+    /// May happen in methods:
+    /// 1. [`RestrictChatMember`]
+    ///
+    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    #[serde(rename = "Bad Request: can't restrict self")]
+    CantRestrictSelf,
+
+    /// Occurs when bot tries to restrict chat member without rights to
+    /// restrict in this chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`RestrictChatMember`]
+    ///
+    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
+    NotEnoughRightsToRestrict,
+
+    /// Occurs when bot tries set webhook to protocol other than HTTPS.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
+    WebhookRequireHTTPS,
+
+    /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
+    /// 8443.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
+                      or 8443")]
+    BadWebhookPort,
+
+    /// Occurs when bot tries to set webhook to unknown host.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
+    UnknownHost,
+
+    /// Occurs when bot tries to set webhook to invalid URL.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: can't parse URL")]
+    CantParseUrl,
+
+    /// Occurs when bot tries to send message with unfinished entities.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: can't parse entities")]
+    CantParseEntities,
+
+    /// Occurs when bot tries to use getUpdates while webhook is active.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetUpdates`]
+    ///
+    /// [`GetUpdates`]: crate::requests::GetUpdates
+    #[serde(rename = "can't use getUpdates method while webhook is active")]
+    CantGetUpdates,
+
+    /// Occurs when bot tries to do some in group where bot was kicked.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot was kicked from a chat")]
+    BotKicked,
+
+    /// Occurs when bot tries to send message to deactivated user.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: user is deactivated")]
+    UserDeactivated,
+
+    /// Occurs when you tries to initiate conversation with a user.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
+    CantInitiateConversation,
+
+    /// Occurs when you tries to send message to bot.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot can't send messages to bots")]
+    CantTalkWithBots,
+
+    /// Occurs when bot tries to send button with invalid http url.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: wrong HTTP URL")]
+    WrongHTTPurl,
+
+    /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
+    /// one Updater is running.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetUpdates`]
+    ///
+    /// [`GetUpdates`]: crate::requests::GetUpdates
+    #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
+                      bot instance is running")]
+    TerminatedByOtherGetUpdates,
+
+    /// Occurs when bot tries to get file by invalid file id.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetFile`]
+    ///
+    /// [`GetFile`]: crate::requests::GetFile
+    #[serde(rename = "Bad Request: invalid file id")]
+    FileIdInvalid,
+}
diff --git a/src/lib.rs b/src/lib.rs
index 1adb08cb..27ddfcd6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,4 +9,45 @@
 // ```
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg))]
 #![forbid(unsafe_code)]
-#![deny(missing_docs)]
+//#![deny(missing_docs)]
+
+pub use self::{
+    bot::{Bot, BotBuilder},
+    errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},
+};
+
+pub mod requests;
+pub mod types;
+
+// reexported
+mod bot;
+mod errors;
+
+// implementation details
+mod net;
+
+/// Constructs a client from the `TELOXIDE_PROXY` environmental variable.
+///
+/// This function passes the value of `TELOXIDE_PROXY` into
+/// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
+/// client.
+///
+/// # Note
+/// The created client will have safe settings, meaning that it will be able to
+/// work in long time durations, see the [issue 223].
+///
+/// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
+/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+pub fn client_from_env() -> reqwest::Client {
+    use crate::bot::{sound_bot, TELOXIDE_PROXY};
+    use reqwest::Proxy;
+
+    let builder = sound_bot();
+
+    match std::env::var(TELOXIDE_PROXY).ok() {
+        Some(proxy) => builder.proxy(Proxy::all(&proxy).expect("creating reqwest::Proxy")),
+        None => builder,
+    }
+    .build()
+    .expect("creating reqwest::Client")
+}
diff --git a/src/net/download.rs b/src/net/download.rs
new file mode 100644
index 00000000..05f08f5d
--- /dev/null
+++ b/src/net/download.rs
@@ -0,0 +1,49 @@
+use reqwest::Client;
+use tokio::io::{AsyncWrite, AsyncWriteExt};
+
+use crate::errors::DownloadError;
+
+use super::TELEGRAM_API_URL;
+
+pub async fn download_file<D>(
+    client: &Client,
+    token: &str,
+    path: &str,
+    destination: &mut D,
+) -> Result<(), DownloadError>
+where
+    D: AsyncWrite + Unpin,
+{
+    let mut res = client
+        .get(&super::file_url(TELEGRAM_API_URL, token, path))
+        .send()
+        .await?
+        .error_for_status()?;
+
+    while let Some(chunk) = res.chunk().await? {
+        destination.write_all(&chunk).await?;
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "unstable-stream")]
+pub async fn download_file_stream(
+    client: &Client,
+    token: &str,
+    path: &str,
+) -> Result<impl Stream<Item = reqwest::Result<Bytes>>, reqwest::Error> {
+    let res = client
+        .get(&super::file_url(TELEGRAM_API_URL, token, path))
+        .send()
+        .await?
+        .error_for_status()?;
+
+    Ok(futures::stream::unfold(res, |mut res| async {
+        match res.chunk().await {
+            Err(err) => Some((Err(err), res)),
+            Ok(Some(c)) => Some((Ok(c), res)),
+            Ok(None) => None,
+        }
+    }))
+}
diff --git a/src/net/mod.rs b/src/net/mod.rs
new file mode 100644
index 00000000..b4944959
--- /dev/null
+++ b/src/net/mod.rs
@@ -0,0 +1,61 @@
+#[cfg(feature = "unstable-stream")]
+pub use download::download_file_stream;
+
+pub use self::{
+    download::download_file,
+    request::{request_json, request_multipart},
+    telegram_response::TelegramResponse,
+};
+
+mod download;
+mod request;
+mod telegram_response;
+
+const TELEGRAM_API_URL: &str = "https://api.telegram.org";
+
+/// Creates URL for making HTTPS requests. See the [Telegram documentation].
+///
+/// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests
+fn method_url(base: &str, token: &str, method_name: &str) -> String {
+    format!("{url}/bot{token}/{method}", url = base, token = token, method = method_name,)
+}
+
+/// Creates URL for downloading a file. See the [Telegram documentation].
+///
+/// [Telegram documentation]: https://core.telegram.org/bots/api#file
+fn file_url(base: &str, token: &str, file_path: &str) -> String {
+    format!("{url}/file/bot{token}/{file}", url = base, token = token, file = file_path,)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn method_url_test() {
+        let url = method_url(
+            TELEGRAM_API_URL,
+            "535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao",
+            "methodName",
+        );
+
+        assert_eq!(
+            url,
+            "https://api.telegram.org/bot535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao/methodName"
+        );
+    }
+
+    #[test]
+    fn file_url_test() {
+        let url = file_url(
+            TELEGRAM_API_URL,
+            "535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao",
+            "AgADAgADyqoxG2g8aEsu_KjjVsGF4-zetw8ABAEAAwIAA20AA_8QAwABFgQ",
+        );
+
+        assert_eq!(
+            url,
+            "https://api.telegram.org/file/bot535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao/AgADAgADyqoxG2g8aEsu_KjjVsGF4-zetw8ABAEAAwIAA20AA_8QAwABFgQ"
+        );
+    }
+}
diff --git a/src/net/request.rs b/src/net/request.rs
new file mode 100644
index 00000000..e376c3fd
--- /dev/null
+++ b/src/net/request.rs
@@ -0,0 +1,63 @@
+use reqwest::{multipart::Form, Client, Response};
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{requests::ResponseResult, RequestError};
+
+use super::{TelegramResponse, TELEGRAM_API_URL};
+use std::time::Duration;
+
+const DELAY_ON_SERVER_ERROR: Duration = Duration::from_secs(10);
+
+pub async fn request_multipart<T>(
+    client: &Client,
+    token: &str,
+    method_name: &str,
+    params: Form,
+) -> ResponseResult<T>
+where
+    T: DeserializeOwned,
+{
+    let response = client
+        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .multipart(params)
+        .send()
+        .await
+        .map_err(RequestError::NetworkError)?;
+
+    process_response(response).await
+}
+
+pub async fn request_json<T, P>(
+    client: &Client,
+    token: &str,
+    method_name: &str,
+    params: &P,
+) -> ResponseResult<T>
+where
+    T: DeserializeOwned,
+    P: Serialize,
+{
+    let response = client
+        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .json(params)
+        .send()
+        .await
+        .map_err(RequestError::NetworkError)?;
+
+    process_response(response).await
+}
+
+async fn process_response<T>(response: Response) -> ResponseResult<T>
+where
+    T: DeserializeOwned,
+{
+    if response.status().is_server_error() {
+        tokio::time::delay_for(DELAY_ON_SERVER_ERROR).await;
+    }
+
+    serde_json::from_str::<TelegramResponse<T>>(
+        &response.text().await.map_err(RequestError::NetworkError)?,
+    )
+    .map_err(RequestError::InvalidJson)?
+    .into()
+}
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
new file mode 100644
index 00000000..d5062e8f
--- /dev/null
+++ b/src/net/telegram_response.rs
@@ -0,0 +1,70 @@
+use reqwest::StatusCode;
+use serde::Deserialize;
+
+use crate::{
+    requests::ResponseResult,
+    types::{False, ResponseParameters, True},
+    ApiErrorKind, RequestError,
+};
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub enum TelegramResponse<R> {
+    Ok {
+        /// A dummy field. Used only for deserialization.
+        #[allow(dead_code)]
+        ok: True,
+
+        result: R,
+    },
+    Err {
+        /// A dummy field. Used only for deserialization.
+        #[allow(dead_code)]
+        ok: False,
+
+        #[serde(rename = "description")]
+        kind: ApiErrorKind,
+        error_code: u16,
+        response_parameters: Option<ResponseParameters>,
+    },
+}
+
+impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
+    fn into(self) -> Result<R, RequestError> {
+        match self {
+            TelegramResponse::Ok { result, .. } => Ok(result),
+            TelegramResponse::Err { kind, error_code, response_parameters, .. } => {
+                if let Some(params) = response_parameters {
+                    match params {
+                        ResponseParameters::RetryAfter(i) => Err(RequestError::RetryAfter(i)),
+                        ResponseParameters::MigrateToChatId(to) => {
+                            Err(RequestError::MigrateToChatId(to))
+                        }
+                    }
+                } else {
+                    Err(RequestError::ApiError {
+                        kind,
+                        status_code: StatusCode::from_u16(error_code).unwrap(),
+                    })
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{errors::KnownApiErrorKind, types::Update};
+
+    #[test]
+    fn terminated_by_other_get_updates() {
+        let expected = ApiErrorKind::Known(KnownApiErrorKind::TerminatedByOtherGetUpdates);
+        if let TelegramResponse::Err{ kind, .. } = serde_json::from_str::<TelegramResponse<Update>>(r#"{"ok":false,"error_code":409,"description":"Conflict: terminated by other getUpdates request; make sure that only one bot instance is running"}"#).unwrap() {
+            assert_eq!(expected, kind);
+        }
+        else {
+            panic!("Expected ApiErrorKind::TerminatedByOtherGetUpdates");
+        }
+    }
+}
diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
new file mode 100644
index 00000000..8cc0188f
--- /dev/null
+++ b/src/requests/all/add_sticker_to_set.rs
@@ -0,0 +1,109 @@
+use crate::{
+    net,
+    requests::form_builder::FormBuilder,
+    types::{MaskPosition, True},
+    Bot,
+};
+
+use crate::{
+    requests::{RequestWithFile, ResponseResult},
+    types::StickerType,
+};
+
+/// Use this method to add a new sticker to a set created by the bot.
+///
+/// [The official docs](https://core.telegram.org/bots/api#addstickertoset).
+#[derive(Debug, Clone)]
+pub struct AddStickerToSet {
+    bot: Bot,
+    user_id: i32,
+    name: String,
+    sticker_type: StickerType,
+    emojis: String,
+    mask_position: Option<MaskPosition>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for AddStickerToSet {
+    type Output = True;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<True>> {
+        let builder =
+            FormBuilder::new().add_text("user_id", &self.user_id).add_text("name", &self.name);
+
+        let builder = match &self.sticker_type {
+            StickerType::Png(file) => builder.add_input_file("png_sticker", &file),
+            StickerType::Tgs(file) => builder.add_input_file("tgs_sticker", &file),
+        }
+        .await?
+        .add_text("emojis", &self.emojis)
+        .add_text("mask_position", &self.mask_position);
+
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "addStickerToSet",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl AddStickerToSet {
+    pub(crate) fn new<N, E>(
+        bot: Bot,
+        user_id: i32,
+        name: N,
+        sticker_type: StickerType,
+        emojis: E,
+    ) -> Self
+    where
+        N: Into<String>,
+        E: Into<String>,
+    {
+        Self {
+            bot,
+            user_id,
+            name: name.into(),
+            sticker_type,
+            emojis: emojis.into(),
+            mask_position: None,
+        }
+    }
+
+    /// User identifier of sticker set owner.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// Sticker set name.
+    pub fn name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+
+    pub fn sticker_type(mut self, val: StickerType) -> Self {
+        self.sticker_type = val;
+        self
+    }
+
+    /// One or more emoji corresponding to the sticker.
+    pub fn emojis<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.emojis = val.into();
+        self
+    }
+
+    /// A JSON-serialized object for position where the mask should be placed on
+    /// faces.
+    pub fn mask_position(mut self, val: MaskPosition) -> Self {
+        self.mask_position = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/answer_callback_query.rs b/src/requests/all/answer_callback_query.rs
new file mode 100644
index 00000000..c74b1e88
--- /dev/null
+++ b/src/requests/all/answer_callback_query.rs
@@ -0,0 +1,101 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::True,
+    Bot,
+};
+
+/// Use this method to send answers to callback queries sent from [inline
+/// keyboards].
+///
+/// The answer will be displayed to the user as a notification at
+/// the top of the chat screen or as an alert.
+///
+/// [The official docs](https://core.telegram.org/bots/api#answercallbackquery).
+///
+/// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct AnswerCallbackQuery {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    callback_query_id: String,
+    text: Option<String>,
+    show_alert: Option<bool>,
+    url: Option<String>,
+    cache_time: Option<i32>,
+}
+
+#[async_trait::async_trait]
+impl Request for AnswerCallbackQuery {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "answerCallbackQuery", &self).await
+    }
+}
+
+impl AnswerCallbackQuery {
+    pub(crate) fn new<C>(bot: Bot, callback_query_id: C) -> Self
+    where
+        C: Into<String>,
+    {
+        let callback_query_id = callback_query_id.into();
+        Self { bot, callback_query_id, text: None, show_alert: None, url: None, cache_time: None }
+    }
+
+    /// Unique identifier for the query to be answered.
+    pub fn callback_query_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.callback_query_id = val.into();
+        self
+    }
+
+    /// Text of the notification. If not specified, nothing will be shown to the
+    /// user, 0-200 characters.
+    pub fn text<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.text = Some(val.into());
+        self
+    }
+
+    /// If `true`, an alert will be shown by the client instead of a
+    /// notification at the top of the chat screen. Defaults to `false`.
+    pub fn show_alert(mut self, val: bool) -> Self {
+        self.show_alert = Some(val);
+        self
+    }
+
+    /// URL that will be opened by the user's client. If you have created a
+    /// [`Game`] and accepted the conditions via [@Botfather], specify the
+    /// URL that opens your game – note that this will only work if the
+    /// query comes from a [`callback_game`] button.
+    ///
+    /// Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open
+    /// your bot with a parameter.
+    ///
+    /// [@Botfather]: https://t.me/botfather
+    /// [`callback_game`]: crate::types::InlineKeyboardButton
+    /// [`Game`]: crate::types::Game
+    pub fn url<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.url = Some(val.into());
+        self
+    }
+
+    /// The maximum amount of time in seconds that the result of the callback
+    /// query may be cached client-side. Telegram apps will support caching
+    /// starting in version 3.14. Defaults to 0.
+    pub fn cache_time(mut self, val: i32) -> Self {
+        self.cache_time = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/answer_inline_query.rs b/src/requests/all/answer_inline_query.rs
new file mode 100644
index 00000000..dd1b6a38
--- /dev/null
+++ b/src/requests/all/answer_inline_query.rs
@@ -0,0 +1,146 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineQueryResult, True},
+    Bot,
+};
+
+/// Use this method to send answers to an inline query.
+///
+/// No more than **50** results per query are allowed.
+///
+/// [The official docs](https://core.telegram.org/bots/api#answerinlinequery).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct AnswerInlineQuery {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_query_id: String,
+    results: Vec<InlineQueryResult>,
+    cache_time: Option<i32>,
+    is_personal: Option<bool>,
+    next_offset: Option<String>,
+    switch_pm_text: Option<String>,
+    switch_pm_parameter: Option<String>,
+}
+
+#[async_trait::async_trait]
+impl Request for AnswerInlineQuery {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "answerInlineQuery", &self).await
+    }
+}
+
+impl AnswerInlineQuery {
+    pub(crate) fn new<I, R>(bot: Bot, inline_query_id: I, results: R) -> Self
+    where
+        I: Into<String>,
+        R: Into<Vec<InlineQueryResult>>,
+    {
+        let inline_query_id = inline_query_id.into();
+        let results = results.into();
+        Self {
+            bot,
+            inline_query_id,
+            results,
+            cache_time: None,
+            is_personal: None,
+            next_offset: None,
+            switch_pm_text: None,
+            switch_pm_parameter: None,
+        }
+    }
+
+    /// Unique identifier for the answered query.
+    pub fn inline_query_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_query_id = val.into();
+        self
+    }
+
+    /// A JSON-serialized array of results for the inline query.
+    pub fn results<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<InlineQueryResult>>,
+    {
+        self.results = val.into();
+        self
+    }
+
+    /// The maximum amount of time in seconds that the result of the inline
+    /// query may be cached on the server.
+    ///
+    /// Defaults to 300.
+    pub fn cache_time(mut self, val: i32) -> Self {
+        self.cache_time = Some(val);
+        self
+    }
+
+    /// Pass `true`, if results may be cached on the server side only for the
+    /// user that sent the query.
+    ///
+    /// By default, results may be returned to any user who sends the same
+    /// query.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_personal(mut self, val: bool) -> Self {
+        self.is_personal = Some(val);
+        self
+    }
+
+    /// Pass the offset that a client should send in the next query with the
+    /// same text to receive more results.
+    ///
+    /// Pass an empty string if there are no more results or if you don‘t
+    /// support pagination. Offset length can’t exceed 64 bytes.
+    pub fn next_offset<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.next_offset = Some(val.into());
+        self
+    }
+
+    /// If passed, clients will display a button with specified text that
+    /// switches the user to a private chat with the bot and sends the bot a
+    /// start message with the parameter [`switch_pm_parameter`].
+    ///
+    /// [`switch_pm_parameter`]:
+    /// crate::requests::AnswerInlineQuery::switch_pm_parameter
+    pub fn switch_pm_text<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.switch_pm_text = Some(val.into());
+        self
+    }
+
+    /// [Deep-linking] parameter for the /start message sent to the bot when
+    /// user presses the switch button. 1-64 characters, only `A-Z`, `a-z`,
+    /// `0-9`, `_` and `-` are allowed.
+    ///
+    /// Example: An inline bot that sends YouTube videos can ask the user to
+    /// connect the bot to their YouTube account to adapt search results
+    /// accordingly. To do this, it displays a ‘Connect your YouTube account’
+    /// button above the results, or even before showing any. The user presses
+    /// the button, switches to a private chat with the bot and, in doing so,
+    /// passes a start parameter that instructs the bot to return an oauth link.
+    /// Once done, the bot can offer a [`switch_inline`] button so that the user
+    /// can easily return to the chat where they wanted to use the bot's
+    /// inline capabilities.
+    ///
+    /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
+    /// [`switch_inline`]: crate::types::InlineKeyboardMarkup
+    pub fn switch_pm_parameter<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.switch_pm_parameter = Some(val.into());
+        self
+    }
+}
diff --git a/src/requests/all/answer_pre_checkout_query.rs b/src/requests/all/answer_pre_checkout_query.rs
new file mode 100644
index 00000000..2ac4df42
--- /dev/null
+++ b/src/requests/all/answer_pre_checkout_query.rs
@@ -0,0 +1,82 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::True,
+    Bot,
+};
+
+/// Once the user has confirmed their payment and shipping details, the Bot API
+/// sends the final confirmation in the form of an [`Update`] with the field
+/// `pre_checkout_query`. Use this method to respond to such pre-checkout
+/// queries.
+///
+/// # Note
+/// The Bot API must receive an answer within 10 seconds after the pre-checkout
+/// query was sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
+///
+/// [`Update`]: crate::types::Update
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct AnswerPreCheckoutQuery {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    pre_checkout_query_id: String,
+    ok: bool,
+    error_message: Option<String>,
+}
+
+#[async_trait::async_trait]
+impl Request for AnswerPreCheckoutQuery {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "answerPreCheckoutQuery", &self)
+            .await
+    }
+}
+
+impl AnswerPreCheckoutQuery {
+    pub(crate) fn new<P>(bot: Bot, pre_checkout_query_id: P, ok: bool) -> Self
+    where
+        P: Into<String>,
+    {
+        let pre_checkout_query_id = pre_checkout_query_id.into();
+        Self { bot, pre_checkout_query_id, ok, error_message: None }
+    }
+
+    /// Unique identifier for the query to be answered.
+    pub fn pre_checkout_query_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.pre_checkout_query_id = val.into();
+        self
+    }
+
+    /// Specify `true` if everything is alright (goods are available, etc.) and
+    /// the bot is ready to proceed with the order. Use False if there are any
+    /// problems.
+    pub fn ok(mut self, val: bool) -> Self {
+        self.ok = val;
+        self
+    }
+
+    /// Required if ok is `false`. Error message in human readable form that
+    /// explains the reason for failure to proceed with the checkout (e.g.
+    /// "Sorry, somebody just bought the last of our amazing black T-shirts
+    /// while you were busy filling out your payment details. Please choose a
+    /// different color or garment!").
+    ///
+    /// Telegram will display this message to the user.
+    pub fn error_message<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.error_message = Some(val.into());
+        self
+    }
+}
diff --git a/src/requests/all/answer_shipping_query.rs b/src/requests/all/answer_shipping_query.rs
new file mode 100644
index 00000000..be4d6662
--- /dev/null
+++ b/src/requests/all/answer_shipping_query.rs
@@ -0,0 +1,86 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ShippingOption, True},
+    Bot,
+};
+
+/// If you sent an invoice requesting a shipping address and the parameter
+/// `is_flexible` was specified, the Bot API will send an [`Update`] with a
+/// shipping_query field to the bot. Use this method to reply to shipping
+/// queries.
+///
+/// [The official docs](https://core.telegram.org/bots/api#answershippingquery).
+///
+/// [`Update`]: crate::types::Update
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct AnswerShippingQuery {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    shipping_query_id: String,
+    ok: bool,
+    shipping_options: Option<Vec<ShippingOption>>,
+    error_message: Option<String>,
+}
+
+#[async_trait::async_trait]
+impl Request for AnswerShippingQuery {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "answerShippingQuery", &self).await
+    }
+}
+
+impl AnswerShippingQuery {
+    pub(crate) fn new<S>(bot: Bot, shipping_query_id: S, ok: bool) -> Self
+    where
+        S: Into<String>,
+    {
+        let shipping_query_id = shipping_query_id.into();
+        Self { bot, shipping_query_id, ok, shipping_options: None, error_message: None }
+    }
+
+    /// Unique identifier for the query to be answered.
+    pub fn shipping_query_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.shipping_query_id = val.into();
+        self
+    }
+
+    /// Specify `true` if delivery to the specified address is possible and
+    /// `false` if there are any problems (for example, if delivery to the
+    /// specified address is not possible).
+    pub fn ok(mut self, val: bool) -> Self {
+        self.ok = val;
+        self
+    }
+
+    /// Required if ok is `true`. A JSON-serialized array of available shipping
+    /// options.
+    pub fn shipping_options<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<ShippingOption>>,
+    {
+        self.shipping_options = Some(val.into());
+        self
+    }
+
+    /// Required if ok is `false`. Error message in human readable form that
+    /// explains why it is impossible to complete the order (e.g. "Sorry,
+    /// delivery to your desired address is unavailable').
+    ///
+    /// Telegram will display this message to the user.
+    pub fn error_message<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.error_message = Some(val.into());
+        self
+    }
+}
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
new file mode 100644
index 00000000..a49cb08b
--- /dev/null
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -0,0 +1,134 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{MaskPosition, StickerType, True},
+    Bot,
+};
+
+/// Use this method to create new sticker set owned by a user. The bot will be
+/// able to edit the created sticker set.
+///
+/// [The official docs](https://core.telegram.org/bots/api#createnewstickerset).
+#[derive(Debug, Clone)]
+pub struct CreateNewStickerSet {
+    bot: Bot,
+    user_id: i32,
+    name: String,
+    title: String,
+    sticker_type: StickerType,
+    emojis: String,
+    contains_masks: Option<bool>,
+    mask_position: Option<MaskPosition>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for CreateNewStickerSet {
+    type Output = True;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<True>> {
+        let builder = FormBuilder::new()
+            .add_text("user_id", &self.user_id)
+            .add_text("name", &self.name)
+            .add_text("title", &self.title);
+
+        let builder = match &self.sticker_type {
+            StickerType::Png(file) => builder.add_input_file("png_sticker", &file),
+            StickerType::Tgs(file) => builder.add_input_file("tgs_sticker", &file),
+        }
+        .await?
+        .add_text("emojis", &self.emojis)
+        .add_text("contains_masks", &self.contains_masks)
+        .add_text("mask_position", &self.mask_position);
+
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "createNewStickerSet",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl CreateNewStickerSet {
+    pub(crate) fn new<N, T, E>(
+        bot: Bot,
+        user_id: i32,
+        name: N,
+        title: T,
+        sticker_type: StickerType,
+        emojis: E,
+    ) -> Self
+    where
+        N: Into<String>,
+        T: Into<String>,
+        E: Into<String>,
+    {
+        Self {
+            bot,
+            user_id,
+            name: name.into(),
+            title: title.into(),
+            sticker_type,
+            emojis: emojis.into(),
+            contains_masks: None,
+            mask_position: None,
+        }
+    }
+
+    /// User identifier of created sticker set owner.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g.,
+    /// animals). Can contain only english letters, digits and underscores.
+    ///
+    /// Must begin with a letter, can't contain consecutive underscores and must
+    /// end in `_by_<bot username>`. `<bot_username>` is case insensitive.
+    /// 1-64 characters.
+    pub fn name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+
+    /// Sticker set title, 1-64 characters.
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn sticker_type(mut self, val: StickerType) -> Self {
+        self.sticker_type = val;
+        self
+    }
+
+    /// One or more emoji corresponding to the sticker.
+    pub fn emojis<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.emojis = val.into();
+        self
+    }
+
+    /// Pass `true`, if a set of mask stickers should be created.
+    pub fn contains_masks(mut self, val: bool) -> Self {
+        self.contains_masks = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for position where the mask should be placed on
+    /// faces.
+    pub fn mask_position(mut self, val: MaskPosition) -> Self {
+        self.mask_position = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/delete_chat_photo.rs b/src/requests/all/delete_chat_photo.rs
new file mode 100644
index 00000000..01439bfa
--- /dev/null
+++ b/src/requests/all/delete_chat_photo.rs
@@ -0,0 +1,50 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to delete a chat photo. Photos can't be changed for private
+/// chats. The bot must be an administrator in the chat for this to work and
+/// must have the appropriate admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#deletechatphoto).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct DeleteChatPhoto {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for DeleteChatPhoto {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "deleteChatPhoto", &self).await
+    }
+}
+
+impl DeleteChatPhoto {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/delete_chat_sticker_set.rs b/src/requests/all/delete_chat_sticker_set.rs
new file mode 100644
index 00000000..9fe228c5
--- /dev/null
+++ b/src/requests/all/delete_chat_sticker_set.rs
@@ -0,0 +1,55 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to delete a group sticker set from a supergroup.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights. Use the field `can_set_sticker_set` optionally
+/// returned in [`Bot::get_chat`] requests to check if the bot can use this
+/// method.
+///
+/// [The official docs](https://core.telegram.org/bots/api#deletechatstickerset).
+///
+/// [`Bot::get_chat`]: crate::Bot::get_chat
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct DeleteChatStickerSet {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for DeleteChatStickerSet {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "deleteChatStickerSet", &self).await
+    }
+}
+
+impl DeleteChatStickerSet {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup (in the format `@supergroupusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/delete_message.rs b/src/requests/all/delete_message.rs
new file mode 100644
index 00000000..35ead60a
--- /dev/null
+++ b/src/requests/all/delete_message.rs
@@ -0,0 +1,67 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to delete a message, including service messages.
+///
+/// The limitations are:
+///  - A message can only be deleted if it was sent less than 48 hours ago.
+///  - Bots can delete outgoing messages in private chats, groups, and
+///    supergroups.
+///  - Bots can delete incoming messages in private chats.
+///  - Bots granted can_post_messages permissions can delete outgoing messages
+///    in channels.
+///  - If the bot is an administrator of a group, it can delete any message
+///    there.
+///  - If the bot has can_delete_messages permission in a supergroup or a
+///    channel, it can delete any message there.
+///
+/// [The official docs](https://core.telegram.org/bots/api#deletemessage).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct DeleteMessage {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for DeleteMessage {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "deleteMessage", &self).await
+    }
+}
+
+impl DeleteMessage {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to delete.
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+}
diff --git a/src/requests/all/delete_sticker_from_set.rs b/src/requests/all/delete_sticker_from_set.rs
new file mode 100644
index 00000000..59269f7a
--- /dev/null
+++ b/src/requests/all/delete_sticker_from_set.rs
@@ -0,0 +1,47 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::True,
+    Bot,
+};
+
+/// Use this method to delete a sticker from a set created by the bot.
+///
+/// [The official docs](https://core.telegram.org/bots/api#deletestickerfromset).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct DeleteStickerFromSet {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    sticker: String,
+}
+
+#[async_trait::async_trait]
+impl Request for DeleteStickerFromSet {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "deleteStickerFromSet", &self).await
+    }
+}
+
+impl DeleteStickerFromSet {
+    pub(crate) fn new<S>(bot: Bot, sticker: S) -> Self
+    where
+        S: Into<String>,
+    {
+        let sticker = sticker.into();
+        Self { bot, sticker }
+    }
+
+    /// File identifier of the sticker.
+    pub fn sticker<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.sticker = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/delete_webhook.rs b/src/requests/all/delete_webhook.rs
new file mode 100644
index 00000000..fd3bd3ba
--- /dev/null
+++ b/src/requests/all/delete_webhook.rs
@@ -0,0 +1,37 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::True,
+    Bot,
+};
+
+/// Use this method to remove webhook integration if you decide to switch back
+/// to [Bot::get_updates].
+///
+/// [The official docs](https://core.telegram.org/bots/api#deletewebhook).
+///
+/// [Bot::get_updates]: crate::Bot::get_updates
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct DeleteWebhook {
+    #[serde(skip_serializing)]
+    bot: Bot,
+}
+
+#[async_trait::async_trait]
+impl Request for DeleteWebhook {
+    type Output = True;
+
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "deleteWebhook", &self).await
+    }
+}
+
+impl DeleteWebhook {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self { bot }
+    }
+}
diff --git a/src/requests/all/edit_inline_message_caption.rs b/src/requests/all/edit_inline_message_caption.rs
new file mode 100644
index 00000000..e777f17c
--- /dev/null
+++ b/src/requests/all/edit_inline_message_caption.rs
@@ -0,0 +1,83 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, ParseMode, True},
+    Bot,
+};
+
+/// Use this method to edit captions of messages sent via the bot.
+///
+/// On success, [`True`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
+///
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditInlineMessageCaption {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_message_id: String,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditInlineMessageCaption {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageCaption", &self).await
+    }
+}
+
+impl EditInlineMessageCaption {
+    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
+    where
+        I: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        Self { bot, inline_message_id, caption: None, parse_mode: None, reply_markup: None }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// New caption of the message.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_inline_message_live_location.rs b/src/requests/all/edit_inline_message_live_location.rs
new file mode 100644
index 00000000..4b267427
--- /dev/null
+++ b/src/requests/all/edit_inline_message_live_location.rs
@@ -0,0 +1,77 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, True},
+    Bot,
+};
+
+/// Use this method to edit live location messages sent via the bot.
+///
+/// A location can be edited until its live_period expires or editing is
+/// explicitly disabled by a call to stopMessageLiveLocation. On success,
+/// [`True`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
+///
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditInlineMessageLiveLocation {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_message_id: String,
+    latitude: f32,
+    longitude: f32,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditInlineMessageLiveLocation {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageLiveLocation", &self)
+            .await
+    }
+}
+
+impl EditInlineMessageLiveLocation {
+    pub(crate) fn new<I>(bot: Bot, inline_message_id: I, latitude: f32, longitude: f32) -> Self
+    where
+        I: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        Self { bot, inline_message_id, latitude, longitude, reply_markup: None }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// Latitude of new location.
+    pub fn latitude(mut self, val: f32) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    /// Longitude of new location.
+    pub fn longitude(mut self, val: f32) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_inline_message_media.rs b/src/requests/all/edit_inline_message_media.rs
new file mode 100644
index 00000000..9a11f126
--- /dev/null
+++ b/src/requests/all/edit_inline_message_media.rs
@@ -0,0 +1,78 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    types::{InlineKeyboardMarkup, InputMedia, True},
+    Bot,
+};
+
+/// Use this method to edit animation, audio, document, photo, or video
+/// messages sent via the bot.
+///
+/// If a message is a part of a message album, then it can be edited only to a
+/// photo or a video. Otherwise, message type can be changed arbitrarily. When
+/// this method is used, new file can't be uploaded. Use previously
+/// uploaded file via its `file_id` or specify a URL. On success, [`True`] is
+/// returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
+///
+/// [`True`]: crate::types::True
+#[derive(Debug, Clone)]
+pub struct EditInlineMessageMedia {
+    bot: Bot,
+    inline_message_id: String,
+    media: InputMedia,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditInlineMessageMedia {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "editMessageMedia",
+            FormBuilder::new()
+                .add_text("media", &self.media)
+                .add_text("reply_markup", &self.reply_markup)
+                .add_text("inline_message_id", &self.inline_message_id)
+                .build(),
+        )
+        .await
+    }
+}
+
+impl EditInlineMessageMedia {
+    pub(crate) fn new<I>(bot: Bot, inline_message_id: I, media: InputMedia) -> Self
+    where
+        I: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        Self { bot, inline_message_id, media, reply_markup: None }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// A JSON-serialized object for a new media content of the message.
+    pub fn media(mut self, val: InputMedia) -> Self {
+        self.media = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_inline_message_reply_markup.rs b/src/requests/all/edit_inline_message_reply_markup.rs
new file mode 100644
index 00000000..cd96c686
--- /dev/null
+++ b/src/requests/all/edit_inline_message_reply_markup.rs
@@ -0,0 +1,62 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, True},
+    Bot,
+};
+
+/// Use this method to edit only the reply markup of messages sent via the bot.
+///
+/// On success, [`True`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
+///
+/// [`Message`]: crate::types::Message
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditInlineMessageReplyMarkup {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_message_id: String,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditInlineMessageReplyMarkup {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageReplyMarkup", &self)
+            .await
+    }
+}
+
+impl EditInlineMessageReplyMarkup {
+    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
+    where
+        I: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        Self { bot, inline_message_id, reply_markup: None }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_inline_message_text.rs b/src/requests/all/edit_inline_message_text.rs
new file mode 100644
index 00000000..2b266314
--- /dev/null
+++ b/src/requests/all/edit_inline_message_text.rs
@@ -0,0 +1,98 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, Message, ParseMode},
+    Bot,
+};
+
+/// Use this method to edit text and game messages sent via the bot.
+///
+/// On success, [`True`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
+///
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditInlineMessageText {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_message_id: String,
+    text: String,
+    parse_mode: Option<ParseMode>,
+    disable_web_page_preview: Option<bool>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditInlineMessageText {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageText", &self).await
+    }
+}
+
+impl EditInlineMessageText {
+    pub(crate) fn new<I, T>(bot: Bot, inline_message_id: I, text: T) -> Self
+    where
+        I: Into<String>,
+        T: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        let text = text.into();
+        Self {
+            bot,
+            inline_message_id,
+            text,
+            parse_mode: None,
+            disable_web_page_preview: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// New text of the message.
+    pub fn text<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in your bot's message.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Disables link previews for links in this message.
+    pub fn disable_web_page_preview(mut self, val: bool) -> Self {
+        self.disable_web_page_preview = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_message_caption.rs b/src/requests/all/edit_message_caption.rs
new file mode 100644
index 00000000..9294af93
--- /dev/null
+++ b/src/requests/all/edit_message_caption.rs
@@ -0,0 +1,91 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
+    Bot,
+};
+
+/// Use this method to edit captions of messages sent by the bot.
+///
+/// On success, the edited [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditMessageCaption {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditMessageCaption {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageCaption", &self).await
+    }
+}
+
+impl EditMessageCaption {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, caption: None, parse_mode: None, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// New caption of the message.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_message_live_location.rs b/src/requests/all/edit_message_live_location.rs
new file mode 100644
index 00000000..c5afd295
--- /dev/null
+++ b/src/requests/all/edit_message_live_location.rs
@@ -0,0 +1,91 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Message},
+    Bot,
+};
+
+/// Use this method to edit live location messages.
+///
+/// A location can be edited until its live_period expires or editing is
+/// explicitly disabled by a call to stopMessageLiveLocation. On success, the
+/// edited [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditMessageLiveLocation {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    latitude: f32,
+    longitude: f32,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditMessageLiveLocation {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageLiveLocation", &self)
+            .await
+    }
+}
+
+impl EditMessageLiveLocation {
+    pub(crate) fn new<C>(
+        bot: Bot,
+        chat_id: C,
+        message_id: i32,
+        latitude: f32,
+        longitude: f32,
+    ) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, latitude, longitude, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// Latitude of new location.
+    pub fn latitude(mut self, val: f32) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    /// Longitude of new location.
+    pub fn longitude(mut self, val: f32) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_message_media.rs b/src/requests/all/edit_message_media.rs
new file mode 100644
index 00000000..7f15ed5f
--- /dev/null
+++ b/src/requests/all/edit_message_media.rs
@@ -0,0 +1,85 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, InputMedia, Message},
+    Bot,
+};
+
+/// Use this method to edit animation, audio, document, photo, or video
+/// messages.
+///
+/// If a message is a part of a message album, then it can be edited only to a
+/// photo or a video. Otherwise, message type can be changed arbitrarily. On
+/// success, the edited [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
+///
+/// [`Message`]: crate::types::Message
+#[derive(Debug, Clone)]
+pub struct EditMessageMedia {
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    media: InputMedia,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditMessageMedia {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "editMessageMedia",
+            FormBuilder::new()
+                .add_text("chat_id", &self.chat_id)
+                .add_text("message_id", &self.message_id)
+                .add_text("media", &self.media)
+                .add_text("reply_markup", &self.reply_markup)
+                .build(),
+        )
+        .await
+    }
+}
+
+impl EditMessageMedia {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32, media: InputMedia) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, media, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new media content of the message.
+    pub fn media(mut self, val: InputMedia) -> Self {
+        self.media = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_message_reply_markup.rs b/src/requests/all/edit_message_reply_markup.rs
new file mode 100644
index 00000000..66aab5bf
--- /dev/null
+++ b/src/requests/all/edit_message_reply_markup.rs
@@ -0,0 +1,69 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Message},
+    Bot,
+};
+
+/// Use this method to edit only the reply markup of messages.
+///
+/// On success, the edited [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditMessageReplyMarkup {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditMessageReplyMarkup {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageReplyMarkup", &self)
+            .await
+    }
+}
+
+impl EditMessageReplyMarkup {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/edit_message_text.rs b/src/requests/all/edit_message_text.rs
new file mode 100644
index 00000000..12251313
--- /dev/null
+++ b/src/requests/all/edit_message_text.rs
@@ -0,0 +1,107 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
+    Bot,
+};
+
+/// Use this method to edit text and game messages.
+///
+/// On success, the edited [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct EditMessageText {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    text: String,
+    parse_mode: Option<ParseMode>,
+    disable_web_page_preview: Option<bool>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for EditMessageText {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "editMessageText", &self).await
+    }
+}
+
+impl EditMessageText {
+    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, message_id: i32, text: T) -> Self
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let text = text.into();
+        Self {
+            bot,
+            chat_id,
+            message_id,
+            text,
+            parse_mode: None,
+            disable_web_page_preview: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// New text of the message.
+    pub fn text<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in your bot's message.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Disables link previews for links in this message.
+    pub fn disable_web_page_preview(mut self, val: bool) -> Self {
+        self.disable_web_page_preview = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/export_chat_invite_link.rs b/src/requests/all/export_chat_invite_link.rs
new file mode 100644
index 00000000..51a26437
--- /dev/null
+++ b/src/requests/all/export_chat_invite_link.rs
@@ -0,0 +1,65 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::ChatId,
+    Bot,
+};
+
+/// Use this method to generate a new invite link for a chat; any previously
+/// generated link is revoked.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights.
+///
+/// ## Note
+/// Each administrator in a chat generates their own invite links. Bots can't
+/// use invite links generated by other administrators. If you want your bot to
+/// work with invite links, it will need to generate its own link using
+/// [`Bot::export_chat_invite_link`] – after this the link will become available
+/// to the bot via the [`Bot::get_chat`] method. If your bot needs to generate a
+/// new invite link replacing its previous one, use
+/// [`Bot::export_chat_invite_link`] again.
+///
+/// [The official docs](https://core.telegram.org/bots/api#exportchatinvitelink).
+///
+/// [`Bot::export_chat_invite_link`]: crate::Bot::export_chat_invite_link
+/// [`Bot::get_chat`]: crate::Bot::get_chat
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct ExportChatInviteLink {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for ExportChatInviteLink {
+    type Output = String;
+
+    /// Returns the new invite link as `String` on success.
+    async fn send(&self) -> ResponseResult<String> {
+        net::request_json(self.bot.client(), self.bot.token(), "exportChatInviteLink", &self).await
+    }
+}
+
+impl ExportChatInviteLink {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/forward_message.rs b/src/requests/all/forward_message.rs
new file mode 100644
index 00000000..feb9ec02
--- /dev/null
+++ b/src/requests/all/forward_message.rs
@@ -0,0 +1,81 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message},
+    Bot,
+};
+
+/// Use this method to forward messages of any kind.
+///
+/// [`The official docs`](https://core.telegram.org/bots/api#forwardmessage).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct ForwardMessage {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    from_chat_id: ChatId,
+    disable_notification: Option<bool>,
+    message_id: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for ForwardMessage {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "forwardMessage", &self).await
+    }
+}
+
+impl ForwardMessage {
+    pub(crate) fn new<C, F>(bot: Bot, chat_id: C, from_chat_id: F, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        let from_chat_id = from_chat_id.into();
+        Self { bot, chat_id, from_chat_id, message_id, disable_notification: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier for the chat where the original message was sent (or
+    /// channel username in the format `@channelusername`).
+    #[allow(clippy::wrong_self_convention)]
+    pub fn from_chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.from_chat_id = val.into();
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// Message identifier in the chat specified in [`from_chat_id`].
+    ///
+    /// [`from_chat_id`]: ForwardMessage::from_chat_id
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+}
diff --git a/src/requests/all/get_chat.rs b/src/requests/all/get_chat.rs
new file mode 100644
index 00000000..11406776
--- /dev/null
+++ b/src/requests/all/get_chat.rs
@@ -0,0 +1,50 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{Chat, ChatId},
+    Bot,
+};
+
+/// Use this method to get up to date information about the chat (current name
+/// of the user for one-on-one conversations, current username of a user, group
+/// or channel, etc.).
+///
+/// [The official docs](https://core.telegram.org/bots/api#getchat).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetChat {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for GetChat {
+    type Output = Chat;
+
+    async fn send(&self) -> ResponseResult<Chat> {
+        net::request_json(self.bot.client(), self.bot.token(), "getChat", &self).await
+    }
+}
+
+impl GetChat {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/get_chat_administrators.rs b/src/requests/all/get_chat_administrators.rs
new file mode 100644
index 00000000..06657ec5
--- /dev/null
+++ b/src/requests/all/get_chat_administrators.rs
@@ -0,0 +1,53 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, ChatMember},
+    Bot,
+};
+
+/// Use this method to get a list of administrators in a chat.
+///
+/// If the chat is a group or a supergroup and no administrators were appointed,
+/// only the creator will be returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getchatadministrators).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetChatAdministrators {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for GetChatAdministrators {
+    type Output = Vec<ChatMember>;
+
+    /// On success, returns an array that contains information about all chat
+    /// administrators except other bots.
+    async fn send(&self) -> ResponseResult<Vec<ChatMember>> {
+        net::request_json(self.bot.client(), self.bot.token(), "getChatAdministrators", &self).await
+    }
+}
+
+impl GetChatAdministrators {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/get_chat_member.rs b/src/requests/all/get_chat_member.rs
new file mode 100644
index 00000000..4ebe3f56
--- /dev/null
+++ b/src/requests/all/get_chat_member.rs
@@ -0,0 +1,55 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, ChatMember},
+    Bot,
+};
+
+/// Use this method to get information about a member of a chat.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getchatmember).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetChatMember {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for GetChatMember {
+    type Output = ChatMember;
+
+    async fn send(&self) -> ResponseResult<ChatMember> {
+        net::request_json(self.bot.client(), self.bot.token(), "getChatMember", &self).await
+    }
+}
+
+impl GetChatMember {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, user_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+}
diff --git a/src/requests/all/get_chat_members_count.rs b/src/requests/all/get_chat_members_count.rs
new file mode 100644
index 00000000..5c78596b
--- /dev/null
+++ b/src/requests/all/get_chat_members_count.rs
@@ -0,0 +1,48 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::ChatId,
+    Bot,
+};
+
+/// Use this method to get the number of members in a chat.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getchatmemberscount).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetChatMembersCount {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for GetChatMembersCount {
+    type Output = i32;
+
+    async fn send(&self) -> ResponseResult<i32> {
+        net::request_json(self.bot.client(), self.bot.token(), "getChatMembersCount", &self).await
+    }
+}
+
+impl GetChatMembersCount {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/get_file.rs b/src/requests/all/get_file.rs
new file mode 100644
index 00000000..d2d0556c
--- /dev/null
+++ b/src/requests/all/get_file.rs
@@ -0,0 +1,62 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::File,
+    Bot,
+};
+
+/// Use this method to get basic info about a file and prepare it for
+/// downloading.
+///
+/// For the moment, bots can download files of up to `20MB` in size.
+///
+/// The file can then be downloaded via the link
+/// `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>`
+/// is taken from the response. It is guaranteed that the link will be valid
+/// for at least `1` hour. When the link expires, a new one can be requested by
+/// calling [`GetFile`] again.
+///
+/// **Note**: This function may not preserve the original file name and MIME
+/// type. You should save the file's MIME type and name (if available) when the
+/// [`File`] object is received.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getfile).
+///
+/// [`File`]: crate::types::File
+/// [`GetFile`]: self::GetFile
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetFile {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    file_id: String,
+}
+
+#[async_trait::async_trait]
+impl Request for GetFile {
+    type Output = File;
+
+    async fn send(&self) -> ResponseResult<File> {
+        net::request_json(self.bot.client(), self.bot.token(), "getFile", &self).await
+    }
+}
+
+impl GetFile {
+    pub(crate) fn new<F>(bot: Bot, file_id: F) -> Self
+    where
+        F: Into<String>,
+    {
+        Self { bot, file_id: file_id.into() }
+    }
+
+    /// File identifier to get info about.
+    pub fn file_id<F>(mut self, value: F) -> Self
+    where
+        F: Into<String>,
+    {
+        self.file_id = value.into();
+        self
+    }
+}
diff --git a/src/requests/all/get_game_high_scores.rs b/src/requests/all/get_game_high_scores.rs
new file mode 100644
index 00000000..1a43d63e
--- /dev/null
+++ b/src/requests/all/get_game_high_scores.rs
@@ -0,0 +1,63 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{GameHighScore, TargetMessage},
+    Bot,
+};
+
+/// Use this method to get data for high score tables.
+///
+/// Will return the score of the specified user and several of his neighbors in
+/// a game.
+///
+/// ## Note
+/// This method will currently return scores for the target user, plus two of
+/// his closest neighbors on each side. Will also return the top three users if
+/// the user and his neighbors are not among them. Please note that this
+/// behavior is subject to change.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getgamehighscores)
+#[derive(Debug, Clone, Serialize)]
+pub struct GetGameHighScores {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    #[serde(flatten)]
+    target: TargetMessage,
+    user_id: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for GetGameHighScores {
+    type Output = Vec<GameHighScore>;
+
+    async fn send(&self) -> ResponseResult<Vec<GameHighScore>> {
+        net::request_json(self.bot.client(), self.bot.token(), "getGameHighScores", &self).await
+    }
+}
+
+impl GetGameHighScores {
+    pub(crate) fn new<T>(bot: Bot, target: T, user_id: i32) -> Self
+    where
+        T: Into<TargetMessage>,
+    {
+        let target = target.into();
+        Self { bot, target, user_id }
+    }
+
+    /// Target message, either chat id and message id or inline message id.
+    pub fn target<T>(mut self, val: T) -> Self
+    where
+        T: Into<TargetMessage>,
+    {
+        self.target = val.into();
+        self
+    }
+
+    /// Target user id.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+}
diff --git a/src/requests/all/get_me.rs b/src/requests/all/get_me.rs
new file mode 100644
index 00000000..567b4375
--- /dev/null
+++ b/src/requests/all/get_me.rs
@@ -0,0 +1,33 @@
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::Me,
+    Bot,
+};
+use serde::Serialize;
+
+/// A simple method for testing your bot's auth token. Requires no parameters.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getme).
+#[derive(Debug, Clone, Serialize)]
+pub struct GetMe {
+    #[serde(skip_serializing)]
+    bot: Bot,
+}
+
+#[async_trait::async_trait]
+impl Request for GetMe {
+    type Output = Me;
+
+    /// Returns basic information about the bot.
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    async fn send(&self) -> ResponseResult<Me> {
+        net::request_json(self.bot.client(), self.bot.token(), "getMe", &self).await
+    }
+}
+
+impl GetMe {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self { bot }
+    }
+}
diff --git a/src/requests/all/get_my_commands.rs b/src/requests/all/get_my_commands.rs
new file mode 100644
index 00000000..586bfa28
--- /dev/null
+++ b/src/requests/all/get_my_commands.rs
@@ -0,0 +1,33 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::BotCommand,
+    Bot,
+};
+
+/// Use this method to get the current list of the bot's commands.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getmycommands).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetMyCommands {
+    #[serde(skip_serializing)]
+    bot: Bot,
+}
+
+#[async_trait::async_trait]
+impl Request for GetMyCommands {
+    type Output = Vec<BotCommand>;
+
+    async fn send(&self) -> ResponseResult<Self::Output> {
+        net::request_json(self.bot.client(), self.bot.token(), "getMyCommands", &self).await
+    }
+}
+
+impl GetMyCommands {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self { bot }
+    }
+}
diff --git a/src/requests/all/get_sticker_set.rs b/src/requests/all/get_sticker_set.rs
new file mode 100644
index 00000000..a8a83bea
--- /dev/null
+++ b/src/requests/all/get_sticker_set.rs
@@ -0,0 +1,47 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::StickerSet,
+    Bot,
+};
+
+/// Use this method to get a sticker set.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getstickerset).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetStickerSet {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    name: String,
+}
+
+#[async_trait::async_trait]
+impl Request for GetStickerSet {
+    type Output = StickerSet;
+
+    async fn send(&self) -> ResponseResult<StickerSet> {
+        net::request_json(self.bot.client(), self.bot.token(), "getStickerSet", &self).await
+    }
+}
+
+impl GetStickerSet {
+    pub(crate) fn new<N>(bot: Bot, name: N) -> Self
+    where
+        N: Into<String>,
+    {
+        let name = name.into();
+        Self { bot, name }
+    }
+
+    /// Name of the sticker set.
+    pub fn name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/get_updates.rs b/src/requests/all/get_updates.rs
new file mode 100644
index 00000000..f6fe2d2b
--- /dev/null
+++ b/src/requests/all/get_updates.rs
@@ -0,0 +1,108 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{AllowedUpdate, Update},
+    Bot,
+};
+
+/// Use this method to receive incoming updates using long polling ([wiki]).
+///
+/// **Notes:**
+/// 1. This method will not work if an outgoing webhook is set up.
+/// 2. In order to avoid getting duplicate updates,
+///    recalculate offset after each server response.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getupdates).
+///
+/// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetUpdates {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    pub(crate) offset: Option<i32>,
+    pub(crate) limit: Option<u8>,
+    pub(crate) timeout: Option<u32>,
+    pub(crate) allowed_updates: Option<Vec<AllowedUpdate>>,
+}
+
+// TODO: Add version of this method that will ignore unparsed updates,
+//       to be bullet proof
+#[async_trait::async_trait]
+impl Request for GetUpdates {
+    type Output = Vec<Update>;
+
+    async fn send(&self) -> ResponseResult<Self::Output> {
+        net::request_json(self.bot.client(), self.bot.token(), "getUpdates", &self).await
+    }
+}
+
+impl GetUpdates {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self { bot, offset: None, limit: None, timeout: None, allowed_updates: None }
+    }
+
+    /// Identifier of the first update to be returned.
+    ///
+    /// Must be greater by one than the highest among the identifiers of
+    /// previously received updates. By default, updates starting with the
+    /// earliest unconfirmed update are returned. An update is considered
+    /// confirmed as soon as [`GetUpdates`] is called with an [`offset`]
+    /// higher than its [`id`]. The negative offset can be specified to
+    /// retrieve updates starting from `-offset` update from the end of the
+    /// updates queue. All previous updates will forgotten.
+    ///
+    /// [`GetUpdates`]: self::GetUpdates
+    /// [`offset`]: self::GetUpdates::offset
+    /// [`id`]: crate::types::Update::id
+    pub fn offset(mut self, value: i32) -> Self {
+        self.offset = Some(value);
+        self
+    }
+
+    /// Limits the number of updates to be retrieved.
+    ///
+    /// Values between `1`—`100` are accepted. Defaults to `100`.
+    pub fn limit(mut self, value: u8) -> Self {
+        self.limit = Some(value);
+        self
+    }
+
+    /// Timeout in seconds for long polling.
+    ///
+    /// Defaults to `0`, i.e. usual short polling. Should be positive, short
+    /// polling should be used for testing purposes only.
+    pub fn timeout(mut self, value: u32) -> Self {
+        self.timeout = Some(value);
+        self
+    }
+
+    /// List the types of updates you want your bot to receive.
+    ///
+    /// For example, specify [[`Message`], [`EditedChannelPost`],
+    /// [`CallbackQuery`]] to only receive updates of these types.
+    /// See [`AllowedUpdate`] for a complete list of available update types.
+    ///
+    /// Specify an empty list to receive all updates regardless of type
+    /// (default). If not specified, the previous setting will be used.
+    ///
+    /// **Note:**
+    /// This parameter doesn't affect updates created before the call to the
+    /// [`Bot::get_updates`], so unwanted updates may be received for a short
+    /// period of time.
+    ///
+    /// [`Message`]: self::AllowedUpdate::Message
+    /// [`EditedChannelPost`]: self::AllowedUpdate::EditedChannelPost
+    /// [`CallbackQuery`]: self::AllowedUpdate::CallbackQuery
+    /// [`AllowedUpdate`]: self::AllowedUpdate
+    /// [`Bot::get_updates`]: crate::Bot::get_updates
+    pub fn allowed_updates<T>(mut self, value: T) -> Self
+    where
+        T: Into<Vec<AllowedUpdate>>,
+    {
+        self.allowed_updates = Some(value.into());
+        self
+    }
+}
diff --git a/src/requests/all/get_user_profile_photos.rs b/src/requests/all/get_user_profile_photos.rs
new file mode 100644
index 00000000..663a07a4
--- /dev/null
+++ b/src/requests/all/get_user_profile_photos.rs
@@ -0,0 +1,58 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::UserProfilePhotos,
+    Bot,
+};
+
+/// Use this method to get a list of profile pictures for a user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getuserprofilephotos).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct GetUserProfilePhotos {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    user_id: i32,
+    offset: Option<i32>,
+    limit: Option<i32>,
+}
+
+#[async_trait::async_trait]
+impl Request for GetUserProfilePhotos {
+    type Output = UserProfilePhotos;
+
+    async fn send(&self) -> ResponseResult<UserProfilePhotos> {
+        net::request_json(self.bot.client(), self.bot.token(), "getUserProfilePhotos", &self).await
+    }
+}
+
+impl GetUserProfilePhotos {
+    pub(crate) fn new(bot: Bot, user_id: i32) -> Self {
+        Self { bot, user_id, offset: None, limit: None }
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// Sequential number of the first photo to be returned. By default, all
+    /// photos are returned.
+    pub fn offset(mut self, val: i32) -> Self {
+        self.offset = Some(val);
+        self
+    }
+
+    /// Limits the number of photos to be retrieved. Values between 1—100 are
+    /// accepted.
+    ///
+    /// Defaults to 100.
+    pub fn limit(mut self, val: i32) -> Self {
+        self.limit = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/get_webhook_info.rs b/src/requests/all/get_webhook_info.rs
new file mode 100644
index 00000000..51424471
--- /dev/null
+++ b/src/requests/all/get_webhook_info.rs
@@ -0,0 +1,38 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::WebhookInfo,
+    Bot,
+};
+
+/// Use this method to get current webhook status.
+///
+/// If the bot is using [`Bot::get_updates`], will return an object with the url
+/// field empty.
+///
+/// [The official docs](https://core.telegram.org/bots/api#getwebhookinfo).
+///
+/// [`Bot::get_updates`]: crate::Bot::get_updates
+#[derive(Debug, Clone, Serialize)]
+pub struct GetWebhookInfo {
+    #[serde(skip_serializing)]
+    bot: Bot,
+}
+
+#[async_trait::async_trait]
+impl Request for GetWebhookInfo {
+    type Output = WebhookInfo;
+
+    #[allow(clippy::trivially_copy_pass_by_ref)]
+    async fn send(&self) -> ResponseResult<WebhookInfo> {
+        net::request_json(self.bot.client(), self.bot.token(), "getWebhookInfo", &self).await
+    }
+}
+
+impl GetWebhookInfo {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self { bot }
+    }
+}
diff --git a/src/requests/all/kick_chat_member.rs b/src/requests/all/kick_chat_member.rs
new file mode 100644
index 00000000..31953949
--- /dev/null
+++ b/src/requests/all/kick_chat_member.rs
@@ -0,0 +1,72 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to kick a user from a group, a supergroup or a channel.
+///
+/// In the case of supergroups and channels, the user will not be able to return
+/// to the group on their own using invite links, etc., unless [unbanned] first.
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#kickchatmember).
+///
+/// [unbanned]: crate::Bot::unban_chat_member
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct KickChatMember {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+    until_date: Option<i32>,
+}
+
+#[async_trait::async_trait]
+impl Request for KickChatMember {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "kickChatMember", &self).await
+    }
+}
+
+impl KickChatMember {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, user_id, until_date: None }
+    }
+
+    /// Unique identifier for the target group or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// Date when the user will be unbanned, unix time.
+    ///
+    /// If user is banned for more than 366 days or less than 30 seconds from
+    /// the current time they are considered to be banned forever.
+    pub fn until_date(mut self, val: i32) -> Self {
+        self.until_date = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/leave_chat.rs b/src/requests/all/leave_chat.rs
new file mode 100644
index 00000000..d0411efb
--- /dev/null
+++ b/src/requests/all/leave_chat.rs
@@ -0,0 +1,48 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method for your bot to leave a group, supergroup or channel.
+///
+/// [The official docs](https://core.telegram.org/bots/api#leavechat).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct LeaveChat {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for LeaveChat {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "leaveChat", &self).await
+    }
+}
+
+impl LeaveChat {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup or channel (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/mod.rs b/src/requests/all/mod.rs
new file mode 100644
index 00000000..3de4d87a
--- /dev/null
+++ b/src/requests/all/mod.rs
@@ -0,0 +1,152 @@
+mod add_sticker_to_set;
+mod answer_callback_query;
+mod answer_inline_query;
+mod answer_pre_checkout_query;
+mod answer_shipping_query;
+mod create_new_sticker_set;
+mod delete_chat_photo;
+mod delete_chat_sticker_set;
+mod delete_message;
+mod delete_sticker_from_set;
+mod delete_webhook;
+mod edit_inline_message_caption;
+mod edit_inline_message_live_location;
+mod edit_inline_message_media;
+mod edit_inline_message_reply_markup;
+mod edit_inline_message_text;
+mod edit_message_caption;
+mod edit_message_live_location;
+mod edit_message_media;
+mod edit_message_reply_markup;
+mod edit_message_text;
+mod export_chat_invite_link;
+mod forward_message;
+mod get_chat;
+mod get_chat_administrators;
+mod get_chat_member;
+mod get_chat_members_count;
+mod get_file;
+mod get_game_high_scores;
+mod get_me;
+mod get_my_commands;
+mod get_sticker_set;
+mod get_updates;
+mod get_user_profile_photos;
+mod get_webhook_info;
+mod kick_chat_member;
+mod leave_chat;
+mod pin_chat_message;
+mod promote_chat_member;
+mod restrict_chat_member;
+mod send_animation;
+mod send_audio;
+mod send_chat_action;
+mod send_contact;
+mod send_dice;
+mod send_document;
+mod send_game;
+mod send_invoice;
+mod send_location;
+mod send_media_group;
+mod send_message;
+mod send_photo;
+mod send_poll;
+mod send_sticker;
+mod send_venue;
+mod send_video;
+mod send_video_note;
+mod send_voice;
+mod set_chat_administrator_custom_title;
+mod set_chat_description;
+mod set_chat_permissions;
+mod set_chat_photo;
+mod set_chat_sticker_set;
+mod set_chat_title;
+mod set_game_score;
+mod set_my_commands;
+mod set_sticker_position_in_set;
+mod set_sticker_set_thumb;
+mod set_webhook;
+mod stop_inline_message_live_location;
+mod stop_message_live_location;
+mod stop_poll;
+mod unban_chat_member;
+mod unpin_chat_message;
+mod upload_sticker_file;
+
+pub use add_sticker_to_set::*;
+pub use answer_callback_query::*;
+pub use answer_inline_query::*;
+pub use answer_pre_checkout_query::*;
+pub use answer_shipping_query::*;
+pub use create_new_sticker_set::*;
+pub use delete_chat_photo::*;
+pub use delete_chat_sticker_set::*;
+pub use delete_message::*;
+pub use delete_sticker_from_set::*;
+pub use delete_webhook::*;
+pub use edit_inline_message_caption::*;
+pub use edit_inline_message_live_location::*;
+pub use edit_inline_message_media::*;
+pub use edit_inline_message_reply_markup::*;
+pub use edit_inline_message_text::*;
+pub use edit_message_caption::*;
+pub use edit_message_live_location::*;
+pub use edit_message_media::*;
+pub use edit_message_reply_markup::*;
+pub use edit_message_text::*;
+pub use export_chat_invite_link::*;
+pub use forward_message::*;
+pub use get_chat::*;
+pub use get_chat_administrators::*;
+pub use get_chat_member::*;
+pub use get_chat_members_count::*;
+pub use get_file::*;
+pub use get_game_high_scores::*;
+pub use get_me::*;
+pub use get_my_commands::*;
+pub use get_sticker_set::*;
+pub use get_updates::*;
+pub use get_user_profile_photos::*;
+pub use get_webhook_info::*;
+pub use kick_chat_member::*;
+pub use leave_chat::*;
+pub use pin_chat_message::*;
+pub use promote_chat_member::*;
+pub use restrict_chat_member::*;
+pub use send_animation::*;
+pub use send_audio::*;
+pub use send_chat_action::*;
+pub use send_contact::*;
+pub use send_dice::*;
+pub use send_document::*;
+pub use send_game::*;
+pub use send_invoice::*;
+pub use send_location::*;
+pub use send_media_group::*;
+pub use send_message::*;
+pub use send_photo::*;
+pub use send_poll::*;
+pub use send_sticker::*;
+pub use send_venue::*;
+pub use send_video::*;
+pub use send_video_note::*;
+pub use send_voice::*;
+pub use set_chat_administrator_custom_title::*;
+pub use set_chat_description::*;
+pub use set_chat_permissions::*;
+pub use set_chat_photo::*;
+pub use set_chat_sticker_set::*;
+pub use set_chat_title::*;
+pub use set_game_score::*;
+pub use set_my_commands::*;
+pub use set_sticker_position_in_set::*;
+pub use set_sticker_set_thumb::*;
+pub use set_webhook::*;
+pub use std::pin::Pin;
+pub use stop_inline_message_live_location::*;
+pub use stop_message_live_location::*;
+pub use stop_poll::*;
+pub use unban_chat_member::*;
+pub use unpin_chat_message::*;
+pub use upload_sticker_file::*;
diff --git a/src/requests/all/pin_chat_message.rs b/src/requests/all/pin_chat_message.rs
new file mode 100644
index 00000000..ae1f3227
--- /dev/null
+++ b/src/requests/all/pin_chat_message.rs
@@ -0,0 +1,69 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to pin a message in a group, a supergroup, or a channel.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the `can_pin_messages` admin right in the supergroup or `can_edit_messages`
+/// admin right in the channel.
+///
+/// [The official docs](https://core.telegram.org/bots/api#pinchatmessage).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct PinChatMessage {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    disable_notification: Option<bool>,
+}
+
+#[async_trait::async_trait]
+impl Request for PinChatMessage {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "pinChatMessage", &self).await
+    }
+}
+
+impl PinChatMessage {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, disable_notification: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of a message to pin.
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// Pass `true`, if it is not necessary to send a notification to all chat
+    /// members about the new pinned message.
+    ///
+    /// Notifications are always disabled in channels.
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/promote_chat_member.rs b/src/requests/all/promote_chat_member.rs
new file mode 100644
index 00000000..468b3c48
--- /dev/null
+++ b/src/requests/all/promote_chat_member.rs
@@ -0,0 +1,134 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to promote or demote a user in a supergroup or a channel.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights. Pass False for all boolean parameters to
+/// demote a user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#promotechatmember).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct PromoteChatMember {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+    can_change_info: Option<bool>,
+    can_post_messages: Option<bool>,
+    can_edit_messages: Option<bool>,
+    can_delete_messages: Option<bool>,
+    can_invite_users: Option<bool>,
+    can_restrict_members: Option<bool>,
+    can_pin_messages: Option<bool>,
+    can_promote_members: Option<bool>,
+}
+
+#[async_trait::async_trait]
+impl Request for PromoteChatMember {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "promoteChatMember", &self).await
+    }
+}
+
+impl PromoteChatMember {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self {
+            bot,
+            chat_id,
+            user_id,
+            can_change_info: None,
+            can_post_messages: None,
+            can_edit_messages: None,
+            can_delete_messages: None,
+            can_invite_users: None,
+            can_restrict_members: None,
+            can_pin_messages: None,
+            can_promote_members: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// Pass `true`, if the administrator can change chat title, photo and other
+    /// settings.
+    pub fn can_change_info(mut self, val: bool) -> Self {
+        self.can_change_info = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can create channel posts, channels
+    /// only.
+    pub fn can_post_messages(mut self, val: bool) -> Self {
+        self.can_post_messages = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can edit messages of other users and
+    /// can pin messages, channels only.
+    pub fn can_edit_messages(mut self, val: bool) -> Self {
+        self.can_edit_messages = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can delete messages of other users.
+    pub fn can_delete_messages(mut self, val: bool) -> Self {
+        self.can_delete_messages = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can invite new users to the chat.
+    pub fn can_invite_users(mut self, val: bool) -> Self {
+        self.can_invite_users = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can restrict, ban or unban chat
+    /// members.
+    pub fn can_restrict_members(mut self, val: bool) -> Self {
+        self.can_restrict_members = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can pin messages, supergroups only.
+    pub fn can_pin_messages(mut self, val: bool) -> Self {
+        self.can_pin_messages = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the administrator can add new administrators with a
+    /// subset of his own privileges or demote administrators that he has
+    /// promoted, directly or indirectly (promoted by administrators that were
+    /// appointed by him).
+    pub fn can_promote_members(mut self, val: bool) -> Self {
+        self.can_promote_members = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/restrict_chat_member.rs b/src/requests/all/restrict_chat_member.rs
new file mode 100644
index 00000000..6b825b91
--- /dev/null
+++ b/src/requests/all/restrict_chat_member.rs
@@ -0,0 +1,76 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, ChatPermissions, True},
+    Bot,
+};
+
+/// Use this method to restrict a user in a supergroup.
+///
+/// The bot must be an administrator in the supergroup for this to work and must
+/// have the appropriate admin rights. Pass `true` for all permissions to lift
+/// restrictions from a user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#restrictchatmember).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct RestrictChatMember {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+    permissions: ChatPermissions,
+    until_date: Option<i32>,
+}
+
+#[async_trait::async_trait]
+impl Request for RestrictChatMember {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "restrictChatMember", &self).await
+    }
+}
+
+impl RestrictChatMember {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32, permissions: ChatPermissions) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, user_id, permissions, until_date: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup (in the format `@supergroupusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// New user permissions.
+    pub fn permissions(mut self, val: ChatPermissions) -> Self {
+        self.permissions = val;
+        self
+    }
+
+    /// Date when restrictions will be lifted for the user, unix time.
+    ///
+    /// If user is restricted for more than 366 days or less than 30 seconds
+    /// from the current time, they are considered to be restricted forever.
+    pub fn until_date(mut self, val: i32) -> Self {
+        self.until_date = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_animation.rs b/src/requests/all/send_animation.rs
new file mode 100644
index 00000000..287ebd93
--- /dev/null
+++ b/src/requests/all/send_animation.rs
@@ -0,0 +1,175 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video
+/// without sound).
+///
+/// Bots can currently send animation files of up to 50 MB in size, this limit
+/// may be changed in the future.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendanimation).
+#[derive(Debug, Clone)]
+pub struct SendAnimation {
+    bot: Bot,
+    pub chat_id: ChatId,
+    pub animation: InputFile,
+    pub duration: Option<u32>,
+    pub width: Option<u32>,
+    pub height: Option<u32>,
+    pub thumb: Option<InputFile>,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendAnimation {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        let mut builder = FormBuilder::new()
+            .add_text("chat_id", &self.chat_id)
+            .add_input_file("animation", &self.animation)
+            .await?
+            .add_text("duration", &self.duration)
+            .add_text("width", &self.width)
+            .add_text("height", &self.height)
+            .add_text("caption", &self.caption)
+            .add_text("parse_mode", &self.parse_mode)
+            .add_text("disable_notification", &self.disable_notification)
+            .add_text("reply_to_message_id", &self.reply_to_message_id)
+            .add_text("reply_markup", &self.reply_markup);
+        if let Some(thumb) = self.thumb.as_ref() {
+            builder = builder.add_input_file("thumb", thumb).await?;
+        }
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendAnimation",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl SendAnimation {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, animation: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            animation,
+            duration: None,
+            width: None,
+            height: None,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, value: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = value.into();
+        self
+    }
+
+    /// Animation to send.
+    pub fn animation(mut self, val: InputFile) -> Self {
+        self.animation = val;
+        self
+    }
+
+    /// Duration of sent animation in seconds.
+    pub fn duration(mut self, value: u32) -> Self {
+        self.duration = Some(value);
+        self
+    }
+
+    /// Animation width.
+    pub fn width(mut self, value: u32) -> Self {
+        self.width = Some(value);
+        self
+    }
+
+    /// Animation height.
+    pub fn height(mut self, value: u32) -> Self {
+        self.height = Some(value);
+        self
+    }
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
+    /// the file is supported server-side.
+    ///
+    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
+    /// thumbnail‘s width and height should not exceed 320. Ignored if the
+    /// file is not uploaded using [`InputFile::File`]. Thumbnails can’t be
+    /// reused and can be only uploaded as a new file, with
+    /// [`InputFile::File`].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    pub fn thumb(mut self, value: InputFile) -> Self {
+        self.thumb = Some(value);
+        self
+    }
+
+    /// Animation caption, `0`-`1024` characters.
+    pub fn caption<T>(mut self, value: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(value.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, value: ParseMode) -> Self {
+        self.parse_mode = Some(value);
+        self
+    }
+
+    /// Sends the message silently. Users will receive a notification with no
+    /// sound.
+    pub fn disable_notification(mut self, value: bool) -> Self {
+        self.disable_notification = Some(value);
+        self
+    }
+
+    /// If the message is a reply, [id] of the original message.
+    ///
+    /// [id]: crate::types::Message::id
+    pub fn reply_to_message_id(mut self, value: i32) -> Self {
+        self.reply_to_message_id = Some(value);
+        self
+    }
+
+    /// Additional interface options.
+    pub fn reply_markup<T>(mut self, value: T) -> Self
+    where
+        T: Into<ReplyMarkup>,
+    {
+        self.reply_markup = Some(value.into());
+        self
+    }
+}
diff --git a/src/requests/all/send_audio.rs b/src/requests/all/send_audio.rs
new file mode 100644
index 00000000..f2ed209f
--- /dev/null
+++ b/src/requests/all/send_audio.rs
@@ -0,0 +1,200 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send audio files, if you want Telegram clients to display
+/// them in the music player.
+///
+/// Your audio must be in the .MP3 or .M4A format. Bots can currently send audio
+/// files of up to 50 MB in size, this limit may be changed in the future.
+///
+/// For sending voice messages, use the [`Bot::send_voice`] method instead.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendaudio).
+///
+/// [`Bot::send_voice`]: crate::Bot::send_voice
+#[derive(Debug, Clone)]
+pub struct SendAudio {
+    bot: Bot,
+    chat_id: ChatId,
+    audio: InputFile,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    duration: Option<i32>,
+    performer: Option<String>,
+    title: Option<String>,
+    thumb: Option<InputFile>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendAudio {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        let mut builder = FormBuilder::new()
+            .add_text("chat_id", &self.chat_id)
+            .add_input_file("audio", &self.audio)
+            .await?
+            .add_text("caption", &self.caption)
+            .add_text("parse_mode", &self.parse_mode)
+            .add_text("duration", &self.duration)
+            .add_text("performer", &self.performer)
+            .add_text("title", &self.title)
+            .add_text("disable_notification", &self.disable_notification)
+            .add_text("reply_to_message_id", &self.reply_to_message_id)
+            .add_text("reply_markup", &self.reply_markup);
+        if let Some(thumb) = self.thumb.as_ref() {
+            builder = builder.add_input_file("thumb", thumb).await?;
+        }
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendAudio",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl SendAudio {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, audio: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            audio,
+            caption: None,
+            parse_mode: None,
+            duration: None,
+            performer: None,
+            title: None,
+            thumb: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Audio file to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn audio(mut self, val: InputFile) -> Self {
+        self.audio = val;
+        self
+    }
+
+    /// Audio caption, 0-1024 characters.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Duration of the audio in seconds.
+    pub fn duration(mut self, val: i32) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    /// Performer.
+    pub fn performer<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.performer = Some(val.into());
+        self
+    }
+
+    /// Track name.
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
+    /// the file is supported server-side.
+    ///
+    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
+    /// thumbnail‘s width and height should not exceed 320. Ignored if the
+    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
+    /// be reused and can be only uploaded as a new file, so you can pass
+    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
+    /// `multipart/form-data` under `<file_attach_name>`. [More info on
+    /// Sending Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options. A JSON-serialized object for an [inline
+    /// keyboard], [custom reply keyboard], instructions to remove reply
+    /// keyboard or to force a reply from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_chat_action.rs b/src/requests/all/send_chat_action.rs
new file mode 100644
index 00000000..5fe853b2
--- /dev/null
+++ b/src/requests/all/send_chat_action.rs
@@ -0,0 +1,105 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method when you need to tell the user that something is happening
+/// on the bot's side.
+///
+/// The status is set for 5 seconds or less (when a message arrives from your
+/// bot, Telegram clients clear its typing status).
+///
+/// ## Note
+/// Example: The [ImageBot] needs some time to process a request and upload the
+/// image. Instead of sending a text message along the lines of “Retrieving
+/// image, please wait…”, the bot may use [`Bot::send_chat_action`] with `action
+/// = upload_photo`. The user will see a `sending photo` status for the bot.
+///
+/// We only recommend using this method when a response from the bot will take a
+/// **noticeable** amount of time to arrive.
+///
+/// [ImageBot]: https://t.me/imagebot
+/// [`Bot::send_chat_action`]: crate::Bot::send_chat_action
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendChatAction {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    action: SendChatActionKind,
+}
+
+/// A type of action used in [`SendChatAction`].
+///
+/// [`SendChatAction`]: crate::requests::SendChatAction
+#[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum SendChatActionKind {
+    /// For [text messages](crate::Bot::send_message).
+    Typing,
+
+    /// For [photos](crate::Bot::send_photo).
+    UploadPhoto,
+
+    /// For [videos](crate::Bot::send_video).
+    RecordVideo,
+
+    /// For [videos](crate::Bot::send_video).
+    UploadVideo,
+
+    /// For [audio files](crate::Bot::send_audio).
+    RecordAudio,
+
+    /// For [audio files](crate::Bot::send_audio).
+    UploadAudio,
+
+    /// For [general files](crate::Bot::send_document).
+    UploadDocument,
+
+    /// For [location data](crate::Bot::send_location).
+    FindLocation,
+
+    /// For [video notes](crate::Bot::send_video_note).
+    RecordVideoNote,
+
+    /// For [video notes](crate::Bot::send_video_note).
+    UploadVideoNote,
+}
+
+#[async_trait::async_trait]
+impl Request for SendChatAction {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendChatAction", &self).await
+    }
+}
+
+impl SendChatAction {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, action: SendChatActionKind) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self { bot, chat_id: chat_id.into(), action }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Type of action to broadcast.
+    pub fn action(mut self, val: SendChatActionKind) -> Self {
+        self.action = val;
+        self
+    }
+}
diff --git a/src/requests/all/send_contact.rs b/src/requests/all/send_contact.rs
new file mode 100644
index 00000000..ef3ff034
--- /dev/null
+++ b/src/requests/all/send_contact.rs
@@ -0,0 +1,129 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send phone contacts.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendcontact).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendContact {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    phone_number: String,
+    first_name: String,
+    last_name: Option<String>,
+    vcard: Option<String>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendContact {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendContact", &self).await
+    }
+}
+
+impl SendContact {
+    pub(crate) fn new<C, P, F>(bot: Bot, chat_id: C, phone_number: P, first_name: F) -> Self
+    where
+        C: Into<ChatId>,
+        P: Into<String>,
+        F: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let phone_number = phone_number.into();
+        let first_name = first_name.into();
+        Self {
+            bot,
+            chat_id,
+            phone_number,
+            first_name,
+            last_name: None,
+            vcard: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Contact's phone number.
+    pub fn phone_number<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+
+    /// Contact's first name.
+    pub fn first_name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.first_name = val.into();
+        self
+    }
+
+    /// Contact's last name.
+    pub fn last_name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+
+    /// Additional data about the contact in the form of a [vCard], 0-2048
+    /// bytes.
+    ///
+    /// [vCard]: https://en.wikipedia.org/wiki/VCard
+    pub fn vcard<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.vcard = Some(val.into());
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_dice.rs b/src/requests/all/send_dice.rs
new file mode 100644
index 00000000..663d7001
--- /dev/null
+++ b/src/requests/all/send_dice.rs
@@ -0,0 +1,94 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, DiceEmoji, Message, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send an animated emoji that will display a random value.
+///
+/// [The official docs](https://core.telegram.org/bots/api#senddice).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendDice {
+    #[serde(skip_serializing)]
+    bot: Bot,
+
+    chat_id: ChatId,
+    #[serde(flatten)]
+    emoji: Option<DiceEmoji>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendDice {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendDice", &self).await
+    }
+}
+
+impl SendDice {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            emoji: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, value: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = value.into();
+        self
+    }
+
+    /// Emoji on which the dice throw animation is based.
+    pub fn emoji(mut self, val: DiceEmoji) -> Self {
+        self.emoji = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, value: bool) -> Self {
+        self.disable_notification = Some(value);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, value: i32) -> Self {
+        self.reply_to_message_id = Some(value);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_document.rs b/src/requests/all/send_document.rs
new file mode 100644
index 00000000..a3b6ff6f
--- /dev/null
+++ b/src/requests/all/send_document.rs
@@ -0,0 +1,154 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send general files.
+///
+/// Bots can currently send files of any type of up to 50 MB in size, this limit
+/// may be changed in the future.
+///
+/// [The official docs](https://core.telegram.org/bots/api#senddocument).
+#[derive(Debug, Clone)]
+pub struct SendDocument {
+    bot: Bot,
+    chat_id: ChatId,
+    document: InputFile,
+    thumb: Option<InputFile>,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendDocument {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        let mut builder = FormBuilder::new()
+            .add_text("chat_id", &self.chat_id)
+            .add_input_file("document", &self.document)
+            .await?
+            .add_text("caption", &self.caption)
+            .add_text("parse_mode", &self.parse_mode)
+            .add_text("disable_notification", &self.disable_notification)
+            .add_text("reply_to_message_id", &self.reply_to_message_id)
+            .add_text("reply_markup", &self.reply_markup);
+        if let Some(thumb) = self.thumb.as_ref() {
+            builder = builder.add_input_file("thumb", thumb).await?;
+        }
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendDocument",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl SendDocument {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, document: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            document,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// File to send.
+    ///
+    /// Pass a file_id as String to send a file that exists on the
+    /// Telegram servers (recommended), pass an HTTP URL as a String for
+    /// Telegram to get a file from the Internet, or upload a new one using
+    /// `multipart/form-data`. [More info on Sending Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn document(mut self, val: InputFile) -> Self {
+        self.document = val;
+        self
+    }
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
+    /// the file is supported server-side.
+    ///
+    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
+    /// thumbnail‘s width and height should not exceed 320. Ignored if the
+    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
+    /// be reused and can be only uploaded as a new file, so you can pass
+    /// “attach://<file_attach_name>” if the thumbnail was uploaded using
+    /// `multipart/form-data` under `<file_attach_name>`. [More info on
+    /// Sending Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    /// Document caption (may also be used when resending documents by
+    /// `file_id`), 0-1024 characters.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_game.rs b/src/requests/all/send_game.rs
new file mode 100644
index 00000000..03a0b0e2
--- /dev/null
+++ b/src/requests/all/send_game.rs
@@ -0,0 +1,92 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, Message},
+    Bot,
+};
+
+/// Use this method to send a game.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendgame).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendGame {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: i32,
+    game_short_name: String,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendGame {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendGame", &self).await
+    }
+}
+
+impl SendGame {
+    pub(crate) fn new<G>(bot: Bot, chat_id: i32, game_short_name: G) -> Self
+    where
+        G: Into<String>,
+    {
+        let game_short_name = game_short_name.into();
+        Self {
+            bot,
+            chat_id,
+            game_short_name,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat.
+    pub fn chat_id(mut self, val: i32) -> Self {
+        self.chat_id = val;
+        self
+    }
+
+    /// Short name of the game, serves as the unique identifier for the game.
+    /// Set up your games via [@Botfather].
+    ///
+    /// [@Botfather]: https://t.me/botfather
+    pub fn game_short_name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.game_short_name = val.into();
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard]. If empty, one `Play
+    /// game_title` button will be shown. If not empty, the first button must
+    /// launch the game.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_invoice.rs b/src/requests/all/send_invoice.rs
new file mode 100644
index 00000000..8466cdba
--- /dev/null
+++ b/src/requests/all/send_invoice.rs
@@ -0,0 +1,299 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, LabeledPrice, Message},
+    Bot,
+};
+
+/// Use this method to send invoices.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendinvoice).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendInvoice {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: i32,
+    title: String,
+    description: String,
+    payload: String,
+    provider_token: String,
+    start_parameter: String,
+    currency: String,
+    prices: Vec<LabeledPrice>,
+    provider_data: Option<String>,
+    photo_url: Option<String>,
+    photo_size: Option<i32>,
+    photo_width: Option<i32>,
+    photo_height: Option<i32>,
+    need_name: Option<bool>,
+    need_phone_number: Option<bool>,
+    need_email: Option<bool>,
+    need_shipping_address: Option<bool>,
+    send_phone_number_to_provider: Option<bool>,
+    send_email_to_provider: Option<bool>,
+    is_flexible: Option<bool>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendInvoice {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendInvoice", &self).await
+    }
+}
+
+impl SendInvoice {
+    #[allow(clippy::too_many_arguments)]
+    pub(crate) fn new<T, D, Pl, Pt, S, C, Pr>(
+        bot: Bot,
+        chat_id: i32,
+        title: T,
+        description: D,
+        payload: Pl,
+        provider_token: Pt,
+        start_parameter: S,
+        currency: C,
+        prices: Pr,
+    ) -> Self
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pl: Into<String>,
+        Pt: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pr: Into<Vec<LabeledPrice>>,
+    {
+        let title = title.into();
+        let description = description.into();
+        let payload = payload.into();
+        let provider_token = provider_token.into();
+        let start_parameter = start_parameter.into();
+        let currency = currency.into();
+        let prices = prices.into();
+        Self {
+            bot,
+            chat_id,
+            title,
+            description,
+            payload,
+            provider_token,
+            start_parameter,
+            currency,
+            prices,
+            provider_data: None,
+            photo_url: None,
+            photo_size: None,
+            photo_width: None,
+            photo_height: None,
+            need_name: None,
+            need_phone_number: None,
+            need_email: None,
+            need_shipping_address: None,
+            send_phone_number_to_provider: None,
+            send_email_to_provider: None,
+            is_flexible: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target private chat.
+    pub fn chat_id(mut self, val: i32) -> Self {
+        self.chat_id = val;
+        self
+    }
+
+    /// Product name, 1-32 characters.
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    /// Product description, 1-255 characters.
+    pub fn description<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+
+    /// Bot-defined invoice payload, 1-128 bytes. This will not be displayed to
+    /// the user, use for your internal processes.
+    pub fn payload<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.payload = val.into();
+        self
+    }
+
+    /// Payments provider token, obtained via [@Botfather].
+    ///
+    /// [@Botfather]: https://t.me/botfather
+    pub fn provider_token<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.provider_token = val.into();
+        self
+    }
+
+    /// Unique deep-linking parameter that can be used to generate this invoice
+    /// when used as a start parameter.
+    pub fn start_parameter<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.start_parameter = val.into();
+        self
+    }
+
+    /// Three-letter ISO 4217 currency code, see [more on currencies].
+    ///
+    /// [more on currencies]: https://core.telegram.org/bots/payments#supported-currencies
+    pub fn currency<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.currency = val.into();
+        self
+    }
+
+    /// Price breakdown, a list of components (e.g. product price, tax,
+    /// discount, delivery cost, delivery tax, bonus, etc.).
+    pub fn prices<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<LabeledPrice>>,
+    {
+        self.prices = val.into();
+        self
+    }
+
+    /// JSON-encoded data about the invoice, which will be shared with the
+    /// payment provider.
+    ///
+    /// A detailed description of required fields should be provided by the
+    /// payment provider.
+    pub fn provider_data<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.provider_data = Some(val.into());
+        self
+    }
+
+    /// URL of the product photo for the invoice.
+    ///
+    /// Can be a photo of the goods or a marketing image for a service. People
+    /// like it better when they see what they are paying for.
+    pub fn photo_url<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.photo_url = Some(val.into());
+        self
+    }
+
+    /// Photo size.
+    pub fn photo_size(mut self, val: i32) -> Self {
+        self.photo_size = Some(val);
+        self
+    }
+
+    /// Photo width.
+    pub fn photo_width(mut self, val: i32) -> Self {
+        self.photo_width = Some(val);
+        self
+    }
+
+    /// Photo height.
+    pub fn photo_height(mut self, val: i32) -> Self {
+        self.photo_height = Some(val);
+        self
+    }
+
+    /// Pass `true`, if you require the user's full name to complete the order.
+    pub fn need_name(mut self, val: bool) -> Self {
+        self.need_name = Some(val);
+        self
+    }
+
+    /// Pass `true`, if you require the user's phone number to complete the
+    /// order.
+    pub fn need_phone_number(mut self, val: bool) -> Self {
+        self.need_phone_number = Some(val);
+        self
+    }
+
+    /// Pass `true`, if you require the user's email address to complete the
+    /// order.
+    pub fn need_email(mut self, val: bool) -> Self {
+        self.need_email = Some(val);
+        self
+    }
+
+    /// Pass `true`, if you require the user's shipping address to complete the
+    /// order.
+    pub fn need_shipping_address(mut self, val: bool) -> Self {
+        self.need_shipping_address = Some(val);
+        self
+    }
+
+    /// Pass `true`, if user's phone number should be sent to provider.
+    pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
+        self.send_phone_number_to_provider = Some(val);
+        self
+    }
+
+    /// Pass `true`, if user's email address should be sent to provider.
+    pub fn send_email_to_provider(mut self, val: bool) -> Self {
+        self.send_email_to_provider = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the final price depends on the shipping method.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_flexible(mut self, val: bool) -> Self {
+        self.is_flexible = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// If empty, one 'Pay `total price`' button will be shown. If not empty,
+    /// the first button must be a Pay button.
+    ///
+    /// [inlint keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_location.rs b/src/requests/all/send_location.rs
new file mode 100644
index 00000000..20201ad1
--- /dev/null
+++ b/src/requests/all/send_location.rs
@@ -0,0 +1,110 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send point on the map.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendlocation).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendLocation {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    latitude: f32,
+    longitude: f32,
+    live_period: Option<i64>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendLocation {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendLocation", &self).await
+    }
+}
+
+impl SendLocation {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, latitude: f32, longitude: f32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self {
+            bot,
+            chat_id,
+            latitude,
+            longitude,
+            live_period: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Latitude of the location.
+    pub fn latitude(mut self, val: f32) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    /// Longitude of the location.
+    pub fn longitude(mut self, val: f32) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    /// Period in seconds for which the location will be updated (see [Live
+    /// Locations], should be between 60 and 86400).
+    ///
+    /// [Live Locations]: https://telegram.org/blog/live-locations
+    pub fn live_period(mut self, val: i64) -> Self {
+        self.live_period = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// A JSON-serialized object for an [inline keyboard].
+    ///
+    /// If empty, one 'Pay `total price`' button will be shown. If not empty,
+    /// the first button must be a Pay button.
+    ///
+    /// [inlint keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_media_group.rs b/src/requests/all/send_media_group.rs
new file mode 100644
index 00000000..7484fc62
--- /dev/null
+++ b/src/requests/all/send_media_group.rs
@@ -0,0 +1,85 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    types::{ChatId, InputMedia, Message},
+    Bot,
+};
+
+/// Use this method to send a group of photos or videos as an album.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendmediagroup).
+#[derive(Debug, Clone)]
+pub struct SendMediaGroup {
+    bot: Bot,
+    chat_id: ChatId,
+    media: Vec<InputMedia>, // TODO: InputMediaPhoto and InputMediaVideo
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendMediaGroup {
+    type Output = Vec<Message>;
+
+    async fn send(&self) -> ResponseResult<Vec<Message>> {
+        net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendMediaGroup",
+            FormBuilder::new()
+                .add_text("chat_id", &self.chat_id)
+                .add_text("media", &self.media)
+                .add_text("disable_notification", &self.disable_notification)
+                .add_text("reply_to_message_id", &self.reply_to_message_id)
+                .build(),
+        )
+        .await
+    }
+}
+
+impl SendMediaGroup {
+    pub(crate) fn new<C, M>(bot: Bot, chat_id: C, media: M) -> Self
+    where
+        C: Into<ChatId>,
+        M: Into<Vec<InputMedia>>,
+    {
+        let chat_id = chat_id.into();
+        let media = media.into();
+        Self { bot, chat_id, media, disable_notification: None, reply_to_message_id: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// A JSON-serialized array describing photos and videos to be sent, must
+    /// include 2–10 items.
+    pub fn media<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<InputMedia>>,
+    {
+        self.media = val.into();
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the messages are a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_message.rs b/src/requests/all/send_message.rs
new file mode 100644
index 00000000..29525cb9
--- /dev/null
+++ b/src/requests/all/send_message.rs
@@ -0,0 +1,121 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send text messages.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendmessage).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendMessage {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    pub chat_id: ChatId,
+    pub text: String,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_web_page_preview: Option<bool>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendMessage {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendMessage", &self).await
+    }
+}
+
+impl SendMessage {
+    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, text: T) -> Self
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            text: text.into(),
+            parse_mode: None,
+            disable_web_page_preview: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, value: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = value.into();
+        self
+    }
+
+    /// Text of the message to be sent.
+    pub fn text<T>(mut self, value: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.text = value.into();
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, value: ParseMode) -> Self {
+        self.parse_mode = Some(value);
+        self
+    }
+
+    /// Disables link previews for links in this message.
+    pub fn disable_web_page_preview(mut self, value: bool) -> Self {
+        self.disable_web_page_preview = Some(value);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, value: bool) -> Self {
+        self.disable_notification = Some(value);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, value: i32) -> Self {
+        self.reply_to_message_id = Some(value);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup<T>(mut self, value: T) -> Self
+    where
+        T: Into<ReplyMarkup>,
+    {
+        self.reply_markup = Some(value.into());
+        self
+    }
+}
diff --git a/src/requests/all/send_photo.rs b/src/requests/all/send_photo.rs
new file mode 100644
index 00000000..4027f000
--- /dev/null
+++ b/src/requests/all/send_photo.rs
@@ -0,0 +1,138 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send photos.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendphoto).
+#[derive(Debug, Clone)]
+pub struct SendPhoto {
+    bot: Bot,
+    chat_id: ChatId,
+    photo: InputFile,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendPhoto {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendPhoto",
+            FormBuilder::new()
+                .add_text("chat_id", &self.chat_id)
+                .add_input_file("photo", &self.photo)
+                .await?
+                .add_text("caption", &self.caption)
+                .add_text("parse_mode", &self.parse_mode)
+                .add_text("disable_notification", &self.disable_notification)
+                .add_text("reply_to_message_id", &self.reply_to_message_id)
+                .add_text("reply_markup", &self.reply_markup)
+                .build(),
+        )
+        .await)
+    }
+}
+
+impl SendPhoto {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, photo: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            photo,
+            caption: None,
+            parse_mode: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Photo to send.
+    ///
+    /// Pass [`InputFile::File`] to send a photo that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn photo(mut self, val: InputFile) -> Self {
+        self.photo = val;
+        self
+    }
+
+    ///Photo caption (may also be used when resending photos by file_id),
+    /// 0-1024 characters.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options. A JSON-serialized object for an [inline
+    /// keyboard], [custom reply keyboard], instructions to remove reply
+    /// keyboard or to force a reply from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_poll.rs b/src/requests/all/send_poll.rs
new file mode 100644
index 00000000..3dd412a1
--- /dev/null
+++ b/src/requests/all/send_poll.rs
@@ -0,0 +1,217 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message, ParseMode, PollType, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send a native poll.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendpoll).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendPoll {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    question: String,
+    options: Vec<String>,
+    is_anonymous: Option<bool>,
+    poll_type: Option<PollType>,
+    allows_multiple_answers: Option<bool>,
+    correct_option_id: Option<i32>,
+    explanation: Option<String>,
+    explanation_parse_mode: Option<ParseMode>,
+    open_period: Option<i32>,
+    close_date: Option<i32>,
+    is_closed: Option<bool>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendPoll {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendPoll", &self).await
+    }
+}
+
+impl SendPoll {
+    pub(crate) fn new<C, Q, O>(bot: Bot, chat_id: C, question: Q, options: O) -> Self
+    where
+        C: Into<ChatId>,
+        Q: Into<String>,
+        O: Into<Vec<String>>,
+    {
+        let chat_id = chat_id.into();
+        let question = question.into();
+        let options = options.into();
+        Self {
+            bot,
+            chat_id,
+            question,
+            options,
+            is_anonymous: None,
+            poll_type: None,
+            allows_multiple_answers: None,
+            correct_option_id: None,
+            explanation: None,
+            explanation_parse_mode: None,
+            is_closed: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+            close_date: None,
+            open_period: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    ///
+    /// A native poll can't be sent to a private chat.
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Poll question, 1-255 characters.
+    pub fn question<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.question = val.into();
+        self
+    }
+
+    /// List of answer options, 2-10 strings 1-100 characters each.
+    pub fn options<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<String>>,
+    {
+        self.options = val.into();
+        self
+    }
+
+    /// `true`, if the poll needs to be anonymous, defaults to `true`.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_anonymous<T>(mut self, val: T) -> Self
+    where
+        T: Into<bool>,
+    {
+        self.is_anonymous = Some(val.into());
+        self
+    }
+
+    /// Poll type, `quiz` or `regular`, defaults to `regular`.
+    pub fn poll_type(mut self, val: PollType) -> Self {
+        self.poll_type = Some(val);
+        self
+    }
+
+    /// `true`, if the poll allows multiple answers, ignored for polls in quiz
+    /// mode.
+    ///
+    /// Defaults to `false`.
+    pub fn allows_multiple_answers<T>(mut self, val: T) -> Self
+    where
+        T: Into<bool>,
+    {
+        self.allows_multiple_answers = Some(val.into());
+        self
+    }
+
+    /// 0-based identifier of the correct answer option, required for polls in
+    /// quiz mode.
+    pub fn correct_option_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<i32>,
+    {
+        self.correct_option_id = Some(val.into());
+        self
+    }
+
+    /// Text that is shown when a user chooses an incorrect answer or taps on
+    /// the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line
+    /// feeds after entities parsing.
+    pub fn explanation<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.explanation = Some(val.into());
+        self
+    }
+
+    /// Mode for parsing entities in the explanation. See [formatting options]
+    /// for more details.
+    ///
+    /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+    pub fn explanation_parse_mode(mut self, val: ParseMode) -> Self {
+        self.explanation_parse_mode = Some(val);
+        self
+    }
+
+    /// Amount of time in seconds the poll will be active after creation, 5-600.
+    /// Can't be used together with `close_date`.
+    pub fn open_period(mut self, val: i32) -> Self {
+        self.open_period = Some(val);
+        self
+    }
+
+    /// Point in time (Unix timestamp) when the poll will be automatically
+    /// closed. Must be at least 5 and no more than 600 seconds in the future.
+    /// Can't be used together with `open_period`.
+    pub fn close_date(mut self, val: i32) -> Self {
+        self.close_date = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the poll needs to be immediately closed.
+    ///
+    /// This can be useful for poll preview.
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_closed<T>(mut self, val: T) -> Self
+    where
+        T: Into<bool>,
+    {
+        self.is_closed = Some(val.into());
+        self
+    }
+
+    /// Sends the message [silently].
+    ///
+    /// Users will receive a notification with no sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_sticker.rs b/src/requests/all/send_sticker.rs
new file mode 100644
index 00000000..5e019e19
--- /dev/null
+++ b/src/requests/all/send_sticker.rs
@@ -0,0 +1,113 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send static .WEBP or [animated] .TGS stickers.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendsticker).
+///
+/// [animated]: https://telegram.org/blog/animated-stickers
+#[derive(Debug, Clone)]
+pub struct SendSticker {
+    bot: Bot,
+    chat_id: ChatId,
+    sticker: InputFile,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendSticker {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendSticker",
+            FormBuilder::new()
+                .add_text("chat_id", &self.chat_id)
+                .add_input_file("sticker", &self.sticker)
+                .await?
+                .add_text("disable_notification", &self.disable_notification)
+                .add_text("reply_to_message_id", &self.reply_to_message_id)
+                .add_text("reply_markup", &self.reply_markup)
+                .build(),
+        )
+        .await)
+    }
+}
+
+impl SendSticker {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, sticker: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            sticker,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Sticker to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn sticker(mut self, val: InputFile) -> Self {
+        self.sticker = val;
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_venue.rs b/src/requests/all/send_venue.rs
new file mode 100644
index 00000000..513ece7d
--- /dev/null
+++ b/src/requests/all/send_venue.rs
@@ -0,0 +1,159 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, Message, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send information about a venue.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendvenue).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SendVenue {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    latitude: f32,
+    longitude: f32,
+    title: String,
+    address: String,
+    foursquare_id: Option<String>,
+    foursquare_type: Option<String>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for SendVenue {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendVenue", &self).await
+    }
+}
+
+impl SendVenue {
+    pub(crate) fn new<C, T, A>(
+        bot: Bot,
+        chat_id: C,
+        latitude: f32,
+        longitude: f32,
+        title: T,
+        address: A,
+    ) -> Self
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+        A: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let title = title.into();
+        let address = address.into();
+        Self {
+            bot,
+            chat_id,
+            latitude,
+            longitude,
+            title,
+            address,
+            foursquare_id: None,
+            foursquare_type: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Latitude of the venue.
+    pub fn latitude(mut self, val: f32) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    /// Longitude of the venue.
+    pub fn longitude(mut self, val: f32) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    /// Name of the venue.
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    /// Address of the venue.
+    pub fn address<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.address = val.into();
+        self
+    }
+
+    /// Foursquare identifier of the venue.
+    pub fn foursquare_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.foursquare_id = Some(val.into());
+        self
+    }
+
+    /// Foursquare type of the venue, if known.
+    ///
+    /// For example, `arts_entertainment/default`, `arts_entertainment/aquarium`
+    /// or `food/icecream`.
+    pub fn foursquare_type<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.foursquare_type = Some(val.into());
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_video.rs b/src/requests/all/send_video.rs
new file mode 100644
index 00000000..30ab6a45
--- /dev/null
+++ b/src/requests/all/send_video.rs
@@ -0,0 +1,200 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send video files, Telegram clients support mp4 videos
+/// (other formats may be sent as Document).
+///
+/// Bots can currently send video files of up to 50 MB in size, this
+/// limit may be changed in the future.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendvideo).
+#[derive(Debug, Clone)]
+pub struct SendVideo {
+    bot: Bot,
+    chat_id: ChatId,
+    video: InputFile,
+    duration: Option<i32>,
+    width: Option<i32>,
+    height: Option<i32>,
+    thumb: Option<InputFile>,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    supports_streaming: Option<bool>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendVideo {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        let mut builder = FormBuilder::new()
+            .add_text("chat_id", &self.chat_id)
+            .add_input_file("video", &self.video)
+            .await?
+            .add_text("duration", &self.duration)
+            .add_text("width", &self.width)
+            .add_text("height", &self.height)
+            .add_text("caption", &self.caption)
+            .add_text("parse_mode", &self.parse_mode)
+            .add_text("supports_streaming", &self.supports_streaming)
+            .add_text("disable_notification", &self.disable_notification)
+            .add_text("reply_to_message_id", &self.reply_to_message_id)
+            .add_text("reply_markup", &self.reply_markup);
+        if let Some(thumb) = self.thumb.as_ref() {
+            builder = builder.add_input_file("thumb", thumb).await?;
+        }
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendVideo",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl SendVideo {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, video: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            video,
+            duration: None,
+            width: None,
+            height: None,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            supports_streaming: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Video to sent.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    pub fn video(mut self, val: InputFile) -> Self {
+        self.video = val;
+        self
+    }
+
+    /// Duration of sent video in seconds.
+    pub fn duration(mut self, val: i32) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    /// Video width.
+    pub fn width(mut self, val: i32) -> Self {
+        self.width = Some(val);
+        self
+    }
+
+    /// Video height.
+    pub fn height(mut self, val: i32) -> Self {
+        self.height = Some(val);
+        self
+    }
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
+    /// the file is supported server-side.
+    ///
+    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
+    /// thumbnail‘s width and height should not exceed 320. Ignored if the
+    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t be
+    /// reused and can be only uploaded as a new file, so you can pass
+    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
+    /// `multipart/form-data` under `<file_attach_name>`. [More info on Sending
+    /// Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    /// Video caption (may also be used when resending videos by file_id),
+    /// 0-1024 characters.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Pass `true`, if the uploaded video is suitable for streaming.
+    pub fn supports_streaming(mut self, val: bool) -> Self {
+        self.supports_streaming = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_video_note.rs b/src/requests/all/send_video_note.rs
new file mode 100644
index 00000000..2ac653be
--- /dev/null
+++ b/src/requests/all/send_video_note.rs
@@ -0,0 +1,152 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ReplyMarkup},
+    Bot,
+};
+
+/// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1
+/// minute long. Use this method to send video messages.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendvideonote).
+///
+/// [v.4.0]: https://telegram.org/blog/video-messages-and-telescope
+#[derive(Debug, Clone)]
+pub struct SendVideoNote {
+    bot: Bot,
+    chat_id: ChatId,
+    video_note: InputFile,
+    duration: Option<i32>,
+    length: Option<i32>,
+    thumb: Option<InputFile>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendVideoNote {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        let mut builder = FormBuilder::new()
+            .add_text("chat_id", &self.chat_id)
+            .add_input_file("video_note", &self.video_note)
+            .await?
+            .add_text("duration", &self.duration)
+            .add_text("length", &self.length)
+            .add_text("disable_notification", &self.disable_notification)
+            .add_text("reply_to_message_id", &self.reply_to_message_id)
+            .add_text("reply_markup", &self.reply_markup);
+        if let Some(thumb) = self.thumb.as_ref() {
+            builder = builder.add_input_file("thumb", thumb).await?;
+        }
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendVideoNote",
+            builder.build(),
+        )
+        .await)
+    }
+}
+
+impl SendVideoNote {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, video_note: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            video_note,
+            duration: None,
+            length: None,
+            thumb: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Video note to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn video_note(mut self, val: InputFile) -> Self {
+        self.video_note = val;
+        self
+    }
+
+    /// Duration of sent video in seconds.
+    pub fn duration(mut self, val: i32) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    /// Video width and height, i.e. diameter of the video message.
+    pub fn length(mut self, val: i32) -> Self {
+        self.length = Some(val);
+        self
+    }
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
+    /// the file is supported server-side.
+    ///
+    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
+    /// thumbnail‘s width and height should not exceed 320. Ignored if the
+    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
+    /// be reused and can be only uploaded as a new file, so you can pass
+    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
+    /// `multipart/form-data` under `<file_attach_name>`. [More info on
+    /// Sending Files »].
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/send_voice.rs b/src/requests/all/send_voice.rs
new file mode 100644
index 00000000..1e50bbed
--- /dev/null
+++ b/src/requests/all/send_voice.rs
@@ -0,0 +1,156 @@
+use crate::{
+    net,
+    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
+    Bot,
+};
+
+/// Use this method to send audio files, if you want Telegram clients to display
+/// the file as a playable voice message.
+///
+/// For this to work, your audio must be in an .ogg file encoded with OPUS
+/// (other formats may be sent as [`Audio`] or [`Document`]). Bots can currently
+/// send voice messages of up to 50 MB in size, this limit may be changed in the
+/// future.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sendvoice).
+///
+/// [`Audio`]: crate::types::Audio
+/// [`Document`]: crate::types::Document
+#[derive(Debug, Clone)]
+pub struct SendVoice {
+    bot: Bot,
+    chat_id: ChatId,
+    voice: InputFile,
+    caption: Option<String>,
+    parse_mode: Option<ParseMode>,
+    duration: Option<i32>,
+    disable_notification: Option<bool>,
+    reply_to_message_id: Option<i32>,
+    reply_markup: Option<ReplyMarkup>,
+}
+
+#[async_trait::async_trait]
+impl RequestWithFile for SendVoice {
+    type Output = Message;
+
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
+        Ok(net::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            "sendVoice",
+            FormBuilder::new()
+                .add_text("chat_id", &self.chat_id)
+                .add_input_file("voice", &self.voice)
+                .await?
+                .add_text("caption", &self.caption)
+                .add_text("parse_mode", &self.parse_mode)
+                .add_text("duration", &self.duration)
+                .add_text("disable_notification", &self.disable_notification)
+                .add_text("reply_to_message_id", &self.reply_to_message_id)
+                .add_text("reply_markup", &self.reply_markup)
+                .build(),
+        )
+        .await)
+    }
+}
+
+impl SendVoice {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, voice: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        Self {
+            bot,
+            chat_id: chat_id.into(),
+            voice,
+            caption: None,
+            parse_mode: None,
+            duration: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Audio file to send.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn voice(mut self, val: InputFile) -> Self {
+        self.voice = val;
+        self
+    }
+
+    /// Voice message caption, 0-1024 characters.
+    pub fn caption<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    /// Duration of the voice message in seconds.
+    pub fn duration(mut self, val: i32) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    /// If the message is a reply, ID of the original message.
+    pub fn reply_to_message_id(mut self, val: i32) -> Self {
+        self.reply_to_message_id = Some(val);
+        self
+    }
+
+    /// Additional interface options.
+    ///
+    /// A JSON-serialized object for an [inline keyboard], [custom reply
+    /// keyboard], instructions to remove reply keyboard or to force a reply
+    /// from the user.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_administrator_custom_title.rs b/src/requests/all/set_chat_administrator_custom_title.rs
new file mode 100644
index 00000000..a3211811
--- /dev/null
+++ b/src/requests/all/set_chat_administrator_custom_title.rs
@@ -0,0 +1,75 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to set a custom title for an administrator in a supergroup
+/// promoted by the bot.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchatadministratorcustomtitle).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatAdministratorCustomTitle {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+    custom_title: String,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatAdministratorCustomTitle {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(
+            self.bot.client(),
+            self.bot.token(),
+            "setChatAdministratorCustomTitle",
+            &self,
+        )
+        .await
+    }
+}
+
+impl SetChatAdministratorCustomTitle {
+    pub(crate) fn new<C, CT>(bot: Bot, chat_id: C, user_id: i32, custom_title: CT) -> Self
+    where
+        C: Into<ChatId>,
+        CT: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let custom_title = custom_title.into();
+        Self { bot, chat_id, user_id, custom_title }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// New custom title for the administrator; 0-16 characters, emoji are not
+    /// allowed.
+    pub fn custom_title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.custom_title = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_description.rs b/src/requests/all/set_chat_description.rs
new file mode 100644
index 00000000..092c495b
--- /dev/null
+++ b/src/requests/all/set_chat_description.rs
@@ -0,0 +1,62 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to change the description of a group, a supergroup or a
+/// channel.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchatdescription).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatDescription {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    description: Option<String>,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatDescription {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setChatDescription", &self).await
+    }
+}
+
+impl SetChatDescription {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, description: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// New chat description, 0-255 characters.
+    pub fn description<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_permissions.rs b/src/requests/all/set_chat_permissions.rs
new file mode 100644
index 00000000..aaa1881b
--- /dev/null
+++ b/src/requests/all/set_chat_permissions.rs
@@ -0,0 +1,58 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, ChatPermissions, True},
+    Bot,
+};
+
+/// Use this method to set default chat permissions for all members.
+///
+/// The bot must be an administrator in the group or a supergroup for this to
+/// work and must have the can_restrict_members admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchatpermissions).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatPermissions {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    permissions: ChatPermissions,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatPermissions {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "sendChatPermissions", &self).await
+    }
+}
+
+impl SetChatPermissions {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, permissions: ChatPermissions) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, permissions }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup (in the format `@supergroupusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// New default chat permissions.
+    pub fn permissions(mut self, val: ChatPermissions) -> Self {
+        self.permissions = val;
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_photo.rs b/src/requests/all/set_chat_photo.rs
new file mode 100644
index 00000000..dcc5febc
--- /dev/null
+++ b/src/requests/all/set_chat_photo.rs
@@ -0,0 +1,58 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InputFile, True},
+    Bot,
+};
+
+/// Use this method to set a new profile photo for the chat.
+///
+/// Photos can't be changed for private chats. The bot must be an administrator
+/// in the chat for this to work and must have the appropriate admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchatphoto).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatPhoto {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    photo: InputFile,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatPhoto {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setChatPhoto", &self).await
+    }
+}
+
+impl SetChatPhoto {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, photo: InputFile) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, photo }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// New chat photo, uploaded using `multipart/form-data`.
+    pub fn photo(mut self, val: InputFile) -> Self {
+        self.photo = val;
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_sticker_set.rs b/src/requests/all/set_chat_sticker_set.rs
new file mode 100644
index 00000000..010a10f5
--- /dev/null
+++ b/src/requests/all/set_chat_sticker_set.rs
@@ -0,0 +1,64 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to set a new group sticker set for a supergroup.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the appropriate admin rights. Use the field can_set_sticker_set optionally
+/// returned in getChat requests to check if the bot can use this method.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchatstickerset).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatStickerSet {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    sticker_set_name: String,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatStickerSet {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setChatStickerSet", &self).await
+    }
+}
+
+impl SetChatStickerSet {
+    pub(crate) fn new<C, S>(bot: Bot, chat_id: C, sticker_set_name: S) -> Self
+    where
+        C: Into<ChatId>,
+        S: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let sticker_set_name = sticker_set_name.into();
+        Self { bot, chat_id, sticker_set_name }
+    }
+
+    /// Unique identifier for the target chat or username of the target
+    /// supergroup (in the format `@supergroupusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Name of the sticker set to be set as the group sticker set.
+    pub fn sticker_set_name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.sticker_set_name = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/set_chat_title.rs b/src/requests/all/set_chat_title.rs
new file mode 100644
index 00000000..7d6ae6d1
--- /dev/null
+++ b/src/requests/all/set_chat_title.rs
@@ -0,0 +1,63 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to change the title of a chat.
+///
+/// Titles can't be changed for private chats. The bot must be an administrator
+/// in the chat for this to work and must have the appropriate admin rights.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setchattitle).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetChatTitle {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    title: String,
+}
+
+#[async_trait::async_trait]
+impl Request for SetChatTitle {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setChatTitle", &self).await
+    }
+}
+
+impl SetChatTitle {
+    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, title: T) -> Self
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        let chat_id = chat_id.into();
+        let title = title.into();
+        Self { bot, chat_id, title }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// New chat title, 1-255 characters.
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/set_game_score.rs b/src/requests/all/set_game_score.rs
new file mode 100644
index 00000000..8e429e3a
--- /dev/null
+++ b/src/requests/all/set_game_score.rs
@@ -0,0 +1,89 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{Message, TargetMessage},
+    Bot,
+};
+
+/// Use this method to set the score of the specified user in a game.
+///
+/// On success, if the message was sent by the bot, returns the edited
+/// [`Message`], otherwise returns [`True`]. Returns an error, if the new score
+/// is not greater than the user's current score in the chat and force is
+/// `false`.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setgamescore).
+///
+/// [`Message`]: crate::types::Message
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetGameScore {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    #[serde(flatten)]
+    target: TargetMessage,
+    user_id: i32,
+    score: i32,
+    force: Option<bool>,
+    disable_edit_message: Option<bool>,
+}
+
+#[async_trait::async_trait]
+impl Request for SetGameScore {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "setGameScore", &self).await
+    }
+}
+
+impl SetGameScore {
+    pub(crate) fn new<T>(bot: Bot, target: T, user_id: i32, score: i32) -> Self
+    where
+        T: Into<TargetMessage>,
+    {
+        let target = target.into();
+        Self { bot, target, user_id, score, force: None, disable_edit_message: None }
+    }
+
+    /// Target message, either chat id and message id or inline message id.
+    pub fn target<T>(mut self, val: T) -> Self
+    where
+        T: Into<TargetMessage>,
+    {
+        self.target = val.into();
+        self
+    }
+
+    /// User identifier.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// New score, must be non-negative.
+    pub fn score(mut self, val: i32) -> Self {
+        self.score = val;
+        self
+    }
+
+    /// Pass `true`, if the high score is allowed to decrease.
+    ///
+    /// This can be useful when fixing mistakes or banning cheaters.
+    pub fn force(mut self, val: bool) -> Self {
+        self.force = Some(val);
+        self
+    }
+
+    /// Sends the message [silently]. Users will receive a notification with no
+    /// sound.
+    ///
+    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+    pub fn disable_edit_message(mut self, val: bool) -> Self {
+        self.disable_edit_message = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/set_my_commands.rs b/src/requests/all/set_my_commands.rs
new file mode 100644
index 00000000..831f9705
--- /dev/null
+++ b/src/requests/all/set_my_commands.rs
@@ -0,0 +1,50 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{BotCommand, True},
+    Bot,
+};
+
+/// Use this method to change the list of the bot's commands.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setmycommands).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetMyCommands {
+    #[serde(skip_serializing)]
+    bot: Bot,
+
+    commands: Vec<BotCommand>,
+}
+
+#[async_trait::async_trait]
+impl Request for SetMyCommands {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<Self::Output> {
+        net::request_json(self.bot.client(), self.bot.token(), "setMyCommands", &self).await
+    }
+}
+
+impl SetMyCommands {
+    pub(crate) fn new<C>(bot: Bot, commands: C) -> Self
+    where
+        C: Into<Vec<BotCommand>>,
+    {
+        Self { bot, commands: commands.into() }
+    }
+
+    /// A JSON-serialized list of bot commands to be set as the list of the
+    /// bot's commands.
+    ///
+    /// At most 100 commands can be specified.
+    pub fn commands<C>(mut self, commands: C) -> Self
+    where
+        C: Into<Vec<BotCommand>>,
+    {
+        self.commands = commands.into();
+        self
+    }
+}
diff --git a/src/requests/all/set_sticker_position_in_set.rs b/src/requests/all/set_sticker_position_in_set.rs
new file mode 100644
index 00000000..4ed78551
--- /dev/null
+++ b/src/requests/all/set_sticker_position_in_set.rs
@@ -0,0 +1,56 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::True,
+    Bot,
+};
+
+/// Use this method to move a sticker in a set created by the bot to a specific
+/// position.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setstickerpositioninset).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetStickerPositionInSet {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    sticker: String,
+    position: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for SetStickerPositionInSet {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setStickerPositionInSet", &self)
+            .await
+    }
+}
+
+impl SetStickerPositionInSet {
+    pub(crate) fn new<S>(bot: Bot, sticker: S, position: i32) -> Self
+    where
+        S: Into<String>,
+    {
+        let sticker = sticker.into();
+        Self { bot, sticker, position }
+    }
+
+    /// File identifier of the sticker.
+    pub fn sticker<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.sticker = val.into();
+        self
+    }
+
+    /// New sticker position in the set, zero-based.
+    pub fn position(mut self, val: i32) -> Self {
+        self.position = val;
+        self
+    }
+}
diff --git a/src/requests/all/set_sticker_set_thumb.rs b/src/requests/all/set_sticker_set_thumb.rs
new file mode 100644
index 00000000..1f84aacd
--- /dev/null
+++ b/src/requests/all/set_sticker_set_thumb.rs
@@ -0,0 +1,73 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InputFile, True},
+    Bot,
+};
+
+/// Use this method to set the thumbnail of a sticker set. Animated thumbnails
+/// can be set for animated sticker sets only.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setstickersetthumb).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetStickerSetThumb {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    name: String,
+    user_id: i32,
+    thumb: Option<InputFile>,
+}
+
+#[async_trait::async_trait]
+impl Request for SetStickerSetThumb {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<Self::Output> {
+        net::request_json(self.bot.client(), self.bot.token(), "setStickerSetThumb", &self).await
+    }
+}
+
+impl SetStickerSetThumb {
+    pub(crate) fn new<S>(bot: Bot, name: S, user_id: i32) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { bot, name: name.into(), user_id, thumb: None }
+    }
+
+    /// Sticker set name.
+    pub fn name<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+
+    /// User identifier of the sticker set owner.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// A PNG image with the thumbnail, must be up to 128 kilobytes in size and
+    /// have width and height exactly 100px, or a TGS animation with the
+    /// thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements
+    /// for animated sticker technical requirements.
+    ///
+    /// Pass [`InputFile::FileId`] as a String to send a file that already
+    /// exists on the Telegram servers, pass [`InputFile::Url`] for Telegram
+    /// to get a file from the Internet, or upload a new one using
+    /// multipart/form-data. More info on Sending Files ». Animated sticker
+    /// set thumbnail can't be uploaded via HTTP URL.
+    ///
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [`InputFile::Url]: crate::types::InputFile::Url
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/set_webhook.rs b/src/requests/all/set_webhook.rs
new file mode 100644
index 00000000..c2aff792
--- /dev/null
+++ b/src/requests/all/set_webhook.rs
@@ -0,0 +1,114 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{AllowedUpdate, InputFile, True},
+    Bot,
+};
+
+/// Use this method to specify a url and receive incoming updates via an
+/// outgoing webhook.
+///
+/// Whenever there is an update for the bot, we will send an
+/// HTTPS POST request to the specified url, containing a JSON-serialized
+/// [`Update`]. In case of an unsuccessful request, we will give up after a
+/// reasonable amount of attempts.
+///
+/// If you'd like to make sure that the Webhook request comes from Telegram,
+/// we recommend using a secret path in the URL, e.g.
+/// `https://www.example.com/<token>`. Since nobody else knows your bot‘s
+/// token, you can be pretty sure it’s us.
+///
+/// [The official docs](https://core.telegram.org/bots/api#setwebhook).
+///
+/// [`Update`]: crate::types::Update
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct SetWebhook {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    url: String,
+    certificate: Option<InputFile>,
+    max_connections: Option<i32>,
+    allowed_updates: Option<Vec<AllowedUpdate>>,
+}
+
+#[async_trait::async_trait]
+impl Request for SetWebhook {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "setWebhook", &self).await
+    }
+}
+
+impl SetWebhook {
+    pub(crate) fn new<U>(bot: Bot, url: U) -> Self
+    where
+        U: Into<String>,
+    {
+        let url = url.into();
+        Self { bot, url, certificate: None, max_connections: None, allowed_updates: None }
+    }
+
+    /// HTTPS url to send updates to.
+    ///
+    /// Use an empty string to remove webhook integration.
+    pub fn url<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.url = val.into();
+        self
+    }
+
+    /// Upload your public key certificate so that the root certificate in use
+    /// can be checked.
+    ///
+    /// See our [self-signed guide] for details.
+    ///
+    /// [self-signed guide]: https://core.telegram.org/bots/self-signed
+    pub fn certificate(mut self, val: InputFile) -> Self {
+        self.certificate = Some(val);
+        self
+    }
+
+    /// Maximum allowed number of simultaneous HTTPS connections to the webhook
+    /// for update delivery, 1-100.
+    ///
+    /// Defaults to 40. Use lower values to limit the load on your bot‘s server,
+    /// and higher values to increase your bot’s throughput.
+    pub fn max_connections(mut self, val: i32) -> Self {
+        self.max_connections = Some(val);
+        self
+    }
+
+    /// List the types of updates you want your bot to receive.
+    ///
+    /// For example, specify [`AllowedUpdate::Message`],
+    /// [`AllowedUpdate::EditedChannelPost`], [`AllowedUpdate::CallbackQuery`]
+    /// to only receive updates of these types. Specify an empty list to receive
+    /// all updates regardless of type (default). If not specified, the
+    /// previous setting will be used. See [`AllowedUpdate`] for a complete list
+    /// of available update types.
+    ///
+    /// Please note that this parameter doesn't affect updates created before
+    /// the call to the [`Bot::set_webhook`], so unwanted updates may be
+    /// received for a short period of time.
+    ///
+    /// [`Bot::set_webhook`]: crate::Bot::set_webhook
+    /// [`AllowedUpdate::Message`]: crate::types::AllowedUpdate::Message
+    /// [`AllowedUpdate::EditedChannelPost`]:
+    /// crate::types::AllowedUpdate::EditedChannelPost
+    /// [`AllowedUpdate::CallbackQuery`]:
+    /// crate::types::AllowedUpdate::CallbackQuery
+    /// [`AllowedUpdate`]: crate::types::AllowedUpdate
+    pub fn allowed_updates<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<AllowedUpdate>>,
+    {
+        self.allowed_updates = Some(val.into());
+        self
+    }
+}
diff --git a/src/requests/all/stop_inline_message_live_location.rs b/src/requests/all/stop_inline_message_live_location.rs
new file mode 100644
index 00000000..40fb5604
--- /dev/null
+++ b/src/requests/all/stop_inline_message_live_location.rs
@@ -0,0 +1,62 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{InlineKeyboardMarkup, Message},
+    Bot,
+};
+
+/// Use this method to stop updating a live location message (sent via the bot)
+/// before `live_period` expires.
+///
+/// On success, [`True`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
+///
+/// [`True`]: crate::types::True
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct StopInlineMessageLiveLocation {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    inline_message_id: String,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for StopInlineMessageLiveLocation {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "stopMessageLiveLocation", &self)
+            .await
+    }
+}
+
+impl StopInlineMessageLiveLocation {
+    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
+    where
+        I: Into<String>,
+    {
+        let inline_message_id = inline_message_id.into();
+        Self { bot, inline_message_id, reply_markup: None }
+    }
+
+    /// Identifier of the inline message.
+    pub fn inline_message_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.inline_message_id = val.into();
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/stop_message_live_location.rs b/src/requests/all/stop_message_live_location.rs
new file mode 100644
index 00000000..892492ea
--- /dev/null
+++ b/src/requests/all/stop_message_live_location.rs
@@ -0,0 +1,70 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Message},
+    Bot,
+};
+
+/// Use this method to stop updating a live location message before
+/// `live_period` expires.
+///
+/// On success, the sent [`Message`] is returned.
+///
+/// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct StopMessageLiveLocation {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for StopMessageLiveLocation {
+    type Output = Message;
+
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_json(self.bot.client(), self.bot.token(), "stopMessageLiveLocation", &self)
+            .await
+    }
+}
+
+impl StopMessageLiveLocation {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the message to edit
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/stop_poll.rs b/src/requests/all/stop_poll.rs
new file mode 100644
index 00000000..946b4760
--- /dev/null
+++ b/src/requests/all/stop_poll.rs
@@ -0,0 +1,66 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, InlineKeyboardMarkup, Poll},
+    Bot,
+};
+
+/// Use this method to stop a poll which was sent by the bot.
+///
+/// [The official docs](https://core.telegram.org/bots/api#stoppoll).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct StopPoll {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    message_id: i32,
+    reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+#[async_trait::async_trait]
+impl Request for StopPoll {
+    type Output = Poll;
+
+    /// On success, the stopped [`Poll`] with the final results is returned.
+    ///
+    /// [`Poll`]: crate::types::Poll
+    async fn send(&self) -> ResponseResult<Poll> {
+        net::request_json(self.bot.client(), self.bot.token(), "stopPoll", &self).await
+    }
+}
+impl StopPoll {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, message_id, reply_markup: None }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Identifier of the original message with the poll.
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    /// A JSON-serialized object for a new [inline keyboard].
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/requests/all/unban_chat_member.rs b/src/requests/all/unban_chat_member.rs
new file mode 100644
index 00000000..5aee625c
--- /dev/null
+++ b/src/requests/all/unban_chat_member.rs
@@ -0,0 +1,58 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to unban a previously kicked user in a supergroup or
+/// channel. The user will **not** return to the group or channel automatically,
+/// but will be able to join via link, etc. The bot must be an administrator for
+/// this to work.
+///
+/// [The official docs](https://core.telegram.org/bots/api#unbanchatmember).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct UnbanChatMember {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+    user_id: i32,
+}
+
+#[async_trait::async_trait]
+impl Request for UnbanChatMember {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "unbanChatMember", &self).await
+    }
+}
+
+impl UnbanChatMember {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id, user_id }
+    }
+
+    /// Unique identifier for the target group or username of the target
+    /// supergroup or channel (in the format `@username`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    /// Unique identifier of the target user.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+}
diff --git a/src/requests/all/unpin_chat_message.rs b/src/requests/all/unpin_chat_message.rs
new file mode 100644
index 00000000..15e76a99
--- /dev/null
+++ b/src/requests/all/unpin_chat_message.rs
@@ -0,0 +1,52 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{ChatId, True},
+    Bot,
+};
+
+/// Use this method to unpin a message in a group, a supergroup, or a channel.
+///
+/// The bot must be an administrator in the chat for this to work and must have
+/// the `can_pin_messages` admin right in the supergroup or `can_edit_messages`
+/// admin right in the channel.
+///
+/// [The official docs](https://core.telegram.org/bots/api#unpinchatmessage).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct UnpinChatMessage {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    chat_id: ChatId,
+}
+
+#[async_trait::async_trait]
+impl Request for UnpinChatMessage {
+    type Output = True;
+
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_json(self.bot.client(), self.bot.token(), "unpinChatMessage", &self).await
+    }
+}
+
+impl UnpinChatMessage {
+    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        let chat_id = chat_id.into();
+        Self { bot, chat_id }
+    }
+
+    /// Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`).
+    pub fn chat_id<T>(mut self, val: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+}
diff --git a/src/requests/all/upload_sticker_file.rs b/src/requests/all/upload_sticker_file.rs
new file mode 100644
index 00000000..b09b143f
--- /dev/null
+++ b/src/requests/all/upload_sticker_file.rs
@@ -0,0 +1,55 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{Request, ResponseResult},
+    types::{File, InputFile},
+    Bot,
+};
+
+/// Use this method to upload a .png file with a sticker for later use in
+/// [`Bot::create_new_sticker_set`] and [`Bot::add_sticker_to_set`] methods (can
+/// be used multiple times).
+///
+/// [The official docs](https://core.telegram.org/bots/api#uploadstickerfile).
+///
+/// [`Bot::create_new_sticker_set`]: crate::Bot::create_new_sticker_set
+/// [`Bot::add_sticker_to_set`]: crate::Bot::add_sticker_to_set
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
+pub struct UploadStickerFile {
+    #[serde(skip_serializing)]
+    bot: Bot,
+    user_id: i32,
+    png_sticker: InputFile,
+}
+#[async_trait::async_trait]
+impl Request for UploadStickerFile {
+    type Output = File;
+
+    async fn send(&self) -> ResponseResult<File> {
+        net::request_json(self.bot.client(), self.bot.token(), "uploadStickerFile", &self).await
+    }
+}
+
+impl UploadStickerFile {
+    pub(crate) fn new(bot: Bot, user_id: i32, png_sticker: InputFile) -> Self {
+        Self { bot, user_id, png_sticker }
+    }
+
+    /// User identifier of sticker file owner.
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = val;
+        self
+    }
+
+    /// **Png** image with the sticker, must be up to 512 kilobytes in size,
+    /// dimensions must not exceed 512px, and either width or height must be
+    /// exactly 512px. [More info on Sending Files »].
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    pub fn png_sticker(mut self, val: InputFile) -> Self {
+        self.png_sticker = val;
+        self
+    }
+}
diff --git a/src/requests/form_builder.rs b/src/requests/form_builder.rs
new file mode 100644
index 00000000..3c7f70b9
--- /dev/null
+++ b/src/requests/form_builder.rs
@@ -0,0 +1,156 @@
+use std::{borrow::Cow, path::PathBuf};
+
+use reqwest::multipart::Form;
+
+use crate::{
+    requests::utils::{file_from_memory_to_part, file_to_part},
+    types::{
+        ChatId, InlineKeyboardMarkup, InputFile, InputMedia, MaskPosition, ParseMode, ReplyMarkup,
+    },
+};
+
+/// This is a convenient struct that builds `reqwest::multipart::Form`
+/// from scratch.
+pub(crate) struct FormBuilder {
+    form: Form,
+}
+
+impl FormBuilder {
+    pub(crate) fn new() -> Self {
+        Self { form: Form::new() }
+    }
+
+    pub fn add_text<'a, T, N>(self, name: N, value: &T) -> Self
+    where
+        N: Into<Cow<'a, str>>,
+        T: IntoFormText,
+    {
+        match value.into_form_text() {
+            Some(val) => Self { form: self.form.text(name.into().into_owned(), val) },
+            None => self,
+        }
+    }
+
+    pub async fn add_input_file<'a, N>(self, name: N, value: &InputFile) -> tokio::io::Result<Self>
+    where
+        N: Into<Cow<'a, str>>,
+    {
+        Ok(match value {
+            InputFile::File(path) => self.add_file(name, path.clone()).await?,
+            InputFile::Memory { file_name, data } => {
+                self.add_file_from_memory(name, file_name.clone(), data.clone())
+            }
+            InputFile::Url(url) => self.add_text(name, url),
+            InputFile::FileId(file_id) => self.add_text(name, file_id),
+        })
+    }
+
+    // used in SendMediaGroup
+    pub async fn add_file<'a, N>(self, name: N, path_to_file: PathBuf) -> tokio::io::Result<Self>
+    where
+        N: Into<Cow<'a, str>>,
+    {
+        Ok(Self {
+            form: self.form.part(name.into().into_owned(), file_to_part(path_to_file).await?),
+        })
+    }
+
+    fn add_file_from_memory<'a, N>(
+        self,
+        name: N,
+        file_name: String,
+        data: Cow<'static, [u8]>,
+    ) -> Self
+    where
+        N: Into<Cow<'a, str>>,
+    {
+        Self {
+            form: self
+                .form
+                .part(name.into().into_owned(), file_from_memory_to_part(data, file_name)),
+        }
+    }
+
+    pub fn build(self) -> Form {
+        self.form
+    }
+}
+
+pub(crate) trait IntoFormText {
+    fn into_form_text(&self) -> Option<String>;
+}
+
+macro_rules! impl_for_struct {
+    ($($name:ty),*) => {
+        $(
+            impl IntoFormText for $name {
+                fn into_form_text(&self) -> Option<String> {
+                    let json = serde_json::to_string(self)
+                        .expect("serde_json::to_string failed");
+                    Some(json)
+                }
+            }
+        )*
+    };
+}
+
+impl_for_struct!(bool, i32, i64, u32, ReplyMarkup, InlineKeyboardMarkup, MaskPosition);
+
+impl<T> IntoFormText for Option<T>
+where
+    T: IntoFormText,
+{
+    fn into_form_text(&self) -> Option<String> {
+        self.as_ref().and_then(IntoFormText::into_form_text)
+    }
+}
+
+// TODO: fix InputMedia implementation of IntoFormValue (for now it doesn't
+// encode files :|)
+impl IntoFormText for Vec<InputMedia> {
+    fn into_form_text(&self) -> Option<String> {
+        let json = serde_json::to_string(self).expect("serde_json::to_string failed");
+        Some(json)
+    }
+}
+
+impl IntoFormText for InputMedia {
+    fn into_form_text(&self) -> Option<String> {
+        let json = serde_json::to_string(self).expect("serde_json::to_string failed");
+        Some(json)
+    }
+}
+
+impl IntoFormText for str {
+    fn into_form_text(&self) -> Option<String> {
+        Some(self.to_owned())
+    }
+}
+
+impl IntoFormText for ParseMode {
+    fn into_form_text(&self) -> Option<String> {
+        let string = match self {
+            ParseMode::MarkdownV2 => String::from("MarkdownV2"),
+            ParseMode::HTML => String::from("HTML"),
+            #[allow(deprecated)]
+            ParseMode::Markdown => String::from("Markdown"),
+        };
+        Some(string)
+    }
+}
+
+impl IntoFormText for ChatId {
+    fn into_form_text(&self) -> Option<String> {
+        let string = match self {
+            ChatId::Id(id) => id.to_string(),
+            ChatId::ChannelUsername(username) => username.clone(),
+        };
+        Some(string)
+    }
+}
+
+impl IntoFormText for String {
+    fn into_form_text(&self) -> Option<String> {
+        Some(self.clone())
+    }
+}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
new file mode 100644
index 00000000..09f2af6c
--- /dev/null
+++ b/src/requests/mod.rs
@@ -0,0 +1,32 @@
+//! API requests.
+
+mod all;
+mod form_builder;
+mod utils;
+
+pub use all::*;
+
+/// A type that is returned after making a request to Telegram.
+pub type ResponseResult<T> = Result<T, crate::RequestError>;
+
+/// Designates an API request.
+#[async_trait::async_trait]
+pub trait Request {
+    /// A data structure returned if success.
+    type Output;
+
+    /// Asynchronously sends this request to Telegram and returns the result.
+    async fn send(&self) -> ResponseResult<Self::Output>;
+}
+
+/// Designates an API request with possibly sending file.
+#[async_trait::async_trait]
+pub trait RequestWithFile {
+    /// A data structure returned if success.
+    type Output;
+
+    /// Asynchronously sends this request to Telegram and returns the result.
+    /// Returns `tokio::io::Result::Err` when trying to send file which does not
+    /// exists.
+    async fn send(&self) -> tokio::io::Result<ResponseResult<Self::Output>>;
+}
diff --git a/src/requests/utils.rs b/src/requests/utils.rs
new file mode 100644
index 00000000..f10c9dc5
--- /dev/null
+++ b/src/requests/utils.rs
@@ -0,0 +1,31 @@
+use std::{borrow::Cow, path::PathBuf};
+
+use bytes::{Bytes, BytesMut};
+use reqwest::{multipart::Part, Body};
+use tokio_util::codec::{Decoder, FramedRead};
+
+struct FileDecoder;
+
+impl Decoder for FileDecoder {
+    type Item = Bytes;
+    type Error = std::io::Error;
+
+    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        if src.is_empty() {
+            return Ok(None);
+        }
+        Ok(Some(src.split().freeze()))
+    }
+}
+
+pub async fn file_to_part(path_to_file: PathBuf) -> std::io::Result<Part> {
+    let file_name = path_to_file.file_name().unwrap().to_string_lossy().into_owned();
+
+    let file = FramedRead::new(tokio::fs::File::open(path_to_file).await?, FileDecoder);
+
+    Ok(Part::stream(Body::wrap_stream(file)).file_name(file_name))
+}
+
+pub fn file_from_memory_to_part(data: Cow<'static, [u8]>, name: String) -> Part {
+    Part::bytes(data).file_name(name)
+}
diff --git a/src/types/allowed_update.rs b/src/types/allowed_update.rs
new file mode 100644
index 00000000..f3b920ac
--- /dev/null
+++ b/src/types/allowed_update.rs
@@ -0,0 +1,14 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum AllowedUpdate {
+    Message,
+    EditedMessage,
+    ChannelPost,
+    EditedChannelPost,
+    InlineQuery,
+    ChosenInlineResult,
+    CallbackQuery,
+}
diff --git a/src/types/animation.rs b/src/types/animation.rs
new file mode 100644
index 00000000..dc52901c
--- /dev/null
+++ b/src/types/animation.rs
@@ -0,0 +1,165 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{MimeWrapper, PhotoSize};
+
+/// This object represents an animation file (GIF or H.264/MPEG-4 AVC video
+/// without sound).
+///
+/// [The official docs](https://core.telegram.org/bots/api#animation).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Animation {
+    /// An identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// A video width as defined by a sender.
+    pub width: u32,
+
+    /// A video height as defined by a sender.
+    pub height: u32,
+
+    /// A duration of the video in seconds as defined by a sender.
+    pub duration: u32,
+
+    /// An animation thumbnail as defined by a sender.
+    pub thumb: Option<PhotoSize>,
+
+    /// An original animation filename as defined by a sender.
+    pub file_name: Option<String>,
+
+    /// A MIME type of the file as defined by a sender.
+    pub mime_type: Option<MimeWrapper>,
+
+    /// A size of a file.
+    pub file_size: Option<u32>,
+}
+
+impl Animation {
+    pub fn new<S1, S2>(
+        file_id: S1,
+        file_unique_id: S2,
+        width: u32,
+        height: u32,
+        duration: u32,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            width,
+            height,
+            duration,
+            thumb: None,
+            file_name: None,
+            mime_type: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn width(mut self, val: u32) -> Self {
+        self.width = val;
+        self
+    }
+
+    pub fn height(mut self, val: u32) -> Self {
+        self.height = val;
+        self
+    }
+
+    pub fn duration(mut self, val: u32) -> Self {
+        self.duration = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn file_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_name = Some(val.into());
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{
+        "file_id":"id",
+        "file_unique_id":"",
+        "width":320,
+        "height":320,
+        "duration":59,
+        "thumb":{
+            "file_id":"id",
+            "file_unique_id":"",
+            "width":320,
+            "height":320,
+            "file_size":3452
+        },
+        "file_name":"some",
+        "mime_type":"video/gif",
+        "file_size":6500}"#;
+        let expected = Animation {
+            file_id: "id".to_string(),
+            file_unique_id: "".to_string(),
+            width: 320,
+            height: 320,
+            duration: 59,
+            thumb: Some(PhotoSize {
+                file_id: "id".to_string(),
+                file_unique_id: "".to_string(),
+                width: 320,
+                height: 320,
+                file_size: Some(3452),
+            }),
+            file_name: Some("some".to_string()),
+            mime_type: Some(MimeWrapper("video/gif".parse().unwrap())),
+            file_size: Some(6500),
+        };
+        let actual = serde_json::from_str::<Animation>(json).unwrap();
+        assert_eq!(actual, expected)
+    }
+}
diff --git a/src/types/audio.rs b/src/types/audio.rs
new file mode 100644
index 00000000..d5599c20
--- /dev/null
+++ b/src/types/audio.rs
@@ -0,0 +1,152 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{MimeWrapper, PhotoSize};
+
+/// This object represents an audio file to be treated as music by the Telegram
+/// clients.
+///
+/// [The official docs](https://core.telegram.org/bots/api#audio).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Audio {
+    /// An identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// A duration of the audio in seconds as defined by a sender.
+    pub duration: u32,
+
+    /// A performer of the audio as defined by a sender or by audio tags.
+    pub performer: Option<String>,
+
+    /// A title of the audio as defined by sender or by audio tags.
+    pub title: Option<String>,
+
+    /// A MIME type of the file as defined by a sender.
+    pub mime_type: Option<MimeWrapper>,
+
+    /// A size of a file.
+    pub file_size: Option<u32>,
+
+    /// A thumbnail of the album cover to which the music file belongs.
+    pub thumb: Option<PhotoSize>,
+}
+
+impl Audio {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, duration: u32) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            duration,
+            performer: None,
+            title: None,
+            mime_type: None,
+            file_size: None,
+            thumb: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn duration(mut self, val: u32) -> Self {
+        self.duration = val;
+        self
+    }
+
+    pub fn performer<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.performer = Some(val.into());
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{
+            "file_id":"id",
+            "file_unique_id":"",
+            "duration":60,
+            "performer":"Performer",
+            "title":"Title",
+            "mime_type":"application/zip",
+            "file_size":123456,
+            "thumb":{
+                "file_id":"id",
+                "file_unique_id":"",
+                "width":320,
+                "height":320,
+                "file_size":3452
+            }
+        }"#;
+        let expected = Audio {
+            file_id: "id".to_string(),
+            file_unique_id: "".to_string(),
+            duration: 60,
+            performer: Some("Performer".to_string()),
+            title: Some("Title".to_string()),
+            mime_type: Some(serde_json::from_str("\"application/zip\"").unwrap()),
+            file_size: Some(123_456),
+            thumb: Some(PhotoSize {
+                file_id: "id".to_string(),
+                file_unique_id: "".to_string(),
+                width: 320,
+                height: 320,
+                file_size: Some(3452),
+            }),
+        };
+        let actual = serde_json::from_str::<Audio>(&json).unwrap();
+        assert_eq!(actual, expected)
+    }
+}
diff --git a/src/types/bot_command.rs b/src/types/bot_command.rs
new file mode 100644
index 00000000..d3116dff
--- /dev/null
+++ b/src/types/bot_command.rs
@@ -0,0 +1,42 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a bot command.
+///
+/// [The official docs](https://core.telegram.org/bots/api#botcommand).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct BotCommand {
+    /// Text of the command, 1-32 characters.
+    ///
+    /// Can contain only lowercase English letters, digits and underscores.
+    pub command: String,
+
+    /// Description of the command, 3-256 characters.
+    pub description: String,
+}
+
+impl BotCommand {
+    pub fn new<S1, S2>(command: S1, description: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self { command: command.into(), description: description.into() }
+    }
+
+    pub fn command<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.command = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+}
diff --git a/src/types/callback_game.rs b/src/types/callback_game.rs
new file mode 100644
index 00000000..5b2d6e0f
--- /dev/null
+++ b/src/types/callback_game.rs
@@ -0,0 +1,13 @@
+/// A placeholder, currently holds no information. Use [@BotFather](https://t.me/botfather) to set up your game.
+///
+/// [The official docs](https://core.telegram.org/bots/api#callbackgame).
+use serde::{Deserialize, Serialize};
+
+/// A placeholder, currently holds no information.
+///
+/// Use [@Botfather] to set up your game.
+///
+/// [@Botfather]:  https://t.me/botfather
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct CallbackGame;
diff --git a/src/types/callback_query.rs b/src/types/callback_query.rs
new file mode 100644
index 00000000..d8c1d07c
--- /dev/null
+++ b/src/types/callback_query.rs
@@ -0,0 +1,158 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Message, User};
+
+/// This object represents an incoming callback query from a callback button in
+/// an [inline keyboard].
+///
+/// If the button that originated the query was attached to a message sent by
+/// the bot, the field message will be present. If the button was attached to a
+/// message sent via the bot (in [inline mode]), the field `inline_message_id`
+/// will be present. Exactly one of the fields data or `game_short_name` will be
+/// present.
+///
+/// [The official docs](https://core.telegram.org/bots/api#callbackquery).
+///
+/// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+/// [inline mode]: https://core.telegram.org/bots/api#inline-mode
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct CallbackQuery {
+    /// An unique identifier for this query.
+    pub id: String,
+
+    /// A sender.
+    pub from: User,
+
+    /// A message with the callback button that originated the query. Note that
+    /// message content and message date will not be available if the message
+    /// is too old.
+    pub message: Option<Message>,
+
+    /// An identifier of the message sent via the bot in inline mode, that
+    /// originated the query.
+    pub inline_message_id: Option<String>,
+
+    /// A global identifier, uniquely corresponding to the chat to which the
+    /// message with the callback button was sent. Useful for high scores in
+    /// [games].
+    ///
+    /// [games]: https://core.telegram.org/bots/api#games
+    pub chat_instance: String,
+
+    /// A data associated with the callback button. Be aware that a bad client
+    /// can send arbitrary data in this field.
+    pub data: Option<String>,
+
+    /// A short name of a Game to be returned, serves as the unique identifier
+    /// for the game.
+    pub game_short_name: Option<String>,
+}
+
+impl CallbackQuery {
+    pub fn new<S1, S2>(id: S1, from: User, chat_instance: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            from,
+            message: None,
+            inline_message_id: None,
+            chat_instance: chat_instance.into(),
+            data: None,
+            game_short_name: None,
+        }
+    }
+
+    pub fn id<S>(mut self, id: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = id.into();
+        self
+    }
+
+    pub fn from(mut self, val: User) -> Self {
+        self.from = val;
+        self
+    }
+
+    pub fn message(mut self, val: Message) -> Self {
+        self.message = Some(val);
+        self
+    }
+
+    pub fn inline_message_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.inline_message_id = Some(val.into());
+        self
+    }
+
+    pub fn chat_instance<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.chat_instance = val.into();
+        self
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = Some(val.into());
+        self
+    }
+
+    pub fn game_short_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.game_short_name = Some(val.into());
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{
+            "id":"id",
+            "from":{
+                "id":12345,
+                "is_bot":false,
+                "first_name":"firstName"
+            },
+            "inline_message_id":"i_m_id",
+            "chat_instance":"123456",
+            "data":"some_data",
+            "game_short_name":"game_name"
+        }"#;
+        let expected = CallbackQuery {
+            id: "id".to_string(),
+            from: User {
+                id: 12345,
+                is_bot: false,
+                first_name: "firstName".to_string(),
+                last_name: None,
+                username: None,
+                language_code: None,
+            },
+            chat_instance: "123456".to_string(),
+            message: None,
+            inline_message_id: Some("i_m_id".to_string()),
+            data: Some("some_data".to_string()),
+            game_short_name: Some("game_name".to_string()),
+        };
+        let actual = serde_json::from_str::<CallbackQuery>(json).unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/src/types/chat.rs b/src/types/chat.rs
new file mode 100644
index 00000000..04c1bd49
--- /dev/null
+++ b/src/types/chat.rs
@@ -0,0 +1,353 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{ChatPermissions, ChatPhoto, Message};
+
+/// This object represents a chat.
+///
+/// [The official docs](https://core.telegram.org/bots/api#chat).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Chat {
+    /// A unique identifier for this chat. This number may be greater than 32
+    /// bits and some programming languages may have difficulty/silent defects
+    /// in interpreting it. But it is smaller than 52 bits, so a signed 64 bit
+    /// integer or double-precision float type are safe for storing this
+    /// identifier.
+    pub id: i64,
+
+    #[serde(flatten)]
+    pub kind: ChatKind,
+
+    /// A chat photo. Returned only in [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub photo: Option<ChatPhoto>,
+}
+
+impl Chat {
+    pub fn new(id: i64, kind: ChatKind) -> Self {
+        Self { id, kind, photo: None }
+    }
+
+    pub fn id(mut self, val: i64) -> Self {
+        self.id = val;
+        self
+    }
+
+    pub fn kind(mut self, val: ChatKind) -> Self {
+        self.kind = val;
+        self
+    }
+
+    pub fn photo(mut self, val: ChatPhoto) -> Self {
+        self.photo = Some(val);
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum ChatKind {
+    Public(ChatPublic),
+    Private(ChatPrivate),
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChatPublic {
+    /// A title, for supergroups, channels and group chats.
+    pub title: Option<String>,
+
+    #[serde(flatten)]
+    pub kind: PublicChatKind,
+
+    /// A description, for groups, supergroups and channel chats. Returned
+    /// only in [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub description: Option<String>,
+
+    /// A chat invite link, for groups, supergroups and channel chats. Each
+    /// administrator in a chat generates their own invite links, so the
+    /// bot must first generate the link using
+    /// [`Bot::export_chat_invite_link`]. Returned only in
+    /// [`Bot::get_chat`].
+    ///
+    /// [`Bot::export_chat_invite_link`]:
+    /// crate::Bot::export_chat_invite_link
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub invite_link: Option<String>,
+
+    /// Pinned message, for groups, supergroups and channels. Returned only
+    /// in [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub pinned_message: Option<Box<Message>>,
+}
+
+impl ChatPublic {
+    pub fn new(kind: PublicChatKind) -> Self {
+        Self { title: None, kind, description: None, invite_link: None, pinned_message: None }
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn invite_link<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.invite_link = Some(val.into());
+        self
+    }
+
+    pub fn pinned_message(mut self, val: Message) -> Self {
+        self.pinned_message = Some(Box::new(val));
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChatPrivate {
+    /// A dummy field. Used to ensure that the `type` field is equal to
+    /// `private`.
+    #[serde(rename = "type")]
+    #[serde(deserialize_with = "assert_private_field")]
+    pub type_: (),
+
+    /// A username, for private chats, supergroups and channels if
+    /// available.
+    pub username: Option<String>,
+
+    /// A first name of the other party in a private chat.
+    pub first_name: Option<String>,
+
+    /// A last name of the other party in a private chat.
+    pub last_name: Option<String>,
+}
+
+impl ChatPrivate {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn username<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.username = Some(val.into());
+        self
+    }
+
+    pub fn first_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.first_name = Some(val.into());
+        self
+    }
+
+    pub fn last_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+#[non_exhaustive]
+pub enum PublicChatKind {
+    Channel(PublicChatChannel),
+    Group(PublicChatGroup),
+    Supergroup(PublicChatSupergroup),
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PublicChatChannel {
+    /// A username, for private chats, supergroups and channels if available.
+    pub username: Option<String>,
+}
+
+impl PublicChatChannel {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PublicChatGroup {
+    /// A default chat member permissions, for groups and supergroups. Returned
+    /// only from [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub permissions: Option<ChatPermissions>,
+}
+
+impl PublicChatGroup {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PublicChatSupergroup {
+    /// A username, for private chats, supergroups and channels if
+    /// available.
+    pub username: Option<String>,
+
+    /// For supergroups, name of group sticker set. Returned only from
+    /// [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub sticker_set_name: Option<String>,
+
+    /// `true`, if the bot can change the group sticker set. Returned only
+    /// from [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub can_set_sticker_set: Option<bool>,
+
+    /// A default chat member permissions, for groups and supergroups.
+    /// Returned only from [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub permissions: Option<ChatPermissions>,
+
+    /// The minimum allowed delay between consecutive messages sent by each
+    /// unpriviledged user. Returned only from [`Bot::get_chat`].
+    ///
+    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    pub slow_mode_delay: Option<i32>,
+}
+
+impl PublicChatSupergroup {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+struct PrivateChatKindVisitor;
+
+impl<'de> serde::de::Visitor<'de> for PrivateChatKindVisitor {
+    type Value = ();
+
+    fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, r#"field equal to "private""#)
+    }
+
+    fn visit_borrowed_str<E: serde::de::Error>(self, v: &'de str) -> Result<Self::Value, E> {
+        match v {
+            "private" => Ok(()),
+            _ => Err(E::invalid_value(serde::de::Unexpected::Str(v), &r#""private""#)),
+        }
+    }
+}
+
+fn assert_private_field<'de, D>(des: D) -> Result<(), D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    des.deserialize_str(PrivateChatKindVisitor)
+}
+
+impl Chat {
+    pub fn is_private(&self) -> bool {
+        matches!(self.kind, ChatKind::Private(_))
+    }
+    pub fn is_group(&self) -> bool {
+        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Group(_), .. }))
+    }
+    pub fn is_supergroup(&self) -> bool {
+        matches!(
+            self.kind,
+            ChatKind::Public(ChatPublic { kind: PublicChatKind::Supergroup(_), .. })
+        )
+    }
+    pub fn is_channel(&self) -> bool {
+        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Channel(_), .. }))
+    }
+
+    pub fn is_chat(&self) -> bool {
+        self.is_private() || self.is_group() || self.is_supergroup()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::from_str;
+
+    use crate::types::*;
+
+    #[test]
+    fn channel_de() {
+        let expected = Chat {
+            id: -1,
+            kind: ChatKind::Public(ChatPublic {
+                title: None,
+                kind: PublicChatKind::Channel(PublicChatChannel {
+                    username: Some("channelname".into()),
+                }),
+                description: None,
+                invite_link: None,
+                pinned_message: None,
+            }),
+            photo: None,
+        };
+        let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn private_chat_de() {
+        assert_eq!(
+            Chat {
+                id: 0,
+                kind: ChatKind::Private(ChatPrivate {
+                    type_: (),
+                    username: Some("username".into()),
+                    first_name: Some("Anon".into()),
+                    last_name: None,
+                }),
+                photo: None,
+            },
+            from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
+                .unwrap()
+        );
+    }
+
+    #[test]
+    fn private_chat_de_wrong_type_field() {
+        assert!(from_str::<Chat>(r#"{"id":0,"type":"WRONG"}"#).is_err());
+    }
+}
diff --git a/src/types/chat_action.rs b/src/types/chat_action.rs
new file mode 100644
index 00000000..9c112a56
--- /dev/null
+++ b/src/types/chat_action.rs
@@ -0,0 +1,17 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum ChatAction {
+    Typing,
+    UploadPhoto,
+    RecordVideo,
+    UploadVideo,
+    RecordAudio,
+    UploadAudio,
+    UploadDocument,
+    FindLocation,
+    RecordVideoNote,
+    UploadVideoNote,
+}
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
new file mode 100644
index 00000000..f5723da0
--- /dev/null
+++ b/src/types/chat_id.rs
@@ -0,0 +1,39 @@
+use derive_more::{Display, From};
+use serde::{Deserialize, Serialize};
+
+/// A unique identifier for the target chat or username of the target channel
+/// (in the format `@channelusername`).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum ChatId {
+    /// A chat identifier.
+    #[display(fmt = "{}", _0)]
+    Id(i64),
+
+    /// A channel username (in the format @channelusername).
+    #[display(fmt = "{}", _0)]
+    ChannelUsername(String),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn chat_id_id_serialization() {
+        let expected_json = String::from(r#"123456"#);
+        let actual_json = serde_json::to_string(&ChatId::Id(123_456)).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+
+    #[test]
+    fn chat_id_channel_username_serialization() {
+        let expected_json = String::from(r#""@username""#);
+        let actual_json =
+            serde_json::to_string(&ChatId::ChannelUsername(String::from("@username"))).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+}
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
new file mode 100644
index 00000000..b8e38321
--- /dev/null
+++ b/src/types/chat_member.rs
@@ -0,0 +1,262 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::User;
+
+// TODO: ChatMemberKind?...
+/// This object contains information about one member of the chat.
+///
+/// [The official docs](https://core.telegram.org/bots/api#chatmember).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChatMember {
+    /// Information about the user.
+    pub user: User,
+
+    /// The member's status in the chat.
+    pub status: ChatMemberStatus,
+
+    /// Owner and administrators only. Custom title for this user
+    pub custom_title: Option<String>,
+
+    /// Restricted and kicked only. Date when restrictions will be lifted for
+    /// this user, unix time.
+    pub until_date: Option<i32>,
+
+    /// Administrators only. `true`, if the bot is allowed to edit
+    /// administrator privileges of that user.
+    pub can_be_edited: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can change the chat
+    /// title, photo and other settings.
+    pub can_change_info: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can post in the
+    /// channel, channels only.
+    pub can_post_messages: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can edit messages of
+    /// other users and can pin messages, channels only.
+    pub can_edit_messages: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can delete messages
+    /// of other users.
+    pub can_delete_messages: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can invite new users
+    /// to the chat.
+    pub can_invite_users: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can restrict,
+    /// ban or unban chat members.
+    pub can_restrict_members: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can pin messages,
+    /// supergroups only.
+    pub can_pin_messages: Option<bool>,
+
+    /// Administrators only. `true`, if the administrator can add new
+    /// administrators with a subset of his own privileges or demote
+    /// administrators that he has promoted, directly or indirectly (promoted
+    /// by administrators that were appointed by the user).
+    pub can_promote_members: Option<bool>,
+
+    /// Restricted only. `true`, if the user can send text messages,
+    /// contacts, locations and venues.
+    pub can_send_messages: Option<bool>,
+
+    /// Restricted only. `true`, if the user is allowed to send audios,
+    /// documents, photos, videos, video notes and voice notes.
+    pub can_send_media_messages: Option<bool>,
+
+    /// Restricted only. `true`, if the user is allowed to send animations,
+    /// games, stickers and use inline bots.
+    pub can_send_other_messages: Option<bool>,
+
+    /// Restricted only. `true`, if the user is allowed to add web page
+    /// previews to their messages.
+    pub can_add_web_page_previews: Option<bool>,
+}
+
+impl ChatMember {
+    pub fn new(user: User, status: ChatMemberStatus) -> Self {
+        Self {
+            user,
+            status,
+            custom_title: None,
+            until_date: None,
+            can_be_edited: None,
+            can_change_info: None,
+            can_post_messages: None,
+            can_edit_messages: None,
+            can_delete_messages: None,
+            can_invite_users: None,
+            can_restrict_members: None,
+            can_pin_messages: None,
+            can_promote_members: None,
+            can_send_messages: None,
+            can_send_media_messages: None,
+            can_send_other_messages: None,
+            can_add_web_page_previews: None,
+        }
+    }
+
+    pub fn user(mut self, val: User) -> Self {
+        self.user = val;
+        self
+    }
+
+    pub fn status(mut self, val: ChatMemberStatus) -> Self {
+        self.status = val;
+        self
+    }
+
+    pub fn custom_title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.custom_title = Some(val.into());
+        self
+    }
+
+    pub fn until_date(mut self, val: i32) -> Self {
+        self.until_date = Some(val);
+        self
+    }
+
+    pub fn can_be_edited(mut self, val: bool) -> Self {
+        self.can_be_edited = Some(val);
+        self
+    }
+
+    pub fn can_change_info(mut self, val: bool) -> Self {
+        self.can_change_info = Some(val);
+        self
+    }
+
+    pub fn can_post_messages(mut self, val: bool) -> Self {
+        self.can_post_messages = Some(val);
+        self
+    }
+
+    pub fn can_edit_messages(mut self, val: bool) -> Self {
+        self.can_edit_messages = Some(val);
+        self
+    }
+
+    pub fn can_delete_messages(mut self, val: bool) -> Self {
+        self.can_delete_messages = Some(val);
+        self
+    }
+
+    pub fn can_invite_users(mut self, val: bool) -> Self {
+        self.can_invite_users = Some(val);
+        self
+    }
+
+    pub fn can_restrict_members(mut self, val: bool) -> Self {
+        self.can_restrict_members = Some(val);
+        self
+    }
+
+    pub fn can_pin_messages(mut self, val: bool) -> Self {
+        self.can_pin_messages = Some(val);
+        self
+    }
+
+    pub fn can_promote_members(mut self, val: bool) -> Self {
+        self.can_promote_members = Some(val);
+        self
+    }
+
+    pub fn can_send_messages(mut self, val: bool) -> Self {
+        self.can_send_messages = Some(val);
+        self
+    }
+
+    pub fn can_send_media_messages(mut self, val: bool) -> Self {
+        self.can_send_media_messages = Some(val);
+        self
+    }
+
+    pub fn can_send_other_messages(mut self, val: bool) -> Self {
+        self.can_send_other_messages = Some(val);
+        self
+    }
+
+    pub fn can_add_web_page_previews(mut self, val: bool) -> Self {
+        self.can_add_web_page_previews = Some(val);
+        self
+    }
+}
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ChatMemberStatus {
+    Creator,
+    Administrator,
+    Member,
+    Restricted,
+    Left,
+    Kicked,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{
+            "user":{
+                "id":12345,
+                "is_bot":false,
+                "first_name":"firstName"
+            },
+            "status":"creator",
+            "until_date":123456,
+            "can_be_edited":true,
+            "can_post_messages":true,
+            "can_edit_messages":true,
+            "can_delete_messages":true,
+            "can_restrict_members":true,
+            "can_promote_members":true,
+            "can_change_info":true,
+            "can_invite_users":true,
+            "can_pin_messages":true,
+            "is_member":true,
+            "can_send_messages":true,
+            "can_send_media_messages":true,
+            "can_send_polls":true,
+            "can_send_other_messages":true,
+            "can_add_web_page_previews":true
+        }"#;
+        let expected = ChatMember {
+            user: User {
+                id: 12345,
+                is_bot: false,
+                first_name: "firstName".to_string(),
+                last_name: None,
+                username: None,
+                language_code: None,
+            },
+            status: ChatMemberStatus::Creator,
+            custom_title: None,
+            until_date: Some(123_456),
+            can_be_edited: Some(true),
+            can_change_info: Some(true),
+            can_post_messages: Some(true),
+            can_edit_messages: Some(true),
+            can_delete_messages: Some(true),
+            can_invite_users: Some(true),
+            can_restrict_members: Some(true),
+            can_pin_messages: Some(true),
+            can_promote_members: Some(true),
+            can_send_messages: Some(true),
+            can_send_media_messages: Some(true),
+            can_send_other_messages: Some(true),
+            can_add_web_page_previews: Some(true),
+        };
+        let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
+        assert_eq!(actual, expected)
+    }
+}
diff --git a/src/types/chat_permissions.rs b/src/types/chat_permissions.rs
new file mode 100644
index 00000000..d6db3b6a
--- /dev/null
+++ b/src/types/chat_permissions.rs
@@ -0,0 +1,48 @@
+use serde::{Deserialize, Serialize};
+
+/// Describes actions that a non-administrator user is allowed to take in a
+/// chat.
+///
+/// [The official docs](https://core.telegram.org/bots/api#chatpermissions).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChatPermissions {
+    /// `true`, if the user is allowed to send text messages, contacts,
+    /// locations and venues.
+    pub can_send_messages: Option<bool>,
+
+    /// `true`, if the user is allowed to send audios, documents,
+    /// photos, videos, video notes and voice notes, implies
+    /// `can_send_messages`.
+    pub can_send_media_messages: Option<bool>,
+
+    /// `true`, if the user is allowed to send polls, implies
+    /// `can_send_messages`.
+    pub can_send_polls: Option<bool>,
+
+    /// `true`, if the user is allowed to send animations, games, stickers and
+    /// use inline bots, implies `can_send_media_messages`.
+    pub can_send_other_messages: Option<bool>,
+
+    /// `true`, if the user is allowed to add web page previews to
+    /// their messages, implies `can_send_media_messages`.
+    pub can_add_web_page_previews: Option<bool>,
+
+    /// `true`, if the user is allowed to change the chat title, photo and
+    /// other settings. Ignored in public supergroups.
+    pub can_change_info: Option<bool>,
+
+    /// `true`, if the user is allowed to invite new users to the chat.
+    pub can_invite_users: Option<bool>,
+
+    /// `true`, if the user is allowed to pin messages. Ignored in public
+    /// supergroups.
+    pub can_pin_messages: Option<bool>,
+}
+
+impl ChatPermissions {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
diff --git a/src/types/chat_photo.rs b/src/types/chat_photo.rs
new file mode 100644
index 00000000..7f5ed87d
--- /dev/null
+++ b/src/types/chat_photo.rs
@@ -0,0 +1,82 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a chat photo.
+///
+/// [The official docs](https://core.telegram.org/bots/api#chatphoto).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChatPhoto {
+    /// A file identifier of small (160x160) chat photo. This file_id can be
+    /// used only for photo download and only for as long as the photo is
+    /// not changed.
+    pub small_file_id: String,
+
+    /// Unique file identifier of small (160x160) chat photo, which is supposed
+    /// to be the same over time and for different bots. Can't be used to
+    /// download or reuse the file.
+    pub small_file_unique_id: String,
+
+    /// A file identifier of big (640x640) chat photo. This file_id can be used
+    /// only for photo download and only for as long as the photo is not
+    /// changed.
+    pub big_file_id: String,
+
+    /// Unique file identifier of big (640x640) chat photo, which is supposed
+    /// to be the same over time and for different bots. Can't be used to
+    /// download or reuse the file.
+    pub big_file_unique_id: String,
+}
+
+impl ChatPhoto {
+    pub fn new<S1, S2, S3, S4>(
+        small_file_id: S1,
+        small_file_unique_id: S2,
+        big_file_id: S3,
+        big_file_unique_id: S4,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+        S4: Into<String>,
+    {
+        Self {
+            small_file_id: small_file_id.into(),
+            small_file_unique_id: small_file_unique_id.into(),
+            big_file_id: big_file_id.into(),
+            big_file_unique_id: big_file_unique_id.into(),
+        }
+    }
+
+    pub fn small_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.small_file_id = val.into();
+        self
+    }
+
+    pub fn small_file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.small_file_unique_id = val.into();
+        self
+    }
+
+    pub fn big_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.big_file_id = val.into();
+        self
+    }
+
+    pub fn big_file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.big_file_unique_id = val.into();
+        self
+    }
+}
diff --git a/src/types/chosen_inline_result.rs b/src/types/chosen_inline_result.rs
new file mode 100644
index 00000000..18139ff0
--- /dev/null
+++ b/src/types/chosen_inline_result.rs
@@ -0,0 +1,85 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Location, User};
+
+/// Represents a [result] of an inline query that was chosen by the user and
+/// sent to their chat partner.
+///
+/// [The official docs](https://core.telegram.org/bots/api#choseninlineresult).
+///
+/// [result]: https://core.telegram.org/bots/api#inlinequeryresult
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ChosenInlineResult {
+    /// The unique identifier for the result that was chosen.
+    pub result_id: String,
+
+    /// The user that chose the result.
+    pub from: User,
+
+    ///  A sender location, only for bots that require user location.
+    pub location: Option<Location>,
+
+    /// An identifier of the sent inline message. Available only if
+    /// there is an [inline keyboard] attached to the message. Will be also
+    /// received in [callback queries] and can be used to [edit] the message.
+    ///
+    /// [inline keyboard]: https://core.telegram.org/bots/api#inlinekeyboardmarkup
+    /// [callback queries]: https://core.telegram.org/bots/api#callbackquery
+    /// [edit]: https://core.telegram.org/bots/api#updating-messages
+    pub inline_message_id: Option<String>,
+
+    /// The query that was used to obtain the result.
+    pub query: String,
+}
+
+impl ChosenInlineResult {
+    pub fn new<S1, S2>(result_id: S1, from: User, query: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            result_id: result_id.into(),
+            from,
+            location: None,
+            inline_message_id: None,
+            query: query.into(),
+        }
+    }
+
+    pub fn result_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.result_id = val.into();
+        self
+    }
+
+    pub fn from(mut self, val: User) -> Self {
+        self.from = val;
+        self
+    }
+
+    pub fn location<S>(mut self, val: Location) -> Self {
+        self.location = val.into();
+        self
+    }
+
+    pub fn inline_message_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.inline_message_id = Some(val.into());
+        self
+    }
+
+    pub fn query<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.query = val.into();
+        self
+    }
+}
diff --git a/src/types/contact.rs b/src/types/contact.rs
new file mode 100644
index 00000000..68a31b38
--- /dev/null
+++ b/src/types/contact.rs
@@ -0,0 +1,79 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a phone contact.
+///
+/// [The official docs](https://core.telegram.org/bots/api#contact).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Contact {
+    /// A contact's phone number.
+    pub phone_number: String,
+
+    /// A contact's first name.
+    pub first_name: String,
+
+    /// A contact's last name.
+    pub last_name: Option<String>,
+
+    /// A contact's user identifier in Telegram.
+    pub user_id: Option<i32>,
+
+    /// Additional data about the contact in the form of a [vCard].
+    ///
+    /// [vCard]: https://en.wikipedia.org/wiki/VCard
+    pub vcard: Option<String>,
+}
+
+impl Contact {
+    pub fn new<S1, S2>(phone_number: S1, first_name: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            phone_number: phone_number.into(),
+            first_name: first_name.into(),
+            last_name: None,
+            user_id: None,
+            vcard: None,
+        }
+    }
+
+    pub fn phone_number<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+
+    pub fn first_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.first_name = val.into();
+        self
+    }
+
+    pub fn last_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+
+    pub fn user_id(mut self, val: i32) -> Self {
+        self.user_id = Some(val);
+        self
+    }
+
+    pub fn vcard<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.vcard = Some(val.into());
+        self
+    }
+}
diff --git a/src/types/dice.rs b/src/types/dice.rs
new file mode 100644
index 00000000..1c221166
--- /dev/null
+++ b/src/types/dice.rs
@@ -0,0 +1,38 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::DiceEmoji;
+
+/// This object represents an animated emoji that displays a random value.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Dice {
+    /// Emoji on which the dice throw animation is based.
+    emoji: DiceEmoji,
+
+    /// Value of the dice.
+    ///
+    /// 1-6 for [`DiceEmoji::Dice`] and [`DiceEmoji::Darts`], 1-5 for
+    /// [`DiceEmoji::Basketball`].
+    ///
+    /// [`DiceEmoji::Dice`]: crate::types::DiceEmoji::Dice
+    /// [`DiceEmoji::Darts`]:crate::types::DiceEmoji::Darts
+    /// [`DiceEmoji::Basketball`]:crate::types::DiceEmoji::Basketball
+    value: i32,
+}
+
+impl Dice {
+    pub fn new(emoji: DiceEmoji, value: i32) -> Self {
+        Self { emoji, value }
+    }
+
+    pub fn emoji(mut self, val: DiceEmoji) -> Self {
+        self.emoji = val;
+        self
+    }
+
+    pub fn value<S>(mut self, val: i32) -> Self {
+        self.value = val;
+        self
+    }
+}
diff --git a/src/types/dice_emoji.rs b/src/types/dice_emoji.rs
new file mode 100644
index 00000000..e503c7fa
--- /dev/null
+++ b/src/types/dice_emoji.rs
@@ -0,0 +1,16 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
+pub enum DiceEmoji {
+    /// Values from 1-6. Defaults to this variant.
+    #[serde(rename = "🎲")]
+    Dice,
+
+    /// Values from 1-6.
+    #[serde(rename = "🎯")]
+    Darts,
+
+    /// Values from 1-5.
+    #[serde(rename = "🏀")]
+    Basketball,
+}
diff --git a/src/types/document.rs b/src/types/document.rs
new file mode 100644
index 00000000..8a409704
--- /dev/null
+++ b/src/types/document.rs
@@ -0,0 +1,92 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{MimeWrapper, PhotoSize};
+
+/// This object represents a general file (as opposed to [photos], [voice
+/// messages] and [audio files]).
+///
+/// [The official docs](https://core.telegram.org/bots/api#document).
+///
+/// [photos]: https://core.telegram.org/bots/api#photosize
+/// [voice messages]: https://core.telegram.org/bots/api#voice
+/// [audio files]: https://core.telegram.org/bots/api#audio
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Document {
+    /// An identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// A document thumbnail as defined by a sender.
+    pub thumb: Option<PhotoSize>,
+
+    /// An original filename as defined by a sender.
+    pub file_name: Option<String>,
+
+    /// A MIME type of the file as defined by a sender.
+    pub mime_type: Option<MimeWrapper>,
+
+    /// A size of a file.
+    pub file_size: Option<u32>,
+}
+
+impl Document {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            thumb: None,
+            file_name: None,
+            mime_type: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn file_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_name = Some(val.into());
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
new file mode 100644
index 00000000..543e251c
--- /dev/null
+++ b/src/types/encrypted_credentials.rs
@@ -0,0 +1,94 @@
+use serde::{Deserialize, Serialize};
+
+/// Contains data required for decrypting and authenticating
+/// [`EncryptedPassportElement`].
+///
+/// See the [Telegram Passport Documentation] for a complete description of the
+/// data decryption and authentication processes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#encryptedcredentials).
+///
+/// [`EncryptedPassportElement`]:
+/// crate::types::EncryptedPassportElement
+/// [Telegram Passport Documentation]: https://core.telegram.org/passport#receiving-information
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedCredentials {
+    /// Base64-encoded encrypted JSON-serialized data with unique user's
+    /// payload, data hashes and secrets required for
+    /// [`EncryptedPassportElement`] decryption and authentication.
+    ///
+    /// [`EncryptedPassportElement`]:
+    /// crate::types::EncryptedPassportElement
+    pub data: String, // TODO: check base64 type
+
+    /// Base64-encoded data hash for data authentication.
+    pub hash: String,
+
+    /// A base64-encoded secret, encrypted with the bot's public RSA key,
+    /// required for data decryption.
+    pub secret: String,
+}
+
+impl EncryptedCredentials {
+    pub fn new<S1, S2, S3>(data: S1, hash: S2, secret: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self { data: data.into(), hash: hash.into(), secret: secret.into() }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.hash = val.into();
+        self
+    }
+
+    pub fn secret<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.secret = val.into();
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn must_serialize_encrypted_credentials_to_json() {
+        // given
+        let expected_json = r#"
+        {
+            "data":"someData",
+            "hash":"1122",
+            "secret":"secret"
+        }"#
+        .replace("\n", "")
+        .replace(" ", "");
+        let encrypted_credentials = EncryptedCredentials {
+            data: "someData".to_string(),
+            hash: "1122".to_string(),
+            secret: "secret".to_string(),
+        };
+        // when
+        let actual_json = serde_json::to_string(&encrypted_credentials).unwrap();
+        //then
+        assert_eq!(actual_json, expected_json)
+    }
+}
diff --git a/src/types/encrypted_passport_element.rs b/src/types/encrypted_passport_element.rs
new file mode 100644
index 00000000..72c0884a
--- /dev/null
+++ b/src/types/encrypted_passport_element.rs
@@ -0,0 +1,794 @@
+use serde::{Deserialize, Serialize};
+
+use super::PassportFile;
+
+/// Contains information about documents or other Telegram Passport elements
+/// shared with the bot by the user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#encryptedpassportelement).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElement {
+    /// Base64-encoded element hash for using in
+    /// [`PassportElementErrorKind::Unspecified`].
+    ///
+    /// [`PassportElementErrorKind::Unspecified`]:
+    /// crate::types::PassportElementErrorKind::Unspecified
+    pub hash: String,
+
+    #[serde(flatten)]
+    pub kind: EncryptedPassportElementKind,
+}
+
+impl EncryptedPassportElement {
+    pub fn new<S>(hash: S, kind: EncryptedPassportElementKind) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { hash: hash.into(), kind }
+    }
+
+    pub fn hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.hash = val.into();
+        self
+    }
+
+    pub fn kind(mut self, val: EncryptedPassportElementKind) -> Self {
+        self.kind = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[allow(clippy::large_enum_variant)]
+#[non_exhaustive]
+pub enum EncryptedPassportElementKind {
+    PersonalDetails(EncryptedPassportElementPersonalDetails),
+    Passport(EncryptedPassportElementPassport),
+    DriverLicense(EncryptedPassportElementDriverLicense),
+    IdentityCard(EncryptedPassportElementIdentityCard),
+    InternalPassport(EncryptedPassportElementInternalPassport),
+    Address(EncryptedPassportElementAddress),
+    UtilityBill(EncryptedPassportElementUtilityBill),
+    BankStatement(EncryptedPassportElementBankStatement),
+    RentalAgreement(EncryptedPassportElementRentalAgreement),
+    PassportRegistration(EncryptedPassportElementPassportRegistration),
+    EncryptedPassportElement(EncryptedPassportElementTemporaryRegistration),
+    PhoneNumber(EncryptedPassportElementPhoneNumber),
+    Email(EncryptedPassportElementEmail),
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementPersonalDetails {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+}
+
+impl EncryptedPassportElementPersonalDetails {
+    pub fn new<S>(data: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into() }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementPassport {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+
+    /// Encrypted file with the front side of the document, provided by the
+    /// user. Available for `passport`, `driver_license`, `identity_card`
+    /// and `internal_passport`. The file can be decrypted and verified
+    /// using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub front_side: PassportFile,
+
+    /// Encrypted file with the selfie of the user holding a document,
+    /// provided by the user; available for `passport`, `driver_license`,
+    /// `identity_card` and `internal_passport`. The file can be decrypted
+    /// and verified using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub selfie: PassportFile,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementPassport {
+    pub fn new<S>(data: S, front_side: PassportFile, selfie: PassportFile) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into(), front_side, selfie, translation: None }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn front_side(mut self, val: PassportFile) -> Self {
+        self.front_side = val;
+        self
+    }
+
+    pub fn selfie(mut self, val: PassportFile) -> Self {
+        self.selfie = val;
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementDriverLicense {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+
+    /// Encrypted file with the front side of the document, provided by the
+    /// user. Available for `passport`, `driver_license`, `identity_card`
+    /// and `internal_passport`. The file can be decrypted and verified
+    /// using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub front_side: PassportFile,
+
+    /// Encrypted file with the reverse side of the document, provided by
+    /// the user. Available for `driver_license` and `identity_card`. The
+    /// file can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub reverse_side: PassportFile,
+
+    /// Encrypted file with the selfie of the user holding a document,
+    /// provided by the user; available for `passport`, `driver_license`,
+    /// `identity_card` and `internal_passport`. The file can be decrypted
+    /// and verified using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub selfie: PassportFile,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementDriverLicense {
+    pub fn new<S>(
+        data: S,
+        front_side: PassportFile,
+        reverse_side: PassportFile,
+        selfie: PassportFile,
+    ) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into(), front_side, reverse_side, selfie, translation: None }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn front_side(mut self, val: PassportFile) -> Self {
+        self.front_side = val;
+        self
+    }
+
+    pub fn reverse_side(mut self, val: PassportFile) -> Self {
+        self.reverse_side = val;
+        self
+    }
+
+    pub fn selfie(mut self, val: PassportFile) -> Self {
+        self.selfie = val;
+        self
+    }
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementIdentityCard {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+
+    /// Encrypted file with the front side of the document, provided by the
+    /// user. Available for `passport`, `driver_license`, `identity_card`
+    /// and `internal_passport`. The file can be decrypted and verified
+    /// using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub front_side: PassportFile,
+
+    /// Encrypted file with the reverse side of the document, provided by
+    /// the user. Available for `driver_license` and `identity_card`. The
+    /// file can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub reverse_side: PassportFile,
+
+    /// Encrypted file with the selfie of the user holding a document,
+    /// provided by the user; available for `passport`, `driver_license`,
+    /// `identity_card` and `internal_passport`. The file can be decrypted
+    /// and verified using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub selfie: PassportFile,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementIdentityCard {
+    pub fn new<S>(
+        data: S,
+        front_side: PassportFile,
+        reverse_side: PassportFile,
+        selfie: PassportFile,
+    ) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into(), front_side, reverse_side, selfie, translation: None }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn front_side(mut self, val: PassportFile) -> Self {
+        self.front_side = val;
+        self
+    }
+
+    pub fn reverse_side(mut self, val: PassportFile) -> Self {
+        self.reverse_side = val;
+        self
+    }
+
+    pub fn selfie(mut self, val: PassportFile) -> Self {
+        self.selfie = val;
+        self
+    }
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementInternalPassport {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+
+    /// Encrypted file with the front side of the document, provided by the
+    /// user. Available for `passport`, `driver_license`, `identity_card`
+    /// and `internal_passport`. The file can be decrypted and verified
+    /// using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub front_side: PassportFile,
+
+    /// Encrypted file with the selfie of the user holding a document,
+    /// provided by the user; available for `passport`, `driver_license`,
+    /// `identity_card` and `internal_passport`. The file can be decrypted
+    /// and verified using the accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub selfie: PassportFile,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementInternalPassport {
+    pub fn new<S>(data: S, front_side: PassportFile, selfie: PassportFile) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into(), front_side, selfie, translation: None }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn front_side(mut self, val: PassportFile) -> Self {
+        self.front_side = val;
+        self
+    }
+
+    pub fn selfie(mut self, val: PassportFile) -> Self {
+        self.selfie = val;
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementAddress {
+    ///  Base64-encoded encrypted Telegram Passport element data provided
+    /// by the user, available for `personal_details`, `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport` and
+    /// `address` types. Can be decrypted and verified using the
+    /// accompanying [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub data: String,
+}
+
+impl EncryptedPassportElementAddress {
+    pub fn new<S>(data: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { data: data.into() }
+    }
+
+    pub fn data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data = val.into();
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementUtilityBill {
+    /// Array of encrypted files with documents provided by the user,
+    /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub files: Vec<PassportFile>,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementUtilityBill {
+    pub fn new<F>(files: F) -> Self
+    where
+        F: Into<Vec<PassportFile>>,
+    {
+        Self { files: files.into(), translation: None }
+    }
+
+    pub fn files<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.files = val.into();
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementBankStatement {
+    /// Array of encrypted files with documents provided by the user,
+    /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub files: Vec<PassportFile>,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementBankStatement {
+    pub fn new<F>(files: F) -> Self
+    where
+        F: Into<Vec<PassportFile>>,
+    {
+        Self { files: files.into(), translation: None }
+    }
+
+    pub fn files<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.files = val.into();
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementRentalAgreement {
+    /// Array of encrypted files with documents provided by the user,
+    /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub files: Vec<PassportFile>,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementRentalAgreement {
+    pub fn new<F>(files: F) -> Self
+    where
+        F: Into<Vec<PassportFile>>,
+    {
+        Self { files: files.into(), translation: None }
+    }
+
+    pub fn files<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.files = val.into();
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementPassportRegistration {
+    /// Array of encrypted files with documents provided by the user,
+    /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub files: Vec<PassportFile>,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementPassportRegistration {
+    pub fn new<F>(files: F) -> Self
+    where
+        F: Into<Vec<PassportFile>>,
+    {
+        Self { files: files.into(), translation: None }
+    }
+
+    pub fn files<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.files = val.into();
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementTemporaryRegistration {
+    /// Array of encrypted files with documents provided by the user,
+    /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub files: Vec<PassportFile>,
+
+    /// Array of encrypted files with translated versions of documents
+    /// provided by the user. Available if requested for `passport`,
+    /// `driver_license`, `identity_card`, `internal_passport`,
+    /// `utility_bill`, `bank_statement`, `rental_agreement`,
+    /// `passport_registration` and `temporary_registration` types. Files
+    /// can be decrypted and verified using the accompanying
+    /// [`EncryptedCredentials`].
+    ///
+    /// [`EncryptedCredentials`]:
+    /// crate::types::EncryptedCredentials
+    pub translation: Option<Vec<PassportFile>>,
+}
+
+impl EncryptedPassportElementTemporaryRegistration {
+    pub fn new<F>(files: F) -> Self
+    where
+        F: Into<Vec<PassportFile>>,
+    {
+        Self { files: files.into(), translation: None }
+    }
+
+    pub fn files<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.files = val.into();
+        self
+    }
+
+    pub fn translation<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PassportFile>>,
+    {
+        self.translation = Some(val.into());
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementPhoneNumber {
+    /// User's verified phone number, available only for `phone_number`
+    /// type.
+    pub phone_number: String,
+}
+
+impl EncryptedPassportElementPhoneNumber {
+    pub fn new<S>(phone_number: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { phone_number: phone_number.into() }
+    }
+
+    pub fn phone_number<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct EncryptedPassportElementEmail {
+    /// User's verified email address, available only for `email` type.
+    pub email: String,
+}
+
+impl EncryptedPassportElementEmail {
+    pub fn new<S>(email: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { email: email.into() }
+    }
+
+    pub fn email<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.email = val.into();
+        self
+    }
+}
diff --git a/src/types/file.rs b/src/types/file.rs
new file mode 100644
index 00000000..721f61c0
--- /dev/null
+++ b/src/types/file.rs
@@ -0,0 +1,75 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a file ready to be downloaded.
+///
+/// The file can be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`.
+/// It is guaranteed that the link will be valid for at least 1 hour. When the
+/// link expires, a new one can be requested by calling [`Bot::get_file`].
+///
+/// [The official docs](https://core.telegram.org/bots/api#file).
+///
+/// [`Bot::get_file`]: crate::Bot::get_file
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct File {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// File size, if known.
+    pub file_size: u32,
+
+    // TODO: chacge "Use ..." to use bot.download...
+    /// File path. Use `https://api.telegram.org/file/bot<token>/<file_path>`
+    /// to get the file.
+    pub file_path: String,
+}
+
+impl File {
+    pub fn new<S1, S2, S3>(file_id: S1, file_unique_id: S2, file_size: u32, file_path: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            file_size,
+            file_path: file_path.into(),
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = val;
+        self
+    }
+
+    pub fn file_path<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+}
diff --git a/src/types/force_reply.rs b/src/types/force_reply.rs
new file mode 100644
index 00000000..a6a74408
--- /dev/null
+++ b/src/types/force_reply.rs
@@ -0,0 +1,41 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::True;
+
+/// Upon receiving a message with this object, Telegram clients will display a
+/// reply interface to the user (act as if the user has selected the bot‘s
+/// message and tapped ’Reply').
+///
+/// This can be extremely useful if you want to create user-friendly
+/// step-by-step interfaces without having to sacrifice [privacy mode].
+///
+/// [The official docs](https://core.telegram.org/bots/api#forcereply).
+///
+/// [privacy mode]: https://core.telegram.org/bots#privacy-mode
+#[serde_with_macros::skip_serializing_none]
+#[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ForceReply {
+    /// Shows reply interface to the user, as if they manually selected the
+    /// bot‘s message and tapped ’Reply'.
+    pub force_reply: True,
+
+    /// Use this parameter if you want to force reply from specific users only.
+    /// Targets: 1) users that are `@mentioned` in the text of the
+    /// [`Message`] object; 2) if the bot's message is a reply
+    /// (has reply_to_message_id), sender of the original message.
+    ///
+    /// [`Message`]: crate::types::Message
+    pub selective: Option<bool>,
+}
+
+impl ForceReply {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn selective(mut self, val: bool) -> Self {
+        self.selective = Some(val);
+        self
+    }
+}
diff --git a/src/types/game.rs b/src/types/game.rs
new file mode 100644
index 00000000..52fe01b8
--- /dev/null
+++ b/src/types/game.rs
@@ -0,0 +1,106 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Animation, MessageEntity, PhotoSize};
+
+/// This object represents a game.
+///
+/// Use [@Botfather] to create and edit games, their short names will act as
+/// unique identifiers.
+///
+/// [@Botfather]: https://t.me/botfather
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Game {
+    /// Title of the game.
+    pub title: String,
+
+    /// Description of the game.
+    pub description: String,
+
+    /// Photo that will be displayed in the game message in chats.
+    pub photo: Vec<PhotoSize>,
+
+    /// Brief description of the game or high scores included in the game
+    /// message. Can be automatically edited to include current high scores
+    /// for the game when the bot calls [`Bot::set_game_score`], or manually
+    /// edited using [`Bot::edit_message_text`]. 0-4096 characters.
+    ///
+    /// [`Bot::set_game_score`]: crate::Bot::set_game_score
+    ///
+    /// [`Bot::edit_message_text`]: crate::Bot::edit_message_text
+    pub text: Option<String>,
+
+    /// Special entities that appear in text, such as usernames, URLs, bot
+    /// commands, etc.
+    pub text_entities: Option<Vec<MessageEntity>>,
+
+    /// Animation that will be displayed in the game message in chats. Upload
+    /// via [@Botfather].
+    ///
+    /// [@Botfather]: https://t.me/botfather
+    pub animation: Option<Animation>,
+}
+
+impl Game {
+    pub fn new<S1, S2, P>(title: S1, description: S2, photo: P) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        P: Into<Vec<PhotoSize>>,
+    {
+        Self {
+            title: title.into(),
+            description: description.into(),
+            photo: photo.into(),
+            text: None,
+            text_entities: None,
+            animation: None,
+        }
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+
+    pub fn photo<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PhotoSize>>,
+    {
+        self.photo = val.into();
+        self
+    }
+
+    pub fn text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.text = Some(val.into());
+        self
+    }
+
+    pub fn text_entities<T>(mut self, val: T) -> Self
+    where
+        T: Into<Vec<MessageEntity>>,
+    {
+        self.text_entities = Some(val.into());
+        self
+    }
+
+    pub fn animation(mut self, val: Animation) -> Self {
+        self.animation = Some(val);
+        self
+    }
+}
diff --git a/src/types/game_high_score.rs b/src/types/game_high_score.rs
new file mode 100644
index 00000000..f713b18e
--- /dev/null
+++ b/src/types/game_high_score.rs
@@ -0,0 +1,40 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::user::User;
+
+/// This object represents one row of the high scores table for a game.
+///
+/// [The official docs](https://core.telegram.org/bots/api#gamehighscore).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct GameHighScore {
+    /// Position in high score table for the game.
+    pub position: u32,
+
+    /// User.
+    pub user: User,
+
+    /// Score.
+    pub score: u32,
+}
+
+impl GameHighScore {
+    pub fn new(position: u32, user: User, score: u32) -> Self {
+        Self { position, user, score }
+    }
+
+    pub fn position(mut self, val: u32) -> Self {
+        self.position = val;
+        self
+    }
+
+    pub fn user(mut self, val: User) -> Self {
+        self.user = val;
+        self
+    }
+
+    pub fn score(mut self, val: u32) -> Self {
+        self.score = val;
+        self
+    }
+}
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
new file mode 100644
index 00000000..12497463
--- /dev/null
+++ b/src/types/inline_keyboard_button.rs
@@ -0,0 +1,135 @@
+use crate::types::{CallbackGame, LoginUrl};
+use serde::{Deserialize, Serialize};
+
+/// This object represents one button of an inline keyboard.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinekeyboardbutton).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineKeyboardButton {
+    /// Label text on the button.
+    pub text: String,
+
+    #[serde(flatten)]
+    pub kind: InlineKeyboardButtonKind,
+}
+
+impl InlineKeyboardButton {
+    pub fn new<S>(text: S, kind: InlineKeyboardButtonKind) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { text: text.into(), kind }
+    }
+
+    pub fn text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    pub fn kind(mut self, val: InlineKeyboardButtonKind) -> Self {
+        self.kind = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum InlineKeyboardButtonKind {
+    /// HTTP or tg:// url to be opened when button is pressed.
+    Url(String),
+
+    /// An HTTP URL used to automatically authorize the user. Can be used as a
+    /// replacement for the [Telegram Login Widget]().
+    ///
+    /// [Telegram Login Widget]: https://core.telegram.org/widgets/login
+    LoginUrl(LoginUrl),
+
+    /// Data to be sent in a [`CallbackQuery`] to the bot when button is
+    /// pressed, 1-64 bytes.
+    ///
+    /// [`CallbackQuery`]: crate::types::CallbackQuery
+    CallbackData(String),
+
+    /// If set, pressing the button will prompt the user to select one of their
+    /// chats, open that chat and insert the bot‘s username and the specified
+    /// inline query in the input field. Can be empty, in which case just the
+    /// bot’s username will be inserted.
+    ///
+    /// Note: This offers an easy way for users to start using your bot in
+    /// [inline mode] when they are currently in a private chat with it.
+    /// Especially useful when combined with [switch_pm…] actions – in this
+    /// case the user will be automatically returned to the chat they
+    /// switched from, skipping the chat selection screen.
+    ///
+    /// [inline mode]: https://core.telegram.org/bots/inline
+    /// [switch_pm…]: https://core.telegram.org/bots/api#answerinlinequery
+    SwitchInlineQuery(String),
+
+    /// If set, pressing the button will insert the bot‘s username and the
+    /// specified inline query in the current chat's input field.
+    /// Can be empty, in which case only the bot’s username will be
+    /// inserted.
+    ///
+    ///This offers a quick way for the user to open your bot in inline mode in
+    /// the same chat – good for selecting something from multiple options.
+    SwitchInlineQueryCurrentChat(String),
+
+    /// Description of the game that will be launched when the user presses the
+    /// button.
+    ///
+    /// ## Note
+    /// This type of button **must** always be the first button in the first
+    /// row.
+    CallbackGame(CallbackGame),
+
+    /// Specify True, to send a [Pay button].
+    ///
+    /// ## Note
+    /// This type of button **must** always be the first button in the first
+    /// row.
+    ///
+    /// [Pay button]: https://core.telegram.org/bots/api#payments
+    Pay(bool),
+}
+
+/// Build buttons.
+///
+/// # Examples
+/// ```
+/// use teloxide::types::InlineKeyboardButton;
+///
+/// let url_button = InlineKeyboardButton::url("Text".to_string(), "http://url.com".to_string());
+/// ```
+impl InlineKeyboardButton {
+    pub fn url(text: String, url: String) -> InlineKeyboardButton {
+        InlineKeyboardButton { text, kind: InlineKeyboardButtonKind::Url(url) }
+    }
+
+    pub fn callback(text: String, callback_data: String) -> InlineKeyboardButton {
+        InlineKeyboardButton { text, kind: InlineKeyboardButtonKind::CallbackData(callback_data) }
+    }
+
+    pub fn switch_inline_query(text: String, switch_inline_query: String) -> InlineKeyboardButton {
+        InlineKeyboardButton {
+            text,
+            kind: InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query),
+        }
+    }
+
+    pub fn switch_inline_query_current_chat(
+        text: String,
+        switch_inline_query_current_chat: String,
+    ) -> InlineKeyboardButton {
+        InlineKeyboardButton {
+            text,
+            kind: InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat(
+                switch_inline_query_current_chat,
+            ),
+        }
+    }
+}
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
new file mode 100644
index 00000000..b6884a96
--- /dev/null
+++ b/src/types/inline_keyboard_markup.rs
@@ -0,0 +1,109 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::InlineKeyboardButton;
+
+/// This object represents an [inline keyboard] that appears right next to the
+/// message it belongs to.
+///
+/// *Note*: This will only work in Telegram versions released after 9 April,
+/// 2016. Older clients will display unsupported message.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinekeyboardmarkup).
+///
+/// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
+#[non_exhaustive]
+pub struct InlineKeyboardMarkup {
+    /// Array of button rows, each represented by an array of
+    /// [`InlineKeyboardButton`] objects.
+    ///
+    /// [`InlineKeyboardButton`]: crate::types::InlineKeyboardButton
+    pub inline_keyboard: Vec<Vec<InlineKeyboardButton>>,
+}
+
+/// Build `InlineKeyboardMarkup`.
+///
+/// # Examples
+/// ```
+/// use teloxide::types::{InlineKeyboardButton, InlineKeyboardMarkup};
+///
+/// let url_button = InlineKeyboardButton::url("text".to_string(), "http://url.com".to_string());
+/// let keyboard = InlineKeyboardMarkup::default().append_row(vec![url_button]);
+/// ```
+impl InlineKeyboardMarkup {
+    pub fn new<I1, I2>(inline_keyboard: I1) -> Self
+    where
+        I1: Into<Vec<I2>>,
+        I2: Into<Vec<InlineKeyboardButton>>,
+    {
+        Self { inline_keyboard: inline_keyboard.into().into_iter().map(Into::into).collect() }
+    }
+
+    pub fn inline_keyboard<I1, I2>(mut self, val: I1) -> Self
+    where
+        I1: Into<Vec<I2>>,
+        I2: Into<Vec<InlineKeyboardButton>>,
+    {
+        self.inline_keyboard = val.into().into_iter().map(Into::into).collect();
+        self
+    }
+
+    pub fn append_row(mut self, buttons: Vec<InlineKeyboardButton>) -> Self {
+        self.inline_keyboard.push(buttons);
+        self
+    }
+
+    pub fn append_to_row(mut self, button: InlineKeyboardButton, index: usize) -> Self {
+        match self.inline_keyboard.get_mut(index) {
+            Some(buttons) => buttons.push(button),
+            None => self.inline_keyboard.push(vec![button]),
+        };
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn append_row() {
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+
+        let markup =
+            InlineKeyboardMarkup::default().append_row(vec![button1.clone(), button2.clone()]);
+
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
+
+        assert_eq!(markup, expected);
+    }
+
+    #[test]
+    fn append_to_row_existent_row() {
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+
+        let markup = InlineKeyboardMarkup::default()
+            .append_row(vec![button1.clone()])
+            .append_to_row(button2.clone(), 0);
+
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
+
+        assert_eq!(markup, expected);
+    }
+
+    #[test]
+    fn append_to_row_nonexistent_row() {
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+
+        let markup = InlineKeyboardMarkup::default()
+            .append_row(vec![button1.clone()])
+            .append_to_row(button2.clone(), 1);
+
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1], vec![button2]] };
+
+        assert_eq!(markup, expected);
+    }
+}
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
new file mode 100644
index 00000000..a1c15fc8
--- /dev/null
+++ b/src/types/inline_query.rs
@@ -0,0 +1,74 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Location, User};
+
+/// This object represents an incoming inline query.
+///
+/// When the user sends an empty query, your bot could return some default or
+/// trending results.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequery).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQuery {
+    /// Unique identifier for this query.
+    pub id: String,
+
+    /// Sender.
+    pub from: User,
+
+    /// Sender location, only for bots that request user location.
+    pub location: Option<Location>,
+
+    /// Text of the query (up to 512 characters).
+    pub query: String,
+
+    /// Offset of the results to be returned, can be controlled by the bot.
+    pub offset: String,
+}
+
+impl InlineQuery {
+    pub fn new<S1, S2, S3>(id: S1, from: User, query: S2, offset: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self { id: id.into(), from, location: None, query: query.into(), offset: offset.into() }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn from(mut self, val: User) -> Self {
+        self.from = val;
+        self
+    }
+
+    pub fn location(mut self, val: Location) -> Self {
+        self.location = Some(val);
+        self
+    }
+
+    pub fn query<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.query = val.into();
+        self
+    }
+
+    pub fn offset<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.offset = val.into();
+        self
+    }
+}
diff --git a/src/types/inline_query_result.rs b/src/types/inline_query_result.rs
new file mode 100644
index 00000000..cb9976de
--- /dev/null
+++ b/src/types/inline_query_result.rs
@@ -0,0 +1,102 @@
+#![allow(clippy::large_enum_variant)]
+
+use derive_more::From;
+use serde::{Deserialize, Serialize};
+
+use crate::types::{
+    InlineQueryResultArticle, InlineQueryResultAudio, InlineQueryResultCachedAudio,
+    InlineQueryResultCachedDocument, InlineQueryResultCachedGif, InlineQueryResultCachedMpeg4Gif,
+    InlineQueryResultCachedPhoto, InlineQueryResultCachedSticker, InlineQueryResultCachedVideo,
+    InlineQueryResultCachedVoice, InlineQueryResultContact, InlineQueryResultDocument,
+    InlineQueryResultGame, InlineQueryResultGif, InlineQueryResultLocation,
+    InlineQueryResultMpeg4Gif, InlineQueryResultPhoto, InlineQueryResultVenue,
+    InlineQueryResultVideo, InlineQueryResultVoice,
+};
+
+/// This object represents one result of an inline query.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresult).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, From)]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+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),
+    Game(InlineQueryResultGame),
+    Document(InlineQueryResultDocument),
+    Gif(InlineQueryResultGif),
+    Location(InlineQueryResultLocation),
+    #[serde(rename = "mpeg4_gif")]
+    Mpeg4Gif(InlineQueryResultMpeg4Gif),
+    Photo(InlineQueryResultPhoto),
+    Venue(InlineQueryResultVenue),
+    Video(InlineQueryResultVideo),
+    Voice(InlineQueryResultVoice),
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::types::{
+        inline_keyboard_markup::InlineKeyboardMarkup, parse_mode::ParseMode, InlineQueryResult,
+        InlineQueryResultCachedAudio, InputMessageContent, InputMessageContentText,
+    };
+
+    #[test]
+    fn cached_audio_min_serialize() {
+        let structure = InlineQueryResult::CachedAudio(InlineQueryResultCachedAudio {
+            id: String::from("id"),
+            audio_file_id: String::from("audio_file_id"),
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        });
+
+        let expected_json = r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id"}"#;
+        let actual_json = serde_json::to_string(&structure).unwrap();
+
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn cached_audio_full_serialize() {
+        let structure = InlineQueryResult::CachedAudio(InlineQueryResultCachedAudio {
+            id: String::from("id"),
+            audio_file_id: String::from("audio_file_id"),
+            caption: Some(String::from("caption")),
+            parse_mode: Some(ParseMode::HTML),
+            reply_markup: Some(InlineKeyboardMarkup::default()),
+            input_message_content: Some(InputMessageContent::Text(InputMessageContentText {
+                message_text: String::from("message_text"),
+                parse_mode: Some(ParseMode::MarkdownV2),
+                disable_web_page_preview: Some(true),
+            })),
+        });
+
+        let expected_json = r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id","caption":"caption","parse_mode":"HTML","reply_markup":{"inline_keyboard":[]},"input_message_content":{"message_text":"message_text","parse_mode":"MarkdownV2","disable_web_page_preview":true}}"#;
+        let actual_json = serde_json::to_string(&structure).unwrap();
+
+        assert_eq!(expected_json, actual_json);
+    }
+
+    // TODO: Add more tests
+}
diff --git a/src/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
new file mode 100644
index 00000000..2f9bd689
--- /dev/null
+++ b/src/types/inline_query_result_article.rs
@@ -0,0 +1,128 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
+
+/// Represents a link to an article or web page.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultarticle).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultArticle {
+    /// Unique identifier for this result, 1-64 Bytes.
+    pub id: String,
+
+    /// Title of the result.
+    pub title: String,
+
+    /// Content of the message to be sent.
+    pub input_message_content: InputMessageContent,
+
+    /// Inline keyboard attached to the message.
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// URL of the result.
+    pub url: Option<String>,
+
+    /// Pass `true`, if you don't want the URL to be shown in the
+    /// message.
+    pub hide_url: Option<bool>,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Url of the thumbnail for the result.
+    pub thumb_url: Option<String>,
+
+    /// Thumbnail width.
+    pub thumb_width: Option<i32>,
+
+    /// Thumbnail height.
+    pub thumb_height: Option<i32>,
+}
+
+impl InlineQueryResultArticle {
+    pub fn new<S1, S2>(id: S1, title: S2, input_message_content: InputMessageContent) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            title: title.into(),
+            input_message_content,
+            reply_markup: None,
+            url: None,
+            hide_url: None,
+            description: None,
+            thumb_url: None,
+            thumb_width: None,
+            thumb_height: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = val;
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.url = Some(val.into());
+        self
+    }
+
+    pub fn hide_url(mut self, val: bool) -> Self {
+        self.hide_url = Some(val);
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = Some(val.into());
+        self
+    }
+
+    pub fn thumb_width(mut self, val: i32) -> Self {
+        self.thumb_width = Some(val);
+        self
+    }
+
+    pub fn thumb_height(mut self, val: i32) -> Self {
+        self.thumb_height = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
new file mode 100644
index 00000000..648c1bee
--- /dev/null
+++ b/src/types/inline_query_result_audio.rs
@@ -0,0 +1,133 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to an MP3 audio file. By default, this audio file will be
+/// sent by the user.
+///
+/// Alternatively, you can use `input_message_content` to send a message with
+/// the specified content instead of the audio.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultaudio).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultAudio {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL for the audio file.
+    pub audio_url: String,
+
+    /// Title.
+    pub title: String,
+
+    /// Caption, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Performer.
+    pub performer: Option<String>,
+
+    /// Audio duration in seconds.
+    pub audio_duration: Option<String>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the audio.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultAudio {
+    pub fn new<S1, S2, S3>(id: S1, audio_url: S2, title: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            audio_url: audio_url.into(),
+            title: title.into(),
+            caption: None,
+            parse_mode: None,
+            performer: None,
+            audio_duration: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn audio_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.audio_url = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn performer<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.performer = Some(val.into());
+        self
+    }
+
+    pub fn audio_duration<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.audio_duration = Some(val.into());
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_audio.rs b/src/types/inline_query_result_cached_audio.rs
new file mode 100644
index 00000000..5efec634
--- /dev/null
+++ b/src/types/inline_query_result_cached_audio.rs
@@ -0,0 +1,96 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to an MP3 audio file stored on the Telegram servers.
+///
+/// By default, this audio file will be sent by the user. Alternatively, you can
+/// use `input_message_content` to send a message with the specified content
+/// instead of the audio.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedaudio).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedAudio {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier for the audio file.
+    pub audio_file_id: String,
+
+    /// Caption, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the audio.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedAudio {
+    pub fn new<S1, S2>(id: S1, audio_file_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            audio_file_id: audio_file_id.into(),
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn audio_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.audio_file_id = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
new file mode 100644
index 00000000..882c5858
--- /dev/null
+++ b/src/types/inline_query_result_cached_document.rs
@@ -0,0 +1,121 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a file stored on the Telegram servers.
+///
+/// By default, this file will be sent by the user with an optional caption.
+/// Alternatively, you can use `input_message_content` to send a message with
+/// the specified content instead of the file.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcacheddocument).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedDocument {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// Title for the result.
+    pub title: String,
+
+    /// A valid file identifier for the file.
+    pub document_file_id: String,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Caption of the document to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the file.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedDocument {
+    pub fn new<S1, S2, S3>(id: S1, title: S2, document_file_id: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            title: title.into(),
+            document_file_id: document_file_id.into(),
+            description: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn document_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.document_file_id = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
new file mode 100644
index 00000000..79fb44db
--- /dev/null
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -0,0 +1,109 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to an animated GIF file stored on the Telegram servers.
+///
+/// By default, this animated GIF file will be sent by the user with an optional
+/// caption. Alternatively, you can use `input_message_content` to send a
+/// message with specified content instead of the animation.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedgif).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedGif {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier for the GIF file.
+    pub gif_file_id: String,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Caption of the GIF file to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [`ParseMode::Markdown`] or [`ParseMode::HTML`], if you want
+    /// Telegram apps to show [bold, italic, fixed-width text or inline
+    /// URLs] in the media caption.
+    ///
+    /// [`ParseMode::Markdown`]: crate::types::ParseMode::Markdown
+    /// [`ParseMode::HTML`]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the GIF animation.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedGif {
+    pub fn new<S1, S2>(id: S1, gif_file_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            gif_file_id: gif_file_id.into(),
+            title: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn gif_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.gif_file_id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
new file mode 100644
index 00000000..8f97667d
--- /dev/null
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -0,0 +1,101 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a video animation (H.264/MPEG-4 AVC video without
+/// sound) stored on the Telegram servers.
+///
+/// By default, this animated MPEG-4 file will be sent by the user with an
+/// optional caption. Alternatively, you can use `input_message_content` to send
+/// a message with the specified content instead of the animation.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedmpeg4gif).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedMpeg4Gif {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier for the MP4 file.
+    pub mpeg4_file_id: String,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Caption of the MPEG-4 file to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the video animation.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedMpeg4Gif {
+    pub fn new<S1, S2>(id: S1, mpeg4_file_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            mpeg4_file_id: mpeg4_file_id.into(),
+            title: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
new file mode 100644
index 00000000..ac9d28e8
--- /dev/null
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -0,0 +1,120 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a photo stored on the Telegram servers.
+///
+/// By default, this photo will be sent by the user with an optional caption.
+/// Alternatively, you can use `input_message_content` to send a message with
+/// the specified content instead of the photo.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedphoto).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedPhoto {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier of the photo.
+    pub photo_file_id: String,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Caption of the photo to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the photo.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedPhoto {
+    pub fn new<S1, S2>(id: S1, photo_file_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            photo_file_id: photo_file_id.into(),
+            title: None,
+            description: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn photo_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.photo_file_id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_sticker.rs b/src/types/inline_query_result_cached_sticker.rs
new file mode 100644
index 00000000..0c4e9b88
--- /dev/null
+++ b/src/types/inline_query_result_cached_sticker.rs
@@ -0,0 +1,70 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
+
+/// Represents a link to a sticker stored on the Telegram servers.
+///
+/// By default, this sticker will be sent by the user. Alternatively, you can
+/// use `input_message_content` to send a message with the specified content
+/// instead of the sticker.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedsticker).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedSticker {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier of the sticker.
+    pub sticker_file_id: String,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the sticker.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedSticker {
+    pub fn new<S1, S2>(id: S1, sticker_file_id: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            sticker_file_id: sticker_file_id.into(),
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn sticker_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.sticker_file_id = val.into();
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
new file mode 100644
index 00000000..645892b0
--- /dev/null
+++ b/src/types/inline_query_result_cached_video.rs
@@ -0,0 +1,121 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a video file stored on the Telegram servers.
+///
+/// By default, this video file will be sent by the user with an optional
+/// caption. Alternatively, you can use `input_message_content` to send a
+/// message with the specified content instead of the video.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedVideo {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier for the video file.
+    pub video_file_id: String,
+
+    /// Title for each result.
+    pub title: String,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Caption of the video to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the video.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedVideo {
+    pub fn new<S1, S2, S3>(id: S1, video_file_id: S2, title: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            video_file_id: video_file_id.into(),
+            title: title.into(),
+            description: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn video_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.video_file_id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
new file mode 100644
index 00000000..1f50672c
--- /dev/null
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -0,0 +1,109 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a voice message stored on the Telegram servers.
+///
+/// By default, this voice message will be sent by the user. Alternatively, you
+/// can use `input_message_content` to send a message with the specified content
+/// instead of the voice message.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultCachedVoice {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid file identifier for the voice message.
+    pub voice_file_id: String,
+
+    /// Voice message title.
+    pub title: String,
+
+    /// Caption, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the voice message.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultCachedVoice {
+    pub fn new<S1, S2, S3>(id: S1, voice_file_id: S2, title: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            voice_file_id: voice_file_id.into(),
+            title: title.into(),
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn voice_file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.voice_file_id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_contact.rs b/src/types/inline_query_result_contact.rs
new file mode 100644
index 00000000..0b4ae0d8
--- /dev/null
+++ b/src/types/inline_query_result_contact.rs
@@ -0,0 +1,140 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
+
+/// Represents a contact with a phone number.
+///
+/// By default, this contact will be sent by the user. Alternatively, you can
+/// use `input_message_content` to send a message with the specified content
+/// instead of the contact.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultContact {
+    /// Unique identifier for this result, 1-64 Bytes.
+    pub id: String,
+
+    /// Contact's phone number.
+    pub phone_number: String,
+
+    /// Contact's first name.
+    pub first_name: String,
+
+    /// Contact's last name.
+    pub last_name: Option<String>,
+
+    /// Additional data about the contact in the form of a [vCard], 0-2048
+    /// bytes.
+    ///
+    /// [VCard]: https://en.wikipedia.org/wiki/VCard
+    pub vcard: Option<String>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the contact.
+    pub input_message_content: Option<InputMessageContent>,
+
+    /// Url of the thumbnail for the result.
+    pub thumb_url: Option<String>,
+
+    /// Thumbnail width.
+    pub thumb_width: Option<i32>,
+
+    /// Thumbnail height.
+    pub thumb_height: Option<i32>,
+}
+
+impl InlineQueryResultContact {
+    pub fn new<S1, S2, S3>(id: S1, phone_number: S2, first_name: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            phone_number: phone_number.into(),
+            first_name: first_name.into(),
+            last_name: None,
+            vcard: None,
+            reply_markup: None,
+            input_message_content: None,
+            thumb_url: None,
+            thumb_width: None,
+            thumb_height: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn phone_number<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+
+    pub fn first_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.first_name = val.into();
+        self
+    }
+
+    pub fn last_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+
+    pub fn vcard<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.vcard = Some(val.into());
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = Some(val.into());
+        self
+    }
+
+    pub fn thumb_width(mut self, val: i32) -> Self {
+        self.thumb_width = Some(val);
+        self
+    }
+
+    pub fn thumb_height(mut self, val: i32) -> Self {
+        self.thumb_height = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
new file mode 100644
index 00000000..ea66f561
--- /dev/null
+++ b/src/types/inline_query_result_document.rs
@@ -0,0 +1,138 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, ParseMode};
+
+/// Represents a link to a file.
+///
+/// By default, this file will be sent by the user with an optional caption.
+/// Alternatively, you can use `input_message_content` to send a message with
+/// the specified content instead of the file. Currently, only **.PDF** and
+/// **.ZIP** files can be sent using this method.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultdocument).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultDocument {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// Title for the result.
+    pub title: String,
+
+    /// Caption of the document to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// A valid URL for the file.
+    pub document_url: String,
+
+    /// Mime type of the content of the file, either `application/pdf` or
+    /// `application/zip`.
+    pub mime_type: MimeWrapper,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Inline keyboard attached to the message.
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the file.
+    pub input_message_content: Option<InputMessageContent>,
+
+    /// URL of the thumbnail (jpeg only) for the file.
+    pub thumb_url: Option<String>,
+
+    /// Thumbnail width.
+    pub thumb_width: Option<i32>,
+
+    /// Thumbnail height.
+    pub thumb_height: Option<i32>,
+}
+
+impl InlineQueryResultDocument {
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn document_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.document_url = val.into();
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = val;
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = Some(val.into());
+        self
+    }
+
+    pub fn thumb_width(mut self, val: i32) -> Self {
+        self.thumb_width = Some(val);
+        self
+    }
+
+    pub fn thumb_height(mut self, val: i32) -> Self {
+        self.thumb_height = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_game.rs b/src/types/inline_query_result_game.rs
new file mode 100644
index 00000000..c795547c
--- /dev/null
+++ b/src/types/inline_query_result_game.rs
@@ -0,0 +1,55 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::InlineKeyboardMarkup;
+
+/// Represents a [game].
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultgame).
+///
+/// [game]: https://core.telegram.org/bots/api#games
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultGame {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// Short name of the game.
+    pub game_short_name: String,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+impl InlineQueryResultGame {
+    pub fn new<S1, S2>(id: S1, game_short_name: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self { id: id.into(), game_short_name: game_short_name.into(), reply_markup: None }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn game_short_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.game_short_name = val.into();
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
new file mode 100644
index 00000000..71145de3
--- /dev/null
+++ b/src/types/inline_query_result_gif.rs
@@ -0,0 +1,148 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to an animated GIF file.
+///
+/// By default, this animated GIF file will be sent by the user with optional
+/// caption. Alternatively, you can use `input_message_content` to send a
+/// message with the specified content instead of the animation.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultgif).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultGif {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL for the GIF file. File size must not exceed 1MB.
+    pub gif_url: String,
+
+    /// Width of the GIF.
+    pub gif_width: Option<i32>,
+
+    /// Height of the GIFv.
+    pub gif_height: Option<i32>,
+
+    /// Duration of the GIF.
+    pub gif_duration: Option<i32>,
+
+    /// URL of the static thumbnail for the result (jpeg or gif).
+    pub thumb_url: String,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Caption of the GIF file to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the GIF animation.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultGif {
+    pub fn new<S1, S2, S3>(id: S1, gif_url: S2, thumb_url: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            gif_url: gif_url.into(),
+            gif_width: None,
+            gif_height: None,
+            gif_duration: None,
+            thumb_url: thumb_url.into(),
+            title: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn gif_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.gif_url = val.into();
+        self
+    }
+
+    pub fn gif_width(mut self, val: i32) -> Self {
+        self.gif_width = Some(val);
+        self
+    }
+
+    pub fn gif_height(mut self, val: i32) -> Self {
+        self.gif_height = Some(val);
+        self
+    }
+
+    pub fn gif_duration(mut self, val: i32) -> Self {
+        self.gif_duration = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
new file mode 100644
index 00000000..1d6d9270
--- /dev/null
+++ b/src/types/inline_query_result_location.rs
@@ -0,0 +1,128 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
+
+/// Represents a location on a map.
+///
+/// By default, the location will be sent by the user. Alternatively, you can
+/// use `input_message_content` to send a message with the specified content
+/// instead of the location.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultlocation).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultLocation {
+    /// Unique identifier for this result, 1-64 Bytes.
+    pub id: String,
+
+    /// Location latitude in degrees.
+    pub latitude: f64,
+
+    /// Location longitude in degrees.
+    pub longitude: f64,
+
+    /// Location title.
+    pub title: String,
+
+    /// Period in seconds for which the location can be updated, should be
+    /// between 60 and 86400.
+    pub live_period: Option<i32>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the location.
+    pub input_message_content: Option<InputMessageContent>,
+
+    /// Url of the thumbnail for the result.
+    pub thumb_url: Option<String>,
+
+    /// Thumbnail width.
+    pub thumb_width: Option<i32>,
+
+    /// Thumbnail height.
+    pub thumb_height: Option<i32>,
+}
+
+impl InlineQueryResultLocation {
+    pub fn new<S1, S2>(id: S1, title: S2, latitude: f64, longitude: f64) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            title: title.into(),
+            latitude,
+            longitude,
+            live_period: None,
+            reply_markup: None,
+            input_message_content: None,
+            thumb_url: None,
+            thumb_width: None,
+            thumb_height: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn latitude(mut self, val: f64) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    pub fn longitude(mut self, val: f64) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn live_period(mut self, val: i32) -> Self {
+        self.live_period = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = Some(val.into());
+        self
+    }
+
+    pub fn thumb_width(mut self, val: i32) -> Self {
+        self.thumb_width = Some(val);
+        self
+    }
+
+    pub fn thumb_height(mut self, val: i32) -> Self {
+        self.thumb_height = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
new file mode 100644
index 00000000..6c01ceb7
--- /dev/null
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -0,0 +1,149 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a video animation (H.264/MPEG-4 AVC video without
+/// sound).
+///
+/// By default, this animated MPEG-4 file will be sent by the user with optional
+/// caption. Alternatively, you can use `input_message_content` to send
+/// a message with the specified content instead of the animation.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultmpeg4gif).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultMpeg4Gif {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL for the MP4 file. File size must not exceed 1MB.
+    pub mpeg4_url: String,
+
+    /// Video width.
+    pub mpeg4_width: Option<i32>,
+
+    /// Video height.
+    pub mpeg4_height: Option<i32>,
+
+    /// Video duration.
+    pub mpeg4_duration: Option<i32>,
+
+    /// URL of the static thumbnail (jpeg or gif) for the result.
+    pub thumb_url: String,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Caption of the MPEG-4 file to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the video animation.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultMpeg4Gif {
+    pub fn new<S1, S2, S3>(id: S1, mpeg4_url: S2, thumb_url: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            mpeg4_url: mpeg4_url.into(),
+            thumb_url: thumb_url.into(),
+            mpeg4_width: None,
+            mpeg4_height: None,
+            mpeg4_duration: None,
+            title: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn mpeg4_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.mpeg4_url = val.into();
+        self
+    }
+
+    pub fn mpeg4_width(mut self, val: i32) -> Self {
+        self.mpeg4_width = Some(val);
+        self
+    }
+
+    pub fn mpeg4_height(mut self, val: i32) -> Self {
+        self.mpeg4_height = Some(val);
+        self
+    }
+
+    pub fn mpeg4_duration(mut self, val: i32) -> Self {
+        self.mpeg4_duration = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
new file mode 100644
index 00000000..e1d32dc9
--- /dev/null
+++ b/src/types/inline_query_result_photo.rs
@@ -0,0 +1,152 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a photo.
+///
+/// By default, this photo will be sent by the user with optional caption.
+/// Alternatively, you can use `input_message_content` to send a message with
+/// the specified content instead of the photo.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultphoto).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultPhoto {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL of the photo. Photo must be in **jpeg** format. Photo size
+    /// must not exceed 5MB.
+    pub photo_url: String,
+
+    /// URL of the thumbnail for the photo.
+    pub thumb_url: String,
+
+    /// Width of the photo.
+    pub photo_width: Option<i32>,
+
+    /// Height of the photo.
+    pub photo_height: Option<i32>,
+
+    /// Title for the result.
+    pub title: Option<String>,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// Caption of the photo to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the photo.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultPhoto {
+    pub fn new<S1, S2, S3>(id: S1, photo_url: S2, thumb_url: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            photo_url: photo_url.into(),
+            thumb_url: thumb_url.into(),
+            photo_width: None,
+            photo_height: None,
+            title: None,
+            description: None,
+            caption: None,
+            parse_mode: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn photo_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.photo_url = val.into();
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = val.into();
+        self
+    }
+
+    pub fn photo_width<S>(mut self, val: i32) -> Self {
+        self.photo_width = Some(val);
+        self
+    }
+
+    pub fn photo_height<S>(mut self, val: i32) -> Self {
+        self.photo_height = Some(val);
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
new file mode 100644
index 00000000..c7e67443
--- /dev/null
+++ b/src/types/inline_query_result_venue.rs
@@ -0,0 +1,157 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent};
+
+/// Represents a venue.
+///
+/// By default, the venue will be sent by the user. Alternatively, you can use
+/// `input_message_content` to send a message with the specified content instead
+/// of the venue.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvenue).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultVenue {
+    /// Unique identifier for this result, 1-64 Bytes.
+    pub id: String,
+
+    /// Latitude of the venue location in degrees.
+    pub latitude: f64,
+
+    /// Longitude of the venue location in degrees.
+    pub longitude: f64,
+
+    /// Title of the venue.
+    pub title: String,
+
+    /// Address of the venue.
+    pub address: String,
+
+    /// Foursquare identifier of the venue if known.
+    pub foursquare_id: Option<String>,
+
+    /// Foursquare type of the venue, if known. (For example,
+    /// `arts_entertainment/default`, `arts_entertainment/aquarium` or
+    /// `food/icecream`.)
+    pub foursquare_type: Option<String>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the venue.
+    pub input_message_content: Option<InputMessageContent>,
+
+    /// Url of the thumbnail for the result.
+    pub thumb_url: Option<String>,
+
+    /// Thumbnail width.
+    pub thumb_width: Option<i32>,
+
+    /// Thumbnail height.
+    pub thumb_height: Option<i32>,
+}
+
+impl InlineQueryResultVenue {
+    pub fn new<S1, S2, S3>(id: S1, latitude: f64, longitude: f64, title: S2, address: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            latitude,
+            longitude,
+            title: title.into(),
+            address: address.into(),
+            foursquare_id: None,
+            foursquare_type: None,
+            reply_markup: None,
+            input_message_content: None,
+            thumb_url: None,
+            thumb_width: None,
+            thumb_height: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn latitude(mut self, val: f64) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    pub fn longitude(mut self, val: f64) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn address<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.address = val.into();
+        self
+    }
+
+    pub fn foursquare_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_id = Some(val.into());
+        self
+    }
+
+    pub fn foursquare_type<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_type = Some(val.into());
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = Some(val.into());
+        self
+    }
+
+    pub fn thumb_width(mut self, val: i32) -> Self {
+        self.thumb_width = Some(val);
+        self
+    }
+
+    pub fn thumb_height(mut self, val: i32) -> Self {
+        self.thumb_height = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
new file mode 100644
index 00000000..d51258fc
--- /dev/null
+++ b/src/types/inline_query_result_video.rs
@@ -0,0 +1,182 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, ParseMode};
+
+/// Represents a link to a page containing an embedded video player or a video
+/// file.
+///
+/// By default, this video file will be sent by the user with an optional
+/// caption. Alternatively, you can use `input_messaage_content` to send a
+/// message with the specified content instead of the video.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvideo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultVideo {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL for the embedded video player or video file.
+    pub video_url: String,
+
+    /// Mime type of the content of video url, `text/html` or `video/mp4`.
+    pub mime_type: MimeWrapper,
+
+    /// URL of the thumbnail (jpeg only) for the video.
+    pub thumb_url: String,
+
+    /// Title for the result.
+    pub title: String,
+
+    /// Caption of the video to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Video width.
+    pub video_width: Option<i32>,
+
+    /// Video height.
+    pub video_height: Option<i32>,
+
+    /// Video duration in seconds.
+    pub video_duration: Option<i32>,
+
+    /// Short description of the result.
+    pub description: Option<String>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the video. This field is
+    /// **required** if [`InlineQueryResultVideo`] is used to send an HTML-page
+    /// as a result (e.g., a YouTube video).
+    ///
+    /// [`InlineQueryResultVideo`]:
+    /// crate::types::InlineQueryResultVideo
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultVideo {
+    pub fn new<S1, S2, S3, S4>(
+        id: S1,
+        video_url: S2,
+        mime_type: MimeWrapper,
+        thumb_url: S3,
+        title: S4,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+        S4: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            video_url: video_url.into(),
+            mime_type,
+            thumb_url: thumb_url.into(),
+            title: title.into(),
+            caption: None,
+            parse_mode: None,
+            video_width: None,
+            video_height: None,
+            video_duration: None,
+            description: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn video_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.video_url = val.into();
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = val;
+        self
+    }
+
+    pub fn thumb_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.thumb_url = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn video_width(mut self, val: i32) -> Self {
+        self.video_width = Some(val);
+        self
+    }
+
+    pub fn video_height(mut self, val: i32) -> Self {
+        self.video_height = Some(val);
+        self
+    }
+
+    pub fn video_duration(mut self, val: i32) -> Self {
+        self.video_duration = Some(val);
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = Some(val.into());
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
new file mode 100644
index 00000000..db812b7e
--- /dev/null
+++ b/src/types/inline_query_result_voice.rs
@@ -0,0 +1,119 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+
+/// Represents a link to a voice recording in an .ogg container encoded with
+/// OPUS.
+///
+/// By default, this voice recording will be sent by the user. Alternatively,
+/// you can use `input_message_content` to send a message with the specified
+/// content instead of the the voice message.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvoice).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InlineQueryResultVoice {
+    /// Unique identifier for this result, 1-64 bytes.
+    pub id: String,
+
+    /// A valid URL for the voice recording.
+    pub voice_url: String,
+
+    /// Recording title.
+    pub title: String,
+
+    /// Caption, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Recording duration in seconds.
+    pub voice_duration: Option<i32>,
+
+    /// [Inline keyboard] attached to the message.
+    ///
+    /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// Content of the message to be sent instead of the voice recording.
+    pub input_message_content: Option<InputMessageContent>,
+}
+
+impl InlineQueryResultVoice {
+    pub fn new<S1, S2, S3>(id: S1, voice_url: S2, title: S3) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            voice_url: voice_url.into(),
+            title: title.into(),
+            caption: None,
+            parse_mode: None,
+            voice_duration: None,
+            reply_markup: None,
+            input_message_content: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn voice_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.voice_url = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn voice_duration(mut self, value: i32) -> Self {
+        self.voice_duration = Some(value);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+
+    pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
+        self.input_message_content = Some(val);
+        self
+    }
+}
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
new file mode 100644
index 00000000..55e15e14
--- /dev/null
+++ b/src/types/input_file.rs
@@ -0,0 +1,101 @@
+use serde::{Deserialize, Serialize};
+
+use std::{borrow::Cow, path::PathBuf};
+
+/// This object represents the contents of a file to be uploaded.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputfile).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Deserialize)]
+#[non_exhaustive]
+pub enum InputFile {
+    File(PathBuf),
+    Memory { file_name: String, data: Cow<'static, [u8]> },
+    Url(String),
+    FileId(String),
+}
+
+impl InputFile {
+    pub fn file<P>(path: P) -> Self
+    where
+        P: Into<PathBuf>,
+    {
+        Self::File(path.into())
+    }
+
+    pub fn memory<S, D>(file_name: S, data: D) -> Self
+    where
+        S: Into<String>,
+        D: Into<Cow<'static, [u8]>>,
+    {
+        Self::Memory { file_name: file_name.into(), data: data.into() }
+    }
+
+    pub fn url<T>(url: T) -> Self
+    where
+        T: Into<String>,
+    {
+        Self::Url(url.into())
+    }
+
+    pub fn file_id<T>(file_id: T) -> Self
+    where
+        T: Into<String>,
+    {
+        Self::FileId(file_id.into())
+    }
+
+    pub fn as_file(&self) -> Option<&PathBuf> {
+        match self {
+            Self::File(path) => Some(path),
+            _ => None,
+        }
+    }
+
+    pub fn as_url(&self) -> Option<&String> {
+        match self {
+            Self::Url(url) => Some(url),
+            _ => None,
+        }
+    }
+
+    pub fn as_file_id(&self) -> Option<&String> {
+        match self {
+            Self::FileId(id) => Some(id),
+            _ => None,
+        }
+    }
+}
+
+impl From<InputFile> for Option<PathBuf> {
+    fn from(file: InputFile) -> Self {
+        match file {
+            InputFile::File(path) => Some(path),
+            _ => None,
+        }
+    }
+}
+
+impl Serialize for InputFile {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self {
+            InputFile::File(path) => {
+                // NOTE: file should be actually attached with
+                // multipart/form-data
+                serializer.serialize_str(
+                    // TODO: remove unwrap (?)
+                    &format!("attach://{}", path.file_name().unwrap().to_string_lossy()),
+                )
+            }
+            InputFile::Memory { data, .. } => {
+                // NOTE: file should be actually attached with
+                // multipart/form-data
+                serializer.serialize_str(&format!("attach://{}", String::from_utf8_lossy(data)))
+            }
+            InputFile::Url(url) => serializer.serialize_str(url),
+            InputFile::FileId(id) => serializer.serialize_str(id),
+        }
+    }
+}
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
new file mode 100644
index 00000000..a37ebda4
--- /dev/null
+++ b/src/types/input_media.rs
@@ -0,0 +1,511 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{InputFile, ParseMode};
+
+/// This object represents the content of a media message to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmedia).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum InputMedia {
+    Photo(InputMediaPhoto),
+    Video(InputMediaVideo),
+    Animation(InputMediaAnimation),
+    Audio(InputMediaAudio),
+    Document(InputMediaDocument),
+}
+
+/// Represents a photo to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmediaphoto).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMediaPhoto {
+    /// File to send.
+    pub media: InputFile,
+
+    /// Caption of the photo to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+}
+
+impl InputMediaPhoto {
+    pub fn new(media: InputFile) -> Self {
+        Self { media, caption: None, parse_mode: None }
+    }
+
+    pub fn media(mut self, val: InputFile) -> Self {
+        self.media = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+}
+
+/// Represents a video to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmediavideo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMediaVideo {
+    // File to send.
+    pub media: InputFile,
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation
+    /// for the file is supported server-side. The thumbnail should be in
+    /// JPEG format and less than 200 kB in size. A thumbnail‘s width and
+    /// height should not exceed 320. Ignored if the file is not uploaded
+    /// using multipart/form-data.
+    pub thumb: Option<InputFile>,
+
+    /// Caption of the video to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Video width.
+    pub width: Option<u16>,
+
+    /// Video height.
+    pub height: Option<u16>,
+
+    /// Video duration.
+    pub duration: Option<u16>,
+
+    /// Pass `true`, if the uploaded video is suitable for streaming.
+    pub supports_streaming: Option<bool>,
+}
+
+impl InputMediaVideo {
+    pub fn new(media: InputFile) -> Self {
+        Self {
+            media,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            width: None,
+            height: None,
+            duration: None,
+            supports_streaming: None,
+        }
+    }
+
+    pub fn media(mut self, val: InputFile) -> Self {
+        self.media = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn width(mut self, val: u16) -> Self {
+        self.width = Some(val);
+        self
+    }
+
+    pub fn height(mut self, val: u16) -> Self {
+        self.height = Some(val);
+        self
+    }
+
+    pub fn duration(mut self, val: u16) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    pub fn supports_streaming(mut self, val: bool) -> Self {
+        self.supports_streaming = Some(val);
+        self
+    }
+}
+
+/// Represents an animation file (GIF or H.264/MPEG-4 AVC video without
+/// sound) to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmediaanimation).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMediaAnimation {
+    /// File to send.
+    pub media: InputFile,
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation
+    /// for the file is supported server-side. The thumbnail should be in
+    /// JPEG format and less than 200 kB in size. A thumbnail‘s width and
+    /// height should not exceed 320. Ignored if the file is not uploaded
+    /// using multipart/form-data.
+    pub thumb: Option<InputFile>,
+
+    /// Caption of the animation to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Animation width.
+    pub width: Option<u16>,
+
+    /// Animation height.
+    pub height: Option<u16>,
+
+    /// Animation duration.
+    pub duration: Option<u16>,
+}
+
+impl InputMediaAnimation {
+    pub fn new(media: InputFile) -> Self {
+        Self {
+            media,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            width: None,
+            height: None,
+            duration: None,
+        }
+    }
+
+    pub fn media(mut self, val: InputFile) -> Self {
+        self.media = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn width(mut self, val: u16) -> Self {
+        self.width = Some(val);
+        self
+    }
+
+    pub fn height(mut self, val: u16) -> Self {
+        self.height = Some(val);
+        self
+    }
+
+    pub fn duration(mut self, val: u16) -> Self {
+        self.duration = Some(val);
+        self
+    }
+}
+
+/// Represents an audio file to be treated as music to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmediaaudio).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMediaAudio {
+    /// File to send.
+    pub media: InputFile,
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation
+    /// for the file is supported server-side. The thumbnail should be in
+    /// JPEG format and less than 200 kB in size. A thumbnail‘s width and
+    /// height should not exceed 320. Ignored if the file is not uploaded
+    /// using multipart/form-data.
+    pub thumb: Option<InputFile>,
+
+    /// Caption of the audio to be sent, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Duration of the audio in seconds.
+    pub duration: Option<u16>,
+
+    /// Performer of the audio.
+    pub performer: Option<String>,
+
+    /// Title of the audio.
+    pub title: Option<String>,
+}
+
+impl InputMediaAudio {
+    pub fn new(media: InputFile) -> Self {
+        Self {
+            media,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            performer: None,
+            title: None,
+            duration: None,
+        }
+    }
+
+    pub fn media(mut self, val: InputFile) -> Self {
+        self.media = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn duration(mut self, val: u16) -> Self {
+        self.duration = Some(val);
+        self
+    }
+
+    pub fn performer<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.performer = Some(val.into());
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = Some(val.into());
+        self
+    }
+}
+
+/// Represents a general file to be sent.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmediadocument).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMediaDocument {
+    /// File to send.
+    pub media: InputFile,
+
+    /// Thumbnail of the file sent; can be ignored if thumbnail generation
+    /// for the file is supported server-side. The thumbnail should be in
+    /// JPEG format and less than 200 kB in size. A thumbnail‘s width and
+    /// height should not exceed 320. Ignored if the file is not uploaded
+    /// using multipart/form-data.
+    pub thumb: Option<InputFile>,
+
+    /// Caption of the document to be sent, 0-1024 charactersю
+    pub caption: Option<String>,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+}
+
+impl InputMediaDocument {
+    pub fn new(media: InputFile) -> Self {
+        Self { media, thumb: None, caption: None, parse_mode: None }
+    }
+
+    pub fn thumb(mut self, val: InputFile) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+}
+
+impl InputMedia {
+    pub fn media(&self) -> &InputFile {
+        match self {
+            InputMedia::Photo(InputMediaPhoto { media, .. })
+            | InputMedia::Document(InputMediaDocument { media, .. })
+            | InputMedia::Audio(InputMediaAudio { media, .. })
+            | InputMedia::Animation(InputMediaAnimation { media, .. })
+            | InputMedia::Video(InputMediaVideo { media, .. }) => media,
+        }
+    }
+}
+
+impl From<InputMedia> for InputFile {
+    fn from(media: InputMedia) -> InputFile {
+        match media {
+            InputMedia::Photo(InputMediaPhoto { media, .. })
+            | InputMedia::Document(InputMediaDocument { media, .. })
+            | InputMedia::Audio(InputMediaAudio { media, .. })
+            | InputMedia::Animation(InputMediaAnimation { media, .. })
+            | InputMedia::Video(InputMediaVideo { media, .. }) => media,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn photo_serialize() {
+        let expected_json = r#"{"type":"photo","media":"123456"}"#;
+        let photo = InputMedia::Photo(InputMediaPhoto {
+            media: InputFile::FileId(String::from("123456")),
+            caption: None,
+            parse_mode: None,
+        });
+
+        let actual_json = serde_json::to_string(&photo).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn video_serialize() {
+        let expected_json = r#"{"type":"video","media":"123456"}"#;
+        let video = InputMedia::Video(InputMediaVideo {
+            media: InputFile::FileId(String::from("123456")),
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            width: None,
+            height: None,
+            duration: None,
+            supports_streaming: None,
+        });
+
+        let actual_json = serde_json::to_string(&video).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn animation_serialize() {
+        let expected_json = r#"{"type":"animation","media":"123456"}"#;
+        let video = InputMedia::Animation(InputMediaAnimation {
+            media: InputFile::FileId(String::from("123456")),
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            width: None,
+            height: None,
+            duration: None,
+        });
+
+        let actual_json = serde_json::to_string(&video).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn audio_serialize() {
+        let expected_json = r#"{"type":"audio","media":"123456"}"#;
+        let video = InputMedia::Audio(InputMediaAudio {
+            media: InputFile::FileId(String::from("123456")),
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+            duration: None,
+            performer: None,
+            title: None,
+        });
+
+        let actual_json = serde_json::to_string(&video).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn document_serialize() {
+        let expected_json = r#"{"type":"document","media":"123456"}"#;
+        let video = InputMedia::Document(InputMediaDocument {
+            media: InputFile::FileId(String::from("123456")),
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+        });
+
+        let actual_json = serde_json::to_string(&video).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+}
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
new file mode 100644
index 00000000..caf57650
--- /dev/null
+++ b/src/types/input_message_content.rs
@@ -0,0 +1,318 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::ParseMode;
+
+/// This object represents the content of a message to be sent as a result of an
+/// inline query.
+///
+/// [The official docs](https://core.telegram.org/bots/api#inputmessagecontent).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum InputMessageContent {
+    Text(InputMessageContentText),
+    Location(InputMessageContentLocation),
+    Venue(InputMessageContentVenue),
+    Contact(InputMessageContentContact),
+}
+/// Represents the content of a text message to be sent as the result of an
+/// inline query.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMessageContentText {
+    /// Text of the message to be sent, 1-4096 characters.
+    pub message_text: String,
+
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
+    /// italic, fixed-width text or inline URLs] in the media caption.
+    ///
+    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
+    /// [HTML]: https://core.telegram.org/bots/api#html-style
+    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
+    pub parse_mode: Option<ParseMode>,
+
+    /// Disables link previews for links in the sent message.
+    pub disable_web_page_preview: Option<bool>,
+}
+
+impl InputMessageContentText {
+    pub fn new<S>(message_text: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { message_text: message_text.into(), parse_mode: None, disable_web_page_preview: None }
+    }
+
+    pub fn message_text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.message_text = val.into();
+        self
+    }
+
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+        self.parse_mode = Some(val);
+        self
+    }
+
+    pub fn disable_web_page_preview(mut self, val: bool) -> Self {
+        self.disable_web_page_preview = Some(val);
+        self
+    }
+}
+
+/// Represents the content of a location message to be sent as the result of an
+/// inline query.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMessageContentLocation {
+    /// Latitude of the location in degrees.
+    pub latitude: f64,
+
+    /// Longitude of the location in degrees.
+    pub longitude: f64,
+
+    /// Period in seconds for which the location can be updated, should be
+    /// between 60 and 86400.
+    pub live_period: Option<u32>,
+}
+
+impl InputMessageContentLocation {
+    pub fn new(latitude: f64, longitude: f64) -> Self {
+        Self { latitude, longitude, live_period: None }
+    }
+
+    pub fn latitude(mut self, val: f64) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    pub fn longitude(mut self, val: f64) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    pub fn live_period(mut self, val: u32) -> Self {
+        self.live_period = Some(val);
+        self
+    }
+}
+
+/// Represents the content of a venue message to be sent as the result of
+/// an inline query.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMessageContentVenue {
+    /// Latitude of the venue in degrees.
+    pub latitude: f64,
+
+    /// Longitude of the venue in degrees.
+    pub longitude: f64,
+
+    /// Name of the venue.
+    pub title: String,
+
+    /// Address of the venue.
+    pub address: String,
+
+    /// Foursquare identifier of the venue, if known.
+    pub foursquare_id: Option<String>,
+
+    /// Foursquare type of the venue, if known. (For example,
+    /// `arts_entertainment/default`, `arts_entertainment/aquarium`
+    /// or `food/icecream`.)
+    pub foursquare_type: Option<String>,
+}
+
+impl InputMessageContentVenue {
+    pub fn new<S1, S2>(latitude: f64, longitude: f64, title: S1, address: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            latitude,
+            longitude,
+            title: title.into(),
+            address: address.into(),
+            foursquare_id: None,
+            foursquare_type: None,
+        }
+    }
+
+    pub fn latitude(mut self, val: f64) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    pub fn longitude(mut self, val: f64) -> Self {
+        self.longitude = val;
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn address<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.address = val.into();
+        self
+    }
+
+    pub fn foursquare_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_id = Some(val.into());
+        self
+    }
+
+    pub fn foursquare_type<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_type = Some(val.into());
+        self
+    }
+}
+
+/// Represents the content of a contact message to be sent as the result of
+/// an inline query.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct InputMessageContentContact {
+    /// Contact's phone number.
+    pub phone_number: String,
+
+    /// Contact's first name.
+    pub first_name: String,
+
+    /// Contact's last name.
+    pub last_name: Option<String>,
+
+    /// Additional data about the contact in the form of a [vCard], 0-2048
+    /// bytes.
+    ///
+    /// [vCard]: https://en.wikipedia.org/wiki/VCard
+    pub vcard: Option<String>,
+}
+
+impl InputMessageContentContact {
+    pub fn new<S1, S2>(phone_number: S1, first_name: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            phone_number: phone_number.into(),
+            first_name: first_name.into(),
+            last_name: None,
+            vcard: None,
+        }
+    }
+
+    pub fn phone_number<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+
+    pub fn first_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.first_name = val.into();
+        self
+    }
+
+    pub fn last_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+
+    pub fn vcard<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.vcard = Some(val.into());
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn text_serialize() {
+        let expected_json = r#"{"message_text":"text"}"#;
+        let text_content = InputMessageContent::Text(InputMessageContentText {
+            message_text: String::from("text"),
+            parse_mode: None,
+            disable_web_page_preview: None,
+        });
+
+        let actual_json = serde_json::to_string(&text_content).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn location_serialize() {
+        let expected_json = r#"{"latitude":59.08,"longitude":38.4326}"#;
+        let location_content = InputMessageContent::Location(InputMessageContentLocation {
+            latitude: 59.08,
+            longitude: 38.4326,
+            live_period: None,
+        });
+
+        let actual_json = serde_json::to_string(&location_content).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn venue_serialize() {
+        let expected_json = r#"{"latitude":59.08,"longitude":38.4326,"title":"some title","address":"some address"}"#;
+        let venue_content = InputMessageContent::Venue(InputMessageContentVenue {
+            latitude: 59.08,
+            longitude: 38.4326,
+            title: String::from("some title"),
+            address: String::from("some address"),
+            foursquare_id: None,
+            foursquare_type: None,
+        });
+
+        let actual_json = serde_json::to_string(&venue_content).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+
+    #[test]
+    fn contact_serialize() {
+        let expected_json = r#"{"phone_number":"+3800000000","first_name":"jhon"}"#;
+        let contact_content = InputMessageContent::Contact(InputMessageContentContact {
+            phone_number: String::from("+3800000000"),
+            first_name: String::from("jhon"),
+            last_name: None,
+            vcard: None,
+        });
+
+        let actual_json = serde_json::to_string(&contact_content).unwrap();
+        assert_eq!(expected_json, actual_json);
+    }
+}
diff --git a/src/types/invoice.rs b/src/types/invoice.rs
new file mode 100644
index 00000000..979881e1
--- /dev/null
+++ b/src/types/invoice.rs
@@ -0,0 +1,91 @@
+use serde::{Deserialize, Serialize};
+
+/// This object contains basic information about an invoice.
+///
+/// [The official docs](https://core.telegram.org/bots/api#invoice).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Invoice {
+    /// Product name.
+    pub title: String,
+
+    /// Product description.
+    pub description: String,
+
+    /// Unique bot deep-linking parameter that can be used to generate this
+    /// invoice.
+    pub start_parameter: String,
+
+    /// Three-letter ISO 4217 currency code.
+    pub currency: String,
+
+    /// Total price in the smallest units of the currency (integer, **not**
+    /// float/double). For example, for a price of `US$ 1.45` pass `amount =
+    /// 145`. See the exp parameter in [`currencies.json`], it shows the number
+    /// of digits past the decimal point for each currency (2 for the
+    /// majority of currencies).
+    ///
+    /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+    pub total_amount: i32,
+}
+
+impl Invoice {
+    pub fn new<S1, S2, S3, S4>(
+        title: S1,
+        description: S2,
+        start_parameter: S3,
+        currency: S4,
+        total_amount: i32,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+        S4: Into<String>,
+    {
+        Self {
+            title: title.into(),
+            description: description.into(),
+            start_parameter: start_parameter.into(),
+            currency: currency.into(),
+            total_amount,
+        }
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+
+    pub fn start_parameter<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.start_parameter = val.into();
+        self
+    }
+
+    pub fn currency<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.currency = val.into();
+        self
+    }
+
+    pub fn total_amount(mut self, val: i32) -> Self {
+        self.total_amount = val;
+        self
+    }
+}
diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
new file mode 100644
index 00000000..fc37134a
--- /dev/null
+++ b/src/types/keyboard_button.rs
@@ -0,0 +1,156 @@
+use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
+
+use crate::types::{KeyboardButtonPollType, True};
+
+/// This object represents one button of the reply keyboard.
+///
+/// For filter text buttons String can be used instead of this object to specify
+/// text of the button.
+///
+/// [The official docs](https://core.telegram.org/bots/api#keyboardbutton).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct KeyboardButton {
+    /// Text of the button. If none of the optional fields are used, it will
+    /// be sent as a message when the button is pressed.
+    pub text: String,
+
+    /// Request something from user.
+    /// - If `Some(Contact)`, the user's phone number will be sent as a contact
+    ///   when the button is pressed. Available in private chats only
+    /// - If `Some(Location)`, the user's current location will be sent when the
+    ///   button is pressed. Available in private chats only
+    #[serde(flatten)]
+    pub request: Option<ButtonRequest>,
+}
+
+impl KeyboardButton {
+    pub fn new<T>(text: T) -> Self
+    where
+        T: Into<String>,
+    {
+        Self { text: text.into(), request: None }
+    }
+
+    pub fn request<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<ButtonRequest>>,
+    {
+        self.request = val.into();
+        self
+    }
+}
+
+// Serialize + Deserialize are implemented by hand
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[non_exhaustive]
+pub enum ButtonRequest {
+    Location,
+    Contact,
+    KeyboardButtonPollType(KeyboardButtonPollType),
+}
+
+/// Helper struct for (de)serializing [`ButtonRequest`](ButtonRequest)
+#[serde_with_macros::skip_serializing_none]
+#[derive(Serialize, Deserialize)]
+#[non_exhaustive]
+struct RawRequest {
+    /// If `true`, the user's phone number will be sent as a contact
+    /// when the button is pressed. Available in private chats only.
+    #[serde(rename = "request_contact")]
+    contact: Option<True>,
+
+    /// If `true`, the user's current location will be sent when the
+    /// button is pressed. Available in private chats only.
+    #[serde(rename = "request_location")]
+    location: Option<True>,
+
+    /// If specified, the user will be asked to create a poll and
+    /// send it to the bot when the button is pressed. Available in private
+    /// chats only.
+    #[serde(rename = "request_poll")]
+    poll: Option<KeyboardButtonPollType>,
+}
+
+impl<'de> Deserialize<'de> for ButtonRequest {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let raw = RawRequest::deserialize(deserializer)?;
+        match raw {
+            RawRequest { contact: Some(_), location: Some(_), poll: Some(_) } => {
+                Err(D::Error::custom(
+                    "`request_contact` and `request_location` fields are mutually exclusive, but \
+                     both were provided",
+                ))
+            }
+            RawRequest { contact: Some(_), .. } => Ok(Self::Contact),
+            RawRequest { location: Some(_), .. } => Ok(Self::Location),
+            RawRequest { poll: Some(poll_type), .. } => Ok(Self::KeyboardButtonPollType(poll_type)),
+            _ => Err(D::Error::custom(
+                "Either one of `request_contact` and `request_location` fields is required",
+            )),
+        }
+    }
+}
+
+impl Serialize for ButtonRequest {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            Self::Contact => {
+                RawRequest { contact: Some(True), location: None, poll: None }.serialize(serializer)
+            }
+            Self::Location => {
+                RawRequest { contact: None, location: Some(True), poll: None }.serialize(serializer)
+            }
+            Self::KeyboardButtonPollType(poll_type) => {
+                RawRequest { contact: None, location: None, poll: Some(poll_type.clone()) }
+                    .serialize(serializer)
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serialize_no_request() {
+        let button = KeyboardButton { text: String::from(""), request: None };
+        let expected = r#"{"text":""}"#;
+        let actual = serde_json::to_string(&button).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn serialize_request_contact() {
+        let button =
+            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
+        let expected = r#"{"text":"","request_contact":true}"#;
+        let actual = serde_json::to_string(&button).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn deserialize_no_request() {
+        let json = r#"{"text":""}"#;
+        let expected = KeyboardButton { text: String::from(""), request: None };
+        let actual = serde_json::from_str(json).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn deserialize_request_contact() {
+        let json = r#"{"text":"","request_contact":true}"#;
+        let expected =
+            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
+        let actual = serde_json::from_str(json).unwrap();
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/src/types/keyboard_button_poll_type.rs b/src/types/keyboard_button_poll_type.rs
new file mode 100644
index 00000000..6b24d540
--- /dev/null
+++ b/src/types/keyboard_button_poll_type.rs
@@ -0,0 +1,24 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct KeyboardButtonPollType {
+    poll_type: String,
+}
+
+impl KeyboardButtonPollType {
+    pub fn new<S>(poll_type: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { poll_type: poll_type.into() }
+    }
+
+    pub fn poll_type<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.poll_type = val.into();
+        self
+    }
+}
diff --git a/src/types/label_price.rs b/src/types/label_price.rs
new file mode 100644
index 00000000..4c6841a9
--- /dev/null
+++ b/src/types/label_price.rs
@@ -0,0 +1,56 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a portion of the price for goods or services.
+///
+/// [The official docs](https://core.telegram.org/bots/api#labeledprice).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct LabeledPrice {
+    /// Portion label.
+    pub label: String,
+
+    /// Price of the product in the smallest units of the [currency] (integer,
+    /// **not** float/double). For example, for a price of `US$ 1.45` pass
+    /// `amount = 145`. See the exp parameter in [`currencies.json`], it shows
+    /// the number of digits past the decimal point for each currency (2
+    /// for the majority of currencies).
+    ///
+    /// [currency]: https://core.telegram.org/bots/payments#supported-currencies
+    /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+    pub amount: i32,
+}
+
+impl LabeledPrice {
+    pub fn new<S>(label: S, amount: i32) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { label: label.into(), amount }
+    }
+
+    pub fn label<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.label = val.into();
+        self
+    }
+
+    pub fn amount(mut self, val: i32) -> Self {
+        self.amount = val;
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serialize() {
+        let labeled_price = LabeledPrice { label: "Label".to_string(), amount: 60 };
+        let expected = r#"{"label":"Label","amount":60}"#;
+        let actual = serde_json::to_string(&labeled_price).unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/src/types/location.rs b/src/types/location.rs
new file mode 100644
index 00000000..e34cee1a
--- /dev/null
+++ b/src/types/location.rs
@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a point on the map.
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Location {
+    /// Longitude as defined by sender.
+    pub longitude: f64,
+
+    /// Latitude as defined by sender.
+    pub latitude: f64,
+}
+
+impl Location {
+    pub fn new(longitude: f64, latitude: f64) -> Self {
+        Self { longitude, latitude }
+    }
+
+    pub fn latitude(mut self, val: f64) -> Self {
+        self.latitude = val;
+        self
+    }
+
+    pub fn longitude(mut self, val: f64) -> Self {
+        self.longitude = val;
+        self
+    }
+}
diff --git a/src/types/login_url.rs b/src/types/login_url.rs
new file mode 100644
index 00000000..5c683df0
--- /dev/null
+++ b/src/types/login_url.rs
@@ -0,0 +1,54 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a parameter of the inline keyboard button used to
+/// automatically authorize a user.
+///
+/// Serves as a great replacement for the [Telegram Login Widget] when the user
+/// is coming from Telegram. All the user needs to do is tap/click a button and
+/// confirm that they want to log in:
+///
+/// <div align="center">
+///     <img src="https://core.telegram.org/file/811140015/1734/8VZFkwWXalM.97872/6127fa62d8a0bf2b3c" width=300 />
+/// </div>
+///
+/// [Telegram Login Widget]: https://core.telegram.org/widgets/login
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct LoginUrl {
+    pub url: String,
+    pub forward_text: Option<String>,
+    pub bot_username: Option<String>,
+    pub request_write_access: Option<bool>,
+}
+
+impl LoginUrl {
+    pub fn url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.url = val.into();
+        self
+    }
+
+    pub fn forward_text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.forward_text = Some(val.into());
+        self
+    }
+
+    pub fn bot_username<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.bot_username = Some(val.into());
+        self
+    }
+
+    pub fn request_write_access<S>(mut self, val: bool) -> Self {
+        self.request_write_access = Some(val);
+        self
+    }
+}
diff --git a/src/types/mask_position.rs b/src/types/mask_position.rs
new file mode 100644
index 00000000..8bca0273
--- /dev/null
+++ b/src/types/mask_position.rs
@@ -0,0 +1,58 @@
+use serde::{Deserialize, Serialize};
+
+/// This object describes the position on faces where a mask should be placed by
+/// default.
+///
+/// [The official docs](https://core.telegram.org/bots/api#maskposition).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MaskPosition {
+    /// The part of the face relative to which the mask should be placed. One
+    /// of `forehead`, `eyes`, `mouth`, or `chin`.
+    pub point: String,
+
+    /// Shift by X-axis measured in widths of the mask scaled to the face size,
+    /// from left to right. For example, choosing `-1.0` will place mask just
+    /// to the left of the default mask position.
+    pub x_shift: f64,
+
+    /// Shift by Y-axis measured in heights of the mask scaled to the face
+    /// size, from top to bottom. For example, `1.0` will place the mask just
+    /// below the default mask position.
+    pub y_shift: f64,
+
+    /// Mask scaling coefficient. For example, `2.0` means double size.
+    pub scale: f64,
+}
+
+impl MaskPosition {
+    pub fn new<S>(point: S, x_shift: f64, y_shift: f64, scale: f64) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { point: point.into(), x_shift, y_shift, scale }
+    }
+
+    pub fn point<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.point = val.into();
+        self
+    }
+
+    pub fn x_shift(mut self, val: f64) -> Self {
+        self.x_shift = val;
+        self
+    }
+
+    pub fn y_shift(mut self, val: f64) -> Self {
+        self.y_shift = val;
+        self
+    }
+
+    pub fn scale(mut self, val: f64) -> Self {
+        self.scale = val;
+        self
+    }
+}
diff --git a/src/types/me.rs b/src/types/me.rs
new file mode 100644
index 00000000..0b46a030
--- /dev/null
+++ b/src/types/me.rs
@@ -0,0 +1,57 @@
+use crate::types::User;
+use serde::{Deserialize, Serialize};
+
+/// Returned only in [`Bot::get_me`].
+///
+/// [`Bot::get_me`]: crate::Bot::get_me
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Me {
+    #[serde(flatten)]
+    pub user: User,
+
+    /// `true`, if the bot can be invited to groups.
+    pub can_join_groups: bool,
+
+    /// `true`, if [privacy mode] is disabled for the bot.
+    ///
+    /// [privacy mode]: https://core.telegram.org/bots#privacy-mode
+    pub can_read_all_group_messages: bool,
+
+    /// `true`, if the bot supports inline queries.
+    pub supports_inline_queries: bool,
+}
+
+impl Me {
+    pub fn new(
+        user: User,
+        can_join_groups: bool,
+        can_read_all_group_messages: bool,
+        supports_inline_queries: bool,
+    ) -> Self {
+        Self { user, can_join_groups, can_read_all_group_messages, supports_inline_queries }
+    }
+
+    pub fn user(mut self, val: User) -> Self {
+        self.user = val;
+        self
+    }
+
+    #[warn(clippy::wrong_self_convention)]
+    pub fn can_join_groups<S>(mut self, val: bool) -> Self {
+        self.can_join_groups = val;
+        self
+    }
+
+    #[warn(clippy::wrong_self_convention)]
+    pub fn can_read_all_group_messages<S>(mut self, val: bool) -> Self {
+        self.can_read_all_group_messages = val;
+        self
+    }
+
+    #[warn(clippy::wrong_self_convention)]
+    pub fn supports_inline_queries<S>(mut self, val: bool) -> Self {
+        self.supports_inline_queries = val;
+        self
+    }
+}
diff --git a/src/types/message.rs b/src/types/message.rs
new file mode 100644
index 00000000..6404ebad
--- /dev/null
+++ b/src/types/message.rs
@@ -0,0 +1,1753 @@
+#![allow(clippy::large_enum_variant)]
+
+use serde::{Deserialize, Serialize};
+
+use crate::types::{
+    chat::{ChatKind, PublicChatKind},
+    Animation, Audio, Chat, ChatPublic, Contact, Dice, Document, Game, InlineKeyboardMarkup,
+    Invoice, Location, MessageEntity, PassportData, PhotoSize, Poll, PublicChatChannel,
+    PublicChatSupergroup, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote, Voice,
+};
+
+/// This object represents a message.
+///
+/// [The official docs](https://core.telegram.org/bots/api#message).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Message {
+    /// Unique message identifier inside this chat.
+    #[serde(rename = "message_id")]
+    pub id: i32,
+
+    /// Date the message was sent in Unix time.
+    pub date: i32,
+
+    /// Conversation the message belongs to.
+    pub chat: Chat,
+
+    /// Bot through which the message was sent.
+    pub via_bot: Option<User>,
+
+    #[serde(flatten)]
+    pub kind: MessageKind,
+}
+
+impl Message {
+    pub fn new(id: i32, date: i32, chat: Chat, kind: MessageKind) -> Self {
+        Self { id, date, chat, kind, via_bot: None }
+    }
+
+    pub fn id(mut self, val: i32) -> Self {
+        self.id = val;
+        self
+    }
+
+    pub fn date(mut self, val: i32) -> Self {
+        self.date = val;
+        self
+    }
+
+    pub fn chat(mut self, val: Chat) -> Self {
+        self.chat = val;
+        self
+    }
+
+    pub fn kind(mut self, val: MessageKind) -> Self {
+        self.kind = val;
+        self
+    }
+
+    pub fn via_bot(mut self, val: User) -> Self {
+        self.via_bot = Some(val);
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum MessageKind {
+    Common(MessageCommon),
+    NewChatMembers(MessageNewChatMembers),
+    LeftChatMember(MessageLeftChatMember),
+    NewChatTitle(MessageNewChatTitle),
+    NewChatPhoto(MessageNewChatPhoto),
+    DeleteChatPhoto(MessageDeleteChatPhoto),
+    GroupChatCreated(MessageGroupChatCreated),
+    SupergroupChatCreated(MessageSupergroupChatCreated),
+    ChannelChatCreated(MessageChannelChatCreated),
+    Migrate(MessageMigrate),
+    Pinned(MessagePinned),
+    Invoice(MessageInvoice),
+    SuccessfulPayment(MessageSuccessfulPayment),
+    ConnectedWebsite(MessageConnectedWebsite),
+    PassportData(MessagePassportData),
+    Dice(MessageDice),
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageCommon {
+    /// Sender, empty for messages sent to channels.
+    pub from: Option<User>,
+
+    #[serde(flatten)]
+    pub forward_kind: ForwardKind,
+
+    /// Date the message was last edited in Unix time.
+    pub edit_date: Option<i32>,
+
+    #[serde(flatten)]
+    pub media_kind: MediaKind,
+
+    /// Inline keyboard attached to the message. `login_url` buttons are
+    /// represented as ordinary `url` buttons.
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+impl MessageCommon {
+    pub fn new(forward_kind: ForwardKind, media_kind: MediaKind) -> Self {
+        Self { from: None, forward_kind, edit_date: None, media_kind, reply_markup: None }
+    }
+
+    pub fn from(mut self, val: User) -> Self {
+        self.from = Some(val);
+        self
+    }
+
+    pub fn forward_kind(mut self, val: ForwardKind) -> Self {
+        self.forward_kind = val;
+        self
+    }
+
+    pub fn edit_date(mut self, val: i32) -> Self {
+        self.edit_date = Some(val);
+        self
+    }
+
+    pub fn media_kind(mut self, val: MediaKind) -> Self {
+        self.media_kind = val;
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageNewChatMembers {
+    /// New members that were added to the group or supergroup and
+    /// information about them (the bot itself may be one of these
+    /// members).
+    pub new_chat_members: Vec<User>,
+}
+
+impl MessageNewChatMembers {
+    pub fn new<N>(new_chat_members: N) -> Self
+    where
+        N: Into<Vec<User>>,
+    {
+        Self { new_chat_members: new_chat_members.into() }
+    }
+
+    pub fn new_chat_members<N>(mut self, val: N) -> Self
+    where
+        N: Into<Vec<User>>,
+    {
+        self.new_chat_members = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageLeftChatMember {
+    /// A member was removed from the group, information about them (this
+    /// member may be the bot itself).
+    pub left_chat_member: User,
+}
+
+impl MessageLeftChatMember {
+    pub fn new<N>(left_chat_member: N) -> Self
+    where
+        N: Into<User>,
+    {
+        Self { left_chat_member: left_chat_member.into() }
+    }
+
+    pub fn left_chat_member<N>(mut self, val: N) -> Self
+    where
+        N: Into<User>,
+    {
+        self.left_chat_member = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageNewChatTitle {
+    /// A chat title was changed to this value.
+    pub new_chat_title: String,
+}
+
+impl MessageNewChatTitle {
+    pub fn new<N>(new_chat_title: N) -> Self
+    where
+        N: Into<String>,
+    {
+        Self { new_chat_title: new_chat_title.into() }
+    }
+
+    pub fn new_chat_title<N>(mut self, val: N) -> Self
+    where
+        N: Into<String>,
+    {
+        self.new_chat_title = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageNewChatPhoto {
+    /// A chat photo was change to this value.
+    pub new_chat_photo: Vec<PhotoSize>,
+}
+
+impl MessageNewChatPhoto {
+    pub fn new<N>(new_chat_photo: N) -> Self
+    where
+        N: Into<Vec<PhotoSize>>,
+    {
+        Self { new_chat_photo: new_chat_photo.into() }
+    }
+
+    pub fn new_chat_photo<N>(mut self, val: N) -> Self
+    where
+        N: Into<Vec<PhotoSize>>,
+    {
+        self.new_chat_photo = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageDeleteChatPhoto {
+    /// Service message: the chat photo was deleted.
+    pub delete_chat_photo: True,
+}
+
+impl MessageDeleteChatPhoto {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageGroupChatCreated {
+    /// Service message: the group has been created.
+    pub group_chat_created: True,
+}
+
+impl MessageGroupChatCreated {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageSupergroupChatCreated {
+    /// Service message: the supergroup has been created. This field can‘t
+    /// be received in a message coming through updates, because bot can’t
+    /// be a member of a supergroup when it is created. It can only be
+    /// found in `reply_to_message` if someone replies to a very first
+    /// message in a directly created supergroup.
+    pub supergroup_chat_created: True,
+}
+
+impl MessageSupergroupChatCreated {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageChannelChatCreated {
+    /// Service message: the channel has been created. This field can‘t be
+    /// received in a message coming through updates, because bot can’t be
+    /// a member of a channel when it is created. It can only be found in
+    /// `reply_to_message` if someone replies to a very first message in a
+    /// channel.
+    pub channel_chat_created: True,
+}
+
+impl MessageChannelChatCreated {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageMigrate {
+    /// The group has been migrated to a supergroup with the specified
+    /// identifier. This number may be greater than 32 bits and some
+    /// programming languages may have difficulty/silent defects in
+    /// interpreting it. But it is smaller than 52 bits, so a signed 64 bit
+    /// integer or double-precision float type are safe for storing this
+    /// identifier.
+    pub migrate_to_chat_id: i64,
+
+    /// The supergroup has been migrated from a group with the specified
+    /// identifier. This number may be greater than 32 bits and some
+    /// programming languages may have difficulty/silent defects in
+    /// interpreting it. But it is smaller than 52 bits, so a signed 64 bit
+    /// integer or double-precision float type are safe for storing this
+    /// identifier.
+    pub migrate_from_chat_id: i64,
+}
+
+impl MessageMigrate {
+    pub fn new(migrate_to_chat_id: i64, migrate_from_chat_id: i64) -> Self {
+        Self { migrate_to_chat_id, migrate_from_chat_id }
+    }
+
+    pub fn migrate_to_chat_id(mut self, val: i64) -> Self {
+        self.migrate_to_chat_id = val;
+        self
+    }
+
+    pub fn migrate_from_chat_id(mut self, val: i64) -> Self {
+        self.migrate_from_chat_id = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessagePinned {
+    /// Specified message was pinned. Note that the Message object in this
+    /// field will not contain further `reply_to_message` fields even if it
+    /// is itself a reply.
+    #[serde(rename = "pinned_message")]
+    pub pinned: Box<Message>,
+}
+
+impl MessagePinned {
+    pub fn new(pinned: Message) -> Self {
+        Self { pinned: Box::new(pinned) }
+    }
+
+    pub fn pinned(mut self, val: Message) -> Self {
+        self.pinned = Box::new(val);
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageInvoice {
+    /// Message is an invoice for a [payment], information about the
+    /// invoice. [More about payments »].
+    ///
+    /// [payment]: https://core.telegram.org/bots/api#payments
+    /// [More about payments »]: https://core.telegram.org/bots/api#payments
+    pub invoice: Invoice,
+}
+
+impl MessageInvoice {
+    pub fn new(invoice: Invoice) -> Self {
+        Self { invoice }
+    }
+
+    pub fn invoice(mut self, val: Invoice) -> Self {
+        self.invoice = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageSuccessfulPayment {
+    /// Message is a service message about a successful payment,
+    /// information about the payment. [More about payments »].
+    ///
+    /// [More about payments »]: https://core.telegram.org/bots/api#payments
+    pub successful_payment: SuccessfulPayment,
+}
+
+impl MessageSuccessfulPayment {
+    pub fn new(successful_payment: SuccessfulPayment) -> Self {
+        Self { successful_payment }
+    }
+
+    pub fn successful_payment(mut self, val: SuccessfulPayment) -> Self {
+        self.successful_payment = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageConnectedWebsite {
+    /// The domain name of the website on which the user has logged in.
+    /// [More about Telegram Login »].
+    ///
+    /// [More about Telegram Login »]: https://core.telegram.org/widgets/login
+    pub connected_website: String,
+}
+
+impl MessageConnectedWebsite {
+    pub fn new<S>(connected_website: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { connected_website: connected_website.into() }
+    }
+
+    pub fn connected_website<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.connected_website = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessagePassportData {
+    /// Telegram Passport data.
+    pub passport_data: PassportData,
+}
+
+impl MessagePassportData {
+    pub fn new(passport_data: PassportData) -> Self {
+        Self { passport_data }
+    }
+
+    pub fn passport_data(mut self, val: PassportData) -> Self {
+        self.passport_data = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum ForwardedFrom {
+    #[serde(rename = "forward_from")]
+    User(User),
+    #[serde(rename = "forward_sender_name")]
+    SenderName(String),
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum ForwardKind {
+    Channel(ForwardChannel),
+    NonChannel(ForwardNonChannel),
+    Origin(ForwardOrigin),
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ForwardChannel {
+    #[serde(rename = "forward_date")]
+    pub date: i32,
+
+    #[serde(rename = "forward_from_chat")]
+    pub chat: Chat,
+
+    #[serde(rename = "forward_from_message_id")]
+    pub message_id: i32,
+
+    #[serde(rename = "forward_signature")]
+    pub signature: Option<String>,
+}
+
+impl ForwardChannel {
+    pub fn new(date: i32, chat: Chat, message_id: i32) -> Self {
+        Self { date, chat, message_id, signature: None }
+    }
+
+    pub fn date(mut self, val: i32) -> Self {
+        self.date = val;
+        self
+    }
+
+    pub fn chat(mut self, val: Chat) -> Self {
+        self.chat = val;
+        self
+    }
+
+    pub fn message_id(mut self, val: i32) -> Self {
+        self.message_id = val;
+        self
+    }
+
+    pub fn signature<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.signature = Some(val.into());
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ForwardNonChannel {
+    #[serde(rename = "forward_date")]
+    pub date: i32,
+
+    #[serde(flatten)]
+    pub from: ForwardedFrom,
+}
+
+impl ForwardNonChannel {
+    pub fn new(date: i32, from: ForwardedFrom) -> Self {
+        Self { date, from }
+    }
+
+    pub fn date(mut self, val: i32) -> Self {
+        self.date = val;
+        self
+    }
+
+    pub fn from(mut self, val: ForwardedFrom) -> Self {
+        self.from = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ForwardOrigin {
+    pub reply_to_message: Option<Box<Message>>,
+}
+
+impl ForwardOrigin {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn reply_to_message(mut self, val: Message) -> Self {
+        self.reply_to_message = Some(Box::new(val));
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum MediaKind {
+    Animation(MediaAnimation),
+    Audio(MediaAudio),
+    Contact(MediaContact),
+    Document(MediaDocument),
+    Game(MediaGame),
+    Location(MediaLocation),
+    Photo(MediaPhoto),
+    Poll(MediaPoll),
+    Sticker(MediaSticker),
+    Text(MediaText),
+    Video(MediaVideo),
+    VideoNote(MediaVideoNote),
+    Voice(MediaVoice),
+    Venue(MediaVenue),
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaAnimation {
+    /// Message is an animation, information about the animation. For
+    /// backward compatibility, when this field is set, the document field
+    /// will also be set.
+    pub animation: Animation,
+
+    #[doc(hidden)]
+    /// "For backward compatibility" (c) Telegram Docs.
+    #[serde(skip)]
+    pub document: (),
+
+    /// Caption for the animation, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+}
+
+impl MediaAnimation {
+    pub fn new<CE>(animation: Animation, caption_entities: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self { animation, document: (), caption: None, caption_entities: caption_entities.into() }
+    }
+
+    pub fn animation(mut self, val: Animation) -> Self {
+        self.animation = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaAudio {
+    /// Message is an audio file, information about the file.
+    pub audio: Audio,
+
+    /// Caption for the audio, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+}
+
+impl MediaAudio {
+    pub fn new<CE>(audio: Audio, caption_entities: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self { audio, caption: None, caption_entities: caption_entities.into() }
+    }
+
+    pub fn audio(mut self, val: Audio) -> Self {
+        self.audio = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaContact {
+    /// Message is a shared contact, information about the contact.
+    contact: Contact,
+}
+
+impl MediaContact {
+    pub fn new(contact: Contact) -> Self {
+        Self { contact }
+    }
+
+    pub fn contact(mut self, val: Contact) -> Self {
+        self.contact = val;
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaDocument {
+    /// Message is a general file, information about the file.
+    pub document: Document,
+
+    /// Caption for the document, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+}
+
+impl MediaDocument {
+    pub fn new<CE>(document: Document, caption_entities: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self { document, caption: None, caption_entities: caption_entities.into() }
+    }
+
+    pub fn document(mut self, val: Document) -> Self {
+        self.document = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaGame {
+    /// Message is a game, information about the game. [More
+    /// about games »].
+    ///
+    /// [More about games »]: https://core.telegram.org/bots/api#games
+    pub game: Game,
+}
+
+impl MediaGame {
+    pub fn new(game: Game) -> Self {
+        Self { game }
+    }
+
+    pub fn game(mut self, val: Game) -> Self {
+        self.game = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaLocation {
+    /// Message is a shared location, information about the location.
+    pub location: Location,
+}
+
+impl MediaLocation {
+    pub fn new(location: Location) -> Self {
+        Self { location }
+    }
+
+    pub fn location(mut self, val: Location) -> Self {
+        self.location = val;
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaPhoto {
+    /// Message is a photo, available sizes of the photo.
+    pub photo: Vec<PhotoSize>,
+
+    /// Caption for the photo, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+
+    /// The unique identifier of a media message group this message belongs
+    /// to.
+    pub media_group_id: Option<String>,
+}
+
+impl MediaPhoto {
+    pub fn new<P, CE>(photo: P, caption_entities: CE) -> Self
+    where
+        P: Into<Vec<PhotoSize>>,
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self {
+            photo: photo.into(),
+            caption: None,
+            caption_entities: caption_entities.into(),
+            media_group_id: None,
+        }
+    }
+
+    pub fn photo<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PhotoSize>>,
+    {
+        self.photo = val.into();
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+
+    pub fn media_group_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.media_group_id = Some(val.into());
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaPoll {
+    /// Message is a native poll, information about the poll.
+    pub poll: Poll,
+}
+
+impl MediaPoll {
+    pub fn new(poll: Poll) -> Self {
+        Self { poll }
+    }
+
+    pub fn poll(mut self, val: Poll) -> Self {
+        self.poll = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaSticker {
+    /// Message is a sticker, information about the sticker.
+    pub sticker: Sticker,
+}
+
+impl MediaSticker {
+    pub fn new(sticker: Sticker) -> Self {
+        Self { sticker }
+    }
+
+    pub fn poll(mut self, val: Sticker) -> Self {
+        self.sticker = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaText {
+    /// For text messages, the actual UTF-8 text of the message, 0-4096
+    /// characters.
+    pub text: String,
+
+    /// For text messages, special entities like usernames, URLs, bot
+    /// commands, etc. that appear in the text.
+    #[serde(default = "Vec::new")]
+    pub entities: Vec<MessageEntity>,
+}
+
+impl MediaText {
+    pub fn new<S, E>(text: S, entities: E) -> Self
+    where
+        S: Into<String>,
+        E: Into<Vec<MessageEntity>>,
+    {
+        Self { text: text.into(), entities: entities.into() }
+    }
+
+    pub fn text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    pub fn entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.entities = val.into();
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaVideo {
+    /// Message is a video, information about the video.
+    pub video: Video,
+
+    /// Caption for the video, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+
+    /// The unique identifier of a media message group this message belongs
+    /// to.
+    pub media_group_id: Option<String>,
+}
+
+impl MediaVideo {
+    pub fn new<CE>(video: Video, caption_entities: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self {
+            video,
+            caption: None,
+            caption_entities: caption_entities.into(),
+            media_group_id: None,
+        }
+    }
+
+    pub fn video(mut self, val: Video) -> Self {
+        self.video = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+
+    pub fn media_group_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.media_group_id = Some(val.into());
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaVideoNote {
+    /// Message is a [video note], information about the video message.
+    ///
+    /// [video note]: https://telegram.org/blog/video-messages-and-telescope
+    pub video_note: VideoNote,
+}
+
+impl MediaVideoNote {
+    pub fn new(video_note: VideoNote) -> Self {
+        Self { video_note }
+    }
+
+    pub fn video_note(mut self, val: VideoNote) -> Self {
+        self.video_note = val;
+        self
+    }
+}
+
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaVoice {
+    /// Message is a voice message, information about the file.
+    pub voice: Voice,
+
+    /// Caption for the voice, 0-1024 characters.
+    pub caption: Option<String>,
+
+    /// For messages with a caption, special entities like usernames, URLs,
+    /// bot commands, etc. that appear in the caption.
+    #[serde(default = "Vec::new")]
+    pub caption_entities: Vec<MessageEntity>,
+}
+
+impl MediaVoice {
+    pub fn new<CE>(voice: Voice, caption_entities: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        Self { voice, caption: None, caption_entities: caption_entities.into() }
+    }
+
+    pub fn voice(mut self, val: Voice) -> Self {
+        self.voice = val;
+        self
+    }
+
+    pub fn caption<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.caption = Some(val.into());
+        self
+    }
+
+    pub fn caption_entities<CE>(mut self, val: CE) -> Self
+    where
+        CE: Into<Vec<MessageEntity>>,
+    {
+        self.caption_entities = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MediaVenue {
+    /// Message is a venue, information about the venue.
+    pub venue: Venue,
+}
+
+impl MediaVenue {
+    pub fn new(venue: Venue) -> Self {
+        Self { venue }
+    }
+
+    pub fn venue(mut self, val: Venue) -> Self {
+        self.venue = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageDice {
+    /// Message is a dice with random value from 1 to 6.
+    dice: Dice,
+}
+
+mod getters {
+    use std::ops::Deref;
+
+    use crate::types::{
+        self,
+        message::{
+            ForwardKind::NonChannel,
+            MessageKind::{
+                ChannelChatCreated, Common, ConnectedWebsite, DeleteChatPhoto, GroupChatCreated,
+                Invoice, LeftChatMember, Migrate, NewChatMembers, NewChatPhoto, NewChatTitle,
+                PassportData, Pinned, SuccessfulPayment, SupergroupChatCreated,
+            },
+        },
+        Chat, ForwardChannel, ForwardKind, ForwardNonChannel, ForwardOrigin, ForwardedFrom,
+        MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind,
+        MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo,
+        MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
+        MessageConnectedWebsite, MessageDeleteChatPhoto, MessageEntity, MessageGroupChatCreated,
+        MessageInvoice, MessageLeftChatMember, MessageMigrate, MessageNewChatMembers,
+        MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessagePinned,
+        MessageSuccessfulPayment, MessageSupergroupChatCreated, PhotoSize, True, User,
+    };
+
+    /// Getters for [Message] fields from [telegram docs].
+    ///
+    /// [Message]: crate::types::Message
+    /// [telegram docs]: https://core.telegram.org/bots/api#message
+    impl Message {
+        /// NOTE: this is getter for both `from` and `author_signature`
+        pub fn from(&self) -> Option<&User> {
+            match &self.kind {
+                Common(MessageCommon { from, .. }) => from.as_ref(),
+                _ => None,
+            }
+        }
+
+        pub fn chat_id(&self) -> i64 {
+            self.chat.id
+        }
+
+        /// NOTE: this is getter for both `forward_from` and
+        /// `forward_sender_name`
+        pub fn forward_from(&self) -> Option<&ForwardedFrom> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: NonChannel(ForwardNonChannel { from, .. }),
+                    ..
+                }) => Some(from),
+                _ => None,
+            }
+        }
+
+        pub fn forward_from_chat(&self) -> Option<&Chat> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: ForwardKind::Channel(ForwardChannel { chat, .. }),
+                    ..
+                }) => Some(chat),
+                _ => None,
+            }
+        }
+
+        pub fn forward_from_message_id(&self) -> Option<&i32> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: ForwardKind::Channel(ForwardChannel { message_id, .. }),
+                    ..
+                }) => Some(message_id),
+                _ => None,
+            }
+        }
+
+        pub fn forward_signature(&self) -> Option<&str> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: ForwardKind::Channel(ForwardChannel { signature, .. }),
+                    ..
+                }) => signature.as_ref().map(Deref::deref),
+                _ => None,
+            }
+        }
+
+        pub fn forward_date(&self) -> Option<&i32> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: ForwardKind::Channel(ForwardChannel { date, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    forward_kind: ForwardKind::NonChannel(ForwardNonChannel { date, .. }),
+                    ..
+                }) => Some(date),
+                _ => None,
+            }
+        }
+
+        pub fn reply_to_message(&self) -> Option<&Message> {
+            match &self.kind {
+                Common(MessageCommon {
+                    forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message, .. }),
+                    ..
+                }) => reply_to_message.as_ref().map(Deref::deref),
+                _ => None,
+            }
+        }
+
+        pub fn edit_date(&self) -> Option<&i32> {
+            match &self.kind {
+                Common(MessageCommon { edit_date, .. }) => edit_date.as_ref(),
+                _ => None,
+            }
+        }
+
+        pub fn media_group_id(&self) -> Option<&str> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Video(MediaVideo { media_group_id, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Photo(MediaPhoto { media_group_id, .. }),
+                    ..
+                }) => media_group_id.as_ref().map(Deref::deref),
+                _ => None,
+            }
+        }
+
+        pub fn text(&self) -> Option<&str> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Text(MediaText { text, .. }),
+                    ..
+                }) => Some(text),
+                _ => None,
+            }
+        }
+
+        pub fn text_owned(&self) -> Option<String> {
+            self.text().map(ToOwned::to_owned)
+        }
+
+        pub fn entities(&self) -> Option<&[MessageEntity]> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Text(MediaText { entities, .. }),
+                    ..
+                }) => Some(entities),
+                _ => None,
+            }
+        }
+
+        pub fn caption_entities(&self) -> Option<&[MessageEntity]> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Animation(MediaAnimation { caption_entities, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Audio(MediaAudio { caption_entities, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Document(MediaDocument { caption_entities, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Photo(MediaPhoto { caption_entities, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Video(MediaVideo { caption_entities, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Voice(MediaVoice { caption_entities, .. }),
+                    ..
+                }) => Some(caption_entities),
+                _ => None,
+            }
+        }
+
+        pub fn audio(&self) -> Option<&types::Audio> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Audio(MediaAudio { audio, .. }),
+                    ..
+                }) => Some(audio),
+                _ => None,
+            }
+        }
+
+        pub fn document(&self) -> Option<&types::Document> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Document(MediaDocument { document, .. }),
+                    ..
+                }) => Some(document),
+                _ => None,
+            }
+        }
+
+        pub fn animation(&self) -> Option<&types::Animation> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Animation(MediaAnimation { animation, .. }),
+                    ..
+                }) => Some(animation),
+                _ => None,
+            }
+        }
+
+        pub fn game(&self) -> Option<&types::Game> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Game(MediaGame { game, .. }),
+                    ..
+                }) => Some(game),
+                _ => None,
+            }
+        }
+
+        pub fn photo(&self) -> Option<&[PhotoSize]> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Photo(MediaPhoto { photo, .. }),
+                    ..
+                }) => Some(photo),
+                _ => None,
+            }
+        }
+
+        pub fn sticker(&self) -> Option<&types::Sticker> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Sticker(MediaSticker { sticker, .. }),
+                    ..
+                }) => Some(sticker),
+                _ => None,
+            }
+        }
+
+        pub fn video(&self) -> Option<&types::Video> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Video(MediaVideo { video, .. }),
+                    ..
+                }) => Some(video),
+                _ => None,
+            }
+        }
+
+        pub fn voice(&self) -> Option<&types::Voice> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Voice(MediaVoice { voice, .. }),
+                    ..
+                }) => Some(voice),
+                _ => None,
+            }
+        }
+
+        pub fn video_note(&self) -> Option<&types::VideoNote> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::VideoNote(MediaVideoNote { video_note, .. }),
+                    ..
+                }) => Some(video_note),
+                _ => None,
+            }
+        }
+
+        pub fn caption(&self) -> Option<&str> {
+            match &self.kind {
+                Common(MessageCommon { media_kind, .. }) => match media_kind {
+                    MediaKind::Animation(MediaAnimation { caption, .. })
+                    | MediaKind::Audio(MediaAudio { caption, .. })
+                    | MediaKind::Document(MediaDocument { caption, .. })
+                    | MediaKind::Photo(MediaPhoto { caption, .. })
+                    | MediaKind::Video(MediaVideo { caption, .. })
+                    | MediaKind::Voice(MediaVoice { caption, .. }) => {
+                        caption.as_ref().map(Deref::deref)
+                    }
+                    _ => None,
+                },
+                _ => None,
+            }
+        }
+
+        pub fn contact(&self) -> Option<&types::Contact> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Contact(MediaContact { contact, .. }),
+                    ..
+                }) => Some(contact),
+                _ => None,
+            }
+        }
+
+        pub fn location(&self) -> Option<&types::Location> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Location(MediaLocation { location, .. }),
+                    ..
+                }) => Some(location),
+                _ => None,
+            }
+        }
+
+        pub fn venue(&self) -> Option<&types::Venue> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Venue(MediaVenue { venue, .. }),
+                    ..
+                }) => Some(venue),
+                _ => None,
+            }
+        }
+
+        pub fn poll(&self) -> Option<&types::Poll> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Poll(MediaPoll { poll, .. }),
+                    ..
+                }) => Some(poll),
+                _ => None,
+            }
+        }
+
+        pub fn new_chat_members(&self) -> Option<&[User]> {
+            match &self.kind {
+                NewChatMembers(MessageNewChatMembers { new_chat_members }) => {
+                    Some(new_chat_members.as_ref())
+                }
+                _ => None,
+            }
+        }
+
+        pub fn left_chat_member(&self) -> Option<&User> {
+            match &self.kind {
+                LeftChatMember(MessageLeftChatMember { left_chat_member }) => {
+                    Some(left_chat_member)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn new_chat_title(&self) -> Option<&str> {
+            match &self.kind {
+                NewChatTitle(MessageNewChatTitle { new_chat_title }) => Some(new_chat_title),
+                _ => None,
+            }
+        }
+
+        pub fn new_chat_photo(&self) -> Option<&[PhotoSize]> {
+            match &self.kind {
+                NewChatPhoto(MessageNewChatPhoto { new_chat_photo }) => Some(new_chat_photo),
+                _ => None,
+            }
+        }
+
+        // TODO: OK, `Option<True>` is weird, can we do something with it?
+        //       mb smt like `is_delete_chat_photo(&self) -> bool`?
+        pub fn delete_chat_photo(&self) -> Option<True> {
+            match &self.kind {
+                DeleteChatPhoto(MessageDeleteChatPhoto { delete_chat_photo }) => {
+                    Some(*delete_chat_photo)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn group_chat_created(&self) -> Option<True> {
+            match &self.kind {
+                GroupChatCreated(MessageGroupChatCreated { group_chat_created }) => {
+                    Some(*group_chat_created)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn super_group_chat_created(&self) -> Option<True> {
+            match &self.kind {
+                SupergroupChatCreated(MessageSupergroupChatCreated { supergroup_chat_created }) => {
+                    Some(*supergroup_chat_created)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn channel_chat_created(&self) -> Option<True> {
+            match &self.kind {
+                ChannelChatCreated(MessageChannelChatCreated { channel_chat_created }) => {
+                    Some(*channel_chat_created)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn migrate_to_chat_id(&self) -> Option<i64> {
+            match &self.kind {
+                Migrate(MessageMigrate { migrate_to_chat_id, .. }) => Some(*migrate_to_chat_id),
+                _ => None,
+            }
+        }
+
+        pub fn migrate_from_chat_id(&self) -> Option<i64> {
+            match &self.kind {
+                Migrate(MessageMigrate { migrate_from_chat_id, .. }) => Some(*migrate_from_chat_id),
+                _ => None,
+            }
+        }
+
+        pub fn pinned_message(&self) -> Option<&Message> {
+            match &self.kind {
+                Pinned(MessagePinned { pinned }) => Some(pinned),
+                _ => None,
+            }
+        }
+
+        pub fn invoice(&self) -> Option<&types::Invoice> {
+            match &self.kind {
+                Invoice(MessageInvoice { invoice }) => Some(invoice),
+                _ => None,
+            }
+        }
+
+        pub fn successful_payment(&self) -> Option<&types::SuccessfulPayment> {
+            match &self.kind {
+                SuccessfulPayment(MessageSuccessfulPayment { successful_payment }) => {
+                    Some(successful_payment)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn connected_website(&self) -> Option<&str> {
+            match &self.kind {
+                ConnectedWebsite(MessageConnectedWebsite { connected_website }) => {
+                    Some(connected_website)
+                }
+                _ => None,
+            }
+        }
+
+        pub fn passport_data(&self) -> Option<&types::PassportData> {
+            match &self.kind {
+                PassportData(MessagePassportData { passport_data }) => Some(passport_data),
+                _ => None,
+            }
+        }
+
+        pub fn reply_markup(&self) -> Option<&types::InlineKeyboardMarkup> {
+            match &self.kind {
+                Common(MessageCommon { reply_markup, .. }) => reply_markup.as_ref(),
+                _ => None,
+            }
+        }
+    }
+}
+
+impl Message {
+    pub fn url(&self) -> Option<reqwest::Url> {
+        match &self.chat.kind {
+            ChatKind::Public(ChatPublic {
+                kind: PublicChatKind::Channel(PublicChatChannel { username: Some(username) }),
+                ..
+            })
+            | ChatKind::Public(ChatPublic {
+                kind:
+                    PublicChatKind::Supergroup(PublicChatSupergroup {
+                        username: Some(username), ..
+                    }),
+                ..
+            }) => Some(
+                reqwest::Url::parse(format!("https://t.me/{0}/{1}/", username, self.id).as_str())
+                    .unwrap(),
+            ),
+            _ => None,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::from_str;
+
+    use crate::types::*;
+
+    #[test]
+    fn de_media_forwarded() {
+        let json = r#"{
+          "message_id": 198283,
+          "from": {
+            "id": 250918540,
+            "is_bot": false,
+            "first_name": "Андрей",
+            "last_name": "Власов",
+            "username": "aka_dude",
+            "language_code": "en"
+          },
+          "chat": {
+            "id": 250918540,
+            "first_name": "Андрей",
+            "last_name": "Власов",
+            "username": "aka_dude",
+            "type": "private"
+          },
+          "date": 1567927221,
+          "video": {
+            "duration": 13,
+            "width": 512,
+            "height": 640,
+            "mime_type": "video/mp4",
+            "thumb": {
+              "file_id": "AAQCAAOmBAACBf2oS53pByA-I4CWWCObDwAEAQAHbQADMWcAAhYE",
+              "file_unique_id":"",
+              "file_size": 10339,
+              "width": 256,
+              "height": 320
+            },
+            "file_id": "BAADAgADpgQAAgX9qEud6QcgPiOAlhYE",
+            "file_unique_id":"",
+            "file_size": 1381334
+          }
+        }"#;
+        let message = from_str::<Message>(json);
+        assert!(message.is_ok());
+    }
+
+    #[test]
+    fn de_media_group_forwarded() {
+        let json = r#"{
+          "message_id": 198283,
+          "from": {
+            "id": 250918540,
+            "is_bot": false,
+            "first_name": "Андрей",
+            "last_name": "Власов",
+            "username": "aka_dude",
+            "language_code": "en"
+          },
+          "chat": {
+            "id": 250918540,
+            "first_name": "Андрей",
+            "last_name": "Власов",
+            "username": "aka_dude",
+            "type": "private"
+          },
+          "date": 1567927221,
+          "media_group_id": "12543417770506682",
+          "video": {
+            "duration": 13,
+            "width": 512,
+            "height": 640,
+            "mime_type": "video/mp4",
+            "thumb": {
+              "file_id": "AAQCAAOmBAACBf2oS53pByA-I4CWWCObDwAEAQAHbQADMWcAAhYE",
+              "file_unique_id":"",
+              "file_size": 10339,
+              "width": 256,
+              "height": 320
+            },
+            "file_id": "BAADAgADpgQAAgX9qEud6QcgPiOAlhYE",
+            "file_unique_id":"",
+            "file_size": 1381334
+          }
+        }"#;
+        let message = from_str::<Message>(json);
+        assert!(message.is_ok());
+    }
+
+    #[test]
+    fn de_text() {
+        let json = r#"{
+          "message_id": 199785,
+          "from": {
+           "id": 250918540,
+           "is_bot": false,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "language_code": "en"
+          },
+          "chat": {
+           "id": 250918540,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "type": "private"
+          },
+          "date": 1568289890,
+          "text": "Лол кек 😂"
+         }"#;
+        let message = from_str::<Message>(json);
+        assert!(message.is_ok());
+    }
+
+    #[test]
+    fn de_sticker() {
+        let json = r#"{
+          "message_id": 199787,
+          "from": {
+           "id": 250918540,
+           "is_bot": false,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "language_code": "en"
+          },
+          "chat": {
+           "id": 250918540,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "type": "private"
+          },
+          "date": 1568290188,
+          "sticker": {
+           "width": 512,
+           "height": 512,
+           "emoji": "😡",
+           "set_name": "AdvenTimeAnim",
+           "is_animated": true,
+           "thumb": {
+            "file_id": "AAQCAAMjAAOw0PgMaabKAcaXKCBLubkPAAQBAAdtAAPGKwACFgQ",
+            "file_unique_id":"",
+            "file_size": 4118,
+            "width": 128,
+            "height": 128
+           },
+           "file_id": "CAADAgADIwADsND4DGmmygHGlyggFgQ",
+           "file_unique_id":"",
+           "file_size": 16639
+          }
+         }"#;
+        let message = from_str::<Message>(json);
+        assert!(message.is_ok());
+    }
+
+    #[test]
+    fn de_image() {
+        let json = r#"{
+          "message_id": 199791,
+          "from": {
+           "id": 250918540,
+           "is_bot": false,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "language_code": "en"
+          },
+          "chat": {
+           "id": 250918540,
+           "first_name": "Андрей",
+           "last_name": "Власов",
+           "username": "aka_dude",
+           "type": "private"
+          },
+          "date": 1568290622,
+          "photo": [
+           {
+            "file_id": "AgADAgAD36sxG-PX0UvQSXIn9rccdw-ACA4ABAEAAwIAA20AAybcBAABFgQ",
+            "file_unique_id":"",
+            "file_size": 18188,
+            "width": 320,
+            "height": 239
+           },
+           {
+            "file_id": "AgADAgAD36sxG-PX0UvQSXIn9rccdw-ACA4ABAEAAwIAA3gAAyfcBAABFgQ",
+            "file_unique_id":"",
+            "file_size": 62123,
+            "width": 800,
+            "height": 598
+           },
+           {
+            "file_id": "AgADAgAD36sxG-PX0UvQSXIn9rccdw-ACA4ABAEAAwIAA3kAAyTcBAABFgQ",
+            "file_unique_id":"",
+            "file_size": 75245,
+            "width": 962,
+            "height": 719
+           }
+          ]
+         }"#;
+        let message = from_str::<Message>(json);
+        assert!(message.is_ok());
+    }
+}
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
new file mode 100644
index 00000000..c39459be
--- /dev/null
+++ b/src/types/message_entity.rs
@@ -0,0 +1,162 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Message, User};
+
+/// This object represents one special entity in a text message.
+///
+/// For example, hashtags, usernames, URLs, etc.
+///
+/// [The official docs](https://core.telegram.org/bots/api#messageentity).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct MessageEntity {
+    #[serde(flatten)]
+    pub kind: MessageEntityKind,
+
+    /// Offset in UTF-16 code units to the start of the entity.
+    pub offset: usize,
+
+    /// Length of the entity in UTF-16 code units.
+    pub length: usize,
+}
+
+impl MessageEntity {
+    pub fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
+        Self { kind, offset, length }
+    }
+
+    pub fn kind(mut self, val: MessageEntityKind) -> Self {
+        self.kind = val;
+        self
+    }
+
+    pub fn offset(mut self, val: usize) -> Self {
+        self.offset = val;
+        self
+    }
+
+    pub fn length(mut self, val: usize) -> Self {
+        self.length = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+#[non_exhaustive]
+pub enum MessageEntityKind {
+    Mention,
+    Hashtag,
+    Cashtag,
+    BotCommand,
+    Url,
+    Email,
+    PhoneNumber,
+    Bold,
+    Italic,
+    Code,
+    Pre { language: Option<String> },
+    TextLink { url: String },
+    TextMention { user: User },
+    Underline,
+    Strikethrough,
+}
+
+impl MessageEntity {
+    pub fn text_from(&self, message: &Message) -> Option<String> {
+        let text = message.text();
+        Some(String::from(&text?[self.offset..self.offset + self.length]))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::types::{
+        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText,
+        MessageCommon, MessageKind,
+    };
+
+    #[test]
+    fn recursive_kind() {
+        use serde_json::from_str;
+
+        assert_eq!(
+            MessageEntity {
+                kind: MessageEntityKind::TextLink { url: "ya.ru".into() },
+                offset: 1,
+                length: 2,
+            },
+            from_str::<MessageEntity>(
+                r#"{"type":"text_link","url":"ya.ru","offset":1,"length":2}"#
+            )
+            .unwrap()
+        );
+    }
+
+    #[test]
+    fn pre() {
+        use serde_json::from_str;
+
+        assert_eq!(
+            MessageEntity {
+                kind: MessageEntityKind::Pre { language: Some("rust".to_string()) },
+                offset: 1,
+                length: 2,
+            },
+            from_str::<MessageEntity>(
+                r#"{"type":"pre","url":"ya.ru","offset":1,"length":2,"language":"rust"}"#
+            )
+            .unwrap()
+        );
+    }
+
+    #[test]
+    fn text_from() {
+        let message = message();
+        let expected = Some("yes".to_string());
+        let entity = message.entities().unwrap()[0].clone();
+        let actual = entity.text_from(&message);
+        assert_eq!(actual, expected);
+    }
+
+    fn message() -> Message {
+        Message {
+            via_bot: None,
+            id: 0,
+            date: 0,
+            chat: Chat {
+                id: 0,
+                kind: ChatKind::Private(ChatPrivate {
+                    type_: (),
+                    username: None,
+                    first_name: None,
+                    last_name: None,
+                }),
+                photo: None,
+            },
+            kind: MessageKind::Common(MessageCommon {
+                from: Some(User {
+                    id: 0,
+                    is_bot: false,
+                    first_name: "".to_string(),
+                    last_name: None,
+                    username: None,
+                    language_code: None,
+                }),
+                forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message: None }),
+                edit_date: None,
+                media_kind: MediaKind::Text(MediaText {
+                    text: "no yes no".to_string(),
+                    entities: vec![MessageEntity {
+                        kind: MessageEntityKind::Mention,
+                        offset: 3,
+                        length: 3,
+                    }],
+                }),
+                reply_markup: None,
+            }),
+        }
+    }
+}
diff --git a/src/types/mod.rs b/src/types/mod.rs
new file mode 100644
index 00000000..e6f7e5fa
--- /dev/null
+++ b/src/types/mod.rs
@@ -0,0 +1,194 @@
+//! API types.
+
+pub use allowed_update::*;
+pub use animation::*;
+pub use audio::*;
+pub use bot_command::*;
+pub use callback_game::*;
+pub use callback_query::*;
+pub use chat::*;
+pub use chat_action::*;
+pub use chat_id::*;
+pub use chat_member::*;
+pub use chat_permissions::*;
+pub use chat_photo::*;
+pub use chosen_inline_result::*;
+pub use contact::*;
+pub use dice::*;
+pub use dice_emoji::*;
+pub use document::*;
+pub use encrypted_credentials::*;
+pub use encrypted_passport_element::*;
+pub use file::*;
+pub use force_reply::*;
+pub use game::*;
+pub use game_high_score::*;
+pub use inline_keyboard_button::*;
+pub use inline_keyboard_markup::*;
+pub use inline_query::*;
+pub use inline_query_result::*;
+pub use inline_query_result_article::*;
+pub use inline_query_result_audio::*;
+pub use inline_query_result_cached_audio::*;
+pub use inline_query_result_cached_document::*;
+pub use inline_query_result_cached_gif::*;
+pub use inline_query_result_cached_mpeg4_gif::*;
+pub use inline_query_result_cached_photo::*;
+pub use inline_query_result_cached_sticker::*;
+pub use inline_query_result_cached_video::*;
+pub use inline_query_result_cached_voice::*;
+pub use inline_query_result_contact::*;
+pub use inline_query_result_document::*;
+pub use inline_query_result_game::*;
+pub use inline_query_result_gif::*;
+pub use inline_query_result_location::*;
+pub use inline_query_result_mpeg4_gif::*;
+pub use inline_query_result_photo::*;
+pub use inline_query_result_venue::*;
+pub use inline_query_result_video::*;
+pub use inline_query_result_voice::*;
+pub use input_file::*;
+pub use input_media::*;
+pub use input_message_content::*;
+pub use invoice::*;
+pub use keyboard_button::*;
+pub use keyboard_button_poll_type::*;
+pub use label_price::*;
+pub use location::*;
+pub use login_url::*;
+pub use mask_position::*;
+pub use me::*;
+pub use message::*;
+pub use message_entity::*;
+pub use order_info::*;
+pub use parse_mode::*;
+pub use passport_data::*;
+pub use passport_element_error::*;
+pub use passport_file::*;
+pub use photo_size::*;
+pub use poll::*;
+pub use poll_answer::*;
+pub use poll_type::*;
+pub use pre_checkout_query::*;
+pub use reply_keyboard_markup::*;
+pub use reply_keyboard_remove::*;
+pub use reply_markup::*;
+pub use response_parameters::*;
+pub use send_invoice::*;
+pub use shipping_address::*;
+pub use shipping_option::*;
+pub use shipping_query::*;
+pub use sticker::*;
+pub use sticker_set::*;
+pub use sticker_type::*;
+pub use successful_payment::*;
+pub use target_message::*;
+pub use unit_false::*;
+pub use unit_true::*;
+pub use update::*;
+pub use user::*;
+pub use user_profile_photos::*;
+pub use venue::*;
+pub use video::*;
+pub use video_note::*;
+pub use voice::*;
+pub use webhook_info::*;
+
+mod allowed_update;
+mod animation;
+mod audio;
+mod bot_command;
+mod callback_game;
+mod callback_query;
+mod chat;
+mod chat_action;
+mod chat_id;
+mod chat_member;
+mod chat_permissions;
+mod chat_photo;
+mod chosen_inline_result;
+mod contact;
+mod dice;
+mod dice_emoji;
+mod document;
+mod file;
+mod force_reply;
+mod game;
+mod game_high_score;
+mod inline_keyboard_button;
+mod inline_keyboard_markup;
+mod input_file;
+mod input_media;
+mod input_message_content;
+mod invoice;
+mod keyboard_button;
+mod keyboard_button_poll_type;
+mod label_price;
+mod location;
+mod login_url;
+mod mask_position;
+mod me;
+mod message;
+mod message_entity;
+mod order_info;
+mod parse_mode;
+mod photo_size;
+mod poll;
+mod poll_answer;
+mod poll_type;
+mod pre_checkout_query;
+mod reply_keyboard_markup;
+mod reply_keyboard_remove;
+mod reply_markup;
+mod response_parameters;
+mod send_invoice;
+mod shipping_address;
+mod shipping_option;
+mod shipping_query;
+mod sticker;
+mod sticker_set;
+mod sticker_type;
+mod successful_payment;
+mod target_message;
+mod unit_false;
+mod unit_true;
+mod update;
+mod user;
+mod user_profile_photos;
+mod venue;
+mod video;
+mod video_note;
+mod voice;
+mod webhook_info;
+
+mod inline_query;
+mod inline_query_result;
+mod inline_query_result_article;
+mod inline_query_result_audio;
+mod inline_query_result_cached_audio;
+mod inline_query_result_cached_document;
+mod inline_query_result_cached_gif;
+mod inline_query_result_cached_mpeg4_gif;
+mod inline_query_result_cached_photo;
+mod inline_query_result_cached_sticker;
+mod inline_query_result_cached_video;
+mod inline_query_result_cached_voice;
+mod inline_query_result_contact;
+mod inline_query_result_document;
+mod inline_query_result_game;
+mod inline_query_result_gif;
+mod inline_query_result_location;
+mod inline_query_result_mpeg4_gif;
+mod inline_query_result_photo;
+mod inline_query_result_venue;
+mod inline_query_result_video;
+mod inline_query_result_voice;
+
+mod encrypted_credentials;
+mod encrypted_passport_element;
+mod passport_data;
+mod passport_element_error;
+mod passport_file;
+
+pub use non_telegram_types::*;
+mod non_telegram_types;
diff --git a/src/types/non_telegram_types/country_code.rs b/src/types/non_telegram_types/country_code.rs
new file mode 100644
index 00000000..4f7705ac
--- /dev/null
+++ b/src/types/non_telegram_types/country_code.rs
@@ -0,0 +1,254 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub enum CountryCode {
+    AD,
+    AE,
+    AF,
+    AG,
+    AI,
+    AL,
+    AM,
+    AO,
+    AQ,
+    AR,
+    AS,
+    AT,
+    AU,
+    AW,
+    AX,
+    AZ,
+    BA,
+    BB,
+    BD,
+    BE,
+    BF,
+    BG,
+    BH,
+    BI,
+    BJ,
+    BL,
+    BM,
+    BN,
+    BO,
+    BQ,
+    BR,
+    BS,
+    BT,
+    BV,
+    BW,
+    BY,
+    BZ,
+    CA,
+    CC,
+    CD,
+    CF,
+    CG,
+    CH,
+    CI,
+    CK,
+    CL,
+    CM,
+    CN,
+    CO,
+    CR,
+    CU,
+    CV,
+    CW,
+    CX,
+    CY,
+    CZ,
+    DE,
+    DJ,
+    DK,
+    DM,
+    DO,
+    DZ,
+    EC,
+    EE,
+    EG,
+    EH,
+    ER,
+    ES,
+    ET,
+    FI,
+    FJ,
+    FK,
+    FM,
+    FO,
+    FR,
+    GA,
+    GB,
+    GD,
+    GE,
+    GF,
+    GG,
+    GH,
+    GI,
+    GL,
+    GM,
+    GN,
+    GP,
+    GQ,
+    GR,
+    GS,
+    GT,
+    GU,
+    GW,
+    GY,
+    HK,
+    HM,
+    HN,
+    HR,
+    HT,
+    HU,
+    ID,
+    IE,
+    IL,
+    IM,
+    IN,
+    IO,
+    IQ,
+    IR,
+    IS,
+    IT,
+    JE,
+    JM,
+    JO,
+    JP,
+    KE,
+    KG,
+    KH,
+    KI,
+    KM,
+    KN,
+    KP,
+    KR,
+    KW,
+    KY,
+    KZ,
+    LA,
+    LB,
+    LC,
+    LI,
+    LK,
+    LR,
+    LS,
+    LT,
+    LU,
+    LV,
+    LY,
+    MA,
+    MC,
+    MD,
+    ME,
+    MF,
+    MG,
+    MH,
+    MK,
+    ML,
+    MM,
+    MN,
+    MO,
+    MP,
+    MQ,
+    MR,
+    MS,
+    MT,
+    MU,
+    MV,
+    MW,
+    MX,
+    MY,
+    MZ,
+    NA,
+    NC,
+    NE,
+    NF,
+    NG,
+    NI,
+    NL,
+    NO,
+    NP,
+    NR,
+    NU,
+    NZ,
+    OM,
+    PA,
+    PE,
+    PF,
+    PG,
+    PH,
+    PK,
+    PL,
+    PM,
+    PN,
+    PR,
+    PS,
+    PT,
+    PW,
+    PY,
+    QA,
+    RE,
+    RO,
+    RS,
+    RU,
+    RW,
+    SA,
+    SB,
+    SC,
+    SD,
+    SE,
+    SG,
+    SH,
+    SI,
+    SJ,
+    SK,
+    SL,
+    SM,
+    SN,
+    SO,
+    SR,
+    SS,
+    ST,
+    SV,
+    SX,
+    SY,
+    SZ,
+    TC,
+    TD,
+    TF,
+    TG,
+    TH,
+    TJ,
+    TK,
+    TL,
+    TM,
+    TN,
+    TO,
+    TR,
+    TT,
+    TV,
+    TW,
+    TZ,
+    UA,
+    UG,
+    UM,
+    US,
+    UY,
+    UZ,
+    VA,
+    VC,
+    VE,
+    VG,
+    VI,
+    VN,
+    VU,
+    WF,
+    WS,
+    YE,
+    YT,
+    ZA,
+    ZM,
+    ZW,
+}
diff --git a/src/types/non_telegram_types/currency.rs b/src/types/non_telegram_types/currency.rs
new file mode 100644
index 00000000..0cdebce6
--- /dev/null
+++ b/src/types/non_telegram_types/currency.rs
@@ -0,0 +1,89 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub enum Currency {
+    AED,
+    AFN,
+    ALL,
+    AMD,
+    ARS,
+    AUD,
+    AZN,
+    BAM,
+    BDT,
+    BGN,
+    BND,
+    BOB,
+    BRL,
+    CAD,
+    CHF,
+    CLP,
+    CNY,
+    COP,
+    CRC,
+    CZK,
+    DKK,
+    DOP,
+    DZD,
+    EGP,
+    EUR,
+    GBP,
+    GEL,
+    GTQ,
+    HKD,
+    HNL,
+    HRK,
+    HUF,
+    IDR,
+    ILS,
+    INR,
+    ISK,
+    JMD,
+    JPY,
+    KES,
+    KGS,
+    KRW,
+    KZT,
+    LBP,
+    LKR,
+    MAD,
+    MDL,
+    MNT,
+    MUR,
+    MVR,
+    MXN,
+    MYR,
+    MZN,
+    NGN,
+    NIO,
+    NOK,
+    NPR,
+    NZD,
+    PAB,
+    PEN,
+    PHP,
+    PKR,
+    PLN,
+    PYG,
+    QAR,
+    RON,
+    RSD,
+    RUB,
+    SAR,
+    SEK,
+    SGD,
+    THB,
+    TJS,
+    TRY,
+    TTD,
+    TWD,
+    TZS,
+    UAH,
+    UGX,
+    USD,
+    UYU,
+    UZS,
+    VND,
+    YER,
+    ZAR,
+}
diff --git a/src/types/non_telegram_types/mime_wrapper.rs b/src/types/non_telegram_types/mime_wrapper.rs
new file mode 100644
index 00000000..43326de6
--- /dev/null
+++ b/src/types/non_telegram_types/mime_wrapper.rs
@@ -0,0 +1,44 @@
+use derive_more::From;
+use mime::Mime;
+use serde::{de::Visitor, export::Formatter, Deserialize, Deserializer, Serialize, Serializer};
+
+/// Serializable & deserializable `MIME` wrapper.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, From)]
+pub struct MimeWrapper(pub Mime);
+
+impl Serialize for MimeWrapper {
+    fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(self.0.as_ref())
+    }
+}
+
+struct MimeVisitor;
+impl<'a> Visitor<'a> for MimeVisitor {
+    type Value = MimeWrapper;
+
+    fn expecting(&self, formatter: &mut Formatter<'_>) -> Result<(), serde::export::fmt::Error> {
+        formatter.write_str("mime type")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        match v.parse::<Mime>() {
+            Ok(mime_type) => Ok(MimeWrapper(mime_type)),
+            Err(e) => Err(E::custom(e)),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for MimeWrapper {
+    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_str(MimeVisitor)
+    }
+}
diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs
new file mode 100644
index 00000000..8add54b6
--- /dev/null
+++ b/src/types/non_telegram_types/mod.rs
@@ -0,0 +1,7 @@
+pub use country_code::*;
+pub use currency::*;
+pub use mime_wrapper::*;
+
+mod country_code;
+mod currency;
+mod mime_wrapper;
diff --git a/src/types/order_info.rs b/src/types/order_info.rs
new file mode 100644
index 00000000..7f41f7a9
--- /dev/null
+++ b/src/types/order_info.rs
@@ -0,0 +1,72 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::ShippingAddress;
+
+/// This object represents information about an order.
+///
+/// [The official docs](https://core.telegram.org/bots/api#orderinfo).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct OrderInfo {
+    /// User's name.
+    pub name: String,
+
+    /// User's phone number.
+    pub phone_number: String,
+
+    /// User's email.
+    pub email: String,
+
+    /// User's shipping address.
+    pub shipping_address: ShippingAddress,
+}
+
+impl OrderInfo {
+    pub fn new<S1, S2, S3>(
+        name: S1,
+        phone_number: S2,
+        email: S3,
+        shipping_address: ShippingAddress,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            name: name.into(),
+            phone_number: phone_number.into(),
+            email: email.into(),
+            shipping_address,
+        }
+    }
+
+    pub fn name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+
+    pub fn phone_number<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.phone_number = val.into();
+        self
+    }
+
+    pub fn email<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.email = val.into();
+        self
+    }
+
+    pub fn shipping_address(mut self, val: ShippingAddress) -> Self {
+        self.shipping_address = val;
+        self
+    }
+}
diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
new file mode 100644
index 00000000..44a0ecff
--- /dev/null
+++ b/src/types/parse_mode.rs
@@ -0,0 +1,189 @@
+// see https://github.com/rust-lang/rust/issues/38832
+// (for built ins there no warnings, but for (De)Serialize, there are)
+#![allow(deprecated)]
+
+use std::{
+    convert::{TryFrom, TryInto},
+    str::FromStr,
+};
+
+use serde::{Deserialize, Serialize};
+
+/// Formatting options.
+///
+/// The Bot API supports basic formatting for messages. You can use bold,
+/// italic, underlined and strikethrough text, as well as inline links and
+/// pre-formatted code in your bots' messages. Telegram clients will render
+/// them accordingly. You can use either markdown-style or HTML-style
+/// formatting.
+///
+/// Note that Telegram clients will display an **alert** to the user before
+/// opening an inline link (‘Open this link?’ together with the full URL).
+///
+/// Links `tg://user?id=<user_id>` can be used to mention a user by their ID
+/// without using a username. Please note:
+///
+/// - These links will work **only** if they are used inside an inline link. For
+///   example, they will not work, when used in an inline keyboard button or in
+///   a message text.
+/// - These mentions are only guaranteed to work if the user has contacted the
+///   bot in the past, has sent a callback query to the bot via inline button or
+///   is a member in the group where he was mentioned.
+///
+/// ## MarkdownV2 style
+///
+/// To use this mode, pass [`MarkdownV2`] in the `parse_mode` field.
+/// Use the following syntax in your message:
+/// ````text
+/// *bold \*text*
+/// _italic \*text_
+/// __underline__
+/// ~strikethrough~
+/// *bold _italic bold ~italic bold strikethrough~ __underline italic bold___ bold*
+/// [inline URL](http://www.example.com/)
+/// [inline mention of a user](tg://user?id=123456789)
+/// `inline fixed-width code`
+/// ```
+/// pre-formatted fixed-width code block
+/// ```
+/// ```rust
+/// pre-formatted fixed-width code block written in the Rust programming
+/// language ```
+/// ````
+/// 
+/// Please note:
+/// - Any character between 1 and 126 inclusively can be escaped anywhere with a
+///   preceding '\' character, in which case it is treated as an ordinary
+///   character and not a part of the markup.
+/// - Inside `pre` and `code` entities, all '`‘ and ’\‘ characters must be
+///   escaped with a preceding ’\' character.
+/// - Inside `(...)` part of inline link definition, all ')‘ and ’\‘ must be
+///   escaped with a preceding ’\' character.
+/// - In all other places characters ’_‘, ’*‘, ’[‘, ’]‘, ’(‘, ’)‘, ’~‘, ’`‘,
+///   ’>‘, ’#‘, ’+‘, ’+‘, ’-‘, ’|‘, ’{‘, ’}‘, ’.‘, ’!‘ must be escaped with the
+///   preceding character ’\'.
+/// - In case of ambiguity between `italic` and `underline` entities ‘__’ is
+///   always greadily treated from left to right as beginning or end of
+///   `underline` entity, so instead of `___italic underline___` use `___italic
+///   underline_\r__`, where `\r` is a character with code `13`, which will be
+///   ignored.
+///
+/// ## HTML style
+/// To use this mode, pass [`HTML`] in the `parse_mode` field.
+/// The following tags are currently supported:
+/// ````text
+/// <b>bold</b>, <strong>bold</strong>
+/// <i>italic</i>, <em>italic</em>
+/// <u>underline</u>, <ins>underline</ins>
+/// <s>strikethrough</s>, <strike>strikethrough</strike>,
+/// <del>strikethrough</del> <b>bold <i>italic bold <s>italic bold
+/// strikethrough</s> <u>underline italic bold</u></i> bold</b> <a href="http:// www.example.com/">inline URL</a>
+/// <a href="tg:// user?id=123456789">inline mention of a user</a>
+/// <code>inline fixed-width code</code>
+/// <pre>pre-formatted fixed-width code block</pre>
+/// <pre><code class="language-rust">pre-formatted fixed-width code block
+/// written in the Rust programming language</code></pre> ````
+///
+/// Please note:
+///
+/// - Only the tags mentioned above are currently supported.
+/// - All `<`, `>` and `&` symbols that are not a part of a tag or an HTML
+///   entity must be replaced with the corresponding HTML entities (`<` with
+///   `&lt;`, `>` with `&gt;` and `&` with `&amp;`).
+/// - All numerical HTML entities are supported.
+/// - The API currently supports only the following named HTML entities: `&lt;`,
+///   `&gt;`, `&amp;` and `&quot;`.
+/// - Use nested `pre` and `code` tags, to define programming language for `pre`
+///   entity.
+/// - Programming language can't be specified for standalone `code` tags.
+///
+/// ## Markdown style
+/// This is a legacy mode, retained for backward compatibility. To use this
+/// mode, pass [`Markdown`] in the `parse_mode` field.
+/// Use the following syntax in your message:
+/// ````text
+/// *bold text*
+/// _italic text_
+/// [inline URL](http://www.example.com/)
+/// [inline mention of a user](tg://user?id=123456789)
+/// `inline fixed-width code`
+/// ```rust
+/// pre-formatted fixed-width code block written in the Rust programming
+/// language ```
+/// ````
+/// 
+/// Please note:
+/// - Entities must not be nested, use parse mode [`MarkdownV2`] instead.
+/// - There is no way to specify underline and strikethrough entities, use parse
+///   mode [`MarkdownV2`] instead.
+/// - To escape characters ’_‘, ’*‘, ’`‘, ’[‘ outside of an entity, prepend the
+///   characters ’\' before them.
+/// - Escaping inside entities is not allowed, so entity must be closed first
+///   and reopened again: use `_snake_\__case_` for italic `snake_case` and
+///   `*2*\**2=4*` for bold `2*2=4`.
+///
+/// [`MarkdownV2`]: ParseMode::MarkdownV2
+/// [`HTML`]: ParseMode::HTML
+/// [`Markdown`]: ParseMode::Markdown
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum ParseMode {
+    MarkdownV2,
+    HTML,
+    #[deprecated = "This is a legacy mode, retained for backward compatibility. Use `MarkdownV2` \
+                    instead."]
+    Markdown,
+}
+
+impl TryFrom<&str> for ParseMode {
+    type Error = ();
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        let normalized = value.to_lowercase();
+        match normalized.as_ref() {
+            "html" => Ok(ParseMode::HTML),
+            "markdown" => Ok(ParseMode::Markdown),
+            "markdownv2" => Ok(ParseMode::MarkdownV2),
+            _ => Err(()),
+        }
+    }
+}
+
+impl TryFrom<String> for ParseMode {
+    type Error = ();
+
+    fn try_from(value: String) -> Result<Self, Self::Error> {
+        value.as_str().try_into()
+    }
+}
+
+impl FromStr for ParseMode {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        s.try_into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #![allow(deprecated)]
+
+    use super::*;
+
+    #[test]
+    fn html_serialization() {
+        let expected_json = String::from(r#""HTML""#);
+        let actual_json = serde_json::to_string(&ParseMode::HTML).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+
+    #[test]
+    fn markdown_serialization() {
+        let expected_json = String::from(r#""Markdown""#);
+        let actual_json = serde_json::to_string(&ParseMode::Markdown).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+}
diff --git a/src/types/passport_data.rs b/src/types/passport_data.rs
new file mode 100644
index 00000000..3abaef93
--- /dev/null
+++ b/src/types/passport_data.rs
@@ -0,0 +1,40 @@
+use serde::{Deserialize, Serialize};
+
+use super::{EncryptedCredentials, EncryptedPassportElement};
+
+/// Contains information about Telegram Passport data shared with the bot by the
+/// user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportdata).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportData {
+    /// Array with information about documents and other Telegram Passport
+    /// elements that was shared with the bot.
+    pub data: Vec<EncryptedPassportElement>,
+
+    /// Encrypted credentials required to decrypt the data.
+    pub credentials: EncryptedCredentials,
+}
+
+impl PassportData {
+    pub fn new<E>(data: E, credentials: EncryptedCredentials) -> Self
+    where
+        E: Into<Vec<EncryptedPassportElement>>,
+    {
+        Self { data: data.into(), credentials }
+    }
+
+    pub fn data<E>(mut self, val: E) -> Self
+    where
+        E: Into<Vec<EncryptedPassportElement>>,
+    {
+        self.data = val.into();
+        self
+    }
+
+    pub fn credentials(mut self, val: EncryptedCredentials) -> Self {
+        self.credentials = val;
+        self
+    }
+}
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
new file mode 100644
index 00000000..521584e5
--- /dev/null
+++ b/src/types/passport_element_error.rs
@@ -0,0 +1,558 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents an error in the Telegram Passport element which was
+/// submitted that should be resolved by the user.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerror).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementError {
+    /// Error message.
+    message: String,
+
+    #[serde(flatten)]
+    kind: PassportElementErrorKind,
+}
+
+impl PassportElementError {
+    pub fn new<S>(message: S, kind: PassportElementErrorKind) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { message: message.into(), kind }
+    }
+
+    pub fn message<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.message = val.into();
+        self
+    }
+
+    pub fn kind(mut self, val: PassportElementErrorKind) -> Self {
+        self.kind = val;
+        self
+    }
+}
+
+#[serde(tag = "source")]
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum PassportElementErrorKind {
+    #[serde(rename = "data")]
+    DataField(PassportElementErrorDataField),
+
+    #[serde(rename = "snake_case")]
+    FrontSide(PassportElementErrorFrontSide),
+
+    #[serde(rename = "snake_case")]
+    ReverseSide(PassportElementErrorReverseSide),
+
+    #[serde(rename = "snake_case")]
+    Selfie(PassportElementErrorSelfie),
+
+    #[serde(rename = "snake_case")]
+    File(PassportElementErrorFile),
+
+    #[serde(rename = "snake_case")]
+    Files(PassportElementErrorFiles),
+
+    #[serde(rename = "snake_case")]
+    TranslationFile(PassportElementErrorTranslationFile),
+
+    #[serde(rename = "snake_case")]
+    TranslationFiles(PassportElementErrorTranslationFiles),
+
+    #[serde(rename = "snake_case")]
+    Unspecified(PassportElementErrorUnspecified),
+}
+
+/// Represents an issue in one of the data fields that was provided by the
+/// user.
+///
+/// The error is considered resolved when the field's value changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrordatafield).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorDataField {
+    /// The section of the user's Telegram Passport which has the error.
+    pub r#type: PassportElementErrorDataFieldType,
+
+    /// Name of the data field which has the error.
+    pub field_name: String,
+
+    /// Base64-encoded data hash.
+    pub data_hash: String,
+}
+
+impl PassportElementErrorDataField {
+    pub fn new<S1, S2>(
+        r#type: PassportElementErrorDataFieldType,
+        field_name: S1,
+        data_hash: S2,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self { r#type, field_name: field_name.into(), data_hash: data_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorDataFieldType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn field_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.field_name = val.into();
+        self
+    }
+
+    pub fn data_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.data_hash = val.into();
+        self
+    }
+}
+
+/// Represents an issue with the front side of a document.
+///
+/// The error is considered resolved when the file with the front side of the
+/// document changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfrontside).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorFrontSide {
+    /// The section of the user's Telegram Passport which has the issue.
+    pub r#type: PassportElementErrorFrontSideType,
+
+    /// Base64-encoded hash of the file with the front side of the
+    /// document.
+    pub file_hash: String,
+}
+
+impl PassportElementErrorFrontSide {
+    pub fn new<S>(r#type: PassportElementErrorFrontSideType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, file_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorFrontSideType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_hash = val.into();
+        self
+    }
+}
+
+/// Represents an issue with the reverse side of a document.
+///
+/// The error is considered resolved when the file with reverse side of the
+/// document changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorreverseside).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorReverseSide {
+    /// The section of the user's Telegram Passport which has the issue.
+    pub r#type: PassportElementErrorReverseSideType,
+
+    //// Base64-encoded hash of the file with the reverse side of the
+    //// document.
+    pub file_hash: String,
+}
+
+impl PassportElementErrorReverseSide {
+    pub fn new<S>(r#type: PassportElementErrorReverseSideType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, file_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorReverseSideType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_hash = val.into();
+        self
+    }
+}
+
+//// Represents an issue with the selfie with a document.
+//
+/// The error is considered resolved when the file with the selfie changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorselfie).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorSelfie {
+    /// The section of the user's Telegram Passport which has the issue.
+    pub r#type: PassportElementErrorSelfieType,
+
+    /// Base64-encoded hash of the file with the selfie.
+    pub file_hash: String,
+}
+
+impl PassportElementErrorSelfie {
+    pub fn new<S>(r#type: PassportElementErrorSelfieType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, file_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorSelfieType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_hash = val.into();
+        self
+    }
+}
+
+/// Represents an issue with a document scan.
+///
+/// The error is considered resolved when the file with the document scan
+/// changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfile).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorFile {
+    /// The section of the user's Telegram Passport which has the issue.
+    pub r#type: PassportElementErrorFileType,
+
+    /// Base64-encoded file hash.
+    pub file_hash: String,
+}
+
+impl PassportElementErrorFile {
+    pub fn new<S>(r#type: PassportElementErrorFileType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, file_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorFileType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_hash = val.into();
+        self
+    }
+}
+
+/// Represents an issue with a list of scans.
+///
+/// The error is considered resolved when the list of files containing the scans
+/// changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfiles).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorFiles {
+    /// The section of the user's Telegram Passport which has the issue.
+    pub r#type: PassportElementErrorFilesType,
+
+    /// List of base64-encoded file hashes.
+    pub file_hashes: Vec<String>,
+}
+
+impl PassportElementErrorFiles {
+    pub fn new<S>(r#type: PassportElementErrorFilesType, file_hashes: S) -> Self
+    where
+        S: Into<Vec<String>>,
+    {
+        Self { r#type, file_hashes: file_hashes.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorFilesType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hashes<S>(mut self, val: S) -> Self
+    where
+        S: Into<Vec<String>>,
+    {
+        self.file_hashes = val.into();
+        self
+    }
+}
+
+/// Represents an issue with one of the files that constitute the
+/// translation of a document.
+///
+/// The error is considered resolved when the file changes.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrortranslationfile).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorTranslationFile {
+    /// Type of element of the user's Telegram Passport which has the
+    /// issue.
+    pub r#type: PassportElementErrorTranslationFileType,
+
+    /// Base64-encoded file hash.
+    pub file_hash: String,
+}
+
+impl PassportElementErrorTranslationFile {
+    pub fn new<S>(r#type: PassportElementErrorTranslationFileType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, file_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorTranslationFileType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_hash = val.into();
+        self
+    }
+}
+
+/// Represents an issue with the translated version of a document.
+///
+/// The error is considered resolved when a file with the document translation
+/// change.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrortranslationfiles).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorTranslationFiles {
+    /// Type of element of the user's Telegram Passport which has the issue
+    pub r#type: PassportElementErrorTranslationFilesType,
+
+    /// List of base64-encoded file hashes
+    pub file_hashes: Vec<String>,
+}
+
+impl PassportElementErrorTranslationFiles {
+    pub fn new<S>(r#type: PassportElementErrorTranslationFilesType, file_hashes: S) -> Self
+    where
+        S: Into<Vec<String>>,
+    {
+        Self { r#type, file_hashes: file_hashes.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorTranslationFilesType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn file_hashes<S>(mut self, val: S) -> Self
+    where
+        S: Into<Vec<String>>,
+    {
+        self.file_hashes = val.into();
+        self
+    }
+}
+
+/// Represents an issue in an unspecified place.
+///
+/// The error is considered resolved when new data is added.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportelementerrorunspecified).
+#[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportElementErrorUnspecified {
+    /// Type of element of the user's Telegram Passport which has the
+    /// issue.
+    pub r#type: PassportElementErrorUnspecifiedType,
+
+    /// Base64-encoded element hash.
+    pub element_hash: String,
+}
+
+impl PassportElementErrorUnspecified {
+    pub fn new<S>(r#type: PassportElementErrorUnspecifiedType, file_hash: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { r#type, element_hash: file_hash.into() }
+    }
+
+    pub fn r#type(mut self, val: PassportElementErrorUnspecifiedType) -> Self {
+        self.r#type = val;
+        self
+    }
+
+    pub fn element_hash<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.element_hash = val.into();
+        self
+    }
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorDataFieldType {
+    PersonalDetails,
+    Passport,
+    DriverLicense,
+    IdentityCard,
+    InternalPassport,
+    Address,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorFrontSideType {
+    Passport,
+    DriverLicense,
+    IdentityCard,
+    InternalPassport,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorReverseSideType {
+    DriverLicense,
+    IdentityCard,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorSelfieType {
+    Passport,
+    DriverLicense,
+    IdentityCard,
+    InternalPassport,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorFileType {
+    UtilityBill,
+    BankStatement,
+    RentalAgreement,
+    PassportRegistration,
+    TemporaryRegistration,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorFilesType {
+    UtilityBill,
+    BankStatement,
+    RentalAgreement,
+    PassportRegistration,
+    TemporaryRegistration,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorTranslationFileType {
+    Passport,
+    DriverLicense,
+    IdentityCard,
+    InternalPassport,
+    UtilityBill,
+    BankStatement,
+    RentalAgreement,
+    PassportRegistration,
+    TemporaryRegistration,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorTranslationFilesType {
+    Passport,
+    DriverLicense,
+    IdentityCard,
+    InternalPassport,
+    UtilityBill,
+    BankStatement,
+    RentalAgreement,
+    PassportRegistration,
+    TemporaryRegistration,
+}
+
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum PassportElementErrorUnspecifiedType {
+    DataField,
+    FrontSide,
+    ReverseSide,
+    Selfie,
+    File,
+    Files,
+    TranslationFile,
+    TranslationFiles,
+    Unspecified,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serialize_data_field() {
+        let data = PassportElementError {
+            message: "This is an error message!".to_owned(),
+            kind: PassportElementErrorKind::DataField(PassportElementErrorDataField {
+                r#type: PassportElementErrorDataFieldType::InternalPassport,
+                field_name: "The field name".to_owned(),
+                data_hash: "This is a data hash".to_owned(),
+            }),
+        };
+
+        assert_eq!(
+            serde_json::to_string(&data).unwrap(),
+            r#"{"message":"This is an error message!","source":"data","type":"internal_passport","field_name":"The field name","data_hash":"This is a data hash"}"#
+        );
+    }
+}
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
new file mode 100644
index 00000000..448d0c62
--- /dev/null
+++ b/src/types/passport_file.rs
@@ -0,0 +1,66 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a file uploaded to Telegram Passport.
+///
+/// Currently all Telegram Passport files are in JPEG format when decrypted and
+/// don't exceed 10MB.
+///
+/// [The official docs](https://core.telegram.org/bots/api#passportfile).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PassportFile {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// File size.
+    pub file_size: u64,
+
+    /// Unix time when the file was uploaded.
+    pub file_date: u64,
+}
+
+impl PassportFile {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, file_size: u64, file_date: u64) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            file_size,
+            file_date,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn file_size(mut self, val: u64) -> Self {
+        self.file_size = val;
+        self
+    }
+
+    pub fn file_date(mut self, val: u64) -> Self {
+        self.file_date = val;
+        self
+    }
+}
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
new file mode 100644
index 00000000..64ddfac7
--- /dev/null
+++ b/src/types/photo_size.rs
@@ -0,0 +1,94 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents one size of a photo or a [file]/[sticker] thumbnail.
+///
+/// [file]: crate::types::Document
+/// [sticker]: crate::types::Sticker
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PhotoSize {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// Photo width.
+    pub width: i32,
+
+    /// Photo height.
+    pub height: i32,
+
+    /// File size.
+    pub file_size: Option<u32>,
+}
+
+impl PhotoSize {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, width: i32, height: i32) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            width,
+            height,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn width(mut self, val: i32) -> Self {
+        self.width = val;
+        self
+    }
+
+    pub fn height(mut self, val: i32) -> Self {
+        self.height = val;
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{"file_id":"id","file_unique_id":"","width":320,"height":320,
+                             "file_size":3452}"#;
+        let expected = PhotoSize {
+            file_id: "id".to_string(),
+            file_unique_id: "".to_string(),
+            width: 320,
+            height: 320,
+            file_size: Some(3452),
+        };
+        let actual = serde_json::from_str::<PhotoSize>(json).unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/src/types/poll.rs b/src/types/poll.rs
new file mode 100644
index 00000000..c3646e3b
--- /dev/null
+++ b/src/types/poll.rs
@@ -0,0 +1,250 @@
+use crate::types::{MessageEntity, PollType};
+use serde::{Deserialize, Serialize};
+
+/// This object contains information about a poll.
+///
+/// [The official docs](https://core.telegram.org/bots/api#poll).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Poll {
+    /// Unique poll identifier.
+    pub id: String,
+
+    /// Poll question, 1-255 characters.
+    pub question: String,
+
+    /// List of poll options.
+    pub options: Vec<PollOption>,
+
+    /// `true`, if the poll is closed.
+    pub is_closed: bool,
+
+    /// Total number of users that voted in the poll
+    pub total_voter_count: i32,
+
+    /// True, if the poll is anonymous
+    pub is_anonymous: bool,
+
+    /// Poll type, currently can be “regular” or “quiz”
+    #[serde(rename = "type")]
+    pub poll_type: PollType,
+
+    /// True, if the poll allows multiple answers
+    pub allows_multiple_answers: bool,
+
+    /// 0-based identifier of the correct answer option. Available only for
+    /// polls in the quiz mode, which are closed, or was sent (not
+    /// forwarded) by the bot or to the private chat with the bot.
+    pub correct_option_id: Option<i32>,
+
+    /// Text that is shown when a user chooses an incorrect answer or taps on
+    /// the lamp icon in a quiz-style poll, 0-200 characters.
+    pub explanation: Option<String>,
+
+    /// Special entities like usernames, URLs, bot commands, etc. that appear in
+    /// the explanation.
+    pub explanation_entities: Option<Vec<MessageEntity>>,
+
+    /// Amount of time in seconds the poll will be active after creation.
+    open_period: Option<i32>,
+
+    /// Point in time (Unix timestamp) when the poll will be automatically
+    /// closed.
+    close_date: Option<i32>,
+}
+
+impl Poll {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new<S1, S2, O>(
+        id: S1,
+        question: S2,
+        options: O,
+        is_closed: bool,
+        total_voter_count: i32,
+        is_anonymous: bool,
+        poll_type: PollType,
+        allows_multiple_answers: bool,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        O: Into<Vec<PollOption>>,
+    {
+        Self {
+            id: id.into(),
+            question: question.into(),
+            options: options.into(),
+            is_closed,
+            total_voter_count,
+            is_anonymous,
+            poll_type,
+            allows_multiple_answers,
+            correct_option_id: None,
+            explanation: None,
+            explanation_entities: None,
+            open_period: None,
+            close_date: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn question<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.question = val.into();
+        self
+    }
+
+    pub fn options<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<PollOption>>,
+    {
+        self.options = val.into();
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_closed(mut self, val: bool) -> Self {
+        self.is_closed = val;
+        self
+    }
+
+    pub fn total_voter_count(mut self, val: i32) -> Self {
+        self.total_voter_count = val;
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_anonymous(mut self, val: bool) -> Self {
+        self.is_anonymous = val;
+        self
+    }
+
+    pub fn poll_type(mut self, val: PollType) -> Self {
+        self.poll_type = val;
+        self
+    }
+
+    pub fn allows_multiple_answers(mut self, val: bool) -> Self {
+        self.allows_multiple_answers = val;
+        self
+    }
+
+    pub fn correct_option_id(mut self, val: i32) -> Self {
+        self.correct_option_id = Some(val);
+        self
+    }
+
+    pub fn explanation<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.explanation = Some(val.into());
+        self
+    }
+
+    pub fn explanation_entities<S>(mut self, val: S) -> Self
+    where
+        S: Into<Vec<MessageEntity>>,
+    {
+        self.explanation_entities = Some(val.into());
+        self
+    }
+
+    pub fn open_period(mut self, val: i32) -> Self {
+        self.open_period = Some(val);
+        self
+    }
+
+    pub fn close_date(mut self, val: i32) -> Self {
+        self.close_date = Some(val);
+        self
+    }
+}
+
+/// This object contains information about one answer option in a poll.
+///
+/// [The official docs](https://core.telegram.org/bots/api#polloption).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PollOption {
+    /// Option text, 1-100 characters.
+    pub text: String,
+
+    /// Number of users that voted for this option.
+    pub voter_count: i32,
+}
+
+impl PollOption {
+    pub fn new<S>(text: S, voter_count: i32) -> Self
+    where
+        S: Into<String>,
+    {
+        Self { text: text.into(), voter_count }
+    }
+
+    pub fn text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    pub fn voter_count(mut self, val: i32) -> Self {
+        self.voter_count = val;
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let data = r#"
+        {
+            "allows_multiple_answers": false,
+            "id": "5377643193141559299",
+            "is_anonymous": true,
+            "is_closed": false,
+            "options": [
+                {
+                    "text": "1",
+                    "voter_count": 1
+                },
+                {
+                    "text": "2",
+                    "voter_count": 0
+                },
+                {
+                    "text": "3",
+                    "voter_count": 0
+                },
+                {
+                    "text": "4",
+                    "voter_count": 0
+                },
+                {
+                    "text": "5",
+                    "voter_count": 0
+                }
+            ],
+            "question": "Rate me from 1 to 5.",
+            "total_voter_count": 1,
+            "type": "regular"
+        }
+        "#;
+        serde_json::from_str::<Poll>(data).unwrap();
+    }
+}
diff --git a/src/types/poll_answer.rs b/src/types/poll_answer.rs
new file mode 100644
index 00000000..6ddb0b06
--- /dev/null
+++ b/src/types/poll_answer.rs
@@ -0,0 +1,48 @@
+use crate::types::User;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PollAnswer {
+    /// Unique poll identifier.
+    pub poll_id: String,
+
+    /// The user, who changed the answer to the poll.
+    pub user: User,
+
+    /// 0-based identifiers of answer options, chosen by the user.
+    ///
+    /// May be empty if the user retracted their vote.
+    pub option_ids: Vec<i32>,
+}
+
+impl PollAnswer {
+    pub fn new<S, O>(poll_id: S, user: User, option_ids: O) -> Self
+    where
+        S: Into<String>,
+        O: Into<Vec<i32>>,
+    {
+        Self { poll_id: poll_id.into(), user, option_ids: option_ids.into() }
+    }
+
+    pub fn poll_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.poll_id = val.into();
+        self
+    }
+
+    pub fn user(mut self, val: User) -> Self {
+        self.user = val;
+        self
+    }
+
+    pub fn option_ids<S>(mut self, val: S) -> Self
+    where
+        S: Into<Vec<i32>>,
+    {
+        self.option_ids = val.into();
+        self
+    }
+}
diff --git a/src/types/poll_type.rs b/src/types/poll_type.rs
new file mode 100644
index 00000000..0243f7c1
--- /dev/null
+++ b/src/types/poll_type.rs
@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+#[non_exhaustive]
+pub enum PollType {
+    Quiz,
+    Regular,
+}
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
new file mode 100644
index 00000000..87fd9707
--- /dev/null
+++ b/src/types/pre_checkout_query.rs
@@ -0,0 +1,108 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Currency, OrderInfo, User};
+
+/// This object contains information about an incoming pre-checkout query.
+///
+/// [The official docs](https://core.telegram.org/bots/api#precheckoutquery).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct PreCheckoutQuery {
+    /// Unique query identifier.
+    pub id: String,
+
+    /// User who sent the query.
+    pub from: User,
+
+    /// Three-letter ISO 4217 [currency] code.
+    ///
+    /// [currency]: https://core.telegram.org/bots/payments#supported-currencies
+    pub currency: Currency,
+
+    /// Total price in the _smallest units_ of the currency (integer, **not**
+    /// float/double). For example, for a price of `US$ 1.45` pass `amount =
+    /// 145`. See the exp parameter in [`currencies.json`], it shows the number
+    /// of digits past the decimal point for each currency (2 for the
+    /// majority of currencies).
+    ///
+    /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+    pub total_amount: i32,
+
+    /// Bot specified invoice payload.
+    pub invoice_payload: String,
+
+    /// Identifier of the shipping option chosen by the user.
+    pub shipping_option_id: Option<String>,
+
+    /// Order info provided by the user.
+    pub order_info: Option<OrderInfo>,
+}
+
+impl PreCheckoutQuery {
+    pub fn new<S1, S2>(
+        id: S1,
+        from: User,
+        currency: Currency,
+        total_amount: i32,
+        invoice_payload: S2,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            id: id.into(),
+            from,
+            currency,
+            total_amount,
+            invoice_payload: invoice_payload.into(),
+            shipping_option_id: None,
+            order_info: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn from(mut self, val: User) -> Self {
+        self.from = val;
+        self
+    }
+
+    pub fn currency<S>(mut self, val: Currency) -> Self {
+        self.currency = val;
+        self
+    }
+
+    pub fn total_amount(mut self, val: i32) -> Self {
+        self.total_amount = val;
+        self
+    }
+
+    pub fn invoice_payload<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.invoice_payload = val.into();
+        self
+    }
+
+    pub fn shipping_option_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.shipping_option_id = Some(val.into());
+        self
+    }
+
+    pub fn order_info(mut self, val: OrderInfo) -> Self {
+        self.order_info = Some(val);
+        self
+    }
+}
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
new file mode 100644
index 00000000..a8d5983e
--- /dev/null
+++ b/src/types/reply_keyboard_markup.rs
@@ -0,0 +1,98 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::KeyboardButton;
+
+/// This object represents a [custom keyboard] with reply options (see
+/// [Introduction to bots] for details and examples).
+///
+/// [The official docs](https://core.telegram.org/bots/api#replykeyboardmarkup).
+///
+/// [custom keyboard]: https://core.telegram.org/bots#keyboards
+/// [Introduction to bots]: https://core.telegram.org/bots#keyboards
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
+#[non_exhaustive]
+pub struct ReplyKeyboardMarkup {
+    /// Array of button rows, each represented by an Array of
+    /// [`KeyboardButton`] objects
+    ///
+    /// [`KeyboardButton`]: crate::types::KeyboardButton
+    pub keyboard: Vec<Vec<KeyboardButton>>,
+
+    /// Requests clients to resize the keyboard vertically for optimal fit
+    /// (e.g., make the keyboard smaller if there are just two rows of
+    /// buttons). Defaults to `false`, in which case the custom keyboard is
+    /// always of the same height as the app's standard keyboard.
+    pub resize_keyboard: Option<bool>,
+
+    /// Requests clients to hide the keyboard as soon as it's been used. The
+    /// keyboard will still be available, but clients will automatically
+    /// display the usual letter-keyboard in the chat – the user can press a
+    /// special button in the input field to see the custom keyboard again.
+    /// Defaults to `false`.
+    pub one_time_keyboard: Option<bool>,
+
+    /// Use this parameter if you want to show the keyboard to specific users
+    /// only. Targets: 1) users that are `@mentioned` in the `text` of the
+    /// [`Message`] object; 2) if the bot's message is a reply (has
+    /// `reply_to_message_id`), sender of the original message.
+    ///
+    /// Example: A user requests to change the bot‘s language, bot replies to
+    /// the request with a keyboard to select the new language. Other users
+    /// in the group don’t see the keyboard.
+    ///
+    /// [`Message`]: crate::types::Message
+    pub selective: Option<bool>,
+}
+
+impl ReplyKeyboardMarkup {
+    pub fn new<K1, K2>(keyboard: K1) -> Self
+    where
+        K1: Into<Vec<K2>>,
+        K2: Into<Vec<KeyboardButton>>,
+    {
+        Self {
+            keyboard: keyboard.into().into_iter().map(Into::into).collect(),
+            resize_keyboard: None,
+            one_time_keyboard: None,
+            selective: None,
+        }
+    }
+
+    pub fn append_row(mut self, buttons: Vec<KeyboardButton>) -> Self {
+        self.keyboard.push(buttons);
+        self
+    }
+
+    pub fn append_to_row(mut self, button: KeyboardButton, index: usize) -> Self {
+        match self.keyboard.get_mut(index) {
+            Some(buttons) => buttons.push(button),
+            None => self.keyboard.push(vec![button]),
+        };
+        self
+    }
+
+    pub fn resize_keyboard<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<bool>>,
+    {
+        self.resize_keyboard = val.into();
+        self
+    }
+
+    pub fn one_time_keyboard<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<bool>>,
+    {
+        self.one_time_keyboard = val.into();
+        self
+    }
+
+    pub fn selective<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<bool>>,
+    {
+        self.selective = val.into();
+        self
+    }
+}
diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
new file mode 100644
index 00000000..deb8351b
--- /dev/null
+++ b/src/types/reply_keyboard_remove.rs
@@ -0,0 +1,52 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::True;
+
+/// Upon receiving a message with this object, Telegram clients will remove the
+/// current custom keyboard and display the default letter-keyboard.
+///
+/// By default, custom keyboards are displayed until a new keyboard is sent by a
+/// bot. An exception is made for one-time keyboards that are hidden immediately
+/// after the user presses a button (see [`ReplyKeyboardMarkup`]).
+///
+/// [The official docs](https://core.telegram.org/bots/api#replykeyboardremove).
+///
+/// [`ReplyKeyboardMarkup`]: crate::types::ReplyKeyboardMarkup
+#[serde_with_macros::skip_serializing_none]
+#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ReplyKeyboardRemove {
+    /// Requests clients to remove the custom keyboard (user will not be able
+    /// to summon this keyboard; if you want to hide the keyboard from sight
+    /// but keep it accessible, use one_time_keyboard in
+    /// [`ReplyKeyboardMarkup`]).
+    ///
+    /// [`ReplyKeyboardMarkup`]: crate::types::ReplyKeyboardMarkup
+    pub remove_keyboard: True,
+
+    /// Use this parameter if you want to remove the keyboard for specific
+    /// users only. Targets: 1) users that are `@mentioned` in the `text` of
+    /// the [`Message`] object; 2) if the bot's message is a reply (has
+    /// `reply_to_message_id`), sender of the original message.
+    ///
+    /// Example: A user votes in a poll, bot returns confirmation message in
+    /// reply to the vote and removes the keyboard for that user, while still
+    /// showing the keyboard with poll options to users who haven't voted yet.
+    ///
+    /// [`Message`]: crate::types::Message
+    pub selective: Option<bool>,
+}
+
+impl ReplyKeyboardRemove {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn selective<T>(mut self, val: T) -> Self
+    where
+        T: Into<bool>,
+    {
+        self.selective = Some(val.into());
+        self
+    }
+}
diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
new file mode 100644
index 00000000..4bddc56c
--- /dev/null
+++ b/src/types/reply_markup.rs
@@ -0,0 +1,27 @@
+use derive_more::From;
+use serde::{Deserialize, Serialize};
+
+use crate::types::{ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove};
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, From)]
+#[serde(untagged)]
+#[non_exhaustive]
+pub enum ReplyMarkup {
+    InlineKeyboardMarkup(InlineKeyboardMarkup),
+    ReplyKeyboardMarkup(ReplyKeyboardMarkup),
+    ReplyKeyboardRemove(ReplyKeyboardRemove),
+    ForceReply(ForceReply),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn inline_keyboard_markup() {
+        let data = InlineKeyboardMarkup::default();
+        let expected = ReplyMarkup::InlineKeyboardMarkup(data.clone());
+        let actual: ReplyMarkup = data.into();
+        assert_eq!(actual, expected)
+    }
+}
diff --git a/src/types/response_parameters.rs b/src/types/response_parameters.rs
new file mode 100644
index 00000000..2f0fb43f
--- /dev/null
+++ b/src/types/response_parameters.rs
@@ -0,0 +1,43 @@
+use serde::{Deserialize, Serialize};
+
+/// Contains information about why a request was unsuccessful.
+///
+/// [The official docs](https://core.telegram.org/bots/api#responseparameters).
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum ResponseParameters {
+    /// The group has been migrated to a supergroup with the specified
+    /// identifier. This number may be greater than 32 bits and some
+    /// programming languages may have difficulty/silent defects in
+    /// interpreting it. But it is smaller than 52 bits, so a signed 64 bit
+    /// integer or double-precision float type are safe for storing this
+    /// identifier.
+    MigrateToChatId(i64),
+
+    /// In case of exceeding flood control, the number of seconds left to wait
+    /// before the request can be repeated.
+    RetryAfter(i32),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn migrate_to_chat_id_deserialization() {
+        let expected = ResponseParameters::MigrateToChatId(123_456);
+        let actual: ResponseParameters =
+            serde_json::from_str(r#"{"migrate_to_chat_id":123456}"#).unwrap();
+
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn retry_after_deserialization() {
+        let expected = ResponseParameters::RetryAfter(123_456);
+        let actual: ResponseParameters = serde_json::from_str(r#"{"retry_after":123456}"#).unwrap();
+
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/src/types/send_invoice.rs b/src/types/send_invoice.rs
new file mode 100644
index 00000000..bc527b45
--- /dev/null
+++ b/src/types/send_invoice.rs
@@ -0,0 +1,229 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice};
+
+// TODO: missing docs
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct SendInvoice {
+    pub chat_id: ChatId,
+    pub title: String,
+    pub description: String,
+    pub payload: String,
+    pub provider_token: String,
+    pub start_parameter: String,
+    pub currency: String,
+    pub prices: Vec<LabeledPrice>,
+    pub provider_data: Option<String>,
+    pub photo_url: Option<String>,
+    pub photo_size: Option<i32>,
+    pub photo_width: Option<i32>,
+    pub photo_height: Option<i32>,
+    pub need_name: Option<bool>,
+    pub need_phone_number: Option<bool>,
+    pub need_email: Option<bool>,
+    pub need_shipping_address: Option<bool>,
+    pub send_phone_number_to_provider: Option<bool>,
+    pub send_email_to_provider: Option<bool>,
+    pub is_flexible: Option<bool>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
+}
+
+impl SendInvoice {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new<C, S1, S2, S3, S4, S5, S6, P>(
+        chat_id: C,
+        title: S1,
+        description: S2,
+        payload: S3,
+        provider_token: S4,
+        start_parameter: S5,
+        currency: S6,
+        prices: P,
+    ) -> Self
+    where
+        C: Into<ChatId>,
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+        S4: Into<String>,
+        S5: Into<String>,
+        S6: Into<String>,
+        P: Into<Vec<LabeledPrice>>,
+    {
+        Self {
+            chat_id: chat_id.into(),
+            title: title.into(),
+            description: description.into(),
+            payload: payload.into(),
+            provider_token: provider_token.into(),
+            start_parameter: start_parameter.into(),
+            currency: currency.into(),
+            prices: prices.into(),
+            provider_data: None,
+            photo_url: None,
+            photo_size: None,
+            photo_width: None,
+            photo_height: None,
+            need_name: None,
+            need_phone_number: None,
+            need_email: None,
+            need_shipping_address: None,
+            send_phone_number_to_provider: None,
+            send_email_to_provider: None,
+            is_flexible: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+
+    pub fn chat_id<C>(mut self, val: C) -> Self
+    where
+        C: Into<ChatId>,
+    {
+        self.chat_id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn description<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+
+    pub fn payload<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.payload = val.into();
+        self
+    }
+
+    pub fn provider_token<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.provider_token = val.into();
+        self
+    }
+
+    pub fn start_parameter<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.start_parameter = val.into();
+        self
+    }
+
+    pub fn currency<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.currency = val.into();
+        self
+    }
+
+    pub fn prices<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<LabeledPrice>>,
+    {
+        self.prices = val.into();
+        self
+    }
+
+    pub fn provider_data<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.provider_data = Some(val.into());
+        self
+    }
+
+    pub fn photo_url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.photo_url = Some(val.into());
+        self
+    }
+
+    pub fn photo_size(mut self, val: i32) -> Self {
+        self.photo_size = Some(val);
+        self
+    }
+
+    pub fn photo_width(mut self, val: i32) -> Self {
+        self.photo_width = Some(val);
+        self
+    }
+
+    pub fn photo_height(mut self, val: i32) -> Self {
+        self.photo_height = Some(val);
+        self
+    }
+
+    pub fn need_name(mut self, val: bool) -> Self {
+        self.need_name = Some(val);
+        self
+    }
+
+    pub fn need_phone_number(mut self, val: bool) -> Self {
+        self.need_phone_number = Some(val);
+        self
+    }
+
+    pub fn need_email(mut self, val: bool) -> Self {
+        self.need_email = Some(val);
+        self
+    }
+
+    pub fn need_shipping_address(mut self, val: bool) -> Self {
+        self.need_shipping_address = Some(val);
+        self
+    }
+
+    pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
+        self.send_phone_number_to_provider = Some(val);
+        self
+    }
+
+    pub fn send_email_to_provider(mut self, val: bool) -> Self {
+        self.send_email_to_provider = Some(val);
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_flexible(mut self, val: bool) -> Self {
+        self.is_flexible = Some(val);
+        self
+    }
+
+    pub fn disable_notification(mut self, val: bool) -> Self {
+        self.disable_notification = Some(val);
+        self
+    }
+
+    pub fn reply_to_message_id(mut self, value: i32) -> Self {
+        self.reply_to_message_id = Some(value);
+        self
+    }
+
+    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
+        self.reply_markup = Some(val);
+        self
+    }
+}
diff --git a/src/types/shipping_address.rs b/src/types/shipping_address.rs
new file mode 100644
index 00000000..3a0adb58
--- /dev/null
+++ b/src/types/shipping_address.rs
@@ -0,0 +1,100 @@
+use crate::types::CountryCode;
+use serde::{Deserialize, Serialize};
+
+/// This object represents a shipping address.
+///
+/// [The official docs](https://core.telegram.org/bots/api#shippingaddress).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ShippingAddress {
+    /// ISO 3166-1 alpha-2 country code.
+    pub country_code: CountryCode,
+
+    /// State, if applicable.
+    pub state: String,
+
+    /// City.
+    pub city: String,
+
+    /// First line for the address.
+    pub street_line1: String,
+
+    /// Second line for the address.
+    pub street_line2: String,
+
+    /// Address post code.
+    pub post_code: String,
+}
+
+impl ShippingAddress {
+    pub fn new<S1, S2, S3, S4, S5>(
+        country_code: CountryCode,
+
+        state: S1,
+        city: S2,
+        street_line1: S3,
+        street_line2: S4,
+        post_code: S5,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+        S4: Into<String>,
+        S5: Into<String>,
+    {
+        Self {
+            country_code,
+            state: state.into(),
+            city: city.into(),
+            street_line1: street_line1.into(),
+            street_line2: street_line2.into(),
+            post_code: post_code.into(),
+        }
+    }
+
+    pub fn country_code(mut self, val: CountryCode) -> Self {
+        self.country_code = val;
+        self
+    }
+
+    pub fn state<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.state = val.into();
+        self
+    }
+
+    pub fn city<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.city = val.into();
+        self
+    }
+
+    pub fn street_line1<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.street_line1 = val.into();
+        self
+    }
+
+    pub fn street_line2<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.street_line2 = val.into();
+        self
+    }
+
+    pub fn post_code<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.post_code = val.into();
+        self
+    }
+}
diff --git a/src/types/shipping_option.rs b/src/types/shipping_option.rs
new file mode 100644
index 00000000..983c7eef
--- /dev/null
+++ b/src/types/shipping_option.rs
@@ -0,0 +1,71 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::LabeledPrice;
+
+/// This object represents one shipping option.
+///
+/// [The official docs](https://core.telegram.org/bots/api#shippingoption).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ShippingOption {
+    /// Shipping option identifier.
+    pub id: String,
+
+    /// Option title.
+    pub title: String,
+
+    /// List of price portions.
+    pub prices: Vec<LabeledPrice>,
+}
+
+impl ShippingOption {
+    pub fn new<S1, S2, P>(id: S1, title: S2, prices: P) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        P: Into<Vec<LabeledPrice>>,
+    {
+        Self { id: id.into(), title: title.into(), prices: prices.into() }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn prices<P>(mut self, val: P) -> Self
+    where
+        P: Into<Vec<LabeledPrice>>,
+    {
+        self.prices = val.into();
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn serialize() {
+        let shipping_option = ShippingOption {
+            id: "0".to_string(),
+            title: "Option".to_string(),
+            prices: vec![LabeledPrice { label: "Label".to_string(), amount: 60 }],
+        };
+        let expected = r#"{"id":"0","title":"Option","prices":[{"label":"Label","amount":60}]}"#;
+        let actual = serde_json::to_string(&shipping_option).unwrap();
+        assert_eq!(actual, expected);
+    }
+}
diff --git a/src/types/shipping_query.rs b/src/types/shipping_query.rs
new file mode 100644
index 00000000..bfdf7dc8
--- /dev/null
+++ b/src/types/shipping_query.rs
@@ -0,0 +1,63 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{ShippingAddress, User};
+
+/// This object contains information about an incoming shipping query.
+///
+/// [The official docs](https://core.telegram.org/bots/api#shippingquery).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct ShippingQuery {
+    /// Unique query identifier.
+    pub id: String,
+
+    /// User who sent the query.
+    pub from: User,
+
+    /// Bot specified invoice payload.
+    pub invoice_payload: String,
+
+    /// User specified shipping address.
+    pub shipping_address: ShippingAddress,
+}
+
+impl ShippingQuery {
+    pub fn new<S1, S2>(
+        id: S1,
+        from: User,
+        invoice_payload: S2,
+        shipping_address: ShippingAddress,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self { id: id.into(), from, invoice_payload: invoice_payload.into(), shipping_address }
+    }
+
+    pub fn id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.id = val.into();
+        self
+    }
+
+    pub fn from<S>(mut self, val: User) -> Self {
+        self.from = val;
+        self
+    }
+
+    pub fn invoice_payload<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.invoice_payload = val.into();
+        self
+    }
+
+    pub fn shipping_address<S>(mut self, val: ShippingAddress) -> Self {
+        self.shipping_address = val;
+        self
+    }
+}
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
new file mode 100644
index 00000000..d133f1cc
--- /dev/null
+++ b/src/types/sticker.rs
@@ -0,0 +1,135 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{MaskPosition, PhotoSize};
+
+/// This object represents a sticker.
+///
+/// [The official docs](https://core.telegram.org/bots/api#sticker).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Sticker {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// Sticker width.
+    pub width: u16,
+
+    /// Sticker height.
+    pub height: u16,
+
+    /// `true`, if the sticker is [animated].
+    ///
+    /// [animated]: https://telegram.org/blog/animated-stickers
+    pub is_animated: bool,
+
+    /// Sticker thumbnail in the .webp or .jpg format.
+    pub thumb: Option<PhotoSize>,
+
+    /// Emoji associated with the sticker.
+    pub emoji: Option<String>,
+
+    /// Name of the sticker set to which the sticker belongs.
+    pub set_name: Option<String>,
+
+    /// For mask stickers, the position where the mask should be placed.
+    pub mask_position: Option<MaskPosition>,
+
+    /// File size.
+    pub file_size: Option<u32>,
+}
+
+impl Sticker {
+    pub fn new<S1, S2>(
+        file_id: S1,
+        file_unique_id: S2,
+        width: u16,
+        height: u16,
+        is_animated: bool,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            width,
+            height,
+            is_animated,
+            thumb: None,
+            emoji: None,
+            set_name: None,
+            mask_position: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn height(mut self, val: u16) -> Self {
+        self.height = val;
+        self
+    }
+
+    pub fn width(mut self, val: u16) -> Self {
+        self.width = val;
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_animated(mut self, val: bool) -> Self {
+        self.is_animated = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn emoji<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.emoji = Some(val.into());
+        self
+    }
+
+    pub fn set_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.set_name = Some(val.into());
+        self
+    }
+
+    pub fn mask_position(mut self, val: MaskPosition) -> Self {
+        self.mask_position = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
new file mode 100644
index 00000000..0c617205
--- /dev/null
+++ b/src/types/sticker_set.rs
@@ -0,0 +1,89 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{PhotoSize, Sticker};
+
+/// This object represents a sticker set.
+///
+/// [The official docs](https://core.telegram.org/bots/api#stickerset).
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct StickerSet {
+    /// Sticker set name.
+    pub name: String,
+
+    /// Sticker set title.
+    pub title: String,
+
+    /// `true`, if the sticker set contains [animated stickers].
+    ///
+    /// [animates stickers]: https://telegram.org/blog/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.
+    thumb: Option<PhotoSize>,
+}
+
+impl StickerSet {
+    pub fn new<S1, S2, St>(
+        name: S1,
+        title: S2,
+        is_animated: bool,
+        contains_masks: bool,
+        stickers: St,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        St: Into<Vec<Sticker>>,
+    {
+        Self {
+            name: name.into(),
+            title: title.into(),
+            is_animated,
+            contains_masks,
+            stickers: stickers.into(),
+            thumb: None,
+        }
+    }
+
+    pub fn name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.name = val.into();
+        self
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_animated(mut self, val: bool) -> Self {
+        self.is_animated = val;
+        self
+    }
+
+    pub fn contains_masks(mut self, val: bool) -> Self {
+        self.contains_masks = val;
+        self
+    }
+
+    pub fn stickers<S>(mut self, val: S) -> Self
+    where
+        S: Into<Vec<Sticker>>,
+    {
+        self.stickers = val.into();
+        self
+    }
+}
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
new file mode 100644
index 00000000..b80added
--- /dev/null
+++ b/src/types/sticker_type.rs
@@ -0,0 +1,26 @@
+use crate::types::InputFile;
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[non_exhaustive]
+pub enum StickerType {
+    /// PNG image with the sticker, must be up to 512 kilobytes in size,
+    /// dimensions must not exceed 512px, and either width or height must be
+    /// exactly 512px.
+    ///
+    /// Pass [`InputFile::File`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Telegram to get a .webp file from the Internet, or upload a new one
+    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    ///
+    /// [`InputFile::File`]: crate::types::InputFile::File
+    /// [`InputFile::Url`]: crate::types::InputFile::Url
+    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    ///
+    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
+    Png(InputFile),
+
+    /// TGS animation with the sticker, uploaded using multipart/form-data.
+    ///
+    /// See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
+    Tgs(InputFile),
+}
diff --git a/src/types/successful_payment.rs b/src/types/successful_payment.rs
new file mode 100644
index 00000000..439dbc23
--- /dev/null
+++ b/src/types/successful_payment.rs
@@ -0,0 +1,112 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Currency, OrderInfo};
+
+/// This object contains basic information about a successful payment.
+///
+/// [The official docs](https://core.telegram.org/bots/api#successfulpayment).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct SuccessfulPayment {
+    /// Three-letter ISO 4217 [currency] code.
+    ///
+    /// [currency]: https://core.telegram.org/bots/payments#supported-currencies
+    pub currency: Currency,
+
+    /// Total price in the smallest units of the currency (integer, not
+    /// float/double). For example, for a price of `US$ 1.45` pass `amount =
+    /// 145`. See the exp parameter in [`currencies.json`], it shows the
+    /// number of digits past the decimal point for each currency (2 for
+    /// the majority of currencies).
+    ///
+    /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+    pub total_amount: i32,
+
+    /// Bot specified invoice payload.
+    pub invoice_payload: String,
+
+    /// Identifier of the shipping option chosen by the user.
+    pub shipping_option_id: Option<String>,
+
+    /// Order info provided by the user.
+    pub order_info: Option<OrderInfo>,
+
+    /// Telegram payment identifier.
+    pub telegram_payment_charge_id: String,
+
+    /// Provider payment identifier.
+    pub provider_payment_charge_id: String,
+}
+
+impl SuccessfulPayment {
+    pub fn new<S1, S2, S3>(
+        currency: Currency,
+        total_amount: i32,
+        invoice_payload: S1,
+        telegram_payment_charge_id: S2,
+        provider_payment_charge_id: S3,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+        S3: Into<String>,
+    {
+        Self {
+            currency,
+            total_amount,
+            invoice_payload: invoice_payload.into(),
+            shipping_option_id: None,
+            order_info: None,
+            telegram_payment_charge_id: telegram_payment_charge_id.into(),
+            provider_payment_charge_id: provider_payment_charge_id.into(),
+        }
+    }
+
+    pub fn currency<S>(mut self, val: Currency) -> Self {
+        self.currency = val;
+        self
+    }
+
+    pub fn total_amount(mut self, val: i32) -> Self {
+        self.total_amount = val;
+        self
+    }
+
+    pub fn invoice_payload<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.invoice_payload = val.into();
+        self
+    }
+
+    pub fn shipping_option_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.shipping_option_id = Some(val.into());
+        self
+    }
+
+    pub fn order_info(mut self, val: OrderInfo) -> Self {
+        self.order_info = Some(val);
+        self
+    }
+
+    pub fn telegram_payment_charge_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.telegram_payment_charge_id = val.into();
+        self
+    }
+
+    pub fn provider_payment_charge_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.provider_payment_charge_id = val.into();
+        self
+    }
+}
diff --git a/src/types/target_message.rs b/src/types/target_message.rs
new file mode 100644
index 00000000..0c0d8cc1
--- /dev/null
+++ b/src/types/target_message.rs
@@ -0,0 +1,17 @@
+use crate::types::ChatId;
+
+use serde::{Deserialize, Serialize};
+
+/// A message in chat or inline message.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum TargetMessage {
+    Common { chat_id: ChatId, message_id: i32 },
+    Inline { inline_message_id: String },
+}
+
+impl From<String> for TargetMessage {
+    fn from(inline_message_id: String) -> Self {
+        Self::Inline { inline_message_id }
+    }
+}
diff --git a/src/types/unit_false.rs b/src/types/unit_false.rs
new file mode 100644
index 00000000..bde6410b
--- /dev/null
+++ b/src/types/unit_false.rs
@@ -0,0 +1,76 @@
+use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
+
+/// A type that is always false.
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Default)]
+pub struct False;
+
+impl std::convert::TryFrom<bool> for False {
+    type Error = ();
+
+    fn try_from(value: bool) -> Result<Self, Self::Error> {
+        match value {
+            true => Err(()),
+            false => Ok(False),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for False {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_bool(FalseVisitor)
+    }
+}
+
+struct FalseVisitor;
+
+impl<'de> Visitor<'de> for FalseVisitor {
+    type Value = False;
+
+    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(formatter, "bool, equal to `false`")
+    }
+
+    fn visit_bool<E>(self, value: bool) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        match value {
+            true => Err(E::custom("expected `false`, found `true`")),
+            false => Ok(False),
+        }
+    }
+}
+
+impl Serialize for False {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_bool(false)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{from_str, to_string};
+
+    use super::False;
+
+    #[test]
+    fn unit_false_de() {
+        let json = "false";
+        let expected = False;
+        let actual = from_str(json).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn unit_false_se() {
+        let actual = to_string(&False).unwrap();
+        let expected = "false";
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/src/types/unit_true.rs b/src/types/unit_true.rs
new file mode 100644
index 00000000..cd71e5c2
--- /dev/null
+++ b/src/types/unit_true.rs
@@ -0,0 +1,79 @@
+use serde::{
+    de::{self, Deserialize, Deserializer, Visitor},
+    ser::{Serialize, Serializer},
+};
+
+/// A type that is always true.
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Default)]
+pub struct True;
+
+impl std::convert::TryFrom<bool> for True {
+    type Error = ();
+
+    fn try_from(value: bool) -> Result<Self, Self::Error> {
+        match value {
+            true => Ok(True),
+            false => Err(()),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for True {
+    fn deserialize<D>(des: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        des.deserialize_bool(TrueVisitor)
+    }
+}
+
+struct TrueVisitor;
+
+impl<'de> Visitor<'de> for TrueVisitor {
+    type Value = True;
+
+    fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(f, "bool, equal to `true`")
+    }
+
+    fn visit_bool<E>(self, value: bool) -> Result<Self::Value, E>
+    where
+        E: de::Error,
+    {
+        match value {
+            true => Ok(True),
+            false => Err(E::custom("expected `true`, found `false`")),
+        }
+    }
+}
+
+impl Serialize for True {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_bool(true)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{from_str, to_string};
+
+    use super::True;
+
+    #[test]
+    fn unit_true_de() {
+        let json = "true";
+        let expected = True;
+        let actual = from_str(json).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn unit_true_se() {
+        let actual = to_string(&True).unwrap();
+        let expected = "true";
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/src/types/update.rs b/src/types/update.rs
new file mode 100644
index 00000000..13514a39
--- /dev/null
+++ b/src/types/update.rs
@@ -0,0 +1,299 @@
+#![allow(clippy::large_enum_variant)]
+
+use serde::{Deserialize, Serialize};
+
+use crate::types::{
+    CallbackQuery, Chat, ChosenInlineResult, InlineQuery, Message, Poll, PollAnswer,
+    PreCheckoutQuery, ShippingQuery, User,
+};
+
+/// This [object] represents an incoming update.
+///
+/// [The official docs](https://core.telegram.org/bots/api#update).
+///
+/// [object]: https://core.telegram.org/bots/api#available-types
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Update {
+    /// The update‘s unique identifier. Update identifiers start from a certain
+    /// positive number and increase sequentially. This ID becomes especially
+    /// handy if you’re using [Webhooks], since it allows you to ignore
+    /// repeated updates or to restore the correct update sequence, should
+    /// they get out of order. If there are no new updates for at least a
+    /// week, then identifier of the next update will be chosen randomly
+    /// instead of sequentially.
+    ///
+    /// [Webhooks]: crate::Bot::set_webhook
+    #[serde(rename = "update_id")]
+    pub id: i32,
+
+    #[serde(flatten)]
+    pub kind: UpdateKind,
+}
+
+impl Update {
+    pub fn new(id: i32, kind: UpdateKind) -> Self {
+        Self { id, kind }
+    }
+
+    pub fn id<S>(mut self, val: i32) -> Self {
+        self.id = val;
+        self
+    }
+
+    pub fn kind<S>(mut self, val: UpdateKind) -> Self {
+        self.kind = val;
+        self
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[non_exhaustive]
+pub enum UpdateKind {
+    /// New incoming message of any kind — text, photo, sticker, etc.
+    Message(Message),
+
+    /// New version of a message that is known to the bot and was edited.
+    EditedMessage(Message),
+
+    /// New incoming channel post of any kind — text, photo, sticker, etc.
+    ChannelPost(Message),
+
+    /// New version of a channel post that is known to the bot and was edited.
+    EditedChannelPost(Message),
+
+    /// New incoming [inline] query.
+    ///
+    /// [inline]: https://core.telegram.org/bots/api#inline-mode
+    InlineQuery(InlineQuery),
+
+    /// The result of an [inline] query that was chosen by a user and sent to
+    /// their chat partner. Please see our documentation on the [feedback
+    /// collecting] for details on how to enable these updates for your bot.
+    ///
+    /// [inline]: https://core.telegram.org/bots/api#inline-mode
+    /// [feedback collecting]: https://core.telegram.org/bots/inline#collecting-feedback
+    ChosenInlineResult(ChosenInlineResult),
+
+    /// New incoming callback query.
+    CallbackQuery(CallbackQuery),
+
+    /// New incoming shipping query. Only for invoices with flexible price.
+    ShippingQuery(ShippingQuery),
+
+    /// New incoming pre-checkout query. Contains full information about
+    /// checkout.
+    PreCheckoutQuery(PreCheckoutQuery),
+
+    /// New poll state. Bots receive only updates about stopped polls and
+    /// polls, which are sent by the bot.
+    Poll(Poll),
+
+    /// A user changed their answer in a non-anonymous poll. Bots receive new
+    /// votes only in polls that were sent by the bot itself.
+    PollAnswer(PollAnswer),
+}
+
+impl Update {
+    pub fn user(&self) -> Option<&User> {
+        match &self.kind {
+            UpdateKind::Message(m) => m.from(),
+            UpdateKind::EditedMessage(m) => m.from(),
+            UpdateKind::CallbackQuery(query) => Some(&query.from),
+            UpdateKind::ChosenInlineResult(chosen) => Some(&chosen.from),
+            UpdateKind::InlineQuery(query) => Some(&query.from),
+            UpdateKind::ShippingQuery(query) => Some(&query.from),
+            UpdateKind::PreCheckoutQuery(query) => Some(&query.from),
+            UpdateKind::PollAnswer(answer) => Some(&answer.user),
+            _ => None,
+        }
+    }
+
+    pub fn chat(&self) -> Option<&Chat> {
+        match &self.kind {
+            UpdateKind::Message(m) => Some(&m.chat),
+            UpdateKind::EditedMessage(m) => Some(&m.chat),
+            UpdateKind::ChannelPost(p) => Some(&p.chat),
+            UpdateKind::EditedChannelPost(p) => Some(&p.chat),
+            UpdateKind::CallbackQuery(q) => Some(&q.message.as_ref()?.chat),
+            _ => None,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::types::{
+        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText, Message,
+        MessageCommon, MessageKind, Update, UpdateKind, User,
+    };
+
+    // TODO: more tests for deserialization
+    #[test]
+    fn message() {
+        let json = r#"{
+            "update_id":892252934,
+            "message":{
+                "message_id":6557,
+                "from":{
+                    "id":218485655,
+                    "is_bot": false,
+                    "first_name":"Waffle",
+                    "username":"WaffleLapkin",
+                    "language_code":"en"
+                },
+                "chat":{
+                    "id":218485655,
+                    "first_name":"Waffle",
+                    "username":"WaffleLapkin",
+                    "type":"private"
+                },
+               "date":1569518342,
+               "text":"hello there"
+            }
+        }"#;
+
+        let expected = Update {
+            id: 892_252_934,
+            kind: UpdateKind::Message(Message {
+                via_bot: None,
+                id: 6557,
+                date: 1_569_518_342,
+                chat: Chat {
+                    id: 218_485_655,
+                    kind: ChatKind::Private(ChatPrivate {
+                        type_: (),
+                        username: Some(String::from("WaffleLapkin")),
+                        first_name: Some(String::from("Waffle")),
+                        last_name: None,
+                    }),
+                    photo: None,
+                },
+                kind: MessageKind::Common(MessageCommon {
+                    from: Some(User {
+                        id: 218_485_655,
+                        is_bot: false,
+                        first_name: String::from("Waffle"),
+                        last_name: None,
+                        username: Some(String::from("WaffleLapkin")),
+                        language_code: Some(String::from("en")),
+                    }),
+                    forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message: None }),
+                    edit_date: None,
+                    media_kind: MediaKind::Text(MediaText {
+                        text: String::from("hello there"),
+                        entities: vec![],
+                    }),
+                    reply_markup: None,
+                }),
+            }),
+        };
+
+        let actual = serde_json::from_str::<Update>(json).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn de_private_chat_text_message() {
+        let text = r#"
+  {
+    "message": {
+      "chat": {
+        "first_name": "Hirrolot",
+        "id": 408258968,
+        "type": "private",
+        "username": "hirrolot"
+      },
+      "date": 1581448857,
+      "from": {
+        "first_name": "Hirrolot",
+        "id": 408258968,
+        "is_bot": false,
+        "language_code": "en",
+        "username": "hirrolot"
+      },
+      "message_id": 154,
+      "text": "4"
+    },
+    "update_id": 306197398
+  }
+"#;
+
+        assert!(serde_json::from_str::<Update>(text).is_ok());
+    }
+
+    #[test]
+    fn pinned_message_works() {
+        let json = r#"{
+    "message": {
+        "chat": {
+            "id": -1001276785818,
+            "title": "teloxide dev",
+            "type": "supergroup",
+            "username": "teloxide_dev"
+        },
+        "date": 1582134655,
+        "from": {
+            "first_name": "Hirrolot",
+            "id": 408258968,
+            "is_bot": false,
+            "username": "hirrolot"
+        },
+        "message_id": 20225,
+        "pinned_message": {
+            "chat": {
+                "id": -1001276785818,
+                "title": "teloxide dev",
+                "type": "supergroup",
+                "username": "teloxide_dev"
+            },
+            "date": 1582134643,
+            "from": {
+                "first_name": "Hirrolot",
+                "id": 408258968,
+                "is_bot": false,
+                "username": "hirrolot"
+            },
+            "message_id": 20224,
+            "text": "Faster than a bullet"
+        }
+    },
+    "update_id": 845402291
+}"#;
+
+        serde_json::from_str::<Update>(json).unwrap();
+    }
+
+    #[test]
+    fn dice_works() {
+        let json = r#"
+        {
+    "message": {
+        "chat": {
+            "id": -1001276785818,
+            "title": "bla bla bla chat",
+            "type": "supergroup",
+            "username": "teloxide_dev"
+        },
+        "date": 1596014550,
+        "dice": {
+            "emoji": "🎲",
+            "value": 2
+        },
+        "from": {
+            "first_name": "Hirrolot",
+            "id": 408258968,
+            "is_bot": false,
+            "language_code": "en",
+            "username": "hirrolot"
+        },
+        "message_id": 35410
+    },
+    "update_id": 573255266
+}
+        "#;
+
+        serde_json::from_str::<Update>(json).unwrap();
+    }
+}
diff --git a/src/types/user.rs b/src/types/user.rs
new file mode 100644
index 00000000..d24f5caa
--- /dev/null
+++ b/src/types/user.rs
@@ -0,0 +1,132 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a Telegram user or bot.
+///
+/// [The official docs](https://core.telegram.org/bots/api#user).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct User {
+    /// Unique identifier for this user or bot.
+    pub id: i32,
+
+    /// `true`, if this user is a bot.
+    pub is_bot: bool,
+
+    /// User‘s or bot’s first name.
+    pub first_name: String,
+
+    /// User‘s or bot’s last name.
+    pub last_name: Option<String>,
+
+    /// User‘s or bot’s username.
+    pub username: Option<String>,
+
+    /// [IETF language tag] of the user's language.
+    ///
+    /// [IETF language tag]: https://en.wikipedia.org/wiki/IETF_language_tag
+    pub language_code: Option<String>,
+}
+
+impl User {
+    pub fn new<S>(id: i32, is_bot: bool, first_name: S) -> Self
+    where
+        S: Into<String>,
+    {
+        Self {
+            id,
+            is_bot,
+            first_name: first_name.into(),
+            last_name: None,
+            username: None,
+            language_code: None,
+        }
+    }
+
+    pub fn id<S>(mut self, val: i32) -> Self {
+        self.id = val;
+        self
+    }
+
+    #[allow(clippy::wrong_self_convention)]
+    pub fn is_bot<S>(mut self, val: bool) -> Self {
+        self.is_bot = val;
+        self
+    }
+
+    pub fn first_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.first_name = val.into();
+        self
+    }
+
+    pub fn last_name<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_name = Some(val.into());
+        self
+    }
+
+    pub fn username<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.username = Some(val.into());
+        self
+    }
+
+    pub fn language_code<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.language_code = Some(val.into());
+        self
+    }
+}
+
+impl User {
+    pub fn full_name(&self) -> String {
+        match &self.last_name {
+            Some(last_name) => (format!("{0} {1}", self.first_name, last_name)),
+            None => self.first_name.clone(),
+        }
+    }
+
+    pub fn mention(&self) -> Option<String> {
+        Some(format!("@{}", self.username.as_ref()?))
+    }
+
+    pub fn url(&self) -> reqwest::Url {
+        reqwest::Url::parse(format!("tg://user/?id={}", self.id).as_str()).unwrap()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn deserialize() {
+        let json = r#"{
+            "id":12345,
+            "is_bot":false,
+            "first_name":"firstName",
+            "last_name":"lastName",
+            "username":"Username",
+            "language_code":"ru"
+        }"#;
+        let expected = User {
+            id: 12345,
+            is_bot: false,
+            first_name: "firstName".to_string(),
+            last_name: Some("lastName".to_string()),
+            username: Some("Username".to_string()),
+            language_code: Some(String::from("ru")),
+        };
+        let actual = serde_json::from_str::<User>(&json).unwrap();
+        assert_eq!(actual, expected)
+    }
+}
diff --git a/src/types/user_profile_photos.rs b/src/types/user_profile_photos.rs
new file mode 100644
index 00000000..26d8a934
--- /dev/null
+++ b/src/types/user_profile_photos.rs
@@ -0,0 +1,40 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::PhotoSize;
+
+/// This object represent a user's profile pictures.
+///
+/// [The official docs](https://core.telegram.org/bots/api#userprofilephotos).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct UserProfilePhotos {
+    /// Total number of profile pictures the target user has.
+    pub total_count: u32,
+
+    /// Requested profile pictures (in up to 4 sizes each).
+    pub photos: Vec<Vec<PhotoSize>>,
+}
+
+impl UserProfilePhotos {
+    pub fn new<P1, P2>(total_count: u32, photos: P1) -> Self
+    where
+        P1: Into<Vec<P2>>,
+        P2: Into<Vec<PhotoSize>>,
+    {
+        Self { total_count, photos: photos.into().into_iter().map(Into::into).collect() }
+    }
+
+    pub fn total_count(mut self, val: u32) -> Self {
+        self.total_count = val;
+        self
+    }
+
+    pub fn photos<P1, P2>(mut self, val: P1) -> Self
+    where
+        P1: Into<Vec<P2>>,
+        P2: Into<Vec<PhotoSize>>,
+    {
+        self.photos = val.into().into_iter().map(Into::into).collect();
+        self
+    }
+}
diff --git a/src/types/venue.rs b/src/types/venue.rs
new file mode 100644
index 00000000..3a8ff38a
--- /dev/null
+++ b/src/types/venue.rs
@@ -0,0 +1,74 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::Location;
+
+/// This object represents a venue.
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Venue {
+    /// Venue location.
+    pub location: Location,
+
+    /// Name of the venue.
+    pub title: String,
+
+    /// Address of the venue.
+    pub address: String,
+
+    /// Foursquare identifier of the venue.
+    pub foursquare_id: Option<String>,
+
+    /// Foursquare type of the venue. (For example,
+    /// `arts_entertainment/default`, `arts_entertainment/aquarium` or
+    /// `food/icecream`.)
+    pub foursquare_type: Option<String>,
+}
+
+impl Venue {
+    pub fn new<S1, S2>(location: Location, title: S1, address: S2) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            location,
+            title: title.into(),
+            address: address.into(),
+            foursquare_id: None,
+            foursquare_type: None,
+        }
+    }
+
+    pub fn title<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn address<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.address = val.into();
+        self
+    }
+
+    pub fn foursquare_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_id = Some(val.into());
+        self
+    }
+
+    pub fn foursquare_type<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.foursquare_type = Some(val.into());
+        self
+    }
+}
diff --git a/src/types/video.rs b/src/types/video.rs
new file mode 100644
index 00000000..84de086a
--- /dev/null
+++ b/src/types/video.rs
@@ -0,0 +1,108 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{MimeWrapper, PhotoSize};
+
+/// This object represents a video file.
+///
+/// [The official docs](https://core.telegram.org/bots/api#video).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Video {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// Video width as defined by sender.
+    pub width: u32,
+
+    /// Video height as defined by sender.
+    pub height: u32,
+
+    /// Duration of the video in seconds as defined by sender.
+    pub duration: u32,
+
+    /// Video thumbnail.
+    pub thumb: Option<PhotoSize>,
+
+    /// Mime type of a file as defined by sender.
+    pub mime_type: Option<MimeWrapper>,
+
+    /// File size.
+    pub file_size: Option<u32>,
+}
+
+impl Video {
+    pub fn new<S1, S2>(
+        file_id: S1,
+        file_unique_id: S2,
+        width: u32,
+        height: u32,
+        duration: u32,
+    ) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            width,
+            height,
+            duration,
+            thumb: None,
+            mime_type: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn width(mut self, val: u32) -> Self {
+        self.width = val;
+        self
+    }
+
+    pub fn height(mut self, val: u32) -> Self {
+        self.height = val;
+        self
+    }
+
+    pub fn duration(mut self, val: u32) -> Self {
+        self.duration = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
new file mode 100644
index 00000000..467ace0e
--- /dev/null
+++ b/src/types/video_note.rs
@@ -0,0 +1,89 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::PhotoSize;
+
+/// This object represents a [video message] (available in Telegram apps as of
+/// [v.4.0]).
+///
+/// [The official docs](https://core.telegram.org/bots/api#videonote).
+///
+/// [video message]: https://telegram.org/blog/video-messages-and-telescope
+/// [v4.0]: https://telegram.org/blog/video-messages-and-telescope
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct VideoNote {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// Video width and height (diameter of the video message) as defined by
+    /// sender.
+    pub length: u32,
+
+    /// Duration of the video in seconds as defined by sender.
+    pub duration: u32,
+
+    /// Video thumbnail.
+    pub thumb: Option<PhotoSize>,
+
+    /// File size.
+    pub file_size: Option<u32>,
+}
+
+impl VideoNote {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, length: u32, duration: u32) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            length,
+            duration,
+            thumb: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn length(mut self, val: u32) -> Self {
+        self.length = val;
+        self
+    }
+
+    pub fn duration(mut self, val: u32) -> Self {
+        self.duration = val;
+        self
+    }
+
+    pub fn thumb(mut self, val: PhotoSize) -> Self {
+        self.thumb = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u32) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
diff --git a/src/types/voice.rs b/src/types/voice.rs
new file mode 100644
index 00000000..bd522cbb
--- /dev/null
+++ b/src/types/voice.rs
@@ -0,0 +1,74 @@
+use crate::types::MimeWrapper;
+use serde::{Deserialize, Serialize};
+
+/// This object represents a voice note.
+///
+/// [The official docs](https://core.telegram.org/bots/api#voice).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct Voice {
+    /// Identifier for this file.
+    pub file_id: String,
+
+    /// Unique identifier for this file, which is supposed to be the same over
+    /// time and for different bots. Can't be used to download or reuse the
+    /// file.
+    pub file_unique_id: String,
+
+    /// Duration of the audio in seconds as defined by sender.
+    pub duration: u32,
+
+    /// MIME type of the file as defined by sender.
+    pub mime_type: Option<MimeWrapper>,
+
+    /// File size.
+    pub file_size: Option<u64>,
+}
+
+impl Voice {
+    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, duration: u32) -> Self
+    where
+        S1: Into<String>,
+        S2: Into<String>,
+    {
+        Self {
+            file_id: file_id.into(),
+            file_unique_id: file_unique_id.into(),
+            duration,
+            mime_type: None,
+            file_size: None,
+        }
+    }
+
+    pub fn file_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_id = val.into();
+        self
+    }
+
+    pub fn file_unique_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.file_unique_id = val.into();
+        self
+    }
+
+    pub fn duration(mut self, val: u32) -> Self {
+        self.duration = val;
+        self
+    }
+
+    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+        self.mime_type = Some(val);
+        self
+    }
+
+    pub fn file_size(mut self, val: u64) -> Self {
+        self.file_size = Some(val);
+        self
+    }
+}
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
new file mode 100644
index 00000000..782a588d
--- /dev/null
+++ b/src/types/webhook_info.rs
@@ -0,0 +1,98 @@
+use serde::{Deserialize, Serialize};
+
+/// Contains information about the current status of a webhook.
+///
+/// [The official docs](https://core.telegram.org/bots/api#webhookinfo).
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
+pub struct WebhookInfo {
+    /// Webhook URL, may be empty if webhook is not set up.
+    pub url: String,
+
+    /// `true`, if a custom certificate was provided for webhook certificate
+    /// checks.
+    pub has_custom_certificate: bool,
+
+    /// Number of updates awaiting delivery.
+    pub pending_update_count: u32,
+
+    /// Unix time for the most recent error that happened when trying to
+    /// deliver an update via webhook.
+    pub last_error_date: Option<u64>,
+
+    /// Error message in human-readable format for the most recent error that
+    /// happened when trying to deliver an update via webhook.
+    pub last_error_message: Option<String>,
+
+    /// Maximum allowed number of simultaneous HTTPS connections to the webhook
+    /// for update delivery.
+    pub max_connections: Option<u32>,
+
+    /// A list of update types the bot is subscribed to. Defaults to all update
+    /// types.
+    pub allowed_updates: Option<Vec<String>>,
+}
+
+impl WebhookInfo {
+    pub fn new<S>(url: S, has_custom_certificate: bool, pending_update_count: u32) -> Self
+    where
+        S: Into<String>,
+    {
+        Self {
+            url: url.into(),
+            has_custom_certificate,
+            pending_update_count,
+            last_error_date: None,
+
+            last_error_message: None,
+            max_connections: None,
+            allowed_updates: None,
+        }
+    }
+
+    pub fn url<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.url = val.into();
+        self
+    }
+
+    pub fn has_custom_certificate(mut self, val: bool) -> Self {
+        self.has_custom_certificate = val;
+        self
+    }
+
+    pub fn pending_update_count(mut self, val: u32) -> Self {
+        self.pending_update_count = val;
+        self
+    }
+
+    pub fn last_error_date(mut self, val: u64) -> Self {
+        self.last_error_date = Some(val);
+        self
+    }
+
+    pub fn last_error_message<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.last_error_message = Some(val.into());
+        self
+    }
+
+    pub fn max_connections(mut self, val: u32) -> Self {
+        self.max_connections = Some(val);
+        self
+    }
+
+    pub fn allowed_updates<A, S>(mut self, val: A) -> Self
+    where
+        A: Into<Vec<S>>,
+        S: Into<String>,
+    {
+        self.allowed_updates = Some(val.into().into_iter().map(Into::into).collect());
+        self
+    }
+}

From 95cfc0530f7460077d57ea62cbecd9d5466a6688 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Wed, 12 Aug 2020 20:17:26 +0300
Subject: [PATCH 074/755] Add badges to readme

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8026aea2..e6ad7315 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # teloxide-core
 
-Core part of `teloxide` library.
\ No newline at end of file
+[![CI status](https://github.com/teloxide/teloxide-core/workflows/Continuous%20integration/badge.svg)](https://github.com/teloxide/teloxide-core/actions)
+[![documentation (master)](https://img.shields.io/badge/docs-master-blue)](https://teloxide-core.netlify.com)
+[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
+Core part of `teloxide` library.

From 842a084abf4500cd8155c920523306ad942b139d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Aug 2020 20:23:18 +0300
Subject: [PATCH 075/755] replace `teloxide` with `teloxide_core` in doc tests

---
 src/bot/download.rs                 | 6 +++---
 src/types/inline_keyboard_button.rs | 2 +-
 src/types/inline_keyboard_markup.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bot/download.rs b/src/bot/download.rs
index 7035cfe7..3890d79e 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -17,10 +17,10 @@ impl Bot {
     /// ## Examples
     ///
     /// ```no_run
-    /// use teloxide::types::File as TgFile;
+    /// use teloxide_core::types::File as TgFile;
     /// use tokio::fs::File;
-    /// # use teloxide::RequestError;
-    /// use teloxide::{requests::Request, Bot};
+    /// # use teloxide_core::RequestError;
+    /// use teloxide_core::{requests::Request, Bot};
     ///
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 12497463..fd108692 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -101,7 +101,7 @@ pub enum InlineKeyboardButtonKind {
 ///
 /// # Examples
 /// ```
-/// use teloxide::types::InlineKeyboardButton;
+/// use teloxide_core::types::InlineKeyboardButton;
 ///
 /// let url_button = InlineKeyboardButton::url("Text".to_string(), "http://url.com".to_string());
 /// ```
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index b6884a96..06893959 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -25,7 +25,7 @@ pub struct InlineKeyboardMarkup {
 ///
 /// # Examples
 /// ```
-/// use teloxide::types::{InlineKeyboardButton, InlineKeyboardMarkup};
+/// use teloxide_core::types::{InlineKeyboardButton, InlineKeyboardMarkup};
 ///
 /// let url_button = InlineKeyboardButton::url("text".to_string(), "http://url.com".to_string());
 /// let keyboard = InlineKeyboardMarkup::default().append_row(vec![url_button]);

From 06f123710ec632b91188691a532ef7c2505952cc Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 15 Aug 2020 23:52:08 +0300
Subject: [PATCH 076/755] add `RequestError::Io` to wrap I/O errors

Add `RequestError::Io(std::io::Error)` to wrap I/O errors those may happen
while reading files to upload them to telegram
---
 src/errors.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index 466cc501..83fc2d42 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,3 +1,5 @@
+use std::io;
+
 use derive_more::From;
 use reqwest::StatusCode;
 use serde::Deserialize;
@@ -34,6 +36,9 @@ pub enum RequestError {
 
     #[error("An error while parsing JSON: {0}")]
     InvalidJson(#[source] serde_json::Error),
+
+    #[error("An I/O error: {0}")]
+    Io(#[source] io::Error),
 }
 
 /// A kind of an API error.

From b303958afdb0828fb0f4970aed2f7290dcd8231e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 00:07:19 +0300
Subject: [PATCH 077/755] implement serde multipart serializer

Serde multipart serializer can be used to serialize requests
into multipart/form-data without need for copy-paste and boilerplate
---
 Cargo.toml                                    |   3 +-
 src/lib.rs                                    |   4 +
 src/local_macros.rs                           |  38 +
 src/serde_multipart/mod.rs                    |  28 +
 src/serde_multipart/serializers.rs            | 678 ++++++++++++++++++
 src/serde_multipart/unserializers.rs          |  83 +++
 src/serde_multipart/unserializers/bytes.rs    | 145 ++++
 .../unserializers/input_file.rs               | 173 +++++
 src/serde_multipart/unserializers/string.rs   |  61 ++
 src/types/input_file.rs                       |  53 +-
 10 files changed, 1245 insertions(+), 21 deletions(-)
 create mode 100644 src/local_macros.rs
 create mode 100644 src/serde_multipart/mod.rs
 create mode 100644 src/serde_multipart/serializers.rs
 create mode 100644 src/serde_multipart/unserializers.rs
 create mode 100644 src/serde_multipart/unserializers/bytes.rs
 create mode 100644 src/serde_multipart/unserializers/input_file.rs
 create mode 100644 src/serde_multipart/unserializers/string.rs

diff --git a/Cargo.toml b/Cargo.toml
index 48a598d0..22724491 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ authors = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["fs", "stream"] }
+tokio = { version = "0.2.21", features = ["fs", "stream", "rt-threaded", "macros"] }
 tokio-util = "0.3.1"
 bytes = "0.5.5"
 async-trait = "0.1.36"
@@ -26,6 +26,7 @@ reqwest = { version = "0.10.6", features = ["json", "stream"] }
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
 serde_with_macros = "1.1.0"
+uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
 
 derive_more = "0.99.9"
 mime = "0.3.16"
diff --git a/src/lib.rs b/src/lib.rs
index 27ddfcd6..8ea7ef81 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,6 +11,9 @@
 #![forbid(unsafe_code)]
 //#![deny(missing_docs)]
 
+#[macro_use]
+mod local_macros; // internal helper macros
+
 pub use self::{
     bot::{Bot, BotBuilder},
     errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},
@@ -25,6 +28,7 @@ mod errors;
 
 // implementation details
 mod net;
+mod serde_multipart;
 
 /// Constructs a client from the `TELOXIDE_PROXY` environmental variable.
 ///
diff --git a/src/local_macros.rs b/src/local_macros.rs
new file mode 100644
index 00000000..9dfa940d
--- /dev/null
+++ b/src/local_macros.rs
@@ -0,0 +1,38 @@
+#[macro_use]
+macro_rules! forward_to_unsuported_ty {
+    (
+        supported: $supported:expr;
+        simple { $( $method:ident $arg:ty )* }
+        unit { $( $method1:ident $ty:expr )* }
+        compound {
+            $( $method2:ident $( <$T:ident: ?Sized + Serialize> )? ( $( $args:tt )* ) -> $ret:ty => $message:expr )*
+        }
+    ) => {
+        $(
+            fn $method(self, _: $arg) -> Result<Self::Ok, Self::Error> {
+                Err(Self::Error::UnsupportedType {
+                    ty: stringify!($arg),
+                    supported: $supported,
+                })
+            }
+        )+
+
+        $(
+            fn $method1(self) -> Result<Self::Ok, Self::Error> {
+                Err(Self::Error::UnsupportedType {
+                    ty: $ty,
+                    supported: $supported,
+                })
+            }
+        )+
+
+        $(
+            fn $method2 $( <$T: ?Sized + Serialize> )? (self, $( $args )*) -> Result<$ret, Self::Error> {
+                Err(Self::Error::UnsupportedType {
+                    ty: $message,
+                    supported: $supported,
+                })
+            }
+        )+
+    };
+}
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
new file mode 100644
index 00000000..814dc906
--- /dev/null
+++ b/src/serde_multipart/mod.rs
@@ -0,0 +1,28 @@
+//! Module for serializing into `multipart/form-data`
+//! ([`reqwest::multipart::Form`])
+//!
+//! [`reqwest::multipart::Form`]: reqwest::multipart::Form
+//!
+//! ## How it works
+//!
+//! You better not know...
+
+mod serializers;
+mod unserializers;
+
+use std::future::Future;
+
+use reqwest::multipart::Form;
+use serde::Serialize;
+
+use serializers::MultipartTopLvlSerializer;
+
+pub(crate) use serializers::Error;
+
+/// Serializes given value into [`Form`]
+///
+/// [`Form`]:  reqwest::multipart::Form
+pub(crate) fn to_form<T: ?Sized + Serialize>(val: &T) -> impl Future<Output = Result<Form, Error>> {
+    let fut = val.serialize(MultipartTopLvlSerializer {});
+    async { Ok(fut?.await?) }
+}
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
new file mode 100644
index 00000000..7e45e4f9
--- /dev/null
+++ b/src/serde_multipart/serializers.rs
@@ -0,0 +1,678 @@
+use crate::{
+    serde_multipart::unserializers::{InputFileUnserializer, StringUnserializer},
+    types::InputFile,
+};
+use futures::{
+    future::{ready, BoxFuture},
+    stream::FuturesUnordered,
+    FutureExt, StreamExt, TryStreamExt,
+};
+use reqwest::multipart::{Form, Part};
+use serde::{
+    ser,
+    ser::{Impossible, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant},
+    Serialize, Serializer,
+};
+use std::{fmt, fmt::Display, io};
+
+#[derive(Debug, derive_more::From)]
+pub(crate) enum Error {
+    Custom(String),
+    TopLevelNotStruct,
+    InputFileUnserializerError(crate::serde_multipart::unserializers::UnserializerError),
+    Io(std::io::Error),
+    Json(serde_json::Error),
+}
+
+impl ser::Error for Error {
+    fn custom<T>(msg: T) -> Self
+    where
+        T: Display,
+    {
+        Self::Custom(msg.to_string())
+    }
+}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Custom(s) => write!(f, "Custom serde error: {}", s),
+            Self::TopLevelNotStruct => write!(f, "Multipart supports only structs at top level"),
+            Self::InputFileUnserializerError(inner) => {
+                write!(f, "Error while unserializing input file: {}", inner)
+            }
+            Self::Io(inner) => write!(f, "Io error: {}", inner),
+            Self::Json(inner) => write!(f, "Json (de)serialization error: {}", inner),
+        }
+    }
+}
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        None
+    }
+}
+
+pub(crate) struct MultipartTopLvlSerializer {}
+
+impl Serializer for MultipartTopLvlSerializer {
+    type Ok = <MultipartSerializer as SerializeStruct>::Ok;
+    type Error = Error;
+    type SerializeSeq = Impossible<Self::Ok, Self::Error>;
+    type SerializeTuple = Impossible<Self::Ok, Self::Error>;
+    type SerializeTupleStruct = Impossible<Self::Ok, Self::Error>;
+    type SerializeTupleVariant = Impossible<Self::Ok, Self::Error>;
+    type SerializeMap = MultipartMapSerializer; // for `serde(flatten)` (e.g.: in CreateNewStickerSet)
+    type SerializeStruct = MultipartSerializer;
+    type SerializeStructVariant = Impossible<Self::Ok, Self::Error>;
+
+    fn serialize_bool(self, _: bool) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_i8(self, _: i8) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_i16(self, _: i16) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_i32(self, _: i32) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_i64(self, _: i64) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_u8(self, _: u8) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_u16(self, _: u16) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_u32(self, _: u32) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_u64(self, _: u64) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_f32(self, _: f32) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_f64(self, _: f64) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_char(self, _: char) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_str(self, _: &str) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_bytes(self, _: &[u8]) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_some<T: ?Sized>(self, _: &T) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_unit_struct(self, _: &'static str) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_unit_variant(
+        self,
+        _: &'static str,
+        _: u32,
+        _: &'static str,
+    ) -> Result<Self::Ok, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_newtype_struct<T: ?Sized>(
+        self,
+        _: &'static str,
+        _: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        _: &'static str,
+        _: u32,
+        _: &'static str,
+        _: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_tuple(self, _: usize) -> Result<Self::SerializeTuple, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_tuple_struct(
+        self,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_tuple_variant(
+        self,
+        _: &'static str,
+        _: u32,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+
+    fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+        Ok(MultipartMapSerializer { parts: vec![], files: vec![], key: None })
+    }
+
+    fn serialize_struct(
+        self,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeStruct, Self::Error> {
+        Ok(MultipartSerializer::new())
+    }
+
+    fn serialize_struct_variant(
+        self,
+        _: &'static str,
+        _: u32,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeStructVariant, Self::Error> {
+        Err(Error::TopLevelNotStruct)
+    }
+}
+
+pub(crate) struct MultipartSerializer {
+    parts: Vec<(&'static str, Part)>, // TODO: Array vecs
+    files: Vec<(String, InputFile)>,
+}
+
+impl MultipartSerializer {
+    fn new() -> Self {
+        Self { parts: Vec::new(), files: vec![] }
+    }
+}
+
+impl SerializeStruct for MultipartSerializer {
+    type Ok = BoxFuture<'static, io::Result<Form>>; // impl Future<Output = io::Result<Form>>
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let (part, file) = value.serialize(PartSerializer {})?;
+        self.parts.push((key, part));
+        self.files.extend(file);
+
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        let form =
+            self.parts.into_iter().fold(Form::new(), |acc, (key, value)| acc.part(key, value));
+
+        if self.files.is_empty() {
+            //Ok(Either::Left(ready(Ok(form))))
+            Ok(Box::pin(ready(Ok(form))))
+        } else {
+            let fut = self
+                .files
+                .into_iter()
+                .map(|(k, f)| f.into_part().map(move |p| (k, p)))
+                .collect::<FuturesUnordered<_>>()
+                .map(Ok)
+                .try_fold(form, |acc, (k, p)| async { Ok(acc.part(k, p?)) });
+
+            //Ok(Either::Right(fut))
+            Ok(Box::pin(fut))
+        }
+    }
+}
+
+pub(crate) struct MultipartMapSerializer {
+    parts: Vec<(String, Part)>, // TODO: Array vecs
+    files: Vec<(String, InputFile)>,
+    key: Option<String>,
+}
+
+impl SerializeMap for MultipartMapSerializer {
+    type Ok = <MultipartSerializer as SerializeStruct>::Ok;
+    type Error = Error;
+
+    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.key = Some(key.serialize(StringUnserializer)?);
+        Ok(())
+    }
+
+    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let key = self.key.take().unwrap();
+
+        let (part, file) = value.serialize(PartSerializer {})?;
+        self.parts.push((key, part));
+        self.files.extend(file);
+
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        let form =
+            self.parts.into_iter().fold(Form::new(), |acc, (key, value)| acc.part(key, value));
+
+        if self.files.is_empty() {
+            //Ok(Either::Left(ready(Ok(form))))
+            Ok(Box::pin(ready(Ok(form))))
+        } else {
+            let fut = self
+                .files
+                .into_iter()
+                .map(|(k, f)| f.into_part().map(move |p| (k, p)))
+                .collect::<FuturesUnordered<_>>()
+                .map(Ok)
+                .try_fold(form, |acc, (k, p)| async { Ok(acc.part(k, p?)) });
+
+            //Ok(Either::Right(fut))
+            Ok(Box::pin(fut))
+        }
+    }
+}
+
+struct PartSerializer {}
+
+impl Serializer for PartSerializer {
+    type Ok = (Part, Vec<(String, InputFile)>);
+    type Error = Error;
+    type SerializeSeq = InnerPartSerializer;
+    type SerializeTuple = Impossible<Self::Ok, Self::Error>;
+    type SerializeTupleStruct = Impossible<Self::Ok, Self::Error>;
+    type SerializeTupleVariant = Impossible<Self::Ok, Self::Error>;
+    type SerializeMap = Impossible<Self::Ok, Self::Error>;
+    type SerializeStruct = PartSerializerStruct;
+    type SerializeStructVariant = PartFromFile;
+
+    fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
+        Ok((Part::text(v.to_string()), Vec::new()))
+    }
+
+    fn serialize_i8(self, _: i8) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_i16(self, _: i16) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
+        Ok((Part::text(v.to_string()), Vec::new()))
+    }
+
+    fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
+        Ok((Part::text(v.to_string()), Vec::new()))
+    }
+
+    fn serialize_u8(self, _: u8) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_u16(self, _: u16) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_u32(self, _: u32) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_u64(self, _: u64) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_f32(self, _: f32) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_f64(self, _: f64) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_char(self, _: char) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
+        Ok((Part::text(v.to_owned()), Vec::new()))
+    }
+
+    fn serialize_bytes(self, _: &[u8]) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        value.serialize(self)
+    }
+
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_unit_struct(self, _: &'static str) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_unit_variant(
+        self,
+        _: &'static str,
+        _: u32,
+        variant_name: &'static str,
+    ) -> Result<Self::Ok, Self::Error> {
+        Ok((Part::text(variant_name), Vec::new()))
+    }
+
+    fn serialize_newtype_struct<T: ?Sized>(
+        self,
+        _: &'static str,
+        _: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        unimplemented!()
+    }
+
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        name: &'static str,
+        variant_index: u32,
+        variant: &'static str,
+        value: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        let file: InputFile = InputFileUnserializer::NotMem.serialize_newtype_variant(
+            name,
+            variant_index,
+            variant,
+            value,
+        )?;
+
+        match file {
+            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
+                let uuid = uuid::Uuid::new_v4().to_string();
+                let part = Part::text(format!("attach://{}", uuid));
+                Ok((part, vec![(uuid, f)]))
+            }
+            InputFile::FileId(s) | InputFile::Url(s) => Ok((Part::text(s), Vec::new())),
+        }
+    }
+
+    fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        Ok(Self::SerializeSeq { array_json_parts: vec![], files: vec![] })
+    }
+
+    fn serialize_tuple(self, _: usize) -> Result<Self::SerializeTuple, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_tuple_struct(
+        self,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_tuple_variant(
+        self,
+        _: &'static str,
+        _: u32,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_struct(
+        self,
+        name: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStruct, Self::Error> {
+        let mut ser = serde_json::Serializer::new(Vec::new());
+        ser.serialize_struct(name, len)?;
+        Ok(PartSerializerStruct(
+            ser, // TODO: capcity
+            serde_json::ser::State::First,
+            Vec::new(),
+        ))
+    }
+
+    fn serialize_struct_variant(
+        self,
+        name: &'static str,
+        variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStructVariant, Self::Error> {
+        Ok(PartFromFile {
+            inner: InputFileUnserializer::memory().serialize_struct_variant(
+                name,
+                variant_index,
+                variant,
+                len,
+            )?,
+        })
+    }
+}
+
+struct PartFromFile {
+    inner: InputFileUnserializer,
+}
+
+impl SerializeStructVariant for PartFromFile {
+    type Ok = (Part, Vec<(String, InputFile)>);
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        self.inner.serialize_field(key, value).map_err(Error::InputFileUnserializerError)
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        let file = self.inner.end()?;
+
+        // TODO: to method
+        match file {
+            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
+                let uuid = uuid::Uuid::new_v4().to_string();
+                let part = Part::text(format!("attach://{}", uuid));
+
+                Ok((part, vec![(uuid, f)]))
+            }
+            InputFile::FileId(s) | InputFile::Url(s) => Ok((Part::text(s), vec![])),
+        }
+    }
+}
+
+struct InnerPartSerializer {
+    array_json_parts: Vec<serde_json::Value>, // using value is such a workaround :|
+    files: Vec<(String, InputFile)>,
+}
+
+impl SerializeSeq for InnerPartSerializer {
+    type Ok = (Part, Vec<(String, InputFile)>);
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        // NOTE: this is probably highly inefficient (especially for ::Memory),
+        //       but at least it works
+        let mut value = serde_json::to_value(value)?;
+        let file: InputFile = serde_json::from_value(value["media"].take())?;
+
+        match file {
+            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
+                let uuid = uuid::Uuid::new_v4().to_string();
+                value["media"] = serde_json::Value::String(format!("attach://{}", uuid));
+                self.files.push((uuid, f));
+            }
+            InputFile::FileId(s) | InputFile::Url(s) => {
+                value["media"] = serde_json::Value::String(s);
+            }
+        }
+
+        self.array_json_parts.push(value);
+
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        let s = serde_json::to_string(&self.array_json_parts)?;
+        Ok((Part::text(s), self.files))
+    }
+}
+
+struct PartSerializerStruct(
+    serde_json::Serializer<Vec<u8>>,
+    serde_json::ser::State,
+    Vec<(String, InputFile)>,
+);
+
+impl SerializeStruct for PartSerializerStruct {
+    type Ok = (Part, Vec<(String, InputFile)>);
+    type Error = Error;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let state = match self.1 {
+            serde_json::ser::State::Empty => serde_json::ser::State::Empty,
+            serde_json::ser::State::First => serde_json::ser::State::First,
+            serde_json::ser::State::Rest => serde_json::ser::State::Rest,
+        };
+        let mut ser = serde_json::ser::Compound::Map { ser: &mut self.0, state };
+
+        // special case media (required for `edit_message_media` to work)
+        if key == "media" {
+            let file = value.serialize(InputFileUnserializer::NotMem)?;
+
+            match file {
+                f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
+                    let uuid = uuid::Uuid::new_v4().to_string();
+                    let attach = format!("attach://{}", uuid);
+
+                    SerializeStruct::serialize_field(&mut ser, key, attach.as_str())?;
+                    self.1 = get_state(ser);
+
+                    self.2.push((uuid, f));
+                }
+                InputFile::FileId(s) | InputFile::Url(s) => {
+                    SerializeStruct::serialize_field(&mut ser, key, &s)?;
+                    self.1 = get_state(ser)
+                }
+            }
+        } else {
+            SerializeStruct::serialize_field(&mut ser, key, value)?;
+            self.1 = get_state(ser);
+        }
+
+        Ok(())
+    }
+
+    fn end(mut self) -> Result<Self::Ok, Self::Error> {
+        let state = match self.1 {
+            serde_json::ser::State::Empty => serde_json::ser::State::Empty,
+            serde_json::ser::State::First => serde_json::ser::State::First,
+            serde_json::ser::State::Rest => serde_json::ser::State::Rest,
+        };
+        let ser = serde_json::ser::Compound::Map { ser: &mut self.0, state };
+        SerializeStruct::end(ser)?;
+
+        let json = self.0.into_inner();
+        Ok((Part::bytes(json), self.2))
+    }
+}
+
+fn get_state(
+    compound: serde_json::ser::Compound<Vec<u8>, serde_json::ser::CompactFormatter>,
+) -> serde_json::ser::State {
+    // Compound may have more variants under some serde_json features
+    #[allow(unreachable_patterns)]
+    match compound {
+        serde_json::ser::Compound::Map { ser: _, state } => state,
+        _ => unreachable!(),
+    }
+}
diff --git a/src/serde_multipart/unserializers.rs b/src/serde_multipart/unserializers.rs
new file mode 100644
index 00000000..b4b4775f
--- /dev/null
+++ b/src/serde_multipart/unserializers.rs
@@ -0,0 +1,83 @@
+mod bytes;
+mod input_file;
+mod string;
+
+pub(crate) use input_file::InputFileUnserializer;
+pub(crate) use string::StringUnserializer;
+
+use std::fmt::{self, Display};
+
+use serde::ser;
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum UnserializerError {
+    Custom(String),
+    UnsupportedType { ty: &'static str, supported: &'static str },
+    UnexpectedField { name: &'static str, expected: &'static [&'static str] },
+    UnexpectedVariant { name: &'static str, expected: &'static [&'static str] },
+    WrongLen { len: usize, expected: usize },
+}
+
+impl ser::Error for UnserializerError {
+    fn custom<T>(msg: T) -> Self
+    where
+        T: Display,
+    {
+        Self::Custom(msg.to_string())
+    }
+}
+
+impl Display for UnserializerError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::UnexpectedField { name, expected } => write!(
+                f,
+                "Unexpected field: `{}`, expected field(s): `{}`",
+                name,
+                expected.join(", ")
+            ),
+            Self::Custom(s) => write!(f, "Custom serde error: {}", s),
+            Self::UnsupportedType { ty, supported } => {
+                write!(f, "Unsupported type: `{}`, supported type(s): `{}`", ty, supported)
+            }
+            Self::UnexpectedVariant { name, expected } => write!(
+                f,
+                "Unexpected variant: `{}`, expected variants(s): `{}`",
+                name,
+                expected.join(", ")
+            ),
+            Self::WrongLen { len, expected } => {
+                write!(f, "Wrong len: `{}`, expected `{}`", len, expected)
+            }
+        }
+    }
+}
+
+impl std::error::Error for UnserializerError {}
+
+#[test]
+fn test() {
+    use crate::serde_multipart::unserializers::string::StringUnserializer;
+    use serde::Serialize;
+
+    use crate::{
+        serde_multipart::unserializers::input_file::InputFileUnserializer, types::InputFile,
+    };
+    use std::borrow::Cow;
+
+    let value = String::from("test");
+    assert_eq!(value.serialize(StringUnserializer), Ok(value));
+
+    let value = InputFile::Url(String::from("url"));
+    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+
+    let value = InputFile::FileId(String::from("file_id"));
+    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+
+    let value =
+        InputFile::Memory { file_name: String::from("name"), data: Cow::Owned(vec![1, 2, 3]) };
+    assert_eq!(value.serialize(InputFileUnserializer::memory()), Ok(value));
+
+    let value = InputFile::File("a/b/c".into());
+    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+}
diff --git a/src/serde_multipart/unserializers/bytes.rs b/src/serde_multipart/unserializers/bytes.rs
new file mode 100644
index 00000000..182b9da7
--- /dev/null
+++ b/src/serde_multipart/unserializers/bytes.rs
@@ -0,0 +1,145 @@
+use crate::serde_multipart::unserializers::UnserializerError;
+use serde::{
+    ser::{Impossible, SerializeSeq},
+    Serialize, Serializer,
+};
+
+#[derive(Default)]
+pub(crate) struct BytesUnserializer(Vec<u8>);
+
+impl Serializer for BytesUnserializer {
+    type Ok = Vec<u8>;
+    type Error = UnserializerError;
+
+    type SerializeSeq = Self;
+    type SerializeTuple = Impossible<Vec<u8>, UnserializerError>;
+    type SerializeTupleStruct = Impossible<Vec<u8>, UnserializerError>;
+    type SerializeTupleVariant = Impossible<Vec<u8>, UnserializerError>;
+    type SerializeMap = Impossible<Vec<u8>, UnserializerError>;
+    type SerializeStruct = Impossible<Vec<u8>, UnserializerError>;
+    type SerializeStructVariant = Impossible<Vec<u8>, UnserializerError>;
+
+    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
+        Ok(v.to_owned())
+    }
+
+    fn serialize_seq(mut self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        if let Some(len) = len {
+            self.0.reserve_exact(len);
+        }
+        Ok(self)
+    }
+
+    forward_to_unsuported_ty! {
+        supported: "&[u8], Vec<u8>, Cow<[u8]>";
+        simple {
+            serialize_bool  bool
+            serialize_i8    i8
+            serialize_i16   i16
+            serialize_i32   i32
+            serialize_i64   i64
+            serialize_u8    u8
+            serialize_u16   u16
+            serialize_u32   u32
+            serialize_u64   u64
+            serialize_f32   f32
+            serialize_f64   f64
+            serialize_char  char
+            serialize_str   &str
+        }
+        unit {
+            serialize_none "None"
+            serialize_unit "unit"
+        }
+        compound {
+            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
+            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
+            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
+            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
+            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
+            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
+            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
+            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
+            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
+            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
+            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
+        }
+    }
+}
+
+impl SerializeSeq for BytesUnserializer {
+    type Ok = Vec<u8>;
+    type Error = UnserializerError;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        value.serialize(BytesUnserializerPush(&mut self.0))
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        Ok(self.0)
+    }
+}
+
+pub(crate) struct BytesUnserializerPush<'a>(&'a mut Vec<u8>);
+
+impl Serializer for BytesUnserializerPush<'_> {
+    type Ok = ();
+    type Error = UnserializerError;
+
+    type SerializeSeq = Impossible<(), UnserializerError>;
+    type SerializeTuple = Impossible<(), UnserializerError>;
+    type SerializeTupleStruct = Impossible<(), UnserializerError>;
+    type SerializeTupleVariant = Impossible<(), UnserializerError>;
+    type SerializeMap = Impossible<(), UnserializerError>;
+    type SerializeStruct = Impossible<(), UnserializerError>;
+    type SerializeStructVariant = Impossible<(), UnserializerError>;
+
+    fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
+        self.0.push(v);
+        Ok(())
+    }
+
+    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
+        self.0.extend_from_slice(v);
+        Ok(())
+    }
+
+    forward_to_unsuported_ty! {
+        supported: "&[u8], Vec<u8>, Cow<[u8]>";
+        simple {
+            serialize_bool  bool
+            serialize_i8    i8
+            serialize_i16   i16
+            serialize_i32   i32
+            serialize_i64   i64
+            serialize_u16   u16
+            serialize_u32   u32
+            serialize_u64   u64
+            serialize_f32   f32
+            serialize_f64   f64
+            serialize_char  char
+            serialize_str   &str
+        }
+        unit {
+            serialize_none "None"
+            serialize_unit "unit"
+        }
+        compound {
+            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
+            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
+            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
+            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
+            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
+            serialize_seq(_: Option<usize>) -> Self::SerializeSeq => "sequence"
+            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
+            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
+            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
+            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
+            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
+            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
+        }
+    }
+}
diff --git a/src/serde_multipart/unserializers/input_file.rs b/src/serde_multipart/unserializers/input_file.rs
new file mode 100644
index 00000000..d3cc94ff
--- /dev/null
+++ b/src/serde_multipart/unserializers/input_file.rs
@@ -0,0 +1,173 @@
+use std::borrow::Cow;
+
+use serde::{
+    ser::{Impossible, SerializeStructVariant},
+    Serialize, Serializer,
+};
+
+use crate::{
+    serde_multipart::unserializers::{
+        bytes::BytesUnserializer, string::StringUnserializer, UnserializerError,
+    },
+    types::InputFile,
+};
+
+pub(crate) enum InputFileUnserializer {
+    Memory { file_name: String, data: Cow<'static, [u8]> },
+    NotMem,
+}
+
+impl InputFileUnserializer {
+    pub(crate) fn memory() -> Self {
+        Self::Memory { file_name: String::new(), data: Cow::Borrowed(&[]) }
+    }
+}
+
+impl Serializer for InputFileUnserializer {
+    type Ok = InputFile;
+    type Error = UnserializerError;
+
+    type SerializeSeq = Impossible<InputFile, UnserializerError>;
+    type SerializeTuple = Impossible<InputFile, UnserializerError>;
+    type SerializeTupleStruct = Impossible<InputFile, UnserializerError>;
+    type SerializeTupleVariant = Impossible<InputFile, UnserializerError>;
+    type SerializeMap = Impossible<InputFile, UnserializerError>;
+    type SerializeStruct = Impossible<InputFile, UnserializerError>;
+
+    type SerializeStructVariant = Self;
+
+    fn serialize_newtype_variant<T: ?Sized>(
+        self,
+        name: &'static str,
+        _: u32,
+        variant: &'static str,
+        value: &T,
+    ) -> Result<Self::Ok, Self::Error>
+    where
+        T: Serialize,
+    {
+        if name != "InputFile" {
+            return Err(UnserializerError::UnsupportedType {
+                ty: name,
+                supported: "InputFile", // TODO
+            });
+        }
+
+        // TODO
+        match variant {
+            "File" => Ok(InputFile::File(value.serialize(StringUnserializer)?.into())),
+            "Url" => Ok(InputFile::Url(value.serialize(StringUnserializer)?)),
+            "FileId" => Ok(InputFile::FileId(value.serialize(StringUnserializer)?)),
+            name => Err(UnserializerError::UnexpectedVariant {
+                name,
+                expected: &["File", "Url", "FileId"], // TODO
+            }),
+        }
+    }
+
+    fn serialize_struct_variant(
+        self,
+        name: &'static str,
+        _variant_index: u32,
+        variant: &'static str,
+        len: usize,
+    ) -> Result<Self::SerializeStructVariant, Self::Error> {
+        if name != "InputFile" {
+            return Err(UnserializerError::UnsupportedType { ty: name, supported: "InputFile" });
+        }
+
+        if variant != "Memory" {
+            return Err(UnserializerError::UnexpectedVariant {
+                name: variant,
+                expected: &["Memory"],
+            });
+        }
+
+        if len != 2 {
+            return Err(UnserializerError::WrongLen { len, expected: 2 });
+        }
+
+        Ok(self)
+    }
+
+    forward_to_unsuported_ty! {
+        supported: "Newtype variant, struct variant";
+        simple {
+            serialize_bool  bool
+            serialize_i8    i8
+            serialize_i16   i16
+            serialize_i32   i32
+            serialize_i64   i64
+            serialize_u8    u8
+            serialize_u16   u16
+            serialize_u32   u32
+            serialize_u64   u64
+            serialize_f32   f32
+            serialize_f64   f64
+            serialize_bytes &[u8]
+            serialize_char  char
+            serialize_str   &str
+        }
+        unit {
+            serialize_none "None"
+            serialize_unit "unit"
+        }
+        compound {
+            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
+            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
+            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
+            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
+            serialize_seq(_: Option<usize>) -> Self::SerializeSeq => "sequence"
+            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
+            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
+            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
+            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
+            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
+        }
+    }
+}
+
+impl SerializeStructVariant for InputFileUnserializer {
+    type Ok = InputFile;
+    type Error = UnserializerError;
+
+    fn serialize_field<T: ?Sized>(
+        &mut self,
+        key: &'static str,
+        value: &T,
+    ) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        let (file_name, data) = match self {
+            Self::Memory { file_name, data } => (file_name, data),
+            Self::NotMem => {
+                *self = Self::memory();
+                match self {
+                    Self::Memory { file_name, data } => (file_name, data),
+                    Self::NotMem => unreachable!(),
+                }
+            }
+        };
+
+        match key {
+            "file_name" => *file_name = value.serialize(StringUnserializer)?,
+            "data" => *data = Cow::Owned(value.serialize(BytesUnserializer::default())?),
+            name => {
+                return Err(UnserializerError::UnexpectedField {
+                    name,
+                    expected: &["file_name", "data"], // TODO
+                });
+            }
+        }
+
+        Ok(())
+    }
+
+    fn end(self) -> Result<Self::Ok, Self::Error> {
+        match self {
+            Self::Memory { file_name, data } => Ok(InputFile::Memory { file_name, data }),
+            Self::NotMem => unreachable!("struct without fields?"),
+        }
+    }
+}
diff --git a/src/serde_multipart/unserializers/string.rs b/src/serde_multipart/unserializers/string.rs
new file mode 100644
index 00000000..7d4a8548
--- /dev/null
+++ b/src/serde_multipart/unserializers/string.rs
@@ -0,0 +1,61 @@
+use crate::serde_multipart::unserializers::UnserializerError;
+use serde::{ser::Impossible, Serialize, Serializer};
+
+pub(crate) struct StringUnserializer;
+
+impl Serializer for StringUnserializer {
+    type Ok = String;
+    type Error = UnserializerError;
+
+    type SerializeSeq = Impossible<String, UnserializerError>;
+    type SerializeTuple = Impossible<String, UnserializerError>;
+    type SerializeTupleStruct = Impossible<String, UnserializerError>;
+    type SerializeTupleVariant = Impossible<String, UnserializerError>;
+    type SerializeMap = Impossible<String, UnserializerError>;
+    type SerializeStruct = Impossible<String, UnserializerError>;
+    type SerializeStructVariant = Impossible<String, UnserializerError>;
+
+    fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
+        Ok(v.to_string())
+    }
+
+    fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
+        Ok(v.to_owned())
+    }
+
+    forward_to_unsuported_ty! {
+        supported: "&str, String";
+        simple {
+            serialize_bool  bool
+            serialize_i8    i8
+            serialize_i16   i16
+            serialize_i32   i32
+            serialize_i64   i64
+            serialize_u8    u8
+            serialize_u16   u16
+            serialize_u32   u32
+            serialize_u64   u64
+            serialize_f32   f32
+            serialize_f64   f64
+            serialize_bytes &[u8]
+        }
+        unit {
+            serialize_none "None"
+            serialize_unit "unit"
+        }
+        compound {
+            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
+            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
+            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
+            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
+            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
+            serialize_seq(_: Option<usize>) -> Self::SerializeSeq => "sequence"
+            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
+            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
+            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
+            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
+            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
+            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
+        }
+    }
+}
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 55e15e14..d730493a 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -5,7 +5,7 @@ use std::{borrow::Cow, path::PathBuf};
 /// This object represents the contents of a file to be uploaded.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputfile).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum InputFile {
     File(PathBuf),
@@ -75,27 +75,40 @@ impl From<InputFile> for Option<PathBuf> {
     }
 }
 
-impl Serialize for InputFile {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
+// internal api
+
+use reqwest::multipart::Part;
+
+impl InputFile {
+    pub(crate) async fn into_part(self) -> std::io::Result<Part> {
+        use bytes::{Bytes, BytesMut};
+        use reqwest::Body;
+        use tokio_util::codec::{Decoder, FramedRead};
+
+        struct FileDecoder;
+
+        impl Decoder for FileDecoder {
+            type Item = Bytes;
+            type Error = std::io::Error;
+
+            fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+                if src.is_empty() {
+                    return Ok(None);
+                }
+                Ok(Some(src.split().freeze()))
+            }
+        }
+
         match self {
-            InputFile::File(path) => {
-                // NOTE: file should be actually attached with
-                // multipart/form-data
-                serializer.serialize_str(
-                    // TODO: remove unwrap (?)
-                    &format!("attach://{}", path.file_name().unwrap().to_string_lossy()),
-                )
+            Self::File(path_to_file) => {
+                let file_name = path_to_file.file_name().unwrap().to_string_lossy().into_owned();
+
+                let file = FramedRead::new(tokio::fs::File::open(path_to_file).await?, FileDecoder);
+
+                Ok(Part::stream(Body::wrap_stream(file)).file_name(file_name))
             }
-            InputFile::Memory { data, .. } => {
-                // NOTE: file should be actually attached with
-                // multipart/form-data
-                serializer.serialize_str(&format!("attach://{}", String::from_utf8_lossy(data)))
-            }
-            InputFile::Url(url) => serializer.serialize_str(url),
-            InputFile::FileId(id) => serializer.serialize_str(id),
+            Self::Memory { file_name, data } => Ok(Part::bytes(data).file_name(file_name)),
+            Self::Url(s) | Self::FileId(s) => Ok(Part::text(s)),
         }
     }
 }

From 5afe72b3683914d6e5b1ad6a5851475fde912b7d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 00:21:55 +0300
Subject: [PATCH 078/755] rewrite requests to use serde-multipart

Rewrite multipart requests to use serde_multipart instead of FromBuilder
---
 src/net/mod.rs                                |   2 +-
 src/net/request.rs                            |  40 +++--
 src/requests/all/add_sticker_to_set.rs        |  33 ++--
 src/requests/all/create_new_sticker_set.rs    |  36 ++--
 src/requests/all/edit_inline_message_media.rs |  20 +--
 src/requests/all/edit_message_media.rs        |  21 +--
 src/requests/all/send_animation.rs            |  35 +---
 src/requests/all/send_audio.rs                |  35 +---
 src/requests/all/send_document.rs             |  32 +---
 src/requests/all/send_media_group.rs          |  21 +--
 src/requests/all/send_photo.rs                |  29 +---
 src/requests/all/send_sticker.rs              |  27 +--
 src/requests/all/send_video.rs                |  36 +---
 src/requests/all/send_video_note.rs           |  32 +---
 src/requests/all/send_voice.rs                |  30 +---
 src/requests/form_builder.rs                  | 156 ------------------
 src/requests/mod.rs                           |  13 --
 src/requests/utils.rs                         |  17 +-
 src/types/sticker_type.rs                     |   9 +-
 19 files changed, 149 insertions(+), 475 deletions(-)
 delete mode 100644 src/requests/form_builder.rs

diff --git a/src/net/mod.rs b/src/net/mod.rs
index b4944959..3278fb28 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -17,7 +17,7 @@ const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests
 fn method_url(base: &str, token: &str, method_name: &str) -> String {
-    format!("{url}/bot{token}/{method}", url = base, token = token, method = method_name,)
+    format!("{url}/bot{token}/{method}", url = base, token = token, method = method_name)
 }
 
 /// Creates URL for downloading a file. See the [Telegram documentation].
diff --git a/src/net/request.rs b/src/net/request.rs
index e376c3fd..e84c3a47 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -1,25 +1,39 @@
-use reqwest::{multipart::Form, Client, Response};
+use std::time::Duration;
+
+use reqwest::{Client, Response};
 use serde::{de::DeserializeOwned, Serialize};
 
-use crate::{requests::ResponseResult, RequestError};
-
-use super::{TelegramResponse, TELEGRAM_API_URL};
-use std::time::Duration;
+use crate::{
+    net::{TelegramResponse, TELEGRAM_API_URL},
+    requests::ResponseResult,
+    serde_multipart::to_form,
+    RequestError,
+};
 
 const DELAY_ON_SERVER_ERROR: Duration = Duration::from_secs(10);
 
-pub async fn request_multipart<T>(
+pub async fn request_multipart<P, R>(
     client: &Client,
     token: &str,
     method_name: &str,
-    params: Form,
-) -> ResponseResult<T>
+    params: &P, // I'll regret this
+) -> ResponseResult<R>
 where
-    T: DeserializeOwned,
+    P: Serialize,
+    R: DeserializeOwned,
 {
+    use crate::serde_multipart::Error;
+    let form = match to_form(params).await {
+        Ok(x) => x,
+        Err(Error::Io(ioerr)) => return Err(RequestError::Io(ioerr)),
+        Err(_) => unreachable!(
+            "we don't create requests those fail to serialize (if you see this, open an issue :|)"
+        ),
+    };
+
     let response = client
         .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
-        .multipart(params)
+        .multipart(form)
         .send()
         .await
         .map_err(RequestError::NetworkError)?;
@@ -27,15 +41,15 @@ where
     process_response(response).await
 }
 
-pub async fn request_json<T, P>(
+pub async fn request_json<P, R>(
     client: &Client,
     token: &str,
     method_name: &str,
     params: &P,
-) -> ResponseResult<T>
+) -> ResponseResult<R>
 where
-    T: DeserializeOwned,
     P: Serialize,
+    R: DeserializeOwned,
 {
     let response = client
         .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
index 8cc0188f..3408f36b 100644
--- a/src/requests/all/add_sticker_to_set.rs
+++ b/src/requests/all/add_sticker_to_set.rs
@@ -1,51 +1,38 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::form_builder::FormBuilder,
     types::{MaskPosition, True},
     Bot,
 };
 
 use crate::{
-    requests::{RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::StickerType,
 };
 
 /// Use this method to add a new sticker to a set created by the bot.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#addstickertoset).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct AddStickerToSet {
+    #[serde(skip_serializing)]
     bot: Bot,
     user_id: i32,
     name: String,
+    #[serde(flatten)]
     sticker_type: StickerType,
     emojis: String,
     mask_position: Option<MaskPosition>,
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for AddStickerToSet {
+impl Request for AddStickerToSet {
     type Output = True;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<True>> {
-        let builder =
-            FormBuilder::new().add_text("user_id", &self.user_id).add_text("name", &self.name);
-
-        let builder = match &self.sticker_type {
-            StickerType::Png(file) => builder.add_input_file("png_sticker", &file),
-            StickerType::Tgs(file) => builder.add_input_file("tgs_sticker", &file),
-        }
-        .await?
-        .add_text("emojis", &self.emojis)
-        .add_text("mask_position", &self.mask_position);
-
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "addStickerToSet",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "addStickerToSet", self).await
     }
 }
 
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
index a49cb08b..d9c5e9da 100644
--- a/src/requests/all/create_new_sticker_set.rs
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{MaskPosition, StickerType, True},
     Bot,
 };
@@ -9,12 +11,15 @@ use crate::{
 /// able to edit the created sticker set.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#createnewstickerset).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct CreateNewStickerSet {
+    #[serde(skip_serializing)]
     bot: Bot,
     user_id: i32,
     name: String,
     title: String,
+    #[serde(flatten)]
     sticker_type: StickerType,
     emojis: String,
     contains_masks: Option<bool>,
@@ -22,31 +27,12 @@ pub struct CreateNewStickerSet {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for CreateNewStickerSet {
+impl Request for CreateNewStickerSet {
     type Output = True;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<True>> {
-        let builder = FormBuilder::new()
-            .add_text("user_id", &self.user_id)
-            .add_text("name", &self.name)
-            .add_text("title", &self.title);
-
-        let builder = match &self.sticker_type {
-            StickerType::Png(file) => builder.add_input_file("png_sticker", &file),
-            StickerType::Tgs(file) => builder.add_input_file("tgs_sticker", &file),
-        }
-        .await?
-        .add_text("emojis", &self.emojis)
-        .add_text("contains_masks", &self.contains_masks)
-        .add_text("mask_position", &self.mask_position);
-
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "createNewStickerSet",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<True> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "createNewStickerSet", self)
+            .await
     }
 }
 
diff --git a/src/requests/all/edit_inline_message_media.rs b/src/requests/all/edit_inline_message_media.rs
index 9a11f126..ea0a4070 100644
--- a/src/requests/all/edit_inline_message_media.rs
+++ b/src/requests/all/edit_inline_message_media.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{InlineKeyboardMarkup, InputMedia, True},
     Bot,
 };
@@ -17,8 +19,10 @@ use crate::{
 /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
 ///
 /// [`True`]: crate::types::True
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct EditInlineMessageMedia {
+    #[serde(skip_serializing)]
     bot: Bot,
     inline_message_id: String,
     media: InputMedia,
@@ -30,17 +34,7 @@ impl Request for EditInlineMessageMedia {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
-        net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "editMessageMedia",
-            FormBuilder::new()
-                .add_text("media", &self.media)
-                .add_text("reply_markup", &self.reply_markup)
-                .add_text("inline_message_id", &self.inline_message_id)
-                .build(),
-        )
-        .await
+        net::request_multipart(self.bot.client(), self.bot.token(), "editMessageMedia", self).await
     }
 }
 
diff --git a/src/requests/all/edit_message_media.rs b/src/requests/all/edit_message_media.rs
index 7f15ed5f..826244db 100644
--- a/src/requests/all/edit_message_media.rs
+++ b/src/requests/all/edit_message_media.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, InputMedia, Message},
     Bot,
 };
@@ -15,8 +17,10 @@ use crate::{
 /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
 ///
 /// [`Message`]: crate::types::Message
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct EditMessageMedia {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     message_id: i32,
@@ -29,18 +33,7 @@ impl Request for EditMessageMedia {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "editMessageMedia",
-            FormBuilder::new()
-                .add_text("chat_id", &self.chat_id)
-                .add_text("message_id", &self.message_id)
-                .add_text("media", &self.media)
-                .add_text("reply_markup", &self.reply_markup)
-                .build(),
-        )
-        .await
+        net::request_multipart(self.bot.client(), self.bot.token(), "editMessageMedia", self).await
     }
 }
 
diff --git a/src/requests/all/send_animation.rs b/src/requests/all/send_animation.rs
index 287ebd93..6e5ef1cb 100644
--- a/src/requests/all/send_animation.rs
+++ b/src/requests/all/send_animation.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -12,8 +14,10 @@ use crate::{
 /// may be changed in the future.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#sendanimation).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendAnimation {
+    #[serde(skip_serializing)]
     bot: Bot,
     pub chat_id: ChatId,
     pub animation: InputFile,
@@ -29,32 +33,11 @@ pub struct SendAnimation {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendAnimation {
+impl Request for SendAnimation {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        let mut builder = FormBuilder::new()
-            .add_text("chat_id", &self.chat_id)
-            .add_input_file("animation", &self.animation)
-            .await?
-            .add_text("duration", &self.duration)
-            .add_text("width", &self.width)
-            .add_text("height", &self.height)
-            .add_text("caption", &self.caption)
-            .add_text("parse_mode", &self.parse_mode)
-            .add_text("disable_notification", &self.disable_notification)
-            .add_text("reply_to_message_id", &self.reply_to_message_id)
-            .add_text("reply_markup", &self.reply_markup);
-        if let Some(thumb) = self.thumb.as_ref() {
-            builder = builder.add_input_file("thumb", thumb).await?;
-        }
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendAnimation",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendAnimation", self).await
     }
 }
 
diff --git a/src/requests/all/send_audio.rs b/src/requests/all/send_audio.rs
index f2ed209f..dc61458c 100644
--- a/src/requests/all/send_audio.rs
+++ b/src/requests/all/send_audio.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -16,8 +18,10 @@ use crate::{
 /// [The official docs](https://core.telegram.org/bots/api#sendaudio).
 ///
 /// [`Bot::send_voice`]: crate::Bot::send_voice
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendAudio {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     audio: InputFile,
@@ -33,32 +37,11 @@ pub struct SendAudio {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendAudio {
+impl Request for SendAudio {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        let mut builder = FormBuilder::new()
-            .add_text("chat_id", &self.chat_id)
-            .add_input_file("audio", &self.audio)
-            .await?
-            .add_text("caption", &self.caption)
-            .add_text("parse_mode", &self.parse_mode)
-            .add_text("duration", &self.duration)
-            .add_text("performer", &self.performer)
-            .add_text("title", &self.title)
-            .add_text("disable_notification", &self.disable_notification)
-            .add_text("reply_to_message_id", &self.reply_to_message_id)
-            .add_text("reply_markup", &self.reply_markup);
-        if let Some(thumb) = self.thumb.as_ref() {
-            builder = builder.add_input_file("thumb", thumb).await?;
-        }
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendAudio",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendAudio", self).await
     }
 }
 
diff --git a/src/requests/all/send_document.rs b/src/requests/all/send_document.rs
index a3b6ff6f..e865a008 100644
--- a/src/requests/all/send_document.rs
+++ b/src/requests/all/send_document.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -11,8 +13,10 @@ use crate::{
 /// may be changed in the future.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#senddocument).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendDocument {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     document: InputFile,
@@ -25,29 +29,11 @@ pub struct SendDocument {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendDocument {
+impl Request for SendDocument {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        let mut builder = FormBuilder::new()
-            .add_text("chat_id", &self.chat_id)
-            .add_input_file("document", &self.document)
-            .await?
-            .add_text("caption", &self.caption)
-            .add_text("parse_mode", &self.parse_mode)
-            .add_text("disable_notification", &self.disable_notification)
-            .add_text("reply_to_message_id", &self.reply_to_message_id)
-            .add_text("reply_markup", &self.reply_markup);
-        if let Some(thumb) = self.thumb.as_ref() {
-            builder = builder.add_input_file("thumb", thumb).await?;
-        }
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendDocument",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendDocument", self).await
     }
 }
 
diff --git a/src/requests/all/send_media_group.rs b/src/requests/all/send_media_group.rs
index 7484fc62..e7adb68a 100644
--- a/src/requests/all/send_media_group.rs
+++ b/src/requests/all/send_media_group.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, Request, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputMedia, Message},
     Bot,
 };
@@ -8,8 +10,10 @@ use crate::{
 /// Use this method to send a group of photos or videos as an album.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#sendmediagroup).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendMediaGroup {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     media: Vec<InputMedia>, // TODO: InputMediaPhoto and InputMediaVideo
@@ -22,18 +26,7 @@ impl Request for SendMediaGroup {
     type Output = Vec<Message>;
 
     async fn send(&self) -> ResponseResult<Vec<Message>> {
-        net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendMediaGroup",
-            FormBuilder::new()
-                .add_text("chat_id", &self.chat_id)
-                .add_text("media", &self.media)
-                .add_text("disable_notification", &self.disable_notification)
-                .add_text("reply_to_message_id", &self.reply_to_message_id)
-                .build(),
-        )
-        .await
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendMediaGroup", self).await
     }
 }
 
diff --git a/src/requests/all/send_photo.rs b/src/requests/all/send_photo.rs
index 4027f000..42ad8e6f 100644
--- a/src/requests/all/send_photo.rs
+++ b/src/requests/all/send_photo.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -8,8 +10,10 @@ use crate::{
 /// Use this method to send photos.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#sendphoto).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendPhoto {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     photo: InputFile,
@@ -21,26 +25,11 @@ pub struct SendPhoto {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendPhoto {
+impl Request for SendPhoto {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendPhoto",
-            FormBuilder::new()
-                .add_text("chat_id", &self.chat_id)
-                .add_input_file("photo", &self.photo)
-                .await?
-                .add_text("caption", &self.caption)
-                .add_text("parse_mode", &self.parse_mode)
-                .add_text("disable_notification", &self.disable_notification)
-                .add_text("reply_to_message_id", &self.reply_to_message_id)
-                .add_text("reply_markup", &self.reply_markup)
-                .build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendPhoto", self).await
     }
 }
 
diff --git a/src/requests/all/send_sticker.rs b/src/requests/all/send_sticker.rs
index 5e019e19..dd25c9bb 100644
--- a/src/requests/all/send_sticker.rs
+++ b/src/requests/all/send_sticker.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ReplyMarkup},
     Bot,
 };
@@ -10,8 +12,10 @@ use crate::{
 /// [The official docs](https://core.telegram.org/bots/api#sendsticker).
 ///
 /// [animated]: https://telegram.org/blog/animated-stickers
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendSticker {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     sticker: InputFile,
@@ -21,24 +25,11 @@ pub struct SendSticker {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendSticker {
+impl Request for SendSticker {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendSticker",
-            FormBuilder::new()
-                .add_text("chat_id", &self.chat_id)
-                .add_input_file("sticker", &self.sticker)
-                .await?
-                .add_text("disable_notification", &self.disable_notification)
-                .add_text("reply_to_message_id", &self.reply_to_message_id)
-                .add_text("reply_markup", &self.reply_markup)
-                .build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendSticker", self).await
     }
 }
 
diff --git a/src/requests/all/send_video.rs b/src/requests/all/send_video.rs
index 30ab6a45..3f218f10 100644
--- a/src/requests/all/send_video.rs
+++ b/src/requests/all/send_video.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -12,8 +14,10 @@ use crate::{
 /// limit may be changed in the future.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#sendvideo).
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendVideo {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     video: InputFile,
@@ -30,33 +34,11 @@ pub struct SendVideo {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendVideo {
+impl Request for SendVideo {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        let mut builder = FormBuilder::new()
-            .add_text("chat_id", &self.chat_id)
-            .add_input_file("video", &self.video)
-            .await?
-            .add_text("duration", &self.duration)
-            .add_text("width", &self.width)
-            .add_text("height", &self.height)
-            .add_text("caption", &self.caption)
-            .add_text("parse_mode", &self.parse_mode)
-            .add_text("supports_streaming", &self.supports_streaming)
-            .add_text("disable_notification", &self.disable_notification)
-            .add_text("reply_to_message_id", &self.reply_to_message_id)
-            .add_text("reply_markup", &self.reply_markup);
-        if let Some(thumb) = self.thumb.as_ref() {
-            builder = builder.add_input_file("thumb", thumb).await?;
-        }
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendVideo",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendVideo", self).await
     }
 }
 
diff --git a/src/requests/all/send_video_note.rs b/src/requests/all/send_video_note.rs
index 2ac653be..9a0e07dd 100644
--- a/src/requests/all/send_video_note.rs
+++ b/src/requests/all/send_video_note.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ReplyMarkup},
     Bot,
 };
@@ -11,8 +13,10 @@ use crate::{
 /// [The official docs](https://core.telegram.org/bots/api#sendvideonote).
 ///
 /// [v.4.0]: https://telegram.org/blog/video-messages-and-telescope
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendVideoNote {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     video_note: InputFile,
@@ -25,29 +29,11 @@ pub struct SendVideoNote {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendVideoNote {
+impl Request for SendVideoNote {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        let mut builder = FormBuilder::new()
-            .add_text("chat_id", &self.chat_id)
-            .add_input_file("video_note", &self.video_note)
-            .await?
-            .add_text("duration", &self.duration)
-            .add_text("length", &self.length)
-            .add_text("disable_notification", &self.disable_notification)
-            .add_text("reply_to_message_id", &self.reply_to_message_id)
-            .add_text("reply_markup", &self.reply_markup);
-        if let Some(thumb) = self.thumb.as_ref() {
-            builder = builder.add_input_file("thumb", thumb).await?;
-        }
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendVideoNote",
-            builder.build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendVideoNote", self).await
     }
 }
 
diff --git a/src/requests/all/send_voice.rs b/src/requests/all/send_voice.rs
index 1e50bbed..6bfc301a 100644
--- a/src/requests/all/send_voice.rs
+++ b/src/requests/all/send_voice.rs
@@ -1,6 +1,8 @@
+use serde::Serialize;
+
 use crate::{
     net,
-    requests::{form_builder::FormBuilder, RequestWithFile, ResponseResult},
+    requests::{Request, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -17,8 +19,10 @@ use crate::{
 ///
 /// [`Audio`]: crate::types::Audio
 /// [`Document`]: crate::types::Document
-#[derive(Debug, Clone)]
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, Clone, Serialize)]
 pub struct SendVoice {
+    #[serde(skip_serializing)]
     bot: Bot,
     chat_id: ChatId,
     voice: InputFile,
@@ -31,27 +35,11 @@ pub struct SendVoice {
 }
 
 #[async_trait::async_trait]
-impl RequestWithFile for SendVoice {
+impl Request for SendVoice {
     type Output = Message;
 
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Message>> {
-        Ok(net::request_multipart(
-            self.bot.client(),
-            self.bot.token(),
-            "sendVoice",
-            FormBuilder::new()
-                .add_text("chat_id", &self.chat_id)
-                .add_input_file("voice", &self.voice)
-                .await?
-                .add_text("caption", &self.caption)
-                .add_text("parse_mode", &self.parse_mode)
-                .add_text("duration", &self.duration)
-                .add_text("disable_notification", &self.disable_notification)
-                .add_text("reply_to_message_id", &self.reply_to_message_id)
-                .add_text("reply_markup", &self.reply_markup)
-                .build(),
-        )
-        .await)
+    async fn send(&self) -> ResponseResult<Message> {
+        net::request_multipart(self.bot.client(), self.bot.token(), "sendVoice", self).await
     }
 }
 
diff --git a/src/requests/form_builder.rs b/src/requests/form_builder.rs
deleted file mode 100644
index 3c7f70b9..00000000
--- a/src/requests/form_builder.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use std::{borrow::Cow, path::PathBuf};
-
-use reqwest::multipart::Form;
-
-use crate::{
-    requests::utils::{file_from_memory_to_part, file_to_part},
-    types::{
-        ChatId, InlineKeyboardMarkup, InputFile, InputMedia, MaskPosition, ParseMode, ReplyMarkup,
-    },
-};
-
-/// This is a convenient struct that builds `reqwest::multipart::Form`
-/// from scratch.
-pub(crate) struct FormBuilder {
-    form: Form,
-}
-
-impl FormBuilder {
-    pub(crate) fn new() -> Self {
-        Self { form: Form::new() }
-    }
-
-    pub fn add_text<'a, T, N>(self, name: N, value: &T) -> Self
-    where
-        N: Into<Cow<'a, str>>,
-        T: IntoFormText,
-    {
-        match value.into_form_text() {
-            Some(val) => Self { form: self.form.text(name.into().into_owned(), val) },
-            None => self,
-        }
-    }
-
-    pub async fn add_input_file<'a, N>(self, name: N, value: &InputFile) -> tokio::io::Result<Self>
-    where
-        N: Into<Cow<'a, str>>,
-    {
-        Ok(match value {
-            InputFile::File(path) => self.add_file(name, path.clone()).await?,
-            InputFile::Memory { file_name, data } => {
-                self.add_file_from_memory(name, file_name.clone(), data.clone())
-            }
-            InputFile::Url(url) => self.add_text(name, url),
-            InputFile::FileId(file_id) => self.add_text(name, file_id),
-        })
-    }
-
-    // used in SendMediaGroup
-    pub async fn add_file<'a, N>(self, name: N, path_to_file: PathBuf) -> tokio::io::Result<Self>
-    where
-        N: Into<Cow<'a, str>>,
-    {
-        Ok(Self {
-            form: self.form.part(name.into().into_owned(), file_to_part(path_to_file).await?),
-        })
-    }
-
-    fn add_file_from_memory<'a, N>(
-        self,
-        name: N,
-        file_name: String,
-        data: Cow<'static, [u8]>,
-    ) -> Self
-    where
-        N: Into<Cow<'a, str>>,
-    {
-        Self {
-            form: self
-                .form
-                .part(name.into().into_owned(), file_from_memory_to_part(data, file_name)),
-        }
-    }
-
-    pub fn build(self) -> Form {
-        self.form
-    }
-}
-
-pub(crate) trait IntoFormText {
-    fn into_form_text(&self) -> Option<String>;
-}
-
-macro_rules! impl_for_struct {
-    ($($name:ty),*) => {
-        $(
-            impl IntoFormText for $name {
-                fn into_form_text(&self) -> Option<String> {
-                    let json = serde_json::to_string(self)
-                        .expect("serde_json::to_string failed");
-                    Some(json)
-                }
-            }
-        )*
-    };
-}
-
-impl_for_struct!(bool, i32, i64, u32, ReplyMarkup, InlineKeyboardMarkup, MaskPosition);
-
-impl<T> IntoFormText for Option<T>
-where
-    T: IntoFormText,
-{
-    fn into_form_text(&self) -> Option<String> {
-        self.as_ref().and_then(IntoFormText::into_form_text)
-    }
-}
-
-// TODO: fix InputMedia implementation of IntoFormValue (for now it doesn't
-// encode files :|)
-impl IntoFormText for Vec<InputMedia> {
-    fn into_form_text(&self) -> Option<String> {
-        let json = serde_json::to_string(self).expect("serde_json::to_string failed");
-        Some(json)
-    }
-}
-
-impl IntoFormText for InputMedia {
-    fn into_form_text(&self) -> Option<String> {
-        let json = serde_json::to_string(self).expect("serde_json::to_string failed");
-        Some(json)
-    }
-}
-
-impl IntoFormText for str {
-    fn into_form_text(&self) -> Option<String> {
-        Some(self.to_owned())
-    }
-}
-
-impl IntoFormText for ParseMode {
-    fn into_form_text(&self) -> Option<String> {
-        let string = match self {
-            ParseMode::MarkdownV2 => String::from("MarkdownV2"),
-            ParseMode::HTML => String::from("HTML"),
-            #[allow(deprecated)]
-            ParseMode::Markdown => String::from("Markdown"),
-        };
-        Some(string)
-    }
-}
-
-impl IntoFormText for ChatId {
-    fn into_form_text(&self) -> Option<String> {
-        let string = match self {
-            ChatId::Id(id) => id.to_string(),
-            ChatId::ChannelUsername(username) => username.clone(),
-        };
-        Some(string)
-    }
-}
-
-impl IntoFormText for String {
-    fn into_form_text(&self) -> Option<String> {
-        Some(self.clone())
-    }
-}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 09f2af6c..86536cb9 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -1,7 +1,6 @@
 //! API requests.
 
 mod all;
-mod form_builder;
 mod utils;
 
 pub use all::*;
@@ -18,15 +17,3 @@ pub trait Request {
     /// Asynchronously sends this request to Telegram and returns the result.
     async fn send(&self) -> ResponseResult<Self::Output>;
 }
-
-/// Designates an API request with possibly sending file.
-#[async_trait::async_trait]
-pub trait RequestWithFile {
-    /// A data structure returned if success.
-    type Output;
-
-    /// Asynchronously sends this request to Telegram and returns the result.
-    /// Returns `tokio::io::Result::Err` when trying to send file which does not
-    /// exists.
-    async fn send(&self) -> tokio::io::Result<ResponseResult<Self::Output>>;
-}
diff --git a/src/requests/utils.rs b/src/requests/utils.rs
index f10c9dc5..36e7510e 100644
--- a/src/requests/utils.rs
+++ b/src/requests/utils.rs
@@ -1,8 +1,5 @@
-use std::{borrow::Cow, path::PathBuf};
-
 use bytes::{Bytes, BytesMut};
-use reqwest::{multipart::Part, Body};
-use tokio_util::codec::{Decoder, FramedRead};
+use tokio_util::codec::Decoder;
 
 struct FileDecoder;
 
@@ -17,15 +14,3 @@ impl Decoder for FileDecoder {
         Ok(Some(src.split().freeze()))
     }
 }
-
-pub async fn file_to_part(path_to_file: PathBuf) -> std::io::Result<Part> {
-    let file_name = path_to_file.file_name().unwrap().to_string_lossy().into_owned();
-
-    let file = FramedRead::new(tokio::fs::File::open(path_to_file).await?, FileDecoder);
-
-    Ok(Part::stream(Body::wrap_stream(file)).file_name(file_name))
-}
-
-pub fn file_from_memory_to_part(data: Cow<'static, [u8]>, name: String) -> Part {
-    Part::bytes(data).file_name(name)
-}
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index b80added..ffb7618e 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -1,7 +1,10 @@
+use serde::Serialize;
+
 use crate::types::InputFile;
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
 #[non_exhaustive]
+#[serde(untagged)]
 pub enum StickerType {
     /// PNG image with the sticker, must be up to 512 kilobytes in size,
     /// dimensions must not exceed 512px, and either width or height must be
@@ -17,10 +20,10 @@ pub enum StickerType {
     /// [`InputFile::FileId`]: crate::types::InputFile::FileId
     ///
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    Png(InputFile),
+    Png { png_sticker: InputFile },
 
     /// TGS animation with the sticker, uploaded using multipart/form-data.
     ///
     /// See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
-    Tgs(InputFile),
+    Tgs { tgs_sticker: InputFile },
 }

From 72b776d859bf6ee78038cbb7a198027a2ecea662 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 10:53:15 +0300
Subject: [PATCH 079/755] some cleanup (serde_multipart)

---
 Cargo.toml                         |  2 +-
 src/serde_multipart/serializers.rs |  6 +++---
 src/types/input_media.rs           | 10 +++++-----
 src/types/sticker_type.rs          | 20 ++++++++++++++++++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 22724491..72ea17a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ authors = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["fs", "stream", "rt-threaded", "macros"] }
+tokio = { version = "0.2.21", features = ["fs", "stream"] }
 tokio-util = "0.3.1"
 bytes = "0.5.5"
 async-trait = "0.1.36"
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index 7e45e4f9..3e9e7168 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -19,7 +19,7 @@ use std::{fmt, fmt::Display, io};
 pub(crate) enum Error {
     Custom(String),
     TopLevelNotStruct,
-    InputFileUnserializerError(crate::serde_multipart::unserializers::UnserializerError),
+    InputFileUnserializer(crate::serde_multipart::unserializers::UnserializerError),
     Io(std::io::Error),
     Json(serde_json::Error),
 }
@@ -38,7 +38,7 @@ impl Display for Error {
         match self {
             Self::Custom(s) => write!(f, "Custom serde error: {}", s),
             Self::TopLevelNotStruct => write!(f, "Multipart supports only structs at top level"),
-            Self::InputFileUnserializerError(inner) => {
+            Self::InputFileUnserializer(inner) => {
                 write!(f, "Error while unserializing input file: {}", inner)
             }
             Self::Io(inner) => write!(f, "Io error: {}", inner),
@@ -541,7 +541,7 @@ impl SerializeStructVariant for PartFromFile {
     where
         T: Serialize,
     {
-        self.inner.serialize_field(key, value).map_err(Error::InputFileUnserializerError)
+        self.inner.serialize_field(key, value).map_err(Error::InputFileUnserializer)
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index a37ebda4..160f9af8 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -432,7 +432,7 @@ mod tests {
 
     #[test]
     fn photo_serialize() {
-        let expected_json = r#"{"type":"photo","media":"123456"}"#;
+        let expected_json = r#"{"type":"photo","media":{"FileId":"123456"}}"#;
         let photo = InputMedia::Photo(InputMediaPhoto {
             media: InputFile::FileId(String::from("123456")),
             caption: None,
@@ -445,7 +445,7 @@ mod tests {
 
     #[test]
     fn video_serialize() {
-        let expected_json = r#"{"type":"video","media":"123456"}"#;
+        let expected_json = r#"{"type":"video","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Video(InputMediaVideo {
             media: InputFile::FileId(String::from("123456")),
             thumb: None,
@@ -463,7 +463,7 @@ mod tests {
 
     #[test]
     fn animation_serialize() {
-        let expected_json = r#"{"type":"animation","media":"123456"}"#;
+        let expected_json = r#"{"type":"animation","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Animation(InputMediaAnimation {
             media: InputFile::FileId(String::from("123456")),
             thumb: None,
@@ -480,7 +480,7 @@ mod tests {
 
     #[test]
     fn audio_serialize() {
-        let expected_json = r#"{"type":"audio","media":"123456"}"#;
+        let expected_json = r#"{"type":"audio","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Audio(InputMediaAudio {
             media: InputFile::FileId(String::from("123456")),
             thumb: None,
@@ -497,7 +497,7 @@ mod tests {
 
     #[test]
     fn document_serialize() {
-        let expected_json = r#"{"type":"document","media":"123456"}"#;
+        let expected_json = r#"{"type":"document","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Document(InputMediaDocument {
             media: InputFile::FileId(String::from("123456")),
             thumb: None,
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index ffb7618e..1ade552b 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -27,3 +27,23 @@ pub enum StickerType {
     /// See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
     Tgs { tgs_sticker: InputFile },
 }
+
+impl StickerType {
+    /// Create png-`StickerType`.
+    ///
+    /// See [`StickerType::Png`] for more
+    ///
+    /// [`StickerType::Png`]: crate::types::StickerType::Png
+    fn png(png_sticker: InputFile) -> Self {
+        Self::Png { png_sticker }
+    }
+
+    /// Create tgs-`StickerType`.
+    ///
+    /// See [`StickerType::Tgs`] for more
+    ///
+    /// [`StickerType::Tgs`]: crate::types::StickerType::Tgs
+    fn tgs(tgs_sticker: InputFile) -> Self {
+        Self::Tgs{ tgs_sticker }
+    }
+}

From f7aef22fbf08d335efb1d69297933a89488d9e3a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 10:58:10 +0300
Subject: [PATCH 080/755] make `StickerType::{png,tgs}` pub

---
 src/types/sticker_type.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index 1ade552b..964385cd 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -34,7 +34,7 @@ impl StickerType {
     /// See [`StickerType::Png`] for more
     ///
     /// [`StickerType::Png`]: crate::types::StickerType::Png
-    fn png(png_sticker: InputFile) -> Self {
+    pub fn png(png_sticker: InputFile) -> Self {
         Self::Png { png_sticker }
     }
 
@@ -43,7 +43,7 @@ impl StickerType {
     /// See [`StickerType::Tgs`] for more
     ///
     /// [`StickerType::Tgs`]: crate::types::StickerType::Tgs
-    fn tgs(tgs_sticker: InputFile) -> Self {
+    pub fn tgs(tgs_sticker: InputFile) -> Self {
         Self::Tgs{ tgs_sticker }
     }
 }

From f0709a16b3611167184dd3435f7e1033dbeaaf01 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 11:06:50 +0300
Subject: [PATCH 081/755] add changes to `CHANGELOG.md`

(& a bit of fmt :facepalm:)
---
 CHANGELOG.md              | 11 +++++++++++
 src/types/sticker_type.rs |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 738c0045..0ebc11fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `client_from_env` was moved from `teloxide::utils` to crate root of `teloxide-core`
   - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>` 
     (instead of `Vec<Result<Update, (Value, serde_json::Error)>>`)
+
+### Changed
+
+- Changed internal mechanism of sending multipart requests
+- Added `RequestError::Io(io::Error)` to wrap I/O error those can happen while sending files to telegram
+- Change `StickerType`: instead of newtypes (`Png(InputFile)`) use structs (`Png { png_sticker: InputFile }`), add 
+  `StickerType::{png,tgs}` constructors
+
+### Removed
+
+- `RequestWithFile`, now multipart requests use `Request`
   
 
 [`teloxide`]: https://github.com/teloxide/teloxide
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index 964385cd..607b32c6 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -44,6 +44,6 @@ impl StickerType {
     ///
     /// [`StickerType::Tgs`]: crate::types::StickerType::Tgs
     pub fn tgs(tgs_sticker: InputFile) -> Self {
-        Self::Tgs{ tgs_sticker }
+        Self::Tgs { tgs_sticker }
     }
 }

From 891106cabe923862100e4e18afe7456aa583a9c0 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 14:44:08 +0300
Subject: [PATCH 082/755] Update src/errors.rs

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/errors.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/errors.rs b/src/errors.rs
index 83fc2d42..999692be 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -37,6 +37,7 @@ pub enum RequestError {
     #[error("An error while parsing JSON: {0}")]
     InvalidJson(#[source] serde_json::Error),
 
+    // Occurs when trying to send a file to Telegram.
     #[error("An I/O error: {0}")]
     Io(#[source] io::Error),
 }

From d186a73eda6729f856c74c2d1111413e3153b3e3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 20:02:12 +0300
Subject: [PATCH 083/755] add `GetUpdatesNonStrict` 'telegram' method - fail
 proof version of `GetUpdates`

---
 CHANGELOG.md                                  |  2 +
 src/bot/api.rs                                | 30 ++++--
 src/requests/all/get_updates.rs               |  4 +-
 src/requests/all/get_updates_non_strict.rs    | 97 +++++++++++++++++++
 src/requests/all/mod.rs                       |  2 +
 src/types/chat.rs                             |  2 +-
 src/types/non_telegram_types/mod.rs           |  2 +
 .../non_telegram_types/non_strict_vec.rs      | 49 ++++++++++
 8 files changed, 175 insertions(+), 13 deletions(-)
 create mode 100644 src/requests/all/get_updates_non_strict.rs
 create mode 100644 src/types/non_telegram_types/non_strict_vec.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ebc11fe..bf1b58fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `client_from_env` was moved from `teloxide::utils` to crate root of `teloxide-core`
   - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>` 
     (instead of `Vec<Result<Update, (Value, serde_json::Error)>>`)
+- `GetUpdatesNonStrict` 'telegram' method, that behaves just like `GetUpdates` but doesn't 
+  fail if one of updates fails to be deserialized 
 
 ### Changed
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 8fe0fc80..bd7e08de 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -7,15 +7,15 @@ use crate::{
         EditInlineMessageText, EditMessageCaption, EditMessageLiveLocation, EditMessageMedia,
         EditMessageReplyMarkup, EditMessageText, ExportChatInviteLink, ForwardMessage, GetChat,
         GetChatAdministrators, GetChatMember, GetChatMembersCount, GetFile, GetGameHighScores,
-        GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUserProfilePhotos, GetWebhookInfo,
-        KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember, RestrictChatMember,
-        SendAnimation, SendAudio, SendChatAction, SendChatActionKind, SendContact, SendDice,
-        SendDocument, SendGame, SendInvoice, SendLocation, SendMediaGroup, SendMessage, SendPhoto,
-        SendPoll, SendSticker, SendVenue, SendVideo, SendVideoNote, SendVoice,
-        SetChatAdministratorCustomTitle, SetChatDescription, SetChatPermissions, SetChatPhoto,
-        SetChatStickerSet, SetChatTitle, SetGameScore, SetMyCommands, SetStickerPositionInSet,
-        SetStickerSetThumb, SetWebhook, StopInlineMessageLiveLocation, StopMessageLiveLocation,
-        StopPoll, UnbanChatMember, UnpinChatMessage, UploadStickerFile,
+        GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUpdatesNonStrict, GetUserProfilePhotos,
+        GetWebhookInfo, KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember,
+        RestrictChatMember, SendAnimation, SendAudio, SendChatAction, SendChatActionKind,
+        SendContact, SendDice, SendDocument, SendGame, SendInvoice, SendLocation, SendMediaGroup,
+        SendMessage, SendPhoto, SendPoll, SendSticker, SendVenue, SendVideo, SendVideoNote,
+        SendVoice, SetChatAdministratorCustomTitle, SetChatDescription, SetChatPermissions,
+        SetChatPhoto, SetChatStickerSet, SetChatTitle, SetGameScore, SetMyCommands,
+        SetStickerPositionInSet, SetStickerSetThumb, SetWebhook, StopInlineMessageLiveLocation,
+        StopMessageLiveLocation, StopPoll, UnbanChatMember, UnpinChatMessage, UploadStickerFile,
     },
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
@@ -39,6 +39,18 @@ impl Bot {
         GetUpdates::new(self.clone())
     }
 
+    /// This is non strict version of [`get_updates`], this means that if it
+    /// will fail to deserialize some updates, it won't fail entirely, but
+    /// will just return some errors.
+    ///
+    /// Note: this is not a 'real' telegram method, this is simply
+    /// [`get_updates`] with changed return type.
+    ///
+    /// [`get_updates`]: crate::Bot::get_updates
+    pub fn get_updates_non_strict(&self) -> GetUpdatesNonStrict {
+        GetUpdatesNonStrict::new(self.clone())
+    }
+
     /// Use this method to specify a url and receive incoming updates via an
     /// outgoing webhook.
     ///
diff --git a/src/requests/all/get_updates.rs b/src/requests/all/get_updates.rs
index f6fe2d2b..a9f4558d 100644
--- a/src/requests/all/get_updates.rs
+++ b/src/requests/all/get_updates.rs
@@ -21,15 +21,13 @@ use crate::{
 #[derive(Debug, Clone, Serialize)]
 pub struct GetUpdates {
     #[serde(skip_serializing)]
-    bot: Bot,
+    pub(crate) bot: Bot,
     pub(crate) offset: Option<i32>,
     pub(crate) limit: Option<u8>,
     pub(crate) timeout: Option<u32>,
     pub(crate) allowed_updates: Option<Vec<AllowedUpdate>>,
 }
 
-// TODO: Add version of this method that will ignore unparsed updates,
-//       to be bullet proof
 #[async_trait::async_trait]
 impl Request for GetUpdates {
     type Output = Vec<Update>;
diff --git a/src/requests/all/get_updates_non_strict.rs b/src/requests/all/get_updates_non_strict.rs
new file mode 100644
index 00000000..67d326c8
--- /dev/null
+++ b/src/requests/all/get_updates_non_strict.rs
@@ -0,0 +1,97 @@
+use serde::Serialize;
+
+use crate::{
+    net,
+    requests::{GetUpdates, Request, ResponseResult},
+    types::{AllowedUpdate, NonStrictVec, Update},
+    Bot,
+};
+
+/// This is non strict version of [`GetUpdates`], this means that if it will
+/// fail to deserialize some updates, it won't fail entirely, but will just
+/// return some errors.
+///
+/// Note: this is not a 'real' telegram method, this is simply [`GetUpdates`]
+/// with changed return type.
+///
+/// [`GetUpdates`]: crate::requests::GetUpdates
+#[derive(Debug, Clone, Serialize)]
+#[serde(transparent)]
+pub struct GetUpdatesNonStrict(pub GetUpdates);
+
+#[async_trait::async_trait]
+impl Request for GetUpdatesNonStrict {
+    type Output = NonStrictVec<Update>;
+
+    async fn send(&self) -> ResponseResult<Self::Output> {
+        net::request_json(self.0.bot.client(), self.0.bot.token(), "getUpdates", &self).await
+    }
+}
+
+impl GetUpdatesNonStrict {
+    pub(crate) fn new(bot: Bot) -> Self {
+        Self(GetUpdates::new(bot))
+    }
+
+    /// Identifier of the first update to be returned.
+    ///
+    /// Must be greater by one than the highest among the identifiers of
+    /// previously received updates. By default, updates starting with the
+    /// earliest unconfirmed update are returned. An update is considered
+    /// confirmed as soon as [`GetUpdates`] is called with an [`offset`]
+    /// higher than its [`id`]. The negative offset can be specified to
+    /// retrieve updates starting from `-offset` update from the end of the
+    /// updates queue. All previous updates will forgotten.
+    ///
+    /// [`GetUpdates`]: self::GetUpdates
+    /// [`offset`]: self::GetUpdates::offset
+    /// [`id`]: crate::types::Update::id
+    pub fn offset(mut self, value: i32) -> Self {
+        self.0.offset = Some(value);
+        self
+    }
+
+    /// Limits the number of updates to be retrieved.
+    ///
+    /// Values between `1`—`100` are accepted. Defaults to `100`.
+    pub fn limit(mut self, value: u8) -> Self {
+        self.0.limit = Some(value);
+        self
+    }
+
+    /// Timeout in seconds for long polling.
+    ///
+    /// Defaults to `0`, i.e. usual short polling. Should be positive, short
+    /// polling should be used for testing purposes only.
+    pub fn timeout(mut self, value: u32) -> Self {
+        self.0.timeout = Some(value);
+        self
+    }
+
+    /// List the types of updates you want your bot to receive.
+    ///
+    /// For example, specify [[`Message`], [`EditedChannelPost`],
+    /// [`CallbackQuery`]] to only receive updates of these types.
+    /// See [`AllowedUpdate`] for a complete list of available update types.
+    ///
+    /// Specify an empty list to receive all updates regardless of type
+    /// (default). If not specified, the previous setting will be used.
+    ///
+    /// **Note:**
+    /// This parameter doesn't affect updates created before the call to the
+    /// [`Bot::get_updates`], so unwanted updates may be received for a short
+    /// period of time.
+    ///
+    /// [`Message`]: self::AllowedUpdate::Message
+    /// [`EditedChannelPost`]: self::AllowedUpdate::EditedChannelPost
+    /// [`CallbackQuery`]: self::AllowedUpdate::CallbackQuery
+    /// [`AllowedUpdate`]: self::AllowedUpdate
+    /// [`Bot::get_updates`]: crate::Bot::get_updates
+    pub fn allowed_updates<T>(mut self, value: T) -> Self
+    where
+        T: Into<Vec<AllowedUpdate>>,
+    {
+        self.0.allowed_updates = Some(value.into());
+        self
+    }
+}
diff --git a/src/requests/all/mod.rs b/src/requests/all/mod.rs
index 3de4d87a..d173f210 100644
--- a/src/requests/all/mod.rs
+++ b/src/requests/all/mod.rs
@@ -31,6 +31,7 @@ mod get_me;
 mod get_my_commands;
 mod get_sticker_set;
 mod get_updates;
+mod get_updates_non_strict;
 mod get_user_profile_photos;
 mod get_webhook_info;
 mod kick_chat_member;
@@ -107,6 +108,7 @@ pub use get_me::*;
 pub use get_my_commands::*;
 pub use get_sticker_set::*;
 pub use get_updates::*;
+pub use get_updates_non_strict::*;
 pub use get_user_profile_photos::*;
 pub use get_webhook_info::*;
 pub use kick_chat_member::*;
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 04c1bd49..c278d415 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -266,7 +266,7 @@ impl<'de> serde::de::Visitor<'de> for PrivateChatKindVisitor {
         write!(f, r#"field equal to "private""#)
     }
 
-    fn visit_borrowed_str<E: serde::de::Error>(self, v: &'de str) -> Result<Self::Value, E> {
+    fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
         match v {
             "private" => Ok(()),
             _ => Err(E::invalid_value(serde::de::Unexpected::Str(v), &r#""private""#)),
diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs
index 8add54b6..6c8e1636 100644
--- a/src/types/non_telegram_types/mod.rs
+++ b/src/types/non_telegram_types/mod.rs
@@ -1,7 +1,9 @@
 pub use country_code::*;
 pub use currency::*;
 pub use mime_wrapper::*;
+pub use non_strict_vec::*;
 
 mod country_code;
 mod currency;
 mod mime_wrapper;
+mod non_strict_vec;
diff --git a/src/types/non_telegram_types/non_strict_vec.rs b/src/types/non_telegram_types/non_strict_vec.rs
new file mode 100644
index 00000000..0ae479c6
--- /dev/null
+++ b/src/types/non_telegram_types/non_strict_vec.rs
@@ -0,0 +1,49 @@
+use serde::de::DeserializeOwned;
+use serde_json::{from_value, Value};
+
+/// Similar to `Vec<T>` but if it fails to deserialize element, it just saves
+/// `Err((value, err))`
+#[derive(Debug, serde::Deserialize)]
+#[serde(from = "Vec<serde_json::Value>")]
+#[serde(bound = "T: DeserializeOwned")]
+pub struct NonStrictVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Error)>>);
+
+impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for NonStrictVec<T> {
+    fn from(vec: Vec<Value>) -> Self {
+        Self(vec.into_iter().map(|val| from_value(val.clone()).map_err(|e| (val, e))).collect())
+    }
+}
+
+#[test]
+fn test() {
+    use crate::types::Update;
+
+    let x: NonStrictVec<Update> = serde_json::from_str(
+        r#"[{
+         "update_id": 923808447,
+         "message": {
+          "message_id": 361678,
+          "from": {
+           "id": 218485655,
+           "is_bot": false,
+           "first_name": "вафель",
+           "last_name": "🧇",
+           "username": "WaffleLapkin",
+           "language_code": "en"
+          },
+          "chat": {
+           "id": 218485655,
+           "first_name": "вафель",
+           "last_name": "🧇",
+           "username": "WaffleLapkin",
+           "type": "private"
+          },
+          "date": 1595860067,
+          "text": "s"
+         }
+        }]"#,
+    )
+    .unwrap();
+
+    assert!(x.0.first().unwrap().is_ok())
+}

From d4c0bc2fe15fec14acf045ed3f94c60c09c8dda7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 21:10:42 +0300
Subject: [PATCH 084/755] make all methods fields public

---
 src/requests/all/add_sticker_to_set.rs        | 10 ++--
 src/requests/all/answer_callback_query.rs     | 10 ++--
 src/requests/all/answer_inline_query.rs       | 14 +++---
 src/requests/all/answer_pre_checkout_query.rs |  6 +--
 src/requests/all/answer_shipping_query.rs     |  8 ++--
 src/requests/all/create_new_sticker_set.rs    | 14 +++---
 src/requests/all/delete_chat_photo.rs         |  2 +-
 src/requests/all/delete_chat_sticker_set.rs   |  2 +-
 src/requests/all/delete_message.rs            |  4 +-
 src/requests/all/delete_sticker_from_set.rs   |  2 +-
 .../all/edit_inline_message_caption.rs        |  8 ++--
 .../all/edit_inline_message_live_location.rs  |  8 ++--
 src/requests/all/edit_inline_message_media.rs |  6 +--
 .../all/edit_inline_message_reply_markup.rs   |  4 +-
 src/requests/all/edit_inline_message_text.rs  | 10 ++--
 src/requests/all/edit_message_caption.rs      | 10 ++--
 .../all/edit_message_live_location.rs         | 10 ++--
 src/requests/all/edit_message_media.rs        |  8 ++--
 src/requests/all/edit_message_reply_markup.rs |  6 +--
 src/requests/all/edit_message_text.rs         | 12 ++---
 src/requests/all/export_chat_invite_link.rs   |  2 +-
 src/requests/all/forward_message.rs           |  8 ++--
 src/requests/all/get_chat.rs                  |  2 +-
 src/requests/all/get_chat_administrators.rs   |  2 +-
 src/requests/all/get_chat_member.rs           |  4 +-
 src/requests/all/get_chat_members_count.rs    |  2 +-
 src/requests/all/get_file.rs                  |  2 +-
 src/requests/all/get_game_high_scores.rs      |  4 +-
 src/requests/all/get_sticker_set.rs           |  2 +-
 src/requests/all/get_updates.rs               |  8 ++--
 src/requests/all/get_user_profile_photos.rs   |  6 +--
 src/requests/all/kick_chat_member.rs          |  6 +--
 src/requests/all/leave_chat.rs                |  2 +-
 src/requests/all/pin_chat_message.rs          |  6 +--
 src/requests/all/promote_chat_member.rs       | 20 ++++----
 src/requests/all/restrict_chat_member.rs      |  8 ++--
 src/requests/all/send_audio.rs                | 22 ++++-----
 src/requests/all/send_chat_action.rs          |  4 +-
 src/requests/all/send_contact.rs              | 16 +++----
 src/requests/all/send_dice.rs                 | 11 ++---
 src/requests/all/send_document.rs             | 16 +++----
 src/requests/all/send_game.rs                 | 10 ++--
 src/requests/all/send_invoice.rs              | 46 +++++++++----------
 src/requests/all/send_location.rs             | 14 +++---
 src/requests/all/send_media_group.rs          |  8 ++--
 src/requests/all/send_photo.rs                | 14 +++---
 src/requests/all/send_poll.rs                 | 30 ++++++------
 src/requests/all/send_sticker.rs              | 10 ++--
 src/requests/all/send_venue.rs                | 20 ++++----
 src/requests/all/send_video.rs                | 24 +++++-----
 src/requests/all/send_video_note.rs           | 16 +++----
 src/requests/all/send_voice.rs                | 16 +++----
 .../set_chat_administrator_custom_title.rs    |  6 +--
 src/requests/all/set_chat_description.rs      |  4 +-
 src/requests/all/set_chat_permissions.rs      |  4 +-
 src/requests/all/set_chat_photo.rs            |  4 +-
 src/requests/all/set_chat_sticker_set.rs      |  4 +-
 src/requests/all/set_chat_title.rs            |  4 +-
 src/requests/all/set_game_score.rs            | 10 ++--
 src/requests/all/set_my_commands.rs           |  3 +-
 .../all/set_sticker_position_in_set.rs        |  4 +-
 src/requests/all/set_sticker_set_thumb.rs     |  6 +--
 src/requests/all/set_webhook.rs               |  8 ++--
 .../all/stop_inline_message_live_location.rs  |  4 +-
 .../all/stop_message_live_location.rs         |  6 +--
 src/requests/all/stop_poll.rs                 |  6 +--
 src/requests/all/unban_chat_member.rs         |  4 +-
 src/requests/all/unpin_chat_message.rs        |  2 +-
 src/requests/all/upload_sticker_file.rs       |  4 +-
 69 files changed, 298 insertions(+), 300 deletions(-)

diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
index 3408f36b..d78571bc 100644
--- a/src/requests/all/add_sticker_to_set.rs
+++ b/src/requests/all/add_sticker_to_set.rs
@@ -19,12 +19,12 @@ use crate::{
 pub struct AddStickerToSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    user_id: i32,
-    name: String,
+    pub user_id: i32,
+    pub name: String,
     #[serde(flatten)]
-    sticker_type: StickerType,
-    emojis: String,
-    mask_position: Option<MaskPosition>,
+    pub sticker_type: StickerType,
+    pub emojis: String,
+    pub mask_position: Option<MaskPosition>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/answer_callback_query.rs b/src/requests/all/answer_callback_query.rs
index c74b1e88..254f2f07 100644
--- a/src/requests/all/answer_callback_query.rs
+++ b/src/requests/all/answer_callback_query.rs
@@ -21,11 +21,11 @@ use crate::{
 pub struct AnswerCallbackQuery {
     #[serde(skip_serializing)]
     bot: Bot,
-    callback_query_id: String,
-    text: Option<String>,
-    show_alert: Option<bool>,
-    url: Option<String>,
-    cache_time: Option<i32>,
+    pub callback_query_id: String,
+    pub text: Option<String>,
+    pub show_alert: Option<bool>,
+    pub url: Option<String>,
+    pub cache_time: Option<i32>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/answer_inline_query.rs b/src/requests/all/answer_inline_query.rs
index dd1b6a38..f680df36 100644
--- a/src/requests/all/answer_inline_query.rs
+++ b/src/requests/all/answer_inline_query.rs
@@ -17,13 +17,13 @@ use crate::{
 pub struct AnswerInlineQuery {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_query_id: String,
-    results: Vec<InlineQueryResult>,
-    cache_time: Option<i32>,
-    is_personal: Option<bool>,
-    next_offset: Option<String>,
-    switch_pm_text: Option<String>,
-    switch_pm_parameter: Option<String>,
+    pub inline_query_id: String,
+    pub results: Vec<InlineQueryResult>,
+    pub cache_time: Option<i32>,
+    pub is_personal: Option<bool>,
+    pub next_offset: Option<String>,
+    pub switch_pm_text: Option<String>,
+    pub switch_pm_parameter: Option<String>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/answer_pre_checkout_query.rs b/src/requests/all/answer_pre_checkout_query.rs
index 2ac4df42..d3ccc3d9 100644
--- a/src/requests/all/answer_pre_checkout_query.rs
+++ b/src/requests/all/answer_pre_checkout_query.rs
@@ -24,9 +24,9 @@ use crate::{
 pub struct AnswerPreCheckoutQuery {
     #[serde(skip_serializing)]
     bot: Bot,
-    pre_checkout_query_id: String,
-    ok: bool,
-    error_message: Option<String>,
+    pub pre_checkout_query_id: String,
+    pub ok: bool,
+    pub error_message: Option<String>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/answer_shipping_query.rs b/src/requests/all/answer_shipping_query.rs
index be4d6662..020dce24 100644
--- a/src/requests/all/answer_shipping_query.rs
+++ b/src/requests/all/answer_shipping_query.rs
@@ -20,10 +20,10 @@ use crate::{
 pub struct AnswerShippingQuery {
     #[serde(skip_serializing)]
     bot: Bot,
-    shipping_query_id: String,
-    ok: bool,
-    shipping_options: Option<Vec<ShippingOption>>,
-    error_message: Option<String>,
+    pub shipping_query_id: String,
+    pub ok: bool,
+    pub shipping_options: Option<Vec<ShippingOption>>,
+    pub error_message: Option<String>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
index d9c5e9da..9c2d1934 100644
--- a/src/requests/all/create_new_sticker_set.rs
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -16,14 +16,14 @@ use crate::{
 pub struct CreateNewStickerSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    user_id: i32,
-    name: String,
-    title: String,
+    pub user_id: i32,
+    pub name: String,
+    pub title: String,
     #[serde(flatten)]
-    sticker_type: StickerType,
-    emojis: String,
-    contains_masks: Option<bool>,
-    mask_position: Option<MaskPosition>,
+    pub sticker_type: StickerType,
+    pub emojis: String,
+    pub contains_masks: Option<bool>,
+    pub mask_position: Option<MaskPosition>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/delete_chat_photo.rs b/src/requests/all/delete_chat_photo.rs
index 01439bfa..56291e04 100644
--- a/src/requests/all/delete_chat_photo.rs
+++ b/src/requests/all/delete_chat_photo.rs
@@ -17,7 +17,7 @@ use crate::{
 pub struct DeleteChatPhoto {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/delete_chat_sticker_set.rs b/src/requests/all/delete_chat_sticker_set.rs
index 9fe228c5..739aa0f6 100644
--- a/src/requests/all/delete_chat_sticker_set.rs
+++ b/src/requests/all/delete_chat_sticker_set.rs
@@ -22,7 +22,7 @@ use crate::{
 pub struct DeleteChatStickerSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/delete_message.rs b/src/requests/all/delete_message.rs
index 35ead60a..4fd58ec4 100644
--- a/src/requests/all/delete_message.rs
+++ b/src/requests/all/delete_message.rs
@@ -27,8 +27,8 @@ use crate::{
 pub struct DeleteMessage {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
+    pub chat_id: ChatId,
+    pub message_id: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/delete_sticker_from_set.rs b/src/requests/all/delete_sticker_from_set.rs
index 59269f7a..ce1df04c 100644
--- a/src/requests/all/delete_sticker_from_set.rs
+++ b/src/requests/all/delete_sticker_from_set.rs
@@ -15,7 +15,7 @@ use crate::{
 pub struct DeleteStickerFromSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    sticker: String,
+    pub sticker: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_inline_message_caption.rs b/src/requests/all/edit_inline_message_caption.rs
index e777f17c..4e4ff938 100644
--- a/src/requests/all/edit_inline_message_caption.rs
+++ b/src/requests/all/edit_inline_message_caption.rs
@@ -19,10 +19,10 @@ use crate::{
 pub struct EditInlineMessageCaption {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_inline_message_live_location.rs b/src/requests/all/edit_inline_message_live_location.rs
index 4b267427..eae40eb0 100644
--- a/src/requests/all/edit_inline_message_live_location.rs
+++ b/src/requests/all/edit_inline_message_live_location.rs
@@ -21,10 +21,10 @@ use crate::{
 pub struct EditInlineMessageLiveLocation {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    latitude: f32,
-    longitude: f32,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub latitude: f32,
+    pub longitude: f32,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_inline_message_media.rs b/src/requests/all/edit_inline_message_media.rs
index ea0a4070..b874d5c4 100644
--- a/src/requests/all/edit_inline_message_media.rs
+++ b/src/requests/all/edit_inline_message_media.rs
@@ -24,9 +24,9 @@ use crate::{
 pub struct EditInlineMessageMedia {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    media: InputMedia,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub media: InputMedia,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_inline_message_reply_markup.rs b/src/requests/all/edit_inline_message_reply_markup.rs
index cd96c686..632bac1d 100644
--- a/src/requests/all/edit_inline_message_reply_markup.rs
+++ b/src/requests/all/edit_inline_message_reply_markup.rs
@@ -20,8 +20,8 @@ use crate::{
 pub struct EditInlineMessageReplyMarkup {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_inline_message_text.rs b/src/requests/all/edit_inline_message_text.rs
index 2b266314..a4716ca0 100644
--- a/src/requests/all/edit_inline_message_text.rs
+++ b/src/requests/all/edit_inline_message_text.rs
@@ -19,11 +19,11 @@ use crate::{
 pub struct EditInlineMessageText {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    text: String,
-    parse_mode: Option<ParseMode>,
-    disable_web_page_preview: Option<bool>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub text: String,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_web_page_preview: Option<bool>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_message_caption.rs b/src/requests/all/edit_message_caption.rs
index 9294af93..441f4931 100644
--- a/src/requests/all/edit_message_caption.rs
+++ b/src/requests/all/edit_message_caption.rs
@@ -19,11 +19,11 @@ use crate::{
 pub struct EditMessageCaption {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_message_live_location.rs b/src/requests/all/edit_message_live_location.rs
index c5afd295..7d1f4779 100644
--- a/src/requests/all/edit_message_live_location.rs
+++ b/src/requests/all/edit_message_live_location.rs
@@ -21,11 +21,11 @@ use crate::{
 pub struct EditMessageLiveLocation {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    latitude: f32,
-    longitude: f32,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub latitude: f32,
+    pub longitude: f32,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_message_media.rs b/src/requests/all/edit_message_media.rs
index 826244db..36080a96 100644
--- a/src/requests/all/edit_message_media.rs
+++ b/src/requests/all/edit_message_media.rs
@@ -22,10 +22,10 @@ use crate::{
 pub struct EditMessageMedia {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    media: InputMedia,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub media: InputMedia,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_message_reply_markup.rs b/src/requests/all/edit_message_reply_markup.rs
index 66aab5bf..45f8f14d 100644
--- a/src/requests/all/edit_message_reply_markup.rs
+++ b/src/requests/all/edit_message_reply_markup.rs
@@ -19,9 +19,9 @@ use crate::{
 pub struct EditMessageReplyMarkup {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/edit_message_text.rs b/src/requests/all/edit_message_text.rs
index 12251313..4fcc0442 100644
--- a/src/requests/all/edit_message_text.rs
+++ b/src/requests/all/edit_message_text.rs
@@ -19,12 +19,12 @@ use crate::{
 pub struct EditMessageText {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    text: String,
-    parse_mode: Option<ParseMode>,
-    disable_web_page_preview: Option<bool>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub text: String,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_web_page_preview: Option<bool>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/export_chat_invite_link.rs b/src/requests/all/export_chat_invite_link.rs
index 51a26437..70a5825a 100644
--- a/src/requests/all/export_chat_invite_link.rs
+++ b/src/requests/all/export_chat_invite_link.rs
@@ -31,7 +31,7 @@ use crate::{
 pub struct ExportChatInviteLink {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/forward_message.rs b/src/requests/all/forward_message.rs
index feb9ec02..24783cdc 100644
--- a/src/requests/all/forward_message.rs
+++ b/src/requests/all/forward_message.rs
@@ -15,10 +15,10 @@ use crate::{
 pub struct ForwardMessage {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    from_chat_id: ChatId,
-    disable_notification: Option<bool>,
-    message_id: i32,
+    pub chat_id: ChatId,
+    pub from_chat_id: ChatId,
+    pub disable_notification: Option<bool>,
+    pub message_id: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_chat.rs b/src/requests/all/get_chat.rs
index 11406776..e0552798 100644
--- a/src/requests/all/get_chat.rs
+++ b/src/requests/all/get_chat.rs
@@ -17,7 +17,7 @@ use crate::{
 pub struct GetChat {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_chat_administrators.rs b/src/requests/all/get_chat_administrators.rs
index 06657ec5..44cb9c53 100644
--- a/src/requests/all/get_chat_administrators.rs
+++ b/src/requests/all/get_chat_administrators.rs
@@ -18,7 +18,7 @@ use crate::{
 pub struct GetChatAdministrators {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_chat_member.rs b/src/requests/all/get_chat_member.rs
index 4ebe3f56..5883eea3 100644
--- a/src/requests/all/get_chat_member.rs
+++ b/src/requests/all/get_chat_member.rs
@@ -15,8 +15,8 @@ use crate::{
 pub struct GetChatMember {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
+    pub chat_id: ChatId,
+    pub user_id: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_chat_members_count.rs b/src/requests/all/get_chat_members_count.rs
index 5c78596b..c9861215 100644
--- a/src/requests/all/get_chat_members_count.rs
+++ b/src/requests/all/get_chat_members_count.rs
@@ -15,7 +15,7 @@ use crate::{
 pub struct GetChatMembersCount {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_file.rs b/src/requests/all/get_file.rs
index d2d0556c..d45b6013 100644
--- a/src/requests/all/get_file.rs
+++ b/src/requests/all/get_file.rs
@@ -31,7 +31,7 @@ use crate::{
 pub struct GetFile {
     #[serde(skip_serializing)]
     bot: Bot,
-    file_id: String,
+    pub file_id: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_game_high_scores.rs b/src/requests/all/get_game_high_scores.rs
index 1a43d63e..e6d325e0 100644
--- a/src/requests/all/get_game_high_scores.rs
+++ b/src/requests/all/get_game_high_scores.rs
@@ -24,8 +24,8 @@ pub struct GetGameHighScores {
     #[serde(skip_serializing)]
     bot: Bot,
     #[serde(flatten)]
-    target: TargetMessage,
-    user_id: i32,
+    pub target: TargetMessage,
+    pub user_id: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_sticker_set.rs b/src/requests/all/get_sticker_set.rs
index a8a83bea..185d721a 100644
--- a/src/requests/all/get_sticker_set.rs
+++ b/src/requests/all/get_sticker_set.rs
@@ -15,7 +15,7 @@ use crate::{
 pub struct GetStickerSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    name: String,
+    pub name: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_updates.rs b/src/requests/all/get_updates.rs
index a9f4558d..9cb57a7a 100644
--- a/src/requests/all/get_updates.rs
+++ b/src/requests/all/get_updates.rs
@@ -22,10 +22,10 @@ use crate::{
 pub struct GetUpdates {
     #[serde(skip_serializing)]
     pub(crate) bot: Bot,
-    pub(crate) offset: Option<i32>,
-    pub(crate) limit: Option<u8>,
-    pub(crate) timeout: Option<u32>,
-    pub(crate) allowed_updates: Option<Vec<AllowedUpdate>>,
+    pub offset: Option<i32>,
+    pub limit: Option<u8>,
+    pub timeout: Option<u32>,
+    pub allowed_updates: Option<Vec<AllowedUpdate>>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/get_user_profile_photos.rs b/src/requests/all/get_user_profile_photos.rs
index 663a07a4..a3105701 100644
--- a/src/requests/all/get_user_profile_photos.rs
+++ b/src/requests/all/get_user_profile_photos.rs
@@ -15,9 +15,9 @@ use crate::{
 pub struct GetUserProfilePhotos {
     #[serde(skip_serializing)]
     bot: Bot,
-    user_id: i32,
-    offset: Option<i32>,
-    limit: Option<i32>,
+    pub user_id: i32,
+    pub offset: Option<i32>,
+    pub limit: Option<i32>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/kick_chat_member.rs b/src/requests/all/kick_chat_member.rs
index 31953949..50c5bb04 100644
--- a/src/requests/all/kick_chat_member.rs
+++ b/src/requests/all/kick_chat_member.rs
@@ -22,9 +22,9 @@ use crate::{
 pub struct KickChatMember {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
-    until_date: Option<i32>,
+    pub chat_id: ChatId,
+    pub user_id: i32,
+    pub until_date: Option<i32>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/leave_chat.rs b/src/requests/all/leave_chat.rs
index d0411efb..1290fa5c 100644
--- a/src/requests/all/leave_chat.rs
+++ b/src/requests/all/leave_chat.rs
@@ -15,7 +15,7 @@ use crate::{
 pub struct LeaveChat {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/pin_chat_message.rs b/src/requests/all/pin_chat_message.rs
index ae1f3227..9a0655b1 100644
--- a/src/requests/all/pin_chat_message.rs
+++ b/src/requests/all/pin_chat_message.rs
@@ -19,9 +19,9 @@ use crate::{
 pub struct PinChatMessage {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    disable_notification: Option<bool>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub disable_notification: Option<bool>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/promote_chat_member.rs b/src/requests/all/promote_chat_member.rs
index 468b3c48..cc1beef6 100644
--- a/src/requests/all/promote_chat_member.rs
+++ b/src/requests/all/promote_chat_member.rs
@@ -19,16 +19,16 @@ use crate::{
 pub struct PromoteChatMember {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
-    can_change_info: Option<bool>,
-    can_post_messages: Option<bool>,
-    can_edit_messages: Option<bool>,
-    can_delete_messages: Option<bool>,
-    can_invite_users: Option<bool>,
-    can_restrict_members: Option<bool>,
-    can_pin_messages: Option<bool>,
-    can_promote_members: Option<bool>,
+    pub chat_id: ChatId,
+    pub user_id: i32,
+    pub can_change_info: Option<bool>,
+    pub can_post_messages: Option<bool>,
+    pub can_edit_messages: Option<bool>,
+    pub can_delete_messages: Option<bool>,
+    pub can_invite_users: Option<bool>,
+    pub can_restrict_members: Option<bool>,
+    pub can_pin_messages: Option<bool>,
+    pub can_promote_members: Option<bool>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/restrict_chat_member.rs b/src/requests/all/restrict_chat_member.rs
index 6b825b91..5ce1ebab 100644
--- a/src/requests/all/restrict_chat_member.rs
+++ b/src/requests/all/restrict_chat_member.rs
@@ -19,10 +19,10 @@ use crate::{
 pub struct RestrictChatMember {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
-    permissions: ChatPermissions,
-    until_date: Option<i32>,
+    pub chat_id: ChatId,
+    pub user_id: i32,
+    pub permissions: ChatPermissions,
+    pub until_date: Option<i32>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_audio.rs b/src/requests/all/send_audio.rs
index dc61458c..125ed8c0 100644
--- a/src/requests/all/send_audio.rs
+++ b/src/requests/all/send_audio.rs
@@ -23,17 +23,17 @@ use crate::{
 pub struct SendAudio {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    audio: InputFile,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    duration: Option<i32>,
-    performer: Option<String>,
-    title: Option<String>,
-    thumb: Option<InputFile>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub audio: InputFile,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub duration: Option<i32>,
+    pub performer: Option<String>,
+    pub title: Option<String>,
+    pub thumb: Option<InputFile>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_chat_action.rs b/src/requests/all/send_chat_action.rs
index 5fe853b2..82c6328e 100644
--- a/src/requests/all/send_chat_action.rs
+++ b/src/requests/all/send_chat_action.rs
@@ -29,8 +29,8 @@ use crate::{
 pub struct SendChatAction {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    action: SendChatActionKind,
+    pub chat_id: ChatId,
+    pub action: SendChatActionKind,
 }
 
 /// A type of action used in [`SendChatAction`].
diff --git a/src/requests/all/send_contact.rs b/src/requests/all/send_contact.rs
index ef3ff034..61b59e4d 100644
--- a/src/requests/all/send_contact.rs
+++ b/src/requests/all/send_contact.rs
@@ -15,14 +15,14 @@ use crate::{
 pub struct SendContact {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    phone_number: String,
-    first_name: String,
-    last_name: Option<String>,
-    vcard: Option<String>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub phone_number: String,
+    pub first_name: String,
+    pub last_name: Option<String>,
+    pub vcard: Option<String>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_dice.rs b/src/requests/all/send_dice.rs
index 663d7001..ad3cb16a 100644
--- a/src/requests/all/send_dice.rs
+++ b/src/requests/all/send_dice.rs
@@ -15,13 +15,12 @@ use crate::{
 pub struct SendDice {
     #[serde(skip_serializing)]
     bot: Bot,
-
-    chat_id: ChatId,
+    pub chat_id: ChatId,
     #[serde(flatten)]
-    emoji: Option<DiceEmoji>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub emoji: Option<DiceEmoji>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_document.rs b/src/requests/all/send_document.rs
index e865a008..7357341d 100644
--- a/src/requests/all/send_document.rs
+++ b/src/requests/all/send_document.rs
@@ -18,14 +18,14 @@ use crate::{
 pub struct SendDocument {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    document: InputFile,
-    thumb: Option<InputFile>,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub document: InputFile,
+    pub thumb: Option<InputFile>,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_game.rs b/src/requests/all/send_game.rs
index 03a0b0e2..876cabba 100644
--- a/src/requests/all/send_game.rs
+++ b/src/requests/all/send_game.rs
@@ -15,11 +15,11 @@ use crate::{
 pub struct SendGame {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: i32,
-    game_short_name: String,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: i32,
+    pub game_short_name: String,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_invoice.rs b/src/requests/all/send_invoice.rs
index 8466cdba..0469e25f 100644
--- a/src/requests/all/send_invoice.rs
+++ b/src/requests/all/send_invoice.rs
@@ -15,29 +15,29 @@ use crate::{
 pub struct SendInvoice {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: i32,
-    title: String,
-    description: String,
-    payload: String,
-    provider_token: String,
-    start_parameter: String,
-    currency: String,
-    prices: Vec<LabeledPrice>,
-    provider_data: Option<String>,
-    photo_url: Option<String>,
-    photo_size: Option<i32>,
-    photo_width: Option<i32>,
-    photo_height: Option<i32>,
-    need_name: Option<bool>,
-    need_phone_number: Option<bool>,
-    need_email: Option<bool>,
-    need_shipping_address: Option<bool>,
-    send_phone_number_to_provider: Option<bool>,
-    send_email_to_provider: Option<bool>,
-    is_flexible: Option<bool>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: i32,
+    pub title: String,
+    pub description: String,
+    pub payload: String,
+    pub provider_token: String,
+    pub start_parameter: String,
+    pub currency: String,
+    pub prices: Vec<LabeledPrice>,
+    pub provider_data: Option<String>,
+    pub photo_url: Option<String>,
+    pub photo_size: Option<i32>,
+    pub photo_width: Option<i32>,
+    pub photo_height: Option<i32>,
+    pub need_name: Option<bool>,
+    pub need_phone_number: Option<bool>,
+    pub need_email: Option<bool>,
+    pub need_shipping_address: Option<bool>,
+    pub send_phone_number_to_provider: Option<bool>,
+    pub send_email_to_provider: Option<bool>,
+    pub is_flexible: Option<bool>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_location.rs b/src/requests/all/send_location.rs
index 20201ad1..a55d3cc5 100644
--- a/src/requests/all/send_location.rs
+++ b/src/requests/all/send_location.rs
@@ -15,13 +15,13 @@ use crate::{
 pub struct SendLocation {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    latitude: f32,
-    longitude: f32,
-    live_period: Option<i64>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub latitude: f32,
+    pub longitude: f32,
+    pub live_period: Option<i64>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_media_group.rs b/src/requests/all/send_media_group.rs
index e7adb68a..2c9f422a 100644
--- a/src/requests/all/send_media_group.rs
+++ b/src/requests/all/send_media_group.rs
@@ -15,10 +15,10 @@ use crate::{
 pub struct SendMediaGroup {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    media: Vec<InputMedia>, // TODO: InputMediaPhoto and InputMediaVideo
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
+    pub chat_id: ChatId,
+    pub media: Vec<InputMedia>, // TODO: InputMediaPhoto and InputMediaVideo
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_photo.rs b/src/requests/all/send_photo.rs
index 42ad8e6f..e6126fcf 100644
--- a/src/requests/all/send_photo.rs
+++ b/src/requests/all/send_photo.rs
@@ -15,13 +15,13 @@ use crate::{
 pub struct SendPhoto {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    photo: InputFile,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub photo: InputFile,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_poll.rs b/src/requests/all/send_poll.rs
index 3dd412a1..699362c9 100644
--- a/src/requests/all/send_poll.rs
+++ b/src/requests/all/send_poll.rs
@@ -15,21 +15,21 @@ use crate::{
 pub struct SendPoll {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    question: String,
-    options: Vec<String>,
-    is_anonymous: Option<bool>,
-    poll_type: Option<PollType>,
-    allows_multiple_answers: Option<bool>,
-    correct_option_id: Option<i32>,
-    explanation: Option<String>,
-    explanation_parse_mode: Option<ParseMode>,
-    open_period: Option<i32>,
-    close_date: Option<i32>,
-    is_closed: Option<bool>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub question: String,
+    pub options: Vec<String>,
+    pub is_anonymous: Option<bool>,
+    pub poll_type: Option<PollType>,
+    pub allows_multiple_answers: Option<bool>,
+    pub correct_option_id: Option<i32>,
+    pub explanation: Option<String>,
+    pub explanation_parse_mode: Option<ParseMode>,
+    pub open_period: Option<i32>,
+    pub close_date: Option<i32>,
+    pub is_closed: Option<bool>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_sticker.rs b/src/requests/all/send_sticker.rs
index dd25c9bb..8c9f0b00 100644
--- a/src/requests/all/send_sticker.rs
+++ b/src/requests/all/send_sticker.rs
@@ -17,11 +17,11 @@ use crate::{
 pub struct SendSticker {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    sticker: InputFile,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub sticker: InputFile,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_venue.rs b/src/requests/all/send_venue.rs
index 513ece7d..6dacb74e 100644
--- a/src/requests/all/send_venue.rs
+++ b/src/requests/all/send_venue.rs
@@ -15,16 +15,16 @@ use crate::{
 pub struct SendVenue {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    latitude: f32,
-    longitude: f32,
-    title: String,
-    address: String,
-    foursquare_id: Option<String>,
-    foursquare_type: Option<String>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub latitude: f32,
+    pub longitude: f32,
+    pub title: String,
+    pub address: String,
+    pub foursquare_id: Option<String>,
+    pub foursquare_type: Option<String>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_video.rs b/src/requests/all/send_video.rs
index 3f218f10..4c84e52d 100644
--- a/src/requests/all/send_video.rs
+++ b/src/requests/all/send_video.rs
@@ -19,18 +19,18 @@ use crate::{
 pub struct SendVideo {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    video: InputFile,
-    duration: Option<i32>,
-    width: Option<i32>,
-    height: Option<i32>,
-    thumb: Option<InputFile>,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    supports_streaming: Option<bool>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub video: InputFile,
+    pub duration: Option<i32>,
+    pub width: Option<i32>,
+    pub height: Option<i32>,
+    pub thumb: Option<InputFile>,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub supports_streaming: Option<bool>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_video_note.rs b/src/requests/all/send_video_note.rs
index 9a0e07dd..7ae4ae82 100644
--- a/src/requests/all/send_video_note.rs
+++ b/src/requests/all/send_video_note.rs
@@ -18,14 +18,14 @@ use crate::{
 pub struct SendVideoNote {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    video_note: InputFile,
-    duration: Option<i32>,
-    length: Option<i32>,
-    thumb: Option<InputFile>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub video_note: InputFile,
+    pub duration: Option<i32>,
+    pub length: Option<i32>,
+    pub thumb: Option<InputFile>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/send_voice.rs b/src/requests/all/send_voice.rs
index 6bfc301a..20ca93c2 100644
--- a/src/requests/all/send_voice.rs
+++ b/src/requests/all/send_voice.rs
@@ -24,14 +24,14 @@ use crate::{
 pub struct SendVoice {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    voice: InputFile,
-    caption: Option<String>,
-    parse_mode: Option<ParseMode>,
-    duration: Option<i32>,
-    disable_notification: Option<bool>,
-    reply_to_message_id: Option<i32>,
-    reply_markup: Option<ReplyMarkup>,
+    pub chat_id: ChatId,
+    pub voice: InputFile,
+    pub caption: Option<String>,
+    pub parse_mode: Option<ParseMode>,
+    pub duration: Option<i32>,
+    pub disable_notification: Option<bool>,
+    pub reply_to_message_id: Option<i32>,
+    pub reply_markup: Option<ReplyMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_administrator_custom_title.rs b/src/requests/all/set_chat_administrator_custom_title.rs
index a3211811..bbc7c251 100644
--- a/src/requests/all/set_chat_administrator_custom_title.rs
+++ b/src/requests/all/set_chat_administrator_custom_title.rs
@@ -16,9 +16,9 @@ use crate::{
 pub struct SetChatAdministratorCustomTitle {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
-    custom_title: String,
+    pub chat_id: ChatId,
+    pub user_id: i32,
+    pub custom_title: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_description.rs b/src/requests/all/set_chat_description.rs
index 092c495b..a9c98bc9 100644
--- a/src/requests/all/set_chat_description.rs
+++ b/src/requests/all/set_chat_description.rs
@@ -19,8 +19,8 @@ use crate::{
 pub struct SetChatDescription {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    description: Option<String>,
+    pub chat_id: ChatId,
+    pub description: Option<String>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_permissions.rs b/src/requests/all/set_chat_permissions.rs
index aaa1881b..b2233f9bc 100644
--- a/src/requests/all/set_chat_permissions.rs
+++ b/src/requests/all/set_chat_permissions.rs
@@ -18,8 +18,8 @@ use crate::{
 pub struct SetChatPermissions {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    permissions: ChatPermissions,
+    pub chat_id: ChatId,
+    pub permissions: ChatPermissions,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_photo.rs b/src/requests/all/set_chat_photo.rs
index dcc5febc..1572cc03 100644
--- a/src/requests/all/set_chat_photo.rs
+++ b/src/requests/all/set_chat_photo.rs
@@ -18,8 +18,8 @@ use crate::{
 pub struct SetChatPhoto {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    photo: InputFile,
+    pub chat_id: ChatId,
+    pub photo: InputFile,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_sticker_set.rs b/src/requests/all/set_chat_sticker_set.rs
index 010a10f5..04b18e61 100644
--- a/src/requests/all/set_chat_sticker_set.rs
+++ b/src/requests/all/set_chat_sticker_set.rs
@@ -19,8 +19,8 @@ use crate::{
 pub struct SetChatStickerSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    sticker_set_name: String,
+    pub chat_id: ChatId,
+    pub sticker_set_name: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_chat_title.rs b/src/requests/all/set_chat_title.rs
index 7d6ae6d1..3b0e92c8 100644
--- a/src/requests/all/set_chat_title.rs
+++ b/src/requests/all/set_chat_title.rs
@@ -18,8 +18,8 @@ use crate::{
 pub struct SetChatTitle {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    title: String,
+    pub chat_id: ChatId,
+    pub title: String,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_game_score.rs b/src/requests/all/set_game_score.rs
index 8e429e3a..5a467fe9 100644
--- a/src/requests/all/set_game_score.rs
+++ b/src/requests/all/set_game_score.rs
@@ -24,11 +24,11 @@ pub struct SetGameScore {
     #[serde(skip_serializing)]
     bot: Bot,
     #[serde(flatten)]
-    target: TargetMessage,
-    user_id: i32,
-    score: i32,
-    force: Option<bool>,
-    disable_edit_message: Option<bool>,
+    pub target: TargetMessage,
+    pub user_id: i32,
+    pub score: i32,
+    pub force: Option<bool>,
+    pub disable_edit_message: Option<bool>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_my_commands.rs b/src/requests/all/set_my_commands.rs
index 831f9705..c2447c67 100644
--- a/src/requests/all/set_my_commands.rs
+++ b/src/requests/all/set_my_commands.rs
@@ -15,8 +15,7 @@ use crate::{
 pub struct SetMyCommands {
     #[serde(skip_serializing)]
     bot: Bot,
-
-    commands: Vec<BotCommand>,
+    pub commands: Vec<BotCommand>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_sticker_position_in_set.rs b/src/requests/all/set_sticker_position_in_set.rs
index 4ed78551..6ca7e701 100644
--- a/src/requests/all/set_sticker_position_in_set.rs
+++ b/src/requests/all/set_sticker_position_in_set.rs
@@ -16,8 +16,8 @@ use crate::{
 pub struct SetStickerPositionInSet {
     #[serde(skip_serializing)]
     bot: Bot,
-    sticker: String,
-    position: i32,
+    pub sticker: String,
+    pub position: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_sticker_set_thumb.rs b/src/requests/all/set_sticker_set_thumb.rs
index 1f84aacd..343f270a 100644
--- a/src/requests/all/set_sticker_set_thumb.rs
+++ b/src/requests/all/set_sticker_set_thumb.rs
@@ -16,9 +16,9 @@ use crate::{
 pub struct SetStickerSetThumb {
     #[serde(skip_serializing)]
     bot: Bot,
-    name: String,
-    user_id: i32,
-    thumb: Option<InputFile>,
+    pub name: String,
+    pub user_id: i32,
+    pub thumb: Option<InputFile>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/set_webhook.rs b/src/requests/all/set_webhook.rs
index c2aff792..4a1f565a 100644
--- a/src/requests/all/set_webhook.rs
+++ b/src/requests/all/set_webhook.rs
@@ -28,10 +28,10 @@ use crate::{
 pub struct SetWebhook {
     #[serde(skip_serializing)]
     bot: Bot,
-    url: String,
-    certificate: Option<InputFile>,
-    max_connections: Option<i32>,
-    allowed_updates: Option<Vec<AllowedUpdate>>,
+    pub url: String,
+    pub certificate: Option<InputFile>,
+    pub max_connections: Option<i32>,
+    pub allowed_updates: Option<Vec<AllowedUpdate>>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/stop_inline_message_live_location.rs b/src/requests/all/stop_inline_message_live_location.rs
index 40fb5604..55c23038 100644
--- a/src/requests/all/stop_inline_message_live_location.rs
+++ b/src/requests/all/stop_inline_message_live_location.rs
@@ -20,8 +20,8 @@ use crate::{
 pub struct StopInlineMessageLiveLocation {
     #[serde(skip_serializing)]
     bot: Bot,
-    inline_message_id: String,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub inline_message_id: String,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/stop_message_live_location.rs b/src/requests/all/stop_message_live_location.rs
index 892492ea..e07db923 100644
--- a/src/requests/all/stop_message_live_location.rs
+++ b/src/requests/all/stop_message_live_location.rs
@@ -20,9 +20,9 @@ use crate::{
 pub struct StopMessageLiveLocation {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/stop_poll.rs b/src/requests/all/stop_poll.rs
index 946b4760..c60bdb50 100644
--- a/src/requests/all/stop_poll.rs
+++ b/src/requests/all/stop_poll.rs
@@ -15,9 +15,9 @@ use crate::{
 pub struct StopPoll {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    message_id: i32,
-    reply_markup: Option<InlineKeyboardMarkup>,
+    pub chat_id: ChatId,
+    pub message_id: i32,
+    pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/unban_chat_member.rs b/src/requests/all/unban_chat_member.rs
index 5aee625c..ba206733 100644
--- a/src/requests/all/unban_chat_member.rs
+++ b/src/requests/all/unban_chat_member.rs
@@ -18,8 +18,8 @@ use crate::{
 pub struct UnbanChatMember {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
-    user_id: i32,
+    pub chat_id: ChatId,
+    pub user_id: i32,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/unpin_chat_message.rs b/src/requests/all/unpin_chat_message.rs
index 15e76a99..1ce74c30 100644
--- a/src/requests/all/unpin_chat_message.rs
+++ b/src/requests/all/unpin_chat_message.rs
@@ -19,7 +19,7 @@ use crate::{
 pub struct UnpinChatMessage {
     #[serde(skip_serializing)]
     bot: Bot,
-    chat_id: ChatId,
+    pub chat_id: ChatId,
 }
 
 #[async_trait::async_trait]
diff --git a/src/requests/all/upload_sticker_file.rs b/src/requests/all/upload_sticker_file.rs
index b09b143f..9f5df548 100644
--- a/src/requests/all/upload_sticker_file.rs
+++ b/src/requests/all/upload_sticker_file.rs
@@ -20,8 +20,8 @@ use crate::{
 pub struct UploadStickerFile {
     #[serde(skip_serializing)]
     bot: Bot,
-    user_id: i32,
-    png_sticker: InputFile,
+    pub user_id: i32,
+    pub png_sticker: InputFile,
 }
 #[async_trait::async_trait]
 impl Request for UploadStickerFile {

From fd64e17f4ce56850b287d9b04a831df65e23542c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 21:22:25 +0300
Subject: [PATCH 085/755] remove all `#[non_exhaustive]`s

---
 src/types/allowed_update.rs                   |  1 -
 src/types/animation.rs                        |  1 -
 src/types/audio.rs                            |  1 -
 src/types/bot_command.rs                      |  1 -
 src/types/callback_game.rs                    |  1 -
 src/types/callback_query.rs                   |  1 -
 src/types/chat.rs                             |  8 ----
 src/types/chat_action.rs                      |  1 -
 src/types/chat_id.rs                          |  1 -
 src/types/chat_member.rs                      |  1 -
 src/types/chat_permissions.rs                 |  1 -
 src/types/chat_photo.rs                       |  1 -
 src/types/chosen_inline_result.rs             |  1 -
 src/types/contact.rs                          |  1 -
 src/types/dice.rs                             |  1 -
 src/types/document.rs                         |  1 -
 src/types/encrypted_credentials.rs            |  1 -
 src/types/encrypted_passport_element.rs       | 15 --------
 src/types/file.rs                             |  1 -
 src/types/force_reply.rs                      |  1 -
 src/types/game.rs                             |  1 -
 src/types/game_high_score.rs                  |  1 -
 src/types/inline_keyboard_button.rs           |  2 -
 src/types/inline_keyboard_markup.rs           |  1 -
 src/types/inline_query.rs                     |  1 -
 src/types/inline_query_result.rs              |  1 -
 src/types/inline_query_result_article.rs      |  1 -
 src/types/inline_query_result_audio.rs        |  1 -
 src/types/inline_query_result_cached_audio.rs |  1 -
 .../inline_query_result_cached_document.rs    |  1 -
 src/types/inline_query_result_cached_gif.rs   |  1 -
 .../inline_query_result_cached_mpeg4_gif.rs   |  1 -
 src/types/inline_query_result_cached_photo.rs |  1 -
 .../inline_query_result_cached_sticker.rs     |  1 -
 src/types/inline_query_result_cached_video.rs |  1 -
 src/types/inline_query_result_cached_voice.rs |  1 -
 src/types/inline_query_result_contact.rs      |  1 -
 src/types/inline_query_result_document.rs     |  1 -
 src/types/inline_query_result_game.rs         |  1 -
 src/types/inline_query_result_gif.rs          |  1 -
 src/types/inline_query_result_location.rs     |  1 -
 src/types/inline_query_result_mpeg4_gif.rs    |  1 -
 src/types/inline_query_result_photo.rs        |  1 -
 src/types/inline_query_result_venue.rs        |  1 -
 src/types/inline_query_result_video.rs        |  1 -
 src/types/inline_query_result_voice.rs        |  1 -
 src/types/input_file.rs                       |  1 -
 src/types/input_media.rs                      |  6 ---
 src/types/input_message_content.rs            |  5 ---
 src/types/invoice.rs                          |  1 -
 src/types/keyboard_button.rs                  |  3 --
 src/types/keyboard_button_poll_type.rs        |  1 -
 src/types/label_price.rs                      |  1 -
 src/types/location.rs                         |  1 -
 src/types/login_url.rs                        |  1 -
 src/types/mask_position.rs                    |  1 -
 src/types/me.rs                               |  1 -
 src/types/message.rs                          | 38 -------------------
 src/types/message_entity.rs                   |  2 -
 src/types/order_info.rs                       |  1 -
 src/types/parse_mode.rs                       |  1 -
 src/types/passport_data.rs                    |  1 -
 src/types/passport_element_error.rs           | 20 ----------
 src/types/passport_file.rs                    |  1 -
 src/types/photo_size.rs                       |  1 -
 src/types/poll.rs                             |  2 -
 src/types/poll_answer.rs                      |  1 -
 src/types/poll_type.rs                        |  1 -
 src/types/pre_checkout_query.rs               |  1 -
 src/types/reply_keyboard_markup.rs            |  1 -
 src/types/reply_keyboard_remove.rs            |  1 -
 src/types/reply_markup.rs                     |  1 -
 src/types/response_parameters.rs              |  1 -
 src/types/send_invoice.rs                     |  1 -
 src/types/shipping_address.rs                 |  1 -
 src/types/shipping_option.rs                  |  1 -
 src/types/shipping_query.rs                   |  1 -
 src/types/sticker.rs                          |  1 -
 src/types/sticker_set.rs                      |  1 -
 src/types/sticker_type.rs                     |  1 -
 src/types/successful_payment.rs               |  1 -
 src/types/update.rs                           |  2 -
 src/types/user.rs                             |  1 -
 src/types/user_profile_photos.rs              |  1 -
 src/types/venue.rs                            |  1 -
 src/types/video.rs                            |  1 -
 src/types/video_note.rs                       |  1 -
 src/types/voice.rs                            |  1 -
 src/types/webhook_info.rs                     |  1 -
 89 files changed, 181 deletions(-)

diff --git a/src/types/allowed_update.rs b/src/types/allowed_update.rs
index f3b920ac..932f053e 100644
--- a/src/types/allowed_update.rs
+++ b/src/types/allowed_update.rs
@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum AllowedUpdate {
     Message,
     EditedMessage,
diff --git a/src/types/animation.rs b/src/types/animation.rs
index dc52901c..9cf1b0e5 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -8,7 +8,6 @@ use crate::types::{MimeWrapper, PhotoSize};
 /// [The official docs](https://core.telegram.org/bots/api#animation).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Animation {
     /// An identifier for this file.
     pub file_id: String,
diff --git a/src/types/audio.rs b/src/types/audio.rs
index d5599c20..b9d6279d 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -8,7 +8,6 @@ use crate::types::{MimeWrapper, PhotoSize};
 /// [The official docs](https://core.telegram.org/bots/api#audio).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Audio {
     /// An identifier for this file.
     pub file_id: String,
diff --git a/src/types/bot_command.rs b/src/types/bot_command.rs
index d3116dff..cb6d9c6e 100644
--- a/src/types/bot_command.rs
+++ b/src/types/bot_command.rs
@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#botcommand).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct BotCommand {
     /// Text of the command, 1-32 characters.
     ///
diff --git a/src/types/callback_game.rs b/src/types/callback_game.rs
index 5b2d6e0f..0fd9a9b0 100644
--- a/src/types/callback_game.rs
+++ b/src/types/callback_game.rs
@@ -9,5 +9,4 @@ use serde::{Deserialize, Serialize};
 ///
 /// [@Botfather]:  https://t.me/botfather
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct CallbackGame;
diff --git a/src/types/callback_query.rs b/src/types/callback_query.rs
index d8c1d07c..611c23c1 100644
--- a/src/types/callback_query.rs
+++ b/src/types/callback_query.rs
@@ -17,7 +17,6 @@ use crate::types::{Message, User};
 /// [inline mode]: https://core.telegram.org/bots/api#inline-mode
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct CallbackQuery {
     /// An unique identifier for this query.
     pub id: String,
diff --git a/src/types/chat.rs b/src/types/chat.rs
index c278d415..2623614a 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -7,7 +7,6 @@ use crate::types::{ChatPermissions, ChatPhoto, Message};
 /// [The official docs](https://core.telegram.org/bots/api#chat).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Chat {
     /// A unique identifier for this chat. This number may be greater than 32
     /// bits and some programming languages may have difficulty/silent defects
@@ -49,7 +48,6 @@ impl Chat {
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum ChatKind {
     Public(ChatPublic),
     Private(ChatPrivate),
@@ -57,7 +55,6 @@ pub enum ChatKind {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChatPublic {
     /// A title, for supergroups, channels and group chats.
     pub title: Option<String>,
@@ -127,7 +124,6 @@ impl ChatPublic {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChatPrivate {
     /// A dummy field. Used to ensure that the `type` field is equal to
     /// `private`.
@@ -180,7 +176,6 @@ impl ChatPrivate {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
-#[non_exhaustive]
 pub enum PublicChatKind {
     Channel(PublicChatChannel),
     Group(PublicChatGroup),
@@ -189,7 +184,6 @@ pub enum PublicChatKind {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PublicChatChannel {
     /// A username, for private chats, supergroups and channels if available.
     pub username: Option<String>,
@@ -203,7 +197,6 @@ impl PublicChatChannel {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PublicChatGroup {
     /// A default chat member permissions, for groups and supergroups. Returned
     /// only from [`Bot::get_chat`].
@@ -220,7 +213,6 @@ impl PublicChatGroup {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PublicChatSupergroup {
     /// A username, for private chats, supergroups and channels if
     /// available.
diff --git a/src/types/chat_action.rs b/src/types/chat_action.rs
index 9c112a56..a73887ea 100644
--- a/src/types/chat_action.rs
+++ b/src/types/chat_action.rs
@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum ChatAction {
     Typing,
     UploadPhoto,
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index f5723da0..f4e57e98 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 /// (in the format `@channelusername`).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum ChatId {
     /// A chat identifier.
     #[display(fmt = "{}", _0)]
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index b8e38321..dd809633 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -7,7 +7,6 @@ use crate::types::User;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#chatmember).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChatMember {
     /// Information about the user.
     pub user: User,
diff --git a/src/types/chat_permissions.rs b/src/types/chat_permissions.rs
index d6db3b6a..139f261e 100644
--- a/src/types/chat_permissions.rs
+++ b/src/types/chat_permissions.rs
@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#chatpermissions).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChatPermissions {
     /// `true`, if the user is allowed to send text messages, contacts,
     /// locations and venues.
diff --git a/src/types/chat_photo.rs b/src/types/chat_photo.rs
index 7f5ed87d..dc19be54 100644
--- a/src/types/chat_photo.rs
+++ b/src/types/chat_photo.rs
@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#chatphoto).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChatPhoto {
     /// A file identifier of small (160x160) chat photo. This file_id can be
     /// used only for photo download and only for as long as the photo is
diff --git a/src/types/chosen_inline_result.rs b/src/types/chosen_inline_result.rs
index 18139ff0..b3aed6ee 100644
--- a/src/types/chosen_inline_result.rs
+++ b/src/types/chosen_inline_result.rs
@@ -10,7 +10,6 @@ use crate::types::{Location, User};
 /// [result]: https://core.telegram.org/bots/api#inlinequeryresult
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ChosenInlineResult {
     /// The unique identifier for the result that was chosen.
     pub result_id: String,
diff --git a/src/types/contact.rs b/src/types/contact.rs
index 68a31b38..74661c50 100644
--- a/src/types/contact.rs
+++ b/src/types/contact.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#contact).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Contact {
     /// A contact's phone number.
     pub phone_number: String,
diff --git a/src/types/dice.rs b/src/types/dice.rs
index 1c221166..c06c5050 100644
--- a/src/types/dice.rs
+++ b/src/types/dice.rs
@@ -5,7 +5,6 @@ use crate::types::DiceEmoji;
 /// This object represents an animated emoji that displays a random value.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Dice {
     /// Emoji on which the dice throw animation is based.
     emoji: DiceEmoji,
diff --git a/src/types/document.rs b/src/types/document.rs
index 8a409704..aa60c2db 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -12,7 +12,6 @@ use crate::types::{MimeWrapper, PhotoSize};
 /// [audio files]: https://core.telegram.org/bots/api#audio
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Document {
     /// An identifier for this file.
     pub file_id: String,
diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
index 543e251c..332273e7 100644
--- a/src/types/encrypted_credentials.rs
+++ b/src/types/encrypted_credentials.rs
@@ -13,7 +13,6 @@ use serde::{Deserialize, Serialize};
 /// [Telegram Passport Documentation]: https://core.telegram.org/passport#receiving-information
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedCredentials {
     /// Base64-encoded encrypted JSON-serialized data with unique user's
     /// payload, data hashes and secrets required for
diff --git a/src/types/encrypted_passport_element.rs b/src/types/encrypted_passport_element.rs
index 72c0884a..98ed43a2 100644
--- a/src/types/encrypted_passport_element.rs
+++ b/src/types/encrypted_passport_element.rs
@@ -7,7 +7,6 @@ use super::PassportFile;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#encryptedpassportelement).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElement {
     /// Base64-encoded element hash for using in
     /// [`PassportElementErrorKind::Unspecified`].
@@ -45,7 +44,6 @@ impl EncryptedPassportElement {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[allow(clippy::large_enum_variant)]
-#[non_exhaustive]
 pub enum EncryptedPassportElementKind {
     PersonalDetails(EncryptedPassportElementPersonalDetails),
     Passport(EncryptedPassportElementPassport),
@@ -64,7 +62,6 @@ pub enum EncryptedPassportElementKind {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementPersonalDetails {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -96,7 +93,6 @@ impl EncryptedPassportElementPersonalDetails {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementPassport {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -176,7 +172,6 @@ impl EncryptedPassportElementPassport {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementDriverLicense {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -274,7 +269,6 @@ impl EncryptedPassportElementDriverLicense {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementIdentityCard {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -372,7 +366,6 @@ impl EncryptedPassportElementIdentityCard {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementInternalPassport {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -452,7 +445,6 @@ impl EncryptedPassportElementInternalPassport {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementAddress {
     ///  Base64-encoded encrypted Telegram Passport element data provided
     /// by the user, available for `personal_details`, `passport`,
@@ -484,7 +476,6 @@ impl EncryptedPassportElementAddress {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementUtilityBill {
     /// Array of encrypted files with documents provided by the user,
     /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
@@ -536,7 +527,6 @@ impl EncryptedPassportElementUtilityBill {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementBankStatement {
     /// Array of encrypted files with documents provided by the user,
     /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
@@ -588,7 +578,6 @@ impl EncryptedPassportElementBankStatement {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementRentalAgreement {
     /// Array of encrypted files with documents provided by the user,
     /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
@@ -640,7 +629,6 @@ impl EncryptedPassportElementRentalAgreement {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementPassportRegistration {
     /// Array of encrypted files with documents provided by the user,
     /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
@@ -692,7 +680,6 @@ impl EncryptedPassportElementPassportRegistration {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementTemporaryRegistration {
     /// Array of encrypted files with documents provided by the user,
     /// available for `utility_bill`, `bank_statement`, `rental_agreement`,
@@ -744,7 +731,6 @@ impl EncryptedPassportElementTemporaryRegistration {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementPhoneNumber {
     /// User's verified phone number, available only for `phone_number`
     /// type.
@@ -770,7 +756,6 @@ impl EncryptedPassportElementPhoneNumber {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct EncryptedPassportElementEmail {
     /// User's verified email address, available only for `email` type.
     pub email: String,
diff --git a/src/types/file.rs b/src/types/file.rs
index 721f61c0..43734b6d 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [`Bot::get_file`]: crate::Bot::get_file
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct File {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/force_reply.rs b/src/types/force_reply.rs
index a6a74408..cb8ed997 100644
--- a/src/types/force_reply.rs
+++ b/src/types/force_reply.rs
@@ -14,7 +14,6 @@ use crate::types::True;
 /// [privacy mode]: https://core.telegram.org/bots#privacy-mode
 #[serde_with_macros::skip_serializing_none]
 #[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ForceReply {
     /// Shows reply interface to the user, as if they manually selected the
     /// bot‘s message and tapped ’Reply'.
diff --git a/src/types/game.rs b/src/types/game.rs
index 52fe01b8..56f4ef69 100644
--- a/src/types/game.rs
+++ b/src/types/game.rs
@@ -10,7 +10,6 @@ use crate::types::{Animation, MessageEntity, PhotoSize};
 /// [@Botfather]: https://t.me/botfather
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Game {
     /// Title of the game.
     pub title: String,
diff --git a/src/types/game_high_score.rs b/src/types/game_high_score.rs
index f713b18e..4d64e515 100644
--- a/src/types/game_high_score.rs
+++ b/src/types/game_high_score.rs
@@ -6,7 +6,6 @@ use crate::types::user::User;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#gamehighscore).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct GameHighScore {
     /// Position in high score table for the game.
     pub position: u32,
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index fd108692..8f65d04b 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inlinekeyboardbutton).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineKeyboardButton {
     /// Label text on the button.
     pub text: String,
@@ -38,7 +37,6 @@ impl InlineKeyboardButton {
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum InlineKeyboardButtonKind {
     /// HTTP or tg:// url to be opened when button is pressed.
     Url(String),
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index 06893959..d0e56444 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -12,7 +12,6 @@ use crate::types::InlineKeyboardButton;
 ///
 /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
-#[non_exhaustive]
 pub struct InlineKeyboardMarkup {
     /// Array of button rows, each represented by an array of
     /// [`InlineKeyboardButton`] objects.
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
index a1c15fc8..9411822d 100644
--- a/src/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -10,7 +10,6 @@ use crate::types::{Location, User};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequery).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQuery {
     /// Unique identifier for this query.
     pub id: String,
diff --git a/src/types/inline_query_result.rs b/src/types/inline_query_result.rs
index cb9976de..e295bd15 100644
--- a/src/types/inline_query_result.rs
+++ b/src/types/inline_query_result.rs
@@ -19,7 +19,6 @@ use crate::types::{
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, From)]
 #[serde(tag = "type")]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum InlineQueryResult {
     #[serde(rename = "audio")]
     CachedAudio(InlineQueryResultCachedAudio),
diff --git a/src/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
index 2f9bd689..a4445d73 100644
--- a/src/types/inline_query_result_article.rs
+++ b/src/types/inline_query_result_article.rs
@@ -7,7 +7,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultarticle).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultArticle {
     /// Unique identifier for this result, 1-64 Bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
index 648c1bee..9e541f22 100644
--- a/src/types/inline_query_result_audio.rs
+++ b/src/types/inline_query_result_audio.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultaudio).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultAudio {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_audio.rs b/src/types/inline_query_result_cached_audio.rs
index 5efec634..8dcfa47c 100644
--- a/src/types/inline_query_result_cached_audio.rs
+++ b/src/types/inline_query_result_cached_audio.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedaudio).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedAudio {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
index 882c5858..0f119d4d 100644
--- a/src/types/inline_query_result_cached_document.rs
+++ b/src/types/inline_query_result_cached_document.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcacheddocument).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedDocument {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
index 79fb44db..6712ccdf 100644
--- a/src/types/inline_query_result_cached_gif.rs
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedgif).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedGif {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
index 8f97667d..cecafb0b 100644
--- a/src/types/inline_query_result_cached_mpeg4_gif.rs
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -12,7 +12,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedmpeg4gif).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedMpeg4Gif {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
index ac9d28e8..719ec652 100644
--- a/src/types/inline_query_result_cached_photo.rs
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedphoto).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedPhoto {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_sticker.rs b/src/types/inline_query_result_cached_sticker.rs
index 0c4e9b88..66c4138f 100644
--- a/src/types/inline_query_result_cached_sticker.rs
+++ b/src/types/inline_query_result_cached_sticker.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedsticker).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedSticker {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
index 645892b0..b726d0ee 100644
--- a/src/types/inline_query_result_cached_video.rs
+++ b/src/types/inline_query_result_cached_video.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedVideo {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
index 1f50672c..cef3fa08 100644
--- a/src/types/inline_query_result_cached_voice.rs
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultCachedVoice {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_contact.rs b/src/types/inline_query_result_contact.rs
index 0b4ae0d8..cffb96f0 100644
--- a/src/types/inline_query_result_contact.rs
+++ b/src/types/inline_query_result_contact.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultcachedvideo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultContact {
     /// Unique identifier for this result, 1-64 Bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
index ea66f561..7cf0a5f2 100644
--- a/src/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -12,7 +12,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, Parse
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultdocument).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultDocument {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_game.rs b/src/types/inline_query_result_game.rs
index c795547c..0436074b 100644
--- a/src/types/inline_query_result_game.rs
+++ b/src/types/inline_query_result_game.rs
@@ -9,7 +9,6 @@ use crate::types::InlineKeyboardMarkup;
 /// [game]: https://core.telegram.org/bots/api#games
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultGame {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
index 71145de3..73c5f36d 100644
--- a/src/types/inline_query_result_gif.rs
+++ b/src/types/inline_query_result_gif.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultgif).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultGif {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
index 1d6d9270..0a4672f3 100644
--- a/src/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultlocation).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultLocation {
     /// Unique identifier for this result, 1-64 Bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
index 6c01ceb7..b57e4935 100644
--- a/src/types/inline_query_result_mpeg4_gif.rs
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -12,7 +12,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultmpeg4gif).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultMpeg4Gif {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
index e1d32dc9..66e3bdfa 100644
--- a/src/types/inline_query_result_photo.rs
+++ b/src/types/inline_query_result_photo.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultphoto).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultPhoto {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
index c7e67443..d5c16800 100644
--- a/src/types/inline_query_result_venue.rs
+++ b/src/types/inline_query_result_venue.rs
@@ -11,7 +11,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvenue).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultVenue {
     /// Unique identifier for this result, 1-64 Bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
index d51258fc..7d190473 100644
--- a/src/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -12,7 +12,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, Parse
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvideo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultVideo {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
index db812b7e..9365765e 100644
--- a/src/types/inline_query_result_voice.rs
+++ b/src/types/inline_query_result_voice.rs
@@ -12,7 +12,6 @@ use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 /// [The official docs](https://core.telegram.org/bots/api#inlinequeryresultvoice).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InlineQueryResultVoice {
     /// Unique identifier for this result, 1-64 bytes.
     pub id: String,
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index d730493a..6bd0b171 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -6,7 +6,6 @@ use std::{borrow::Cow, path::PathBuf};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputfile).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub enum InputFile {
     File(PathBuf),
     Memory { file_name: String, data: Cow<'static, [u8]> },
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 160f9af8..603a4a16 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -8,7 +8,6 @@ use crate::types::{InputFile, ParseMode};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum InputMedia {
     Photo(InputMediaPhoto),
     Video(InputMediaVideo),
@@ -22,7 +21,6 @@ pub enum InputMedia {
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaphoto).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMediaPhoto {
     /// File to send.
     pub media: InputFile,
@@ -68,7 +66,6 @@ impl InputMediaPhoto {
 /// [The official docs](https://core.telegram.org/bots/api#inputmediavideo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMediaVideo {
     // File to send.
     pub media: InputFile,
@@ -168,7 +165,6 @@ impl InputMediaVideo {
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaanimation).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMediaAnimation {
     /// File to send.
     pub media: InputFile,
@@ -258,7 +254,6 @@ impl InputMediaAnimation {
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaaudio).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMediaAudio {
     /// File to send.
     pub media: InputFile,
@@ -354,7 +349,6 @@ impl InputMediaAudio {
 /// [The official docs](https://core.telegram.org/bots/api#inputmediadocument).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMediaDocument {
     /// File to send.
     pub media: InputFile,
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index caf57650..10d1d2f3 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -8,7 +8,6 @@ use crate::types::ParseMode;
 /// [The official docs](https://core.telegram.org/bots/api#inputmessagecontent).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum InputMessageContent {
     Text(InputMessageContentText),
     Location(InputMessageContentLocation),
@@ -19,7 +18,6 @@ pub enum InputMessageContent {
 /// inline query.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMessageContentText {
     /// Text of the message to be sent, 1-4096 characters.
     pub message_text: String,
@@ -67,7 +65,6 @@ impl InputMessageContentText {
 /// inline query.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMessageContentLocation {
     /// Latitude of the location in degrees.
     pub latitude: f64,
@@ -105,7 +102,6 @@ impl InputMessageContentLocation {
 /// an inline query.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMessageContentVenue {
     /// Latitude of the venue in degrees.
     pub latitude: f64,
@@ -191,7 +187,6 @@ impl InputMessageContentVenue {
 /// an inline query.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct InputMessageContentContact {
     /// Contact's phone number.
     pub phone_number: String,
diff --git a/src/types/invoice.rs b/src/types/invoice.rs
index 979881e1..cb4383e6 100644
--- a/src/types/invoice.rs
+++ b/src/types/invoice.rs
@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#invoice).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Invoice {
     /// Product name.
     pub title: String,
diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index fc37134a..b245a5a2 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -10,7 +10,6 @@ use crate::types::{KeyboardButtonPollType, True};
 /// [The official docs](https://core.telegram.org/bots/api#keyboardbutton).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct KeyboardButton {
     /// Text of the button. If none of the optional fields are used, it will
     /// be sent as a message when the button is pressed.
@@ -44,7 +43,6 @@ impl KeyboardButton {
 
 // Serialize + Deserialize are implemented by hand
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
-#[non_exhaustive]
 pub enum ButtonRequest {
     Location,
     Contact,
@@ -54,7 +52,6 @@ pub enum ButtonRequest {
 /// Helper struct for (de)serializing [`ButtonRequest`](ButtonRequest)
 #[serde_with_macros::skip_serializing_none]
 #[derive(Serialize, Deserialize)]
-#[non_exhaustive]
 struct RawRequest {
     /// If `true`, the user's phone number will be sent as a contact
     /// when the button is pressed. Available in private chats only.
diff --git a/src/types/keyboard_button_poll_type.rs b/src/types/keyboard_button_poll_type.rs
index 6b24d540..40289dd0 100644
--- a/src/types/keyboard_button_poll_type.rs
+++ b/src/types/keyboard_button_poll_type.rs
@@ -1,7 +1,6 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct KeyboardButtonPollType {
     poll_type: String,
 }
diff --git a/src/types/label_price.rs b/src/types/label_price.rs
index 4c6841a9..704aa5c6 100644
--- a/src/types/label_price.rs
+++ b/src/types/label_price.rs
@@ -4,7 +4,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#labeledprice).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct LabeledPrice {
     /// Portion label.
     pub label: String,
diff --git a/src/types/location.rs b/src/types/location.rs
index e34cee1a..8c37f4fb 100644
--- a/src/types/location.rs
+++ b/src/types/location.rs
@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 /// This object represents a point on the map.
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Location {
     /// Longitude as defined by sender.
     pub longitude: f64,
diff --git a/src/types/login_url.rs b/src/types/login_url.rs
index 5c683df0..e0e647eb 100644
--- a/src/types/login_url.rs
+++ b/src/types/login_url.rs
@@ -14,7 +14,6 @@ use serde::{Deserialize, Serialize};
 /// [Telegram Login Widget]: https://core.telegram.org/widgets/login
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct LoginUrl {
     pub url: String,
     pub forward_text: Option<String>,
diff --git a/src/types/mask_position.rs b/src/types/mask_position.rs
index 8bca0273..cd0d0828 100644
--- a/src/types/mask_position.rs
+++ b/src/types/mask_position.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#maskposition).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MaskPosition {
     /// The part of the face relative to which the mask should be placed. One
     /// of `forehead`, `eyes`, `mouth`, or `chin`.
diff --git a/src/types/me.rs b/src/types/me.rs
index 0b46a030..a9f33848 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [`Bot::get_me`]: crate::Bot::get_me
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Me {
     #[serde(flatten)]
     pub user: User,
diff --git a/src/types/message.rs b/src/types/message.rs
index 6404ebad..fb51b0ae 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -13,7 +13,6 @@ use crate::types::{
 ///
 /// [The official docs](https://core.telegram.org/bots/api#message).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Message {
     /// Unique message identifier inside this chat.
     #[serde(rename = "message_id")]
@@ -65,7 +64,6 @@ impl Message {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum MessageKind {
     Common(MessageCommon),
     NewChatMembers(MessageNewChatMembers),
@@ -87,7 +85,6 @@ pub enum MessageKind {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageCommon {
     /// Sender, empty for messages sent to channels.
     pub from: Option<User>,
@@ -138,7 +135,6 @@ impl MessageCommon {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageNewChatMembers {
     /// New members that were added to the group or supergroup and
     /// information about them (the bot itself may be one of these
@@ -164,7 +160,6 @@ impl MessageNewChatMembers {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageLeftChatMember {
     /// A member was removed from the group, information about them (this
     /// member may be the bot itself).
@@ -189,7 +184,6 @@ impl MessageLeftChatMember {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageNewChatTitle {
     /// A chat title was changed to this value.
     pub new_chat_title: String,
@@ -213,7 +207,6 @@ impl MessageNewChatTitle {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageNewChatPhoto {
     /// A chat photo was change to this value.
     pub new_chat_photo: Vec<PhotoSize>,
@@ -237,7 +230,6 @@ impl MessageNewChatPhoto {
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageDeleteChatPhoto {
     /// Service message: the chat photo was deleted.
     pub delete_chat_photo: True,
@@ -250,7 +242,6 @@ impl MessageDeleteChatPhoto {
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageGroupChatCreated {
     /// Service message: the group has been created.
     pub group_chat_created: True,
@@ -263,7 +254,6 @@ impl MessageGroupChatCreated {
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageSupergroupChatCreated {
     /// Service message: the supergroup has been created. This field can‘t
     /// be received in a message coming through updates, because bot can’t
@@ -280,7 +270,6 @@ impl MessageSupergroupChatCreated {
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageChannelChatCreated {
     /// Service message: the channel has been created. This field can‘t be
     /// received in a message coming through updates, because bot can’t be
@@ -297,7 +286,6 @@ impl MessageChannelChatCreated {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageMigrate {
     /// The group has been migrated to a supergroup with the specified
     /// identifier. This number may be greater than 32 bits and some
@@ -333,7 +321,6 @@ impl MessageMigrate {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessagePinned {
     /// Specified message was pinned. Note that the Message object in this
     /// field will not contain further `reply_to_message` fields even if it
@@ -354,7 +341,6 @@ impl MessagePinned {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageInvoice {
     /// Message is an invoice for a [payment], information about the
     /// invoice. [More about payments »].
@@ -376,7 +362,6 @@ impl MessageInvoice {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageSuccessfulPayment {
     /// Message is a service message about a successful payment,
     /// information about the payment. [More about payments »].
@@ -397,7 +382,6 @@ impl MessageSuccessfulPayment {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageConnectedWebsite {
     /// The domain name of the website on which the user has logged in.
     /// [More about Telegram Login »].
@@ -424,7 +408,6 @@ impl MessageConnectedWebsite {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessagePassportData {
     /// Telegram Passport data.
     pub passport_data: PassportData,
@@ -442,7 +425,6 @@ impl MessagePassportData {
 }
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub enum ForwardedFrom {
     #[serde(rename = "forward_from")]
     User(User),
@@ -452,7 +434,6 @@ pub enum ForwardedFrom {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum ForwardKind {
     Channel(ForwardChannel),
     NonChannel(ForwardNonChannel),
@@ -460,7 +441,6 @@ pub enum ForwardKind {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ForwardChannel {
     #[serde(rename = "forward_date")]
     pub date: i32,
@@ -505,7 +485,6 @@ impl ForwardChannel {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ForwardNonChannel {
     #[serde(rename = "forward_date")]
     pub date: i32,
@@ -531,7 +510,6 @@ impl ForwardNonChannel {
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ForwardOrigin {
     pub reply_to_message: Option<Box<Message>>,
 }
@@ -549,7 +527,6 @@ impl ForwardOrigin {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum MediaKind {
     Animation(MediaAnimation),
     Audio(MediaAudio),
@@ -568,7 +545,6 @@ pub enum MediaKind {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaAnimation {
     /// Message is an animation, information about the animation. For
     /// backward compatibility, when this field is set, the document field
@@ -621,7 +597,6 @@ impl MediaAnimation {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaAudio {
     /// Message is an audio file, information about the file.
     pub audio: Audio,
@@ -666,7 +641,6 @@ impl MediaAudio {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaContact {
     /// Message is a shared contact, information about the contact.
     contact: Contact,
@@ -685,7 +659,6 @@ impl MediaContact {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaDocument {
     /// Message is a general file, information about the file.
     pub document: Document,
@@ -730,7 +703,6 @@ impl MediaDocument {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaGame {
     /// Message is a game, information about the game. [More
     /// about games »].
@@ -751,7 +723,6 @@ impl MediaGame {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaLocation {
     /// Message is a shared location, information about the location.
     pub location: Location,
@@ -770,7 +741,6 @@ impl MediaLocation {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaPhoto {
     /// Message is a photo, available sizes of the photo.
     pub photo: Vec<PhotoSize>,
@@ -836,7 +806,6 @@ impl MediaPhoto {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaPoll {
     /// Message is a native poll, information about the poll.
     pub poll: Poll,
@@ -854,7 +823,6 @@ impl MediaPoll {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaSticker {
     /// Message is a sticker, information about the sticker.
     pub sticker: Sticker,
@@ -872,7 +840,6 @@ impl MediaSticker {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaText {
     /// For text messages, the actual UTF-8 text of the message, 0-4096
     /// characters.
@@ -912,7 +879,6 @@ impl MediaText {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaVideo {
     /// Message is a video, information about the video.
     pub video: Video,
@@ -974,7 +940,6 @@ impl MediaVideo {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaVideoNote {
     /// Message is a [video note], information about the video message.
     ///
@@ -995,7 +960,6 @@ impl MediaVideoNote {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaVoice {
     /// Message is a voice message, information about the file.
     pub voice: Voice,
@@ -1040,7 +1004,6 @@ impl MediaVoice {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MediaVenue {
     /// Message is a venue, information about the venue.
     pub venue: Venue,
@@ -1058,7 +1021,6 @@ impl MediaVenue {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageDice {
     /// Message is a dice with random value from 1 to 6.
     dice: Dice,
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index c39459be..283199d3 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -8,7 +8,6 @@ use crate::types::{Message, User};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#messageentity).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct MessageEntity {
     #[serde(flatten)]
     pub kind: MessageEntityKind,
@@ -44,7 +43,6 @@ impl MessageEntity {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
-#[non_exhaustive]
 pub enum MessageEntityKind {
     Mention,
     Hashtag,
diff --git a/src/types/order_info.rs b/src/types/order_info.rs
index 7f41f7a9..5dca09d7 100644
--- a/src/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -6,7 +6,6 @@ use crate::types::ShippingAddress;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#orderinfo).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct OrderInfo {
     /// User's name.
     pub name: String,
diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
index 44a0ecff..989b2f24 100644
--- a/src/types/parse_mode.rs
+++ b/src/types/parse_mode.rs
@@ -126,7 +126,6 @@ use serde::{Deserialize, Serialize};
 /// [`HTML`]: ParseMode::HTML
 /// [`Markdown`]: ParseMode::Markdown
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub enum ParseMode {
     MarkdownV2,
     HTML,
diff --git a/src/types/passport_data.rs b/src/types/passport_data.rs
index 3abaef93..c2abcd49 100644
--- a/src/types/passport_data.rs
+++ b/src/types/passport_data.rs
@@ -7,7 +7,6 @@ use super::{EncryptedCredentials, EncryptedPassportElement};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportdata).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportData {
     /// Array with information about documents and other Telegram Passport
     /// elements that was shared with the bot.
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index 521584e5..4ccb9335 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerror).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementError {
     /// Error message.
     message: String,
@@ -38,7 +37,6 @@ impl PassportElementError {
 
 #[serde(tag = "source")]
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub enum PassportElementErrorKind {
     #[serde(rename = "data")]
     DataField(PassportElementErrorDataField),
@@ -75,7 +73,6 @@ pub enum PassportElementErrorKind {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrordatafield).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorDataField {
     /// The section of the user's Telegram Passport which has the error.
     pub r#type: PassportElementErrorDataFieldType,
@@ -129,7 +126,6 @@ impl PassportElementErrorDataField {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfrontside).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorFrontSide {
     /// The section of the user's Telegram Passport which has the issue.
     pub r#type: PassportElementErrorFrontSideType,
@@ -168,7 +164,6 @@ impl PassportElementErrorFrontSide {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorreverseside).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorReverseSide {
     /// The section of the user's Telegram Passport which has the issue.
     pub r#type: PassportElementErrorReverseSideType,
@@ -206,7 +201,6 @@ impl PassportElementErrorReverseSide {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorselfie).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorSelfie {
     /// The section of the user's Telegram Passport which has the issue.
     pub r#type: PassportElementErrorSelfieType,
@@ -244,7 +238,6 @@ impl PassportElementErrorSelfie {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfile).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorFile {
     /// The section of the user's Telegram Passport which has the issue.
     pub r#type: PassportElementErrorFileType,
@@ -282,7 +275,6 @@ impl PassportElementErrorFile {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorfiles).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorFiles {
     /// The section of the user's Telegram Passport which has the issue.
     pub r#type: PassportElementErrorFilesType,
@@ -320,7 +312,6 @@ impl PassportElementErrorFiles {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrortranslationfile).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorTranslationFile {
     /// Type of element of the user's Telegram Passport which has the
     /// issue.
@@ -359,7 +350,6 @@ impl PassportElementErrorTranslationFile {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrortranslationfiles).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorTranslationFiles {
     /// Type of element of the user's Telegram Passport which has the issue
     pub r#type: PassportElementErrorTranslationFilesType,
@@ -396,7 +386,6 @@ impl PassportElementErrorTranslationFiles {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportelementerrorunspecified).
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportElementErrorUnspecified {
     /// Type of element of the user's Telegram Passport which has the
     /// issue.
@@ -430,7 +419,6 @@ impl PassportElementErrorUnspecified {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorDataFieldType {
     PersonalDetails,
     Passport,
@@ -442,7 +430,6 @@ pub enum PassportElementErrorDataFieldType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorFrontSideType {
     Passport,
     DriverLicense,
@@ -452,7 +439,6 @@ pub enum PassportElementErrorFrontSideType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorReverseSideType {
     DriverLicense,
     IdentityCard,
@@ -460,7 +446,6 @@ pub enum PassportElementErrorReverseSideType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorSelfieType {
     Passport,
     DriverLicense,
@@ -470,7 +455,6 @@ pub enum PassportElementErrorSelfieType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorFileType {
     UtilityBill,
     BankStatement,
@@ -481,7 +465,6 @@ pub enum PassportElementErrorFileType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorFilesType {
     UtilityBill,
     BankStatement,
@@ -492,7 +475,6 @@ pub enum PassportElementErrorFilesType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorTranslationFileType {
     Passport,
     DriverLicense,
@@ -507,7 +489,6 @@ pub enum PassportElementErrorTranslationFileType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorTranslationFilesType {
     Passport,
     DriverLicense,
@@ -522,7 +503,6 @@ pub enum PassportElementErrorTranslationFilesType {
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum PassportElementErrorUnspecifiedType {
     DataField,
     FrontSide,
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index 448d0c62..f5c68741 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportfile).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PassportFile {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 64ddfac7..91e05639 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 /// [sticker]: crate::types::Sticker
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PhotoSize {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/poll.rs b/src/types/poll.rs
index c3646e3b..54020554 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#poll).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Poll {
     /// Unique poll identifier.
     pub id: String,
@@ -175,7 +174,6 @@ impl Poll {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#polloption).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PollOption {
     /// Option text, 1-100 characters.
     pub text: String,
diff --git a/src/types/poll_answer.rs b/src/types/poll_answer.rs
index 6ddb0b06..ac8c2a6b 100644
--- a/src/types/poll_answer.rs
+++ b/src/types/poll_answer.rs
@@ -2,7 +2,6 @@ use crate::types::User;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PollAnswer {
     /// Unique poll identifier.
     pub poll_id: String,
diff --git a/src/types/poll_type.rs b/src/types/poll_type.rs
index 0243f7c1..61b8acd9 100644
--- a/src/types/poll_type.rs
+++ b/src/types/poll_type.rs
@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
-#[non_exhaustive]
 pub enum PollType {
     Quiz,
     Regular,
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
index 87fd9707..6b03f084 100644
--- a/src/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -7,7 +7,6 @@ use crate::types::{Currency, OrderInfo, User};
 /// [The official docs](https://core.telegram.org/bots/api#precheckoutquery).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct PreCheckoutQuery {
     /// Unique query identifier.
     pub id: String,
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index a8d5983e..9289329e 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -11,7 +11,6 @@ use crate::types::KeyboardButton;
 /// [Introduction to bots]: https://core.telegram.org/bots#keyboards
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
-#[non_exhaustive]
 pub struct ReplyKeyboardMarkup {
     /// Array of button rows, each represented by an Array of
     /// [`KeyboardButton`] objects
diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
index deb8351b..7a4d1643 100644
--- a/src/types/reply_keyboard_remove.rs
+++ b/src/types/reply_keyboard_remove.rs
@@ -14,7 +14,6 @@ use crate::types::True;
 /// [`ReplyKeyboardMarkup`]: crate::types::ReplyKeyboardMarkup
 #[serde_with_macros::skip_serializing_none]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ReplyKeyboardRemove {
     /// Requests clients to remove the custom keyboard (user will not be able
     /// to summon this keyboard; if you want to hide the keyboard from sight
diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
index 4bddc56c..5f0afbbe 100644
--- a/src/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -5,7 +5,6 @@ use crate::types::{ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyK
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, From)]
 #[serde(untagged)]
-#[non_exhaustive]
 pub enum ReplyMarkup {
     InlineKeyboardMarkup(InlineKeyboardMarkup),
     ReplyKeyboardMarkup(ReplyKeyboardMarkup),
diff --git a/src/types/response_parameters.rs b/src/types/response_parameters.rs
index 2f0fb43f..c69ce9e0 100644
--- a/src/types/response_parameters.rs
+++ b/src/types/response_parameters.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#responseparameters).
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum ResponseParameters {
     /// The group has been migrated to a supergroup with the specified
     /// identifier. This number may be greater than 32 bits and some
diff --git a/src/types/send_invoice.rs b/src/types/send_invoice.rs
index bc527b45..c2aedb61 100644
--- a/src/types/send_invoice.rs
+++ b/src/types/send_invoice.rs
@@ -5,7 +5,6 @@ use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice};
 // TODO: missing docs
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct SendInvoice {
     pub chat_id: ChatId,
     pub title: String,
diff --git a/src/types/shipping_address.rs b/src/types/shipping_address.rs
index 3a0adb58..95ae4825 100644
--- a/src/types/shipping_address.rs
+++ b/src/types/shipping_address.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#shippingaddress).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ShippingAddress {
     /// ISO 3166-1 alpha-2 country code.
     pub country_code: CountryCode,
diff --git a/src/types/shipping_option.rs b/src/types/shipping_option.rs
index 983c7eef..af13f5ce 100644
--- a/src/types/shipping_option.rs
+++ b/src/types/shipping_option.rs
@@ -6,7 +6,6 @@ use crate::types::LabeledPrice;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#shippingoption).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ShippingOption {
     /// Shipping option identifier.
     pub id: String,
diff --git a/src/types/shipping_query.rs b/src/types/shipping_query.rs
index bfdf7dc8..06ff5985 100644
--- a/src/types/shipping_query.rs
+++ b/src/types/shipping_query.rs
@@ -6,7 +6,6 @@ use crate::types::{ShippingAddress, User};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#shippingquery).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct ShippingQuery {
     /// Unique query identifier.
     pub id: String,
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index d133f1cc..8851e8ef 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -7,7 +7,6 @@ use crate::types::{MaskPosition, PhotoSize};
 /// [The official docs](https://core.telegram.org/bots/api#sticker).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Sticker {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index 0c617205..0ffb4762 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -6,7 +6,6 @@ use crate::types::{PhotoSize, Sticker};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#stickerset).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct StickerSet {
     /// Sticker set name.
     pub name: String,
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index 607b32c6..1b6da91a 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -3,7 +3,6 @@ use serde::Serialize;
 use crate::types::InputFile;
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
-#[non_exhaustive]
 #[serde(untagged)]
 pub enum StickerType {
     /// PNG image with the sticker, must be up to 512 kilobytes in size,
diff --git a/src/types/successful_payment.rs b/src/types/successful_payment.rs
index 439dbc23..4f7e43b5 100644
--- a/src/types/successful_payment.rs
+++ b/src/types/successful_payment.rs
@@ -7,7 +7,6 @@ use crate::types::{Currency, OrderInfo};
 /// [The official docs](https://core.telegram.org/bots/api#successfulpayment).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct SuccessfulPayment {
     /// Three-letter ISO 4217 [currency] code.
     ///
diff --git a/src/types/update.rs b/src/types/update.rs
index 13514a39..e77656c1 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -13,7 +13,6 @@ use crate::types::{
 ///
 /// [object]: https://core.telegram.org/bots/api#available-types
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Update {
     /// The update‘s unique identifier. Update identifiers start from a certain
     /// positive number and increase sequentially. This ID becomes especially
@@ -49,7 +48,6 @@ impl Update {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-#[non_exhaustive]
 pub enum UpdateKind {
     /// New incoming message of any kind — text, photo, sticker, etc.
     Message(Message),
diff --git a/src/types/user.rs b/src/types/user.rs
index d24f5caa..7db4c14c 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#user).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct User {
     /// Unique identifier for this user or bot.
     pub id: i32,
diff --git a/src/types/user_profile_photos.rs b/src/types/user_profile_photos.rs
index 26d8a934..59935efc 100644
--- a/src/types/user_profile_photos.rs
+++ b/src/types/user_profile_photos.rs
@@ -6,7 +6,6 @@ use crate::types::PhotoSize;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#userprofilephotos).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct UserProfilePhotos {
     /// Total number of profile pictures the target user has.
     pub total_count: u32,
diff --git a/src/types/venue.rs b/src/types/venue.rs
index 3a8ff38a..d8891a44 100644
--- a/src/types/venue.rs
+++ b/src/types/venue.rs
@@ -5,7 +5,6 @@ use crate::types::Location;
 /// This object represents a venue.
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Venue {
     /// Venue location.
     pub location: Location,
diff --git a/src/types/video.rs b/src/types/video.rs
index 84de086a..98241c49 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -7,7 +7,6 @@ use crate::types::{MimeWrapper, PhotoSize};
 /// [The official docs](https://core.telegram.org/bots/api#video).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Video {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index 467ace0e..d8c9ab3f 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -11,7 +11,6 @@ use crate::types::PhotoSize;
 /// [v4.0]: https://telegram.org/blog/video-messages-and-telescope
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct VideoNote {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/voice.rs b/src/types/voice.rs
index bd522cbb..f60cc204 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -6,7 +6,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#voice).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct Voice {
     /// Identifier for this file.
     pub file_id: String,
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 782a588d..aad1cefb 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -5,7 +5,6 @@ use serde::{Deserialize, Serialize};
 /// [The official docs](https://core.telegram.org/bots/api#webhookinfo).
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-#[non_exhaustive]
 pub struct WebhookInfo {
     /// Webhook URL, may be empty if webhook is not set up.
     pub url: String,

From 4467a4de8e3dec0a87607929c04166c43595c355 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 21:30:33 +0300
Subject: [PATCH 086/755] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf1b58fa..83f09e66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - `RequestWithFile`, now multipart requests use `Request`
+- Remove all `#[non_exhaustive]` annotations
   
 
 [`teloxide`]: https://github.com/teloxide/teloxide

From 57867e7c6726deb3db4945cb882758a94a4dea49 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 16 Aug 2020 21:31:55 +0300
Subject: [PATCH 087/755] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf1b58fa..1e0364ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `RequestError::Io(io::Error)` to wrap I/O error those can happen while sending files to telegram
 - Change `StickerType`: instead of newtypes (`Png(InputFile)`) use structs (`Png { png_sticker: InputFile }`), add 
   `StickerType::{png,tgs}` constructors
+- Make all fields of all methods `pub`
 
 ### Removed
 

From 45a55c66de1b38e2e30b4337e1ebe4c40a2c6724 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 22 Aug 2020 20:59:04 +0300
Subject: [PATCH 088/755] rename  `Request` => `RequestOld`

---
 src/bot/download.rs                                     | 2 +-
 src/requests/all/add_sticker_to_set.rs                  | 4 ++--
 src/requests/all/answer_callback_query.rs               | 4 ++--
 src/requests/all/answer_inline_query.rs                 | 4 ++--
 src/requests/all/answer_pre_checkout_query.rs           | 4 ++--
 src/requests/all/answer_shipping_query.rs               | 4 ++--
 src/requests/all/create_new_sticker_set.rs              | 4 ++--
 src/requests/all/delete_chat_photo.rs                   | 4 ++--
 src/requests/all/delete_chat_sticker_set.rs             | 4 ++--
 src/requests/all/delete_message.rs                      | 4 ++--
 src/requests/all/delete_sticker_from_set.rs             | 4 ++--
 src/requests/all/delete_webhook.rs                      | 4 ++--
 src/requests/all/edit_inline_message_caption.rs         | 4 ++--
 src/requests/all/edit_inline_message_live_location.rs   | 4 ++--
 src/requests/all/edit_inline_message_media.rs           | 4 ++--
 src/requests/all/edit_inline_message_reply_markup.rs    | 4 ++--
 src/requests/all/edit_inline_message_text.rs            | 4 ++--
 src/requests/all/edit_message_caption.rs                | 4 ++--
 src/requests/all/edit_message_live_location.rs          | 4 ++--
 src/requests/all/edit_message_media.rs                  | 4 ++--
 src/requests/all/edit_message_reply_markup.rs           | 4 ++--
 src/requests/all/edit_message_text.rs                   | 4 ++--
 src/requests/all/export_chat_invite_link.rs             | 4 ++--
 src/requests/all/forward_message.rs                     | 4 ++--
 src/requests/all/get_chat.rs                            | 4 ++--
 src/requests/all/get_chat_administrators.rs             | 4 ++--
 src/requests/all/get_chat_member.rs                     | 4 ++--
 src/requests/all/get_chat_members_count.rs              | 4 ++--
 src/requests/all/get_file.rs                            | 4 ++--
 src/requests/all/get_game_high_scores.rs                | 4 ++--
 src/requests/all/get_me.rs                              | 4 ++--
 src/requests/all/get_my_commands.rs                     | 4 ++--
 src/requests/all/get_sticker_set.rs                     | 4 ++--
 src/requests/all/get_updates.rs                         | 4 ++--
 src/requests/all/get_updates_non_strict.rs              | 4 ++--
 src/requests/all/get_user_profile_photos.rs             | 4 ++--
 src/requests/all/get_webhook_info.rs                    | 4 ++--
 src/requests/all/kick_chat_member.rs                    | 4 ++--
 src/requests/all/leave_chat.rs                          | 4 ++--
 src/requests/all/pin_chat_message.rs                    | 4 ++--
 src/requests/all/promote_chat_member.rs                 | 4 ++--
 src/requests/all/restrict_chat_member.rs                | 4 ++--
 src/requests/all/send_animation.rs                      | 4 ++--
 src/requests/all/send_audio.rs                          | 4 ++--
 src/requests/all/send_chat_action.rs                    | 4 ++--
 src/requests/all/send_contact.rs                        | 4 ++--
 src/requests/all/send_dice.rs                           | 4 ++--
 src/requests/all/send_document.rs                       | 4 ++--
 src/requests/all/send_game.rs                           | 4 ++--
 src/requests/all/send_invoice.rs                        | 4 ++--
 src/requests/all/send_location.rs                       | 4 ++--
 src/requests/all/send_media_group.rs                    | 4 ++--
 src/requests/all/send_message.rs                        | 4 ++--
 src/requests/all/send_photo.rs                          | 4 ++--
 src/requests/all/send_poll.rs                           | 4 ++--
 src/requests/all/send_sticker.rs                        | 4 ++--
 src/requests/all/send_venue.rs                          | 4 ++--
 src/requests/all/send_video.rs                          | 4 ++--
 src/requests/all/send_video_note.rs                     | 4 ++--
 src/requests/all/send_voice.rs                          | 4 ++--
 src/requests/all/set_chat_administrator_custom_title.rs | 4 ++--
 src/requests/all/set_chat_description.rs                | 4 ++--
 src/requests/all/set_chat_permissions.rs                | 4 ++--
 src/requests/all/set_chat_photo.rs                      | 4 ++--
 src/requests/all/set_chat_sticker_set.rs                | 4 ++--
 src/requests/all/set_chat_title.rs                      | 4 ++--
 src/requests/all/set_game_score.rs                      | 4 ++--
 src/requests/all/set_my_commands.rs                     | 4 ++--
 src/requests/all/set_sticker_position_in_set.rs         | 4 ++--
 src/requests/all/set_sticker_set_thumb.rs               | 4 ++--
 src/requests/all/set_webhook.rs                         | 4 ++--
 src/requests/all/stop_inline_message_live_location.rs   | 4 ++--
 src/requests/all/stop_message_live_location.rs          | 4 ++--
 src/requests/all/stop_poll.rs                           | 4 ++--
 src/requests/all/unban_chat_member.rs                   | 4 ++--
 src/requests/all/unpin_chat_message.rs                  | 4 ++--
 src/requests/all/upload_sticker_file.rs                 | 4 ++--
 src/requests/mod.rs                                     | 2 +-
 78 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/src/bot/download.rs b/src/bot/download.rs
index 3890d79e..241ef325 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -20,7 +20,7 @@ impl Bot {
     /// use teloxide_core::types::File as TgFile;
     /// use tokio::fs::File;
     /// # use teloxide_core::RequestError;
-    /// use teloxide_core::{requests::Request, Bot};
+    /// use teloxide_core::{requests::RequestOld, Bot};
     ///
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
index 3408f36b..a438b355 100644
--- a/src/requests/all/add_sticker_to_set.rs
+++ b/src/requests/all/add_sticker_to_set.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 
 use crate::{
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::StickerType,
 };
 
@@ -28,7 +28,7 @@ pub struct AddStickerToSet {
 }
 
 #[async_trait::async_trait]
-impl Request for AddStickerToSet {
+impl RequestOld for AddStickerToSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/answer_callback_query.rs b/src/requests/all/answer_callback_query.rs
index c74b1e88..3ef9ecb2 100644
--- a/src/requests/all/answer_callback_query.rs
+++ b/src/requests/all/answer_callback_query.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::True,
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct AnswerCallbackQuery {
 }
 
 #[async_trait::async_trait]
-impl Request for AnswerCallbackQuery {
+impl RequestOld for AnswerCallbackQuery {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/answer_inline_query.rs b/src/requests/all/answer_inline_query.rs
index dd1b6a38..62b9a0cd 100644
--- a/src/requests/all/answer_inline_query.rs
+++ b/src/requests/all/answer_inline_query.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineQueryResult, True},
     Bot,
 };
@@ -27,7 +27,7 @@ pub struct AnswerInlineQuery {
 }
 
 #[async_trait::async_trait]
-impl Request for AnswerInlineQuery {
+impl RequestOld for AnswerInlineQuery {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/answer_pre_checkout_query.rs b/src/requests/all/answer_pre_checkout_query.rs
index 2ac4df42..93182add 100644
--- a/src/requests/all/answer_pre_checkout_query.rs
+++ b/src/requests/all/answer_pre_checkout_query.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::True,
     Bot,
 };
@@ -30,7 +30,7 @@ pub struct AnswerPreCheckoutQuery {
 }
 
 #[async_trait::async_trait]
-impl Request for AnswerPreCheckoutQuery {
+impl RequestOld for AnswerPreCheckoutQuery {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/answer_shipping_query.rs b/src/requests/all/answer_shipping_query.rs
index be4d6662..2f90e439 100644
--- a/src/requests/all/answer_shipping_query.rs
+++ b/src/requests/all/answer_shipping_query.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ShippingOption, True},
     Bot,
 };
@@ -27,7 +27,7 @@ pub struct AnswerShippingQuery {
 }
 
 #[async_trait::async_trait]
-impl Request for AnswerShippingQuery {
+impl RequestOld for AnswerShippingQuery {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
index d9c5e9da..b475d916 100644
--- a/src/requests/all/create_new_sticker_set.rs
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{MaskPosition, StickerType, True},
     Bot,
 };
@@ -27,7 +27,7 @@ pub struct CreateNewStickerSet {
 }
 
 #[async_trait::async_trait]
-impl Request for CreateNewStickerSet {
+impl RequestOld for CreateNewStickerSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/delete_chat_photo.rs b/src/requests/all/delete_chat_photo.rs
index 01439bfa..ecea4a19 100644
--- a/src/requests/all/delete_chat_photo.rs
+++ b/src/requests/all/delete_chat_photo.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct DeleteChatPhoto {
 }
 
 #[async_trait::async_trait]
-impl Request for DeleteChatPhoto {
+impl RequestOld for DeleteChatPhoto {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/delete_chat_sticker_set.rs b/src/requests/all/delete_chat_sticker_set.rs
index 9fe228c5..26955913 100644
--- a/src/requests/all/delete_chat_sticker_set.rs
+++ b/src/requests/all/delete_chat_sticker_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -26,7 +26,7 @@ pub struct DeleteChatStickerSet {
 }
 
 #[async_trait::async_trait]
-impl Request for DeleteChatStickerSet {
+impl RequestOld for DeleteChatStickerSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/delete_message.rs b/src/requests/all/delete_message.rs
index 35ead60a..60260d09 100644
--- a/src/requests/all/delete_message.rs
+++ b/src/requests/all/delete_message.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -32,7 +32,7 @@ pub struct DeleteMessage {
 }
 
 #[async_trait::async_trait]
-impl Request for DeleteMessage {
+impl RequestOld for DeleteMessage {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/delete_sticker_from_set.rs b/src/requests/all/delete_sticker_from_set.rs
index 59269f7a..8fd8f8bc 100644
--- a/src/requests/all/delete_sticker_from_set.rs
+++ b/src/requests/all/delete_sticker_from_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::True,
     Bot,
 };
@@ -19,7 +19,7 @@ pub struct DeleteStickerFromSet {
 }
 
 #[async_trait::async_trait]
-impl Request for DeleteStickerFromSet {
+impl RequestOld for DeleteStickerFromSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/delete_webhook.rs b/src/requests/all/delete_webhook.rs
index fd3bd3ba..110cbe38 100644
--- a/src/requests/all/delete_webhook.rs
+++ b/src/requests/all/delete_webhook.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::True,
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct DeleteWebhook {
 }
 
 #[async_trait::async_trait]
-impl Request for DeleteWebhook {
+impl RequestOld for DeleteWebhook {
     type Output = True;
 
     #[allow(clippy::trivially_copy_pass_by_ref)]
diff --git a/src/requests/all/edit_inline_message_caption.rs b/src/requests/all/edit_inline_message_caption.rs
index e777f17c..3937bb6e 100644
--- a/src/requests/all/edit_inline_message_caption.rs
+++ b/src/requests/all/edit_inline_message_caption.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, ParseMode, True},
     Bot,
 };
@@ -26,7 +26,7 @@ pub struct EditInlineMessageCaption {
 }
 
 #[async_trait::async_trait]
-impl Request for EditInlineMessageCaption {
+impl RequestOld for EditInlineMessageCaption {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/edit_inline_message_live_location.rs b/src/requests/all/edit_inline_message_live_location.rs
index 4b267427..ee90f15b 100644
--- a/src/requests/all/edit_inline_message_live_location.rs
+++ b/src/requests/all/edit_inline_message_live_location.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, True},
     Bot,
 };
@@ -28,7 +28,7 @@ pub struct EditInlineMessageLiveLocation {
 }
 
 #[async_trait::async_trait]
-impl Request for EditInlineMessageLiveLocation {
+impl RequestOld for EditInlineMessageLiveLocation {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/edit_inline_message_media.rs b/src/requests/all/edit_inline_message_media.rs
index ea0a4070..c9e9d8e5 100644
--- a/src/requests/all/edit_inline_message_media.rs
+++ b/src/requests/all/edit_inline_message_media.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, InputMedia, True},
     Bot,
 };
@@ -30,7 +30,7 @@ pub struct EditInlineMessageMedia {
 }
 
 #[async_trait::async_trait]
-impl Request for EditInlineMessageMedia {
+impl RequestOld for EditInlineMessageMedia {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/edit_inline_message_reply_markup.rs b/src/requests/all/edit_inline_message_reply_markup.rs
index cd96c686..540bdc6c 100644
--- a/src/requests/all/edit_inline_message_reply_markup.rs
+++ b/src/requests/all/edit_inline_message_reply_markup.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, True},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct EditInlineMessageReplyMarkup {
 }
 
 #[async_trait::async_trait]
-impl Request for EditInlineMessageReplyMarkup {
+impl RequestOld for EditInlineMessageReplyMarkup {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/edit_inline_message_text.rs b/src/requests/all/edit_inline_message_text.rs
index 2b266314..15daf1ab 100644
--- a/src/requests/all/edit_inline_message_text.rs
+++ b/src/requests/all/edit_inline_message_text.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, Message, ParseMode},
     Bot,
 };
@@ -27,7 +27,7 @@ pub struct EditInlineMessageText {
 }
 
 #[async_trait::async_trait]
-impl Request for EditInlineMessageText {
+impl RequestOld for EditInlineMessageText {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/edit_message_caption.rs b/src/requests/all/edit_message_caption.rs
index 9294af93..183fc3a5 100644
--- a/src/requests/all/edit_message_caption.rs
+++ b/src/requests/all/edit_message_caption.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
     Bot,
 };
@@ -27,7 +27,7 @@ pub struct EditMessageCaption {
 }
 
 #[async_trait::async_trait]
-impl Request for EditMessageCaption {
+impl RequestOld for EditMessageCaption {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/edit_message_live_location.rs b/src/requests/all/edit_message_live_location.rs
index c5afd295..e64ad7fc 100644
--- a/src/requests/all/edit_message_live_location.rs
+++ b/src/requests/all/edit_message_live_location.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Message},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct EditMessageLiveLocation {
 }
 
 #[async_trait::async_trait]
-impl Request for EditMessageLiveLocation {
+impl RequestOld for EditMessageLiveLocation {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/edit_message_media.rs b/src/requests/all/edit_message_media.rs
index 826244db..64702536 100644
--- a/src/requests/all/edit_message_media.rs
+++ b/src/requests/all/edit_message_media.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, InputMedia, Message},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct EditMessageMedia {
 }
 
 #[async_trait::async_trait]
-impl Request for EditMessageMedia {
+impl RequestOld for EditMessageMedia {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/edit_message_reply_markup.rs b/src/requests/all/edit_message_reply_markup.rs
index 66aab5bf..82681857 100644
--- a/src/requests/all/edit_message_reply_markup.rs
+++ b/src/requests/all/edit_message_reply_markup.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Message},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct EditMessageReplyMarkup {
 }
 
 #[async_trait::async_trait]
-impl Request for EditMessageReplyMarkup {
+impl RequestOld for EditMessageReplyMarkup {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/edit_message_text.rs b/src/requests/all/edit_message_text.rs
index 12251313..52a0d58b 100644
--- a/src/requests/all/edit_message_text.rs
+++ b/src/requests/all/edit_message_text.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
     Bot,
 };
@@ -28,7 +28,7 @@ pub struct EditMessageText {
 }
 
 #[async_trait::async_trait]
-impl Request for EditMessageText {
+impl RequestOld for EditMessageText {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/export_chat_invite_link.rs b/src/requests/all/export_chat_invite_link.rs
index 51a26437..99a270e4 100644
--- a/src/requests/all/export_chat_invite_link.rs
+++ b/src/requests/all/export_chat_invite_link.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::ChatId,
     Bot,
 };
@@ -35,7 +35,7 @@ pub struct ExportChatInviteLink {
 }
 
 #[async_trait::async_trait]
-impl Request for ExportChatInviteLink {
+impl RequestOld for ExportChatInviteLink {
     type Output = String;
 
     /// Returns the new invite link as `String` on success.
diff --git a/src/requests/all/forward_message.rs b/src/requests/all/forward_message.rs
index feb9ec02..e673f0bc 100644
--- a/src/requests/all/forward_message.rs
+++ b/src/requests/all/forward_message.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message},
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct ForwardMessage {
 }
 
 #[async_trait::async_trait]
-impl Request for ForwardMessage {
+impl RequestOld for ForwardMessage {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/get_chat.rs b/src/requests/all/get_chat.rs
index 11406776..bcd41d50 100644
--- a/src/requests/all/get_chat.rs
+++ b/src/requests/all/get_chat.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{Chat, ChatId},
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct GetChat {
 }
 
 #[async_trait::async_trait]
-impl Request for GetChat {
+impl RequestOld for GetChat {
     type Output = Chat;
 
     async fn send(&self) -> ResponseResult<Chat> {
diff --git a/src/requests/all/get_chat_administrators.rs b/src/requests/all/get_chat_administrators.rs
index 06657ec5..1a727880 100644
--- a/src/requests/all/get_chat_administrators.rs
+++ b/src/requests/all/get_chat_administrators.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, ChatMember},
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct GetChatAdministrators {
 }
 
 #[async_trait::async_trait]
-impl Request for GetChatAdministrators {
+impl RequestOld for GetChatAdministrators {
     type Output = Vec<ChatMember>;
 
     /// On success, returns an array that contains information about all chat
diff --git a/src/requests/all/get_chat_member.rs b/src/requests/all/get_chat_member.rs
index 4ebe3f56..79d6d5f2 100644
--- a/src/requests/all/get_chat_member.rs
+++ b/src/requests/all/get_chat_member.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, ChatMember},
     Bot,
 };
@@ -20,7 +20,7 @@ pub struct GetChatMember {
 }
 
 #[async_trait::async_trait]
-impl Request for GetChatMember {
+impl RequestOld for GetChatMember {
     type Output = ChatMember;
 
     async fn send(&self) -> ResponseResult<ChatMember> {
diff --git a/src/requests/all/get_chat_members_count.rs b/src/requests/all/get_chat_members_count.rs
index 5c78596b..c1776dcf 100644
--- a/src/requests/all/get_chat_members_count.rs
+++ b/src/requests/all/get_chat_members_count.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::ChatId,
     Bot,
 };
@@ -19,7 +19,7 @@ pub struct GetChatMembersCount {
 }
 
 #[async_trait::async_trait]
-impl Request for GetChatMembersCount {
+impl RequestOld for GetChatMembersCount {
     type Output = i32;
 
     async fn send(&self) -> ResponseResult<i32> {
diff --git a/src/requests/all/get_file.rs b/src/requests/all/get_file.rs
index d2d0556c..d2bd7e7a 100644
--- a/src/requests/all/get_file.rs
+++ b/src/requests/all/get_file.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::File,
     Bot,
 };
@@ -35,7 +35,7 @@ pub struct GetFile {
 }
 
 #[async_trait::async_trait]
-impl Request for GetFile {
+impl RequestOld for GetFile {
     type Output = File;
 
     async fn send(&self) -> ResponseResult<File> {
diff --git a/src/requests/all/get_game_high_scores.rs b/src/requests/all/get_game_high_scores.rs
index 1a43d63e..216fd627 100644
--- a/src/requests/all/get_game_high_scores.rs
+++ b/src/requests/all/get_game_high_scores.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{GameHighScore, TargetMessage},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct GetGameHighScores {
 }
 
 #[async_trait::async_trait]
-impl Request for GetGameHighScores {
+impl RequestOld for GetGameHighScores {
     type Output = Vec<GameHighScore>;
 
     async fn send(&self) -> ResponseResult<Vec<GameHighScore>> {
diff --git a/src/requests/all/get_me.rs b/src/requests/all/get_me.rs
index 567b4375..6ebbae5a 100644
--- a/src/requests/all/get_me.rs
+++ b/src/requests/all/get_me.rs
@@ -1,6 +1,6 @@
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::Me,
     Bot,
 };
@@ -16,7 +16,7 @@ pub struct GetMe {
 }
 
 #[async_trait::async_trait]
-impl Request for GetMe {
+impl RequestOld for GetMe {
     type Output = Me;
 
     /// Returns basic information about the bot.
diff --git a/src/requests/all/get_my_commands.rs b/src/requests/all/get_my_commands.rs
index 586bfa28..aa8ae4a1 100644
--- a/src/requests/all/get_my_commands.rs
+++ b/src/requests/all/get_my_commands.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::BotCommand,
     Bot,
 };
@@ -18,7 +18,7 @@ pub struct GetMyCommands {
 }
 
 #[async_trait::async_trait]
-impl Request for GetMyCommands {
+impl RequestOld for GetMyCommands {
     type Output = Vec<BotCommand>;
 
     async fn send(&self) -> ResponseResult<Self::Output> {
diff --git a/src/requests/all/get_sticker_set.rs b/src/requests/all/get_sticker_set.rs
index a8a83bea..0bef0fe7 100644
--- a/src/requests/all/get_sticker_set.rs
+++ b/src/requests/all/get_sticker_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::StickerSet,
     Bot,
 };
@@ -19,7 +19,7 @@ pub struct GetStickerSet {
 }
 
 #[async_trait::async_trait]
-impl Request for GetStickerSet {
+impl RequestOld for GetStickerSet {
     type Output = StickerSet;
 
     async fn send(&self) -> ResponseResult<StickerSet> {
diff --git a/src/requests/all/get_updates.rs b/src/requests/all/get_updates.rs
index a9f4558d..ced014d0 100644
--- a/src/requests/all/get_updates.rs
+++ b/src/requests/all/get_updates.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{AllowedUpdate, Update},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct GetUpdates {
 }
 
 #[async_trait::async_trait]
-impl Request for GetUpdates {
+impl RequestOld for GetUpdates {
     type Output = Vec<Update>;
 
     async fn send(&self) -> ResponseResult<Self::Output> {
diff --git a/src/requests/all/get_updates_non_strict.rs b/src/requests/all/get_updates_non_strict.rs
index 67d326c8..77b7db44 100644
--- a/src/requests/all/get_updates_non_strict.rs
+++ b/src/requests/all/get_updates_non_strict.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{GetUpdates, Request, ResponseResult},
+    requests::{GetUpdates, RequestOld, ResponseResult},
     types::{AllowedUpdate, NonStrictVec, Update},
     Bot,
 };
@@ -20,7 +20,7 @@ use crate::{
 pub struct GetUpdatesNonStrict(pub GetUpdates);
 
 #[async_trait::async_trait]
-impl Request for GetUpdatesNonStrict {
+impl RequestOld for GetUpdatesNonStrict {
     type Output = NonStrictVec<Update>;
 
     async fn send(&self) -> ResponseResult<Self::Output> {
diff --git a/src/requests/all/get_user_profile_photos.rs b/src/requests/all/get_user_profile_photos.rs
index 663a07a4..71a4e6b9 100644
--- a/src/requests/all/get_user_profile_photos.rs
+++ b/src/requests/all/get_user_profile_photos.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::UserProfilePhotos,
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct GetUserProfilePhotos {
 }
 
 #[async_trait::async_trait]
-impl Request for GetUserProfilePhotos {
+impl RequestOld for GetUserProfilePhotos {
     type Output = UserProfilePhotos;
 
     async fn send(&self) -> ResponseResult<UserProfilePhotos> {
diff --git a/src/requests/all/get_webhook_info.rs b/src/requests/all/get_webhook_info.rs
index 51424471..086b7464 100644
--- a/src/requests/all/get_webhook_info.rs
+++ b/src/requests/all/get_webhook_info.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::WebhookInfo,
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct GetWebhookInfo {
 }
 
 #[async_trait::async_trait]
-impl Request for GetWebhookInfo {
+impl RequestOld for GetWebhookInfo {
     type Output = WebhookInfo;
 
     #[allow(clippy::trivially_copy_pass_by_ref)]
diff --git a/src/requests/all/kick_chat_member.rs b/src/requests/all/kick_chat_member.rs
index 31953949..d82309b9 100644
--- a/src/requests/all/kick_chat_member.rs
+++ b/src/requests/all/kick_chat_member.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -28,7 +28,7 @@ pub struct KickChatMember {
 }
 
 #[async_trait::async_trait]
-impl Request for KickChatMember {
+impl RequestOld for KickChatMember {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/leave_chat.rs b/src/requests/all/leave_chat.rs
index d0411efb..1b7aad6a 100644
--- a/src/requests/all/leave_chat.rs
+++ b/src/requests/all/leave_chat.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -19,7 +19,7 @@ pub struct LeaveChat {
 }
 
 #[async_trait::async_trait]
-impl Request for LeaveChat {
+impl RequestOld for LeaveChat {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/pin_chat_message.rs b/src/requests/all/pin_chat_message.rs
index ae1f3227..b2547611 100644
--- a/src/requests/all/pin_chat_message.rs
+++ b/src/requests/all/pin_chat_message.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct PinChatMessage {
 }
 
 #[async_trait::async_trait]
-impl Request for PinChatMessage {
+impl RequestOld for PinChatMessage {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/promote_chat_member.rs b/src/requests/all/promote_chat_member.rs
index 468b3c48..24caa2dc 100644
--- a/src/requests/all/promote_chat_member.rs
+++ b/src/requests/all/promote_chat_member.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -32,7 +32,7 @@ pub struct PromoteChatMember {
 }
 
 #[async_trait::async_trait]
-impl Request for PromoteChatMember {
+impl RequestOld for PromoteChatMember {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/restrict_chat_member.rs b/src/requests/all/restrict_chat_member.rs
index 6b825b91..2068330d 100644
--- a/src/requests/all/restrict_chat_member.rs
+++ b/src/requests/all/restrict_chat_member.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, ChatPermissions, True},
     Bot,
 };
@@ -26,7 +26,7 @@ pub struct RestrictChatMember {
 }
 
 #[async_trait::async_trait]
-impl Request for RestrictChatMember {
+impl RequestOld for RestrictChatMember {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/send_animation.rs b/src/requests/all/send_animation.rs
index 6e5ef1cb..f8ef0b80 100644
--- a/src/requests/all/send_animation.rs
+++ b/src/requests/all/send_animation.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -33,7 +33,7 @@ pub struct SendAnimation {
 }
 
 #[async_trait::async_trait]
-impl Request for SendAnimation {
+impl RequestOld for SendAnimation {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_audio.rs b/src/requests/all/send_audio.rs
index dc61458c..fa8ff851 100644
--- a/src/requests/all/send_audio.rs
+++ b/src/requests/all/send_audio.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -37,7 +37,7 @@ pub struct SendAudio {
 }
 
 #[async_trait::async_trait]
-impl Request for SendAudio {
+impl RequestOld for SendAudio {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_chat_action.rs b/src/requests/all/send_chat_action.rs
index 5fe853b2..2301274a 100644
--- a/src/requests/all/send_chat_action.rs
+++ b/src/requests/all/send_chat_action.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -71,7 +71,7 @@ pub enum SendChatActionKind {
 }
 
 #[async_trait::async_trait]
-impl Request for SendChatAction {
+impl RequestOld for SendChatAction {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/send_contact.rs b/src/requests/all/send_contact.rs
index ef3ff034..36680019 100644
--- a/src/requests/all/send_contact.rs
+++ b/src/requests/all/send_contact.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message, ReplyMarkup},
     Bot,
 };
@@ -26,7 +26,7 @@ pub struct SendContact {
 }
 
 #[async_trait::async_trait]
-impl Request for SendContact {
+impl RequestOld for SendContact {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_dice.rs b/src/requests/all/send_dice.rs
index 663d7001..8a384daf 100644
--- a/src/requests/all/send_dice.rs
+++ b/src/requests/all/send_dice.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, DiceEmoji, Message, ReplyMarkup},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct SendDice {
 }
 
 #[async_trait::async_trait]
-impl Request for SendDice {
+impl RequestOld for SendDice {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_document.rs b/src/requests/all/send_document.rs
index e865a008..e27d7796 100644
--- a/src/requests/all/send_document.rs
+++ b/src/requests/all/send_document.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct SendDocument {
 }
 
 #[async_trait::async_trait]
-impl Request for SendDocument {
+impl RequestOld for SendDocument {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_game.rs b/src/requests/all/send_game.rs
index 03a0b0e2..d02270a0 100644
--- a/src/requests/all/send_game.rs
+++ b/src/requests/all/send_game.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, Message},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct SendGame {
 }
 
 #[async_trait::async_trait]
-impl Request for SendGame {
+impl RequestOld for SendGame {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_invoice.rs b/src/requests/all/send_invoice.rs
index 8466cdba..f36c5bd3 100644
--- a/src/requests/all/send_invoice.rs
+++ b/src/requests/all/send_invoice.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, LabeledPrice, Message},
     Bot,
 };
@@ -41,7 +41,7 @@ pub struct SendInvoice {
 }
 
 #[async_trait::async_trait]
-impl Request for SendInvoice {
+impl RequestOld for SendInvoice {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_location.rs b/src/requests/all/send_location.rs
index 20201ad1..5b78d64c 100644
--- a/src/requests/all/send_location.rs
+++ b/src/requests/all/send_location.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message, ReplyMarkup},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct SendLocation {
 }
 
 #[async_trait::async_trait]
-impl Request for SendLocation {
+impl RequestOld for SendLocation {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_media_group.rs b/src/requests/all/send_media_group.rs
index e7adb68a..790dcd13 100644
--- a/src/requests/all/send_media_group.rs
+++ b/src/requests/all/send_media_group.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputMedia, Message},
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct SendMediaGroup {
 }
 
 #[async_trait::async_trait]
-impl Request for SendMediaGroup {
+impl RequestOld for SendMediaGroup {
     type Output = Vec<Message>;
 
     async fn send(&self) -> ResponseResult<Vec<Message>> {
diff --git a/src/requests/all/send_message.rs b/src/requests/all/send_message.rs
index 29525cb9..a1c9b3b0 100644
--- a/src/requests/all/send_message.rs
+++ b/src/requests/all/send_message.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct SendMessage {
 }
 
 #[async_trait::async_trait]
-impl Request for SendMessage {
+impl RequestOld for SendMessage {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_photo.rs b/src/requests/all/send_photo.rs
index 42ad8e6f..c3f80428 100644
--- a/src/requests/all/send_photo.rs
+++ b/src/requests/all/send_photo.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct SendPhoto {
 }
 
 #[async_trait::async_trait]
-impl Request for SendPhoto {
+impl RequestOld for SendPhoto {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_poll.rs b/src/requests/all/send_poll.rs
index 3dd412a1..0ae1462e 100644
--- a/src/requests/all/send_poll.rs
+++ b/src/requests/all/send_poll.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message, ParseMode, PollType, ReplyMarkup},
     Bot,
 };
@@ -33,7 +33,7 @@ pub struct SendPoll {
 }
 
 #[async_trait::async_trait]
-impl Request for SendPoll {
+impl RequestOld for SendPoll {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_sticker.rs b/src/requests/all/send_sticker.rs
index dd25c9bb..4f8f076d 100644
--- a/src/requests/all/send_sticker.rs
+++ b/src/requests/all/send_sticker.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ReplyMarkup},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct SendSticker {
 }
 
 #[async_trait::async_trait]
-impl Request for SendSticker {
+impl RequestOld for SendSticker {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_venue.rs b/src/requests/all/send_venue.rs
index 513ece7d..30dfcc68 100644
--- a/src/requests/all/send_venue.rs
+++ b/src/requests/all/send_venue.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, Message, ReplyMarkup},
     Bot,
 };
@@ -28,7 +28,7 @@ pub struct SendVenue {
 }
 
 #[async_trait::async_trait]
-impl Request for SendVenue {
+impl RequestOld for SendVenue {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_video.rs b/src/requests/all/send_video.rs
index 3f218f10..c6796e03 100644
--- a/src/requests/all/send_video.rs
+++ b/src/requests/all/send_video.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -34,7 +34,7 @@ pub struct SendVideo {
 }
 
 #[async_trait::async_trait]
-impl Request for SendVideo {
+impl RequestOld for SendVideo {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_video_note.rs b/src/requests/all/send_video_note.rs
index 9a0e07dd..a3cca070 100644
--- a/src/requests/all/send_video_note.rs
+++ b/src/requests/all/send_video_note.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ReplyMarkup},
     Bot,
 };
@@ -29,7 +29,7 @@ pub struct SendVideoNote {
 }
 
 #[async_trait::async_trait]
-impl Request for SendVideoNote {
+impl RequestOld for SendVideoNote {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/send_voice.rs b/src/requests/all/send_voice.rs
index 6bfc301a..c99bfd57 100644
--- a/src/requests/all/send_voice.rs
+++ b/src/requests/all/send_voice.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
     Bot,
 };
@@ -35,7 +35,7 @@ pub struct SendVoice {
 }
 
 #[async_trait::async_trait]
-impl Request for SendVoice {
+impl RequestOld for SendVoice {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/set_chat_administrator_custom_title.rs b/src/requests/all/set_chat_administrator_custom_title.rs
index a3211811..1427cf21 100644
--- a/src/requests/all/set_chat_administrator_custom_title.rs
+++ b/src/requests/all/set_chat_administrator_custom_title.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct SetChatAdministratorCustomTitle {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatAdministratorCustomTitle {
+impl RequestOld for SetChatAdministratorCustomTitle {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_chat_description.rs b/src/requests/all/set_chat_description.rs
index 092c495b..acfd4acc 100644
--- a/src/requests/all/set_chat_description.rs
+++ b/src/requests/all/set_chat_description.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -24,7 +24,7 @@ pub struct SetChatDescription {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatDescription {
+impl RequestOld for SetChatDescription {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_chat_permissions.rs b/src/requests/all/set_chat_permissions.rs
index aaa1881b..3b2b55d1 100644
--- a/src/requests/all/set_chat_permissions.rs
+++ b/src/requests/all/set_chat_permissions.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, ChatPermissions, True},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct SetChatPermissions {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatPermissions {
+impl RequestOld for SetChatPermissions {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_chat_photo.rs b/src/requests/all/set_chat_photo.rs
index dcc5febc..8ddf9365 100644
--- a/src/requests/all/set_chat_photo.rs
+++ b/src/requests/all/set_chat_photo.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InputFile, True},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct SetChatPhoto {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatPhoto {
+impl RequestOld for SetChatPhoto {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_chat_sticker_set.rs b/src/requests/all/set_chat_sticker_set.rs
index 010a10f5..c21782f9 100644
--- a/src/requests/all/set_chat_sticker_set.rs
+++ b/src/requests/all/set_chat_sticker_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -24,7 +24,7 @@ pub struct SetChatStickerSet {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatStickerSet {
+impl RequestOld for SetChatStickerSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_chat_title.rs b/src/requests/all/set_chat_title.rs
index 7d6ae6d1..73d556d4 100644
--- a/src/requests/all/set_chat_title.rs
+++ b/src/requests/all/set_chat_title.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct SetChatTitle {
 }
 
 #[async_trait::async_trait]
-impl Request for SetChatTitle {
+impl RequestOld for SetChatTitle {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_game_score.rs b/src/requests/all/set_game_score.rs
index 8e429e3a..a5a75933 100644
--- a/src/requests/all/set_game_score.rs
+++ b/src/requests/all/set_game_score.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{Message, TargetMessage},
     Bot,
 };
@@ -32,7 +32,7 @@ pub struct SetGameScore {
 }
 
 #[async_trait::async_trait]
-impl Request for SetGameScore {
+impl RequestOld for SetGameScore {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/set_my_commands.rs b/src/requests/all/set_my_commands.rs
index 831f9705..a2f0785f 100644
--- a/src/requests/all/set_my_commands.rs
+++ b/src/requests/all/set_my_commands.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{BotCommand, True},
     Bot,
 };
@@ -20,7 +20,7 @@ pub struct SetMyCommands {
 }
 
 #[async_trait::async_trait]
-impl Request for SetMyCommands {
+impl RequestOld for SetMyCommands {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<Self::Output> {
diff --git a/src/requests/all/set_sticker_position_in_set.rs b/src/requests/all/set_sticker_position_in_set.rs
index 4ed78551..5c649adb 100644
--- a/src/requests/all/set_sticker_position_in_set.rs
+++ b/src/requests/all/set_sticker_position_in_set.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::True,
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct SetStickerPositionInSet {
 }
 
 #[async_trait::async_trait]
-impl Request for SetStickerPositionInSet {
+impl RequestOld for SetStickerPositionInSet {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/set_sticker_set_thumb.rs b/src/requests/all/set_sticker_set_thumb.rs
index 1f84aacd..51d04041 100644
--- a/src/requests/all/set_sticker_set_thumb.rs
+++ b/src/requests/all/set_sticker_set_thumb.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InputFile, True},
     Bot,
 };
@@ -22,7 +22,7 @@ pub struct SetStickerSetThumb {
 }
 
 #[async_trait::async_trait]
-impl Request for SetStickerSetThumb {
+impl RequestOld for SetStickerSetThumb {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<Self::Output> {
diff --git a/src/requests/all/set_webhook.rs b/src/requests/all/set_webhook.rs
index c2aff792..0eb38fe4 100644
--- a/src/requests/all/set_webhook.rs
+++ b/src/requests/all/set_webhook.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{AllowedUpdate, InputFile, True},
     Bot,
 };
@@ -35,7 +35,7 @@ pub struct SetWebhook {
 }
 
 #[async_trait::async_trait]
-impl Request for SetWebhook {
+impl RequestOld for SetWebhook {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/stop_inline_message_live_location.rs b/src/requests/all/stop_inline_message_live_location.rs
index 40fb5604..43b80f46 100644
--- a/src/requests/all/stop_inline_message_live_location.rs
+++ b/src/requests/all/stop_inline_message_live_location.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{InlineKeyboardMarkup, Message},
     Bot,
 };
@@ -25,7 +25,7 @@ pub struct StopInlineMessageLiveLocation {
 }
 
 #[async_trait::async_trait]
-impl Request for StopInlineMessageLiveLocation {
+impl RequestOld for StopInlineMessageLiveLocation {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/stop_message_live_location.rs b/src/requests/all/stop_message_live_location.rs
index 892492ea..17d43a68 100644
--- a/src/requests/all/stop_message_live_location.rs
+++ b/src/requests/all/stop_message_live_location.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Message},
     Bot,
 };
@@ -26,7 +26,7 @@ pub struct StopMessageLiveLocation {
 }
 
 #[async_trait::async_trait]
-impl Request for StopMessageLiveLocation {
+impl RequestOld for StopMessageLiveLocation {
     type Output = Message;
 
     async fn send(&self) -> ResponseResult<Message> {
diff --git a/src/requests/all/stop_poll.rs b/src/requests/all/stop_poll.rs
index 946b4760..981d1efa 100644
--- a/src/requests/all/stop_poll.rs
+++ b/src/requests/all/stop_poll.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, InlineKeyboardMarkup, Poll},
     Bot,
 };
@@ -21,7 +21,7 @@ pub struct StopPoll {
 }
 
 #[async_trait::async_trait]
-impl Request for StopPoll {
+impl RequestOld for StopPoll {
     type Output = Poll;
 
     /// On success, the stopped [`Poll`] with the final results is returned.
diff --git a/src/requests/all/unban_chat_member.rs b/src/requests/all/unban_chat_member.rs
index 5aee625c..5065b21d 100644
--- a/src/requests/all/unban_chat_member.rs
+++ b/src/requests/all/unban_chat_member.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct UnbanChatMember {
 }
 
 #[async_trait::async_trait]
-impl Request for UnbanChatMember {
+impl RequestOld for UnbanChatMember {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/unpin_chat_message.rs b/src/requests/all/unpin_chat_message.rs
index 15e76a99..611d4f09 100644
--- a/src/requests/all/unpin_chat_message.rs
+++ b/src/requests/all/unpin_chat_message.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{ChatId, True},
     Bot,
 };
@@ -23,7 +23,7 @@ pub struct UnpinChatMessage {
 }
 
 #[async_trait::async_trait]
-impl Request for UnpinChatMessage {
+impl RequestOld for UnpinChatMessage {
     type Output = True;
 
     async fn send(&self) -> ResponseResult<True> {
diff --git a/src/requests/all/upload_sticker_file.rs b/src/requests/all/upload_sticker_file.rs
index b09b143f..4428c525 100644
--- a/src/requests/all/upload_sticker_file.rs
+++ b/src/requests/all/upload_sticker_file.rs
@@ -2,7 +2,7 @@ use serde::Serialize;
 
 use crate::{
     net,
-    requests::{Request, ResponseResult},
+    requests::{RequestOld, ResponseResult},
     types::{File, InputFile},
     Bot,
 };
@@ -24,7 +24,7 @@ pub struct UploadStickerFile {
     png_sticker: InputFile,
 }
 #[async_trait::async_trait]
-impl Request for UploadStickerFile {
+impl RequestOld for UploadStickerFile {
     type Output = File;
 
     async fn send(&self) -> ResponseResult<File> {
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 86536cb9..238a5fc9 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -10,7 +10,7 @@ pub type ResponseResult<T> = Result<T, crate::RequestError>;
 
 /// Designates an API request.
 #[async_trait::async_trait]
-pub trait Request {
+pub trait RequestOld {
     /// A data structure returned if success.
     type Output;
 

From 76d47276f682ec4160a4553a46770963df325bdb Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 22 Aug 2020 21:58:22 +0300
Subject: [PATCH 089/755] requests redesign part 0

This commit introduces 3 traits mentioned in requests redesign proposal:
- `Payload`
- `HasPayload`
- `Request`

Also it adds `Output<T>` alias to `<<T as HasPayload>::Payload as Payload>::Output`
---
 src/lib.rs                  |  3 +-
 src/requests/has_payload.rs | 45 ++++++++++++++++++++++++
 src/requests/mod.rs         | 10 ++++++
 src/requests/payload.rs     | 20 +++++++++++
 src/requests/request.rs     | 69 +++++++++++++++++++++++++++++++++++++
 5 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 src/requests/has_payload.rs
 create mode 100644 src/requests/payload.rs
 create mode 100644 src/requests/request.rs

diff --git a/src/lib.rs b/src/lib.rs
index 8ea7ef81..4736649d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,8 @@
 // ```console
 // $ RUSTDOCFLAGS="--cfg docsrs" cargo doc --open --all-features
 // ```
-#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg))]
+#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
+#![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![forbid(unsafe_code)]
 //#![deny(missing_docs)]
 
diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
new file mode 100644
index 00000000..e5e06807
--- /dev/null
+++ b/src/requests/has_payload.rs
@@ -0,0 +1,45 @@
+use crate::requests::Payload;
+
+/// Represent types that have payload inside it. E.g.: the payload itself or a
+/// `Request`.
+///
+/// This trait is something between [`DerefMut`] and [`BorrowMut`] — it allows
+/// only one implementation per type (the [output] is associated type, not a
+/// generic), have implementations for all types `P` such `P: `[`Payload`], but
+/// have no magic compiler support like [`DerefMut`] does nor does it require
+/// any laws about `Eq`, `Ord` and `Hash` as [`BorrowMut`] does.
+///
+/// Also [output] type is bounded by [`Payload`] trait.
+///
+/// This trait is mostly used to implement payload setters (on both payloads &
+/// requests), so you probably won't find yourself using it directly.
+///
+/// [`DerefMut`]: std::ops::DerefMut
+/// [`BorrowMut`]: std::borrow::BorrowMut
+/// [`Payload`]: crate::requests::Payload
+/// [output]: HasPayload::Payload
+pub trait HasPayload {
+    /// Type of the payload contained.
+    type Payload: Payload;
+
+    /// Gain mutable access to the underlying payload.
+    fn payload_mut(&mut self) -> &mut Self::Payload;
+
+    /// Gain immutable access to the underlying payload.
+    fn payload_ref(&self) -> &Self::Payload;
+}
+
+impl<P> HasPayload for P
+where
+    P: Payload,
+{
+    type Payload = Self;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self
+    }
+}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 238a5fc9..66551904 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -1,5 +1,11 @@
 //! API requests.
 
+mod has_payload;
+mod payload;
+mod request;
+
+pub use self::{has_payload::HasPayload, payload::Payload, request::Request};
+
 mod all;
 mod utils;
 
@@ -8,6 +14,10 @@ pub use all::*;
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
 
+/// Output of a [`Payload`] in [`HasPayload`]. Alias to
+/// `<<T as HasPayload>::Payload as Payload>::Output`.
+pub type Output<T> = <<T as HasPayload>::Payload as Payload>::Output;
+
 /// Designates an API request.
 #[async_trait::async_trait]
 pub trait RequestOld {
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
new file mode 100644
index 00000000..0e02531d
--- /dev/null
+++ b/src/requests/payload.rs
@@ -0,0 +1,20 @@
+/// Payload of a request.
+///
+/// Simply speaking structs implementing this trait represent arguments of
+/// a telegram bot API method.
+///
+/// This trait provides some additional information needed for sending request
+/// to the telegram.
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+pub trait Payload {
+    /// Return type of the telegram method.
+    ///
+    /// Note: that should not include result wrappers (e.g. it should be simply
+    /// `Message`, `True` or something else)
+    type Output;
+
+    /// Name of the telegram method. Case insensitive, though must not include
+    /// underscores. (e.g.: `GetMe`, `GETME`, `getme`, `getMe` are ok, but
+    /// `get_me` is not ok)
+    const NAME: &'static str;
+}
diff --git a/src/requests/request.rs b/src/requests/request.rs
new file mode 100644
index 00000000..9deb2cdc
--- /dev/null
+++ b/src/requests/request.rs
@@ -0,0 +1,69 @@
+use std::future::Future;
+
+use crate::requests::{HasPayload, Output};
+
+/// A ready-to-send telegram request.
+// FIXME(waffle): Write better doc for the trait
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+pub trait Request: HasPayload {
+    /*
+     * Could be mostly `core::future::IntoFuture` though there is no reason to
+     * use it before it's integrated in async/await
+     */
+
+    /// Type of error that may happen during sending the request to telegram.
+    type Err;
+
+    /// Type of future returned by [`send`](Request::send) method.
+    type Send: Future<Output = Result<Output<Self>, Self::Err>>;
+
+    /// Type of future returned by [`send_ref`](Request::send_ref) method.
+    ///
+    /// NOTE: it intentionally forbids borrowing from self
+    // though anyway we couldn't allow borrowing without GATs :sob:
+    type SendRef: Future<Output = Result<Output<Self>, Self::Err>>;
+
+    /// Send the request.
+    ///
+    /// ## Examples
+    // FIXME(waffle): ignored until full request redesign lands
+    /// ```ignore
+    /// # async {
+    /// use teloxide_core::{methods::GetMe, requests::{Request, RequestJson}, types::User, bot::Bot};
+    ///
+    /// let bot = Bot::new("TOKEN");
+    /// let method = GetMe::new();
+    /// let request = JsonRequest::new(bot, method);
+    /// let _: User = request.send().await.unwrap();
+    /// # }
+    /// ```
+    fn send(self) -> Self::Send;
+
+    /// Send the request.
+    ///
+    /// This method is analogous to [`send`](Request::send), but it doesn't take
+    /// the ownership of `self`. This allows to send the same (or slightly
+    /// different) requests over and over.
+    ///
+    /// _Also_ it is expected that calling this method is better than just
+    /// `clone`ing the requests. (because instead of copying all the data
+    /// and then serializing it, this method should just serialize the data)
+    ///
+    /// ## Examples
+    // FIXME(waffle): ignored until full request redisign lands
+    /// ```ignore
+    /// # async {
+    /// use teloxide_core::prelude::*;
+    ///
+    /// let bot = Bot::new("TOKEN");
+    /// # let chat_ids = vec![1, 2, 3, 4].into_iter().map(Into::into);
+    ///
+    /// let mut req = bot.send_message(0, "Hi there!");
+    /// for chat_id in chat_ids {
+    ///     req.chat_id = chat_id;
+    ///     req.send_ref().await.unwrap();
+    /// }
+    /// # }
+    /// ```
+    fn send_ref(&self) -> Self::SendRef;
+}

From c773ce7affc9b42c61933de053cc6de5cc48234e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 24 Aug 2020 15:50:15 +0300
Subject: [PATCH 090/755] implement `HasPayload` in terms of `As{Ref,Mut}`

---
 src/requests/has_payload.rs | 18 +++++++-----------
 src/requests/payload.rs     |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index e5e06807..ef2e3d28 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -18,15 +18,19 @@ use crate::requests::Payload;
 /// [`BorrowMut`]: std::borrow::BorrowMut
 /// [`Payload`]: crate::requests::Payload
 /// [output]: HasPayload::Payload
-pub trait HasPayload {
+pub trait HasPayload: AsMut<<Self as HasPayload>::Payload> + AsRef<<Self as HasPayload>::Payload> {
     /// Type of the payload contained.
     type Payload: Payload;
 
     /// Gain mutable access to the underlying payload.
-    fn payload_mut(&mut self) -> &mut Self::Payload;
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self.as_mut()
+    }
 
     /// Gain immutable access to the underlying payload.
-    fn payload_ref(&self) -> &Self::Payload;
+    fn payload_ref(&self) -> &Self::Payload {
+        self.as_ref()
+    }
 }
 
 impl<P> HasPayload for P
@@ -34,12 +38,4 @@ where
     P: Payload,
 {
     type Payload = Self;
-
-    fn payload_mut(&mut self) -> &mut Self::Payload {
-        self
-    }
-
-    fn payload_ref(&self) -> &Self::Payload {
-        self
-    }
 }
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 0e02531d..539c9971 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -6,7 +6,7 @@
 /// This trait provides some additional information needed for sending request
 /// to the telegram.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
-pub trait Payload {
+pub trait Payload: AsMut<Self> + AsRef<Self> {
     /// Return type of the telegram method.
     ///
     /// Note: that should not include result wrappers (e.g. it should be simply

From 88004607d3a1b1b5db4d88121ca53a8a423c2d1d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 24 Aug 2020 17:08:55 +0300
Subject: [PATCH 091/755] fmt

---
 src/requests/has_payload.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index ef2e3d28..783e15a0 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -18,7 +18,9 @@ use crate::requests::Payload;
 /// [`BorrowMut`]: std::borrow::BorrowMut
 /// [`Payload`]: crate::requests::Payload
 /// [output]: HasPayload::Payload
-pub trait HasPayload: AsMut<<Self as HasPayload>::Payload> + AsRef<<Self as HasPayload>::Payload> {
+pub trait HasPayload:
+    AsMut<<Self as HasPayload>::Payload> + AsRef<<Self as HasPayload>::Payload>
+{
     /// Type of the payload contained.
     type Payload: Payload;
 

From 1f295f6f36524e98e794776dcbc17cac59e90af5 Mon Sep 17 00:00:00 2001
From: Robin Hundt <24554122+robinhundt@users.noreply.github.com>
Date: Fri, 28 Aug 2020 23:17:28 +0200
Subject: [PATCH 092/755] Use FromStr in default parser

---
 src/fields_parse.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 7ed83e1e..25c42dae 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -67,15 +67,20 @@ pub fn impl_parse_args_named(
 
 fn create_parser<'a>(
     parser_type: &ParserType,
-    types: impl Iterator<Item = &'a Type>,
+    mut types: impl Iterator<Item = &'a Type>,
     count_args: usize,
 ) -> quote::__private::TokenStream {
     let function_to_parse = match parser_type {
-        ParserType::Default => match count_args {
-            1 => {
-                quote! { (|s: String| Ok((s,))) }
+        ParserType::Default => match types.next() {
+            Some(ty) => {
+                quote! { (|s: String| {
+                    let res = <#ty>::from_str(&s)
+                        .map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error + Send + Sync + 'static> = e.into(); e }))?;
+                    Ok((res, ))
+                 })
+                }
             }
-            _ => quote! { compile_error!("Expected 1 argument") },
+            None => quote! { compile_error!("Expected 1 argument") },
         },
         ParserType::Split { separator } => parser_with_separator(
             &separator.clone().unwrap_or_else(|| " ".to_owned()),

From fc7126d7271f810acd2f8625981467dc516825e1 Mon Sep 17 00:00:00 2001
From: Robin Hundt <24554122+robinhundt@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:29:52 +0200
Subject: [PATCH 093/755] Check count_args in create_parser

---
 src/fields_parse.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 25c42dae..440b45e5 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -71,8 +71,9 @@ fn create_parser<'a>(
     count_args: usize,
 ) -> quote::__private::TokenStream {
     let function_to_parse = match parser_type {
-        ParserType::Default => match types.next() {
-            Some(ty) => {
+        ParserType::Default => match count_args {
+            1 => {
+                let ty = types.next().expect("count_args != types.len()");
                 quote! { (|s: String| {
                     let res = <#ty>::from_str(&s)
                         .map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error + Send + Sync + 'static> = e.into(); e }))?;
@@ -80,7 +81,7 @@ fn create_parser<'a>(
                  })
                 }
             }
-            None => quote! { compile_error!("Expected 1 argument") },
+            _ => quote! { compile_error!("Expected exactly 1 argument") },
         },
         ParserType::Split { separator } => parser_with_separator(
             &separator.clone().unwrap_or_else(|| " ".to_owned()),

From 07a403c27987aad1a33ec821b7a013080d3b0f55 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 19 Sep 2020 19:00:23 +0300
Subject: [PATCH 094/755] implement default Bot's {Json,Multipart}Request

---
 Cargo.toml                         |   1 +
 src/bot/mod.rs                     |  53 ++++++++++++-
 src/local_macros.rs                |  70 +++++++++++++++++
 src/net/mod.rs                     |   2 +-
 src/net/request.rs                 |  49 +++++++++++-
 src/requests/json.rs               | 106 ++++++++++++++++++++++++++
 src/requests/mod.rs                |   4 +
 src/requests/multipart.rs          | 116 +++++++++++++++++++++++++++++
 src/requests/request.rs            |   2 +-
 src/serde_multipart/serializers.rs |  15 ++++
 10 files changed, 413 insertions(+), 5 deletions(-)
 create mode 100644 src/requests/json.rs
 create mode 100644 src/requests/multipart.rs

diff --git a/Cargo.toml b/Cargo.toml
index 72ea17a1..f97d63f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,6 +19,7 @@ authors = [
 futures = "0.3.5"
 tokio = { version = "0.2.21", features = ["fs", "stream"] }
 tokio-util = "0.3.1"
+pin-project = "0.4.23"
 bytes = "0.5.5"
 async-trait = "0.1.36"
 reqwest = { version = "0.10.6", features = ["json", "stream"] }
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 617ed664..5c46e992 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -1,9 +1,17 @@
-use crate::types::ParseMode;
+use std::{future::Future, sync::Arc, time::Duration};
+
 use reqwest::{
     header::{HeaderMap, CONNECTION},
     Client, ClientBuilder,
 };
-use std::{sync::Arc, time::Duration};
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{
+    net,
+    requests::{Payload, ResponseResult},
+    serde_multipart,
+    types::ParseMode,
+};
 
 mod api;
 mod download;
@@ -100,6 +108,47 @@ impl Bot {
     }
 }
 
+impl Bot {
+    pub(crate) fn execute_json<P>(
+        &self,
+        payload: &P,
+    ) -> impl Future<Output = ResponseResult<P::Output>> + 'static
+    where
+        P: Payload + Serialize,
+        P::Output: DeserializeOwned,
+    {
+        let client = self.client.clone();
+        let token = Arc::clone(&self.token);
+
+        let params = serde_json::to_vec(payload)
+            // this `expect` should be ok since we don't write request those may trigger error here
+            .expect("serialization of request to be infallible");
+
+        // async move to capture client&token
+        async move { net::request_json2(&client, token.as_ref(), P::NAME, params).await }
+    }
+
+    pub(crate) fn execute_multipart<P>(
+        &self,
+        payload: &P,
+    ) -> impl Future<Output = ResponseResult<P::Output>>
+    where
+        P: Payload + Serialize,
+        P::Output: DeserializeOwned,
+    {
+        let client = self.client.clone();
+        let token = Arc::clone(&self.token);
+
+        let params = serde_multipart::to_form(payload);
+
+        // async move to capture client&token&params
+        async move {
+            let params = params.await?;
+            net::request_multipart2(&client, token.as_ref(), P::NAME, params).await
+        }
+    }
+}
+
 /// Returns a builder with safe settings.
 ///
 /// By "safe settings" I mean that a client will be able to work in long time
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 9dfa940d..c2aed978 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -36,3 +36,73 @@ macro_rules! forward_to_unsuported_ty {
         )+
     };
 }
+
+#[macro_use]
+macro_rules! req_future {
+    (
+        $v2:vis def: | $( $arg:ident: $ArgTy:ty ),* $(,)? | $body:block
+
+        $(#[$($meta:tt)*])*
+        $v:vis $i:ident<$T:ident> ($inner:ident) -> $Out:ty
+        $(where $($wh:tt)*)?
+    ) => {
+        #[pin_project::pin_project]
+        $v struct $i<$T>
+        $(where $($wh)*)?
+        {
+            #[pin]
+            inner: $inner::$i<$T>
+        }
+
+        impl<$T> $i<$T>
+        $(where $($wh)*)?
+        {
+            $v2 fn new($( $arg: $ArgTy ),*) -> Self {
+                Self { inner: $inner::def($( $arg ),*) }
+            }
+        }
+
+        // HACK(waffle): workaround for https://github.com/rust-lang/rust/issues/55997
+        mod $inner {
+            #![allow(type_alias_bounds)]
+
+            // Mostly to bring `use`s
+            #[allow(unused_imports)]
+            use super::{*, $i as _};
+
+            #[cfg(feature = "nightly")]
+            pub(crate) type $i<$T>
+            $(where $($wh)*)? = impl ::core::future::Future<Output = $Out>;
+
+            #[cfg(feature = "nightly")]
+            pub(crate) fn def<$T>($( $arg: $ArgTy ),*) -> $i<$T>
+            $(where $($wh)*)?
+            {
+                $body
+            }
+
+            #[cfg(not(feature = "nightly"))]
+            pub(crate) type $i<$T>
+            $(where $($wh)*)?  = ::core::pin::Pin<Box<dyn ::core::future::Future<Output = $Out>>>;
+
+            #[cfg(not(feature = "nightly"))]
+            pub(crate) fn def<$T>($( $arg: $ArgTy ),*) -> $i<$T>
+            $(where $($wh)*)?
+            {
+                Box::pin($body)
+            }
+        }
+
+        impl<$T> ::core::future::Future for $i<$T>
+        $(where $($wh)*)?
+        {
+            type Output = $Out;
+
+            fn poll(self: ::core::pin::Pin<&mut Self>, cx: &mut ::core::task::Context<'_>) -> ::core::task::Poll<Self::Output> {
+                let this = self.project();
+                this.inner.poll(cx)
+            }
+        }
+
+    };
+}
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 3278fb28..de38dacc 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -3,7 +3,7 @@ pub use download::download_file_stream;
 
 pub use self::{
     download::download_file,
-    request::{request_json, request_multipart},
+    request::{request_json, request_json2, request_multipart, request_multipart2},
     telegram_response::TelegramResponse,
 };
 
diff --git a/src/net/request.rs b/src/net/request.rs
index e84c3a47..824fa03c 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -1,6 +1,9 @@
 use std::time::Duration;
 
-use reqwest::{Client, Response};
+use reqwest::{
+    header::{HeaderValue, CONTENT_TYPE},
+    Client, Response,
+};
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
@@ -61,6 +64,50 @@ where
     process_response(response).await
 }
 
+// FIXME(waffle):
+//   request_{json,mutipart} are currently used in old code, so we keep them
+//   for now when they will not be used anymore, we should remove them
+//   and rename request_{json,mutipart}2 => request_{json,mutipart}
+
+pub async fn request_multipart2<T>(
+    client: &Client,
+    token: &str,
+    method_name: &str,
+    params: reqwest::multipart::Form,
+) -> ResponseResult<T>
+where
+    T: DeserializeOwned,
+{
+    let response = client
+        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .multipart(params)
+        .send()
+        .await
+        .map_err(RequestError::NetworkError)?;
+
+    process_response(response).await
+}
+
+pub async fn request_json2<T>(
+    client: &Client,
+    token: &str,
+    method_name: &str,
+    params: Vec<u8>,
+) -> ResponseResult<T>
+where
+    T: DeserializeOwned,
+{
+    let response = client
+        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
+        .body(params)
+        .send()
+        .await
+        .map_err(RequestError::NetworkError)?;
+
+    process_response(response).await
+}
+
 async fn process_response<T>(response: Response) -> ResponseResult<T>
 where
     T: DeserializeOwned,
diff --git a/src/requests/json.rs b/src/requests/json.rs
new file mode 100644
index 00000000..a9b37e24
--- /dev/null
+++ b/src/requests/json.rs
@@ -0,0 +1,106 @@
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{
+    bot::Bot,
+    requests::{HasPayload, Payload, Request, ResponseResult},
+    RequestError,
+};
+
+/// Ready-to-send telegram request.
+///
+/// Note: payload will be sent to telegram using [`json`]
+///
+/// [`json`]: https://core.telegram.org/bots/api#making-requests
+#[must_use = "requests do nothing until sent"]
+pub struct JsonRequest<P> {
+    bot: Bot,
+    payload: P,
+}
+
+impl<P> JsonRequest<P> {
+    pub const fn new(bot: Bot, payload: P) -> Self {
+        Self { bot, payload }
+    }
+}
+
+impl<P> Request for JsonRequest<P>
+where
+    // FIXME(waffle):
+    //   this is required on stable because of
+    //   https://github.com/rust-lang/rust/issues/76882
+    //   when it's resolved or `type_alias_impl_trait` feature
+    //   stabilized, we should remove 'static restriction
+    //
+    // (though critically, currently we have no
+    // non-'static payloads)
+    P: 'static,
+    P: Payload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    type Err = RequestError;
+    type Send = Send<P>;
+    type SendRef = SendRef<P>;
+
+    fn send(self) -> Self::Send {
+        Send::new(self)
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        SendRef::new(self)
+    }
+}
+
+impl<P> HasPayload for JsonRequest<P>
+where
+    P: Payload,
+{
+    type Payload = P;
+}
+
+impl<P> AsRef<P> for JsonRequest<P> {
+    fn as_ref(&self) -> &P {
+        &self.payload
+    }
+}
+
+impl<P> AsMut<P> for JsonRequest<P> {
+    fn as_mut(&mut self) -> &mut P {
+        &mut self.payload
+    }
+}
+
+impl<P: Payload + Serialize> core::ops::Deref for JsonRequest<P> {
+    type Target = P;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_ref()
+    }
+}
+
+impl<P: Payload + Serialize> core::ops::DerefMut for JsonRequest<P> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.as_mut()
+    }
+}
+
+req_future! {
+    def: |it: JsonRequest<U>| {
+        it.bot.execute_json(&it.payload)
+    }
+    pub Send<U> (inner0) -> ResponseResult<U::Output>
+    where
+        U: 'static,
+        U: Payload + Serialize,
+        U::Output: DeserializeOwned,
+}
+
+req_future! {
+    def: |it: &JsonRequest<U>| {
+        it.bot.execute_json(&it.payload)
+    }
+    pub SendRef<U> (inner1) -> ResponseResult<U::Output>
+    where
+        U: 'static,
+        U: Payload + Serialize,
+        U::Output: DeserializeOwned,
+}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 66551904..188bfc11 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -7,9 +7,13 @@ mod request;
 pub use self::{has_payload::HasPayload, payload::Payload, request::Request};
 
 mod all;
+mod json;
+mod multipart;
 mod utils;
 
 pub use all::*;
+pub use json::JsonRequest;
+pub use multipart::MultipartRequest;
 
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
new file mode 100644
index 00000000..fffaae89
--- /dev/null
+++ b/src/requests/multipart.rs
@@ -0,0 +1,116 @@
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{
+    bot::Bot,
+    requests::{HasPayload, Payload, Request, ResponseResult},
+    RequestError,
+};
+
+/// Ready-to-send telegram request.
+///
+/// Note: payload will be sent to telegram using [`multipart/form-data`]
+///
+/// [`multipart/form-data`]: https://core.telegram.org/bots/api#making-requests
+#[must_use = "requests do nothing until sent"]
+pub struct MultipartRequest<P> {
+    bot: Bot,
+    payload: P,
+}
+
+impl<P> MultipartRequest<P> {
+    pub fn new(bot: Bot, payload: P) -> Self {
+        Self { bot, payload }
+    }
+}
+
+impl<P> Request for MultipartRequest<P>
+where
+    // FIXME(waffle):
+    //   this is required on stable because of
+    //   https://github.com/rust-lang/rust/issues/76882
+    //   when it's resolved or `type_alias_impl_trait` feature
+    //   stabilized, we should remove 'static restriction
+    //
+    // (though critically, currently we have no
+    // non-'static payloads)
+    P: 'static,
+    P: Payload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    type Err = RequestError;
+    type Send = Send<P>;
+    type SendRef = SendRef<P>;
+
+    fn send(self) -> Self::Send {
+        Send::new(self)
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        SendRef::new(self)
+    }
+}
+
+impl<P> HasPayload for MultipartRequest<P>
+where
+    P: Payload,
+{
+    type Payload = P;
+}
+
+impl<P> AsRef<P> for MultipartRequest<P> {
+    fn as_ref(&self) -> &P {
+        &self.payload
+    }
+}
+
+impl<P> AsMut<P> for MultipartRequest<P> {
+    fn as_mut(&mut self) -> &mut P {
+        &mut self.payload
+    }
+}
+
+impl<P> core::ops::Deref for MultipartRequest<P>
+where
+    P: 'static,
+    P: Payload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    type Target = P;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_ref()
+    }
+}
+
+impl<P> core::ops::DerefMut for MultipartRequest<P>
+where
+    P: 'static,
+    P: Payload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.as_mut()
+    }
+}
+
+req_future! {
+    def: |it: MultipartRequest<U>| {
+        it.bot.execute_multipart(&it.payload)
+    }
+    pub Send<U> (inner0) -> ResponseResult<U::Output>
+    where
+        U: 'static,
+        U: Payload + Serialize,
+        U::Output: DeserializeOwned,
+}
+
+req_future! {
+    def: |it: &MultipartRequest<U>| {
+        it.bot.execute_multipart(&it.payload)
+    }
+    pub SendRef<U> (inner1) -> ResponseResult<U::Output>
+    where
+        U: 'static,
+        U: Payload + Serialize,
+        U::Output: DeserializeOwned,
+}
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 9deb2cdc..3ec6ba63 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -50,7 +50,7 @@ pub trait Request: HasPayload {
     /// and then serializing it, this method should just serialize the data)
     ///
     /// ## Examples
-    // FIXME(waffle): ignored until full request redisign lands
+    // FIXME(waffle): ignored until full request redesign lands
     /// ```ignore
     /// # async {
     /// use teloxide_core::prelude::*;
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index 3e9e7168..e31da1a4 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -1,6 +1,7 @@
 use crate::{
     serde_multipart::unserializers::{InputFileUnserializer, StringUnserializer},
     types::InputFile,
+    RequestError,
 };
 use futures::{
     future::{ready, BoxFuture},
@@ -53,6 +54,20 @@ impl std::error::Error for Error {
     }
 }
 
+impl From<Error> for RequestError {
+    fn from(err: Error) -> Self {
+        match err {
+            Error::Io(ioerr) => RequestError::Io(ioerr),
+            // this should be ok since we don't write request those may trigger errors and
+            // Error is internal.
+            _ => unreachable!(
+                "we don't create requests those fail to serialize (if you see this, open an issue \
+                 :|)"
+            ),
+        }
+    }
+}
+
 pub(crate) struct MultipartTopLvlSerializer {}
 
 impl Serializer for MultipartTopLvlSerializer {

From f3e000533575e238e038d25645fb2655d26d7f2d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 22 Sep 2020 22:48:42 +0300
Subject: [PATCH 095/755] remove AsMut/AsRef bounds because of a compiler bug

---
 src/requests/has_payload.rs | 22 ++++++++++++++--------
 src/requests/json.rs        | 18 +++++++-----------
 src/requests/multipart.rs   | 18 +++++++-----------
 src/requests/payload.rs     |  2 +-
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index 783e15a0..facca0cc 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -18,21 +18,19 @@ use crate::requests::Payload;
 /// [`BorrowMut`]: std::borrow::BorrowMut
 /// [`Payload`]: crate::requests::Payload
 /// [output]: HasPayload::Payload
-pub trait HasPayload:
-    AsMut<<Self as HasPayload>::Payload> + AsRef<<Self as HasPayload>::Payload>
+pub trait HasPayload
+// FIXME(waffle):
+//   we wanted to use As{Mut,Ref} here, but they doesn't work
+//   because of https://github.com/rust-lang/rust/issues/77010
 {
     /// Type of the payload contained.
     type Payload: Payload;
 
     /// Gain mutable access to the underlying payload.
-    fn payload_mut(&mut self) -> &mut Self::Payload {
-        self.as_mut()
-    }
+    fn payload_mut(&mut self) -> &mut Self::Payload;
 
     /// Gain immutable access to the underlying payload.
-    fn payload_ref(&self) -> &Self::Payload {
-        self.as_ref()
-    }
+    fn payload_ref(&self) -> &Self::Payload;
 }
 
 impl<P> HasPayload for P
@@ -40,4 +38,12 @@ where
     P: Payload,
 {
     type Payload = Self;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self
+    }
 }
diff --git a/src/requests/json.rs b/src/requests/json.rs
index a9b37e24..51cf906a 100644
--- a/src/requests/json.rs
+++ b/src/requests/json.rs
@@ -55,31 +55,27 @@ where
     P: Payload,
 {
     type Payload = P;
-}
 
-impl<P> AsRef<P> for JsonRequest<P> {
-    fn as_ref(&self) -> &P {
-        &self.payload
-    }
-}
-
-impl<P> AsMut<P> for JsonRequest<P> {
-    fn as_mut(&mut self) -> &mut P {
+    fn payload_mut(&mut self) -> &mut Self::Payload {
         &mut self.payload
     }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        &self.payload
+    }
 }
 
 impl<P: Payload + Serialize> core::ops::Deref for JsonRequest<P> {
     type Target = P;
 
     fn deref(&self) -> &Self::Target {
-        self.as_ref()
+        self.payload_ref()
     }
 }
 
 impl<P: Payload + Serialize> core::ops::DerefMut for JsonRequest<P> {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        self.as_mut()
+        self.payload_mut()
     }
 }
 
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index fffaae89..009271bd 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -55,18 +55,14 @@ where
     P: Payload,
 {
     type Payload = P;
-}
 
-impl<P> AsRef<P> for MultipartRequest<P> {
-    fn as_ref(&self) -> &P {
-        &self.payload
-    }
-}
-
-impl<P> AsMut<P> for MultipartRequest<P> {
-    fn as_mut(&mut self) -> &mut P {
+    fn payload_mut(&mut self) -> &mut Self::Payload {
         &mut self.payload
     }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        &self.payload
+    }
 }
 
 impl<P> core::ops::Deref for MultipartRequest<P>
@@ -78,7 +74,7 @@ where
     type Target = P;
 
     fn deref(&self) -> &Self::Target {
-        self.as_ref()
+        self.payload_ref()
     }
 }
 
@@ -89,7 +85,7 @@ where
     P::Output: DeserializeOwned,
 {
     fn deref_mut(&mut self) -> &mut Self::Target {
-        self.as_mut()
+        self.payload_mut()
     }
 }
 
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 539c9971..0e02531d 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -6,7 +6,7 @@
 /// This trait provides some additional information needed for sending request
 /// to the telegram.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
-pub trait Payload: AsMut<Self> + AsRef<Self> {
+pub trait Payload {
     /// Return type of the telegram method.
     ///
     /// Note: that should not include result wrappers (e.g. it should be simply

From 2cabc5fb4e3caa58337012e3c2d8e1bdb79a27ed Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 22 Sep 2020 22:52:23 +0300
Subject: [PATCH 096/755] add Requester trait and GetMe payload

---
 src/bot/api.rs            | 26 ++++++++++++++++++--------
 src/lib.rs                |  2 ++
 src/payloads/get_me.rs    | 29 +++++++++++++++++++++++++++++
 src/payloads/mod.rs       |  5 +++++
 src/payloads/setters.rs   |  1 +
 src/prelude.rs            |  1 +
 src/requests/mod.rs       |  2 ++
 src/requests/requester.rs | 15 +++++++++++++++
 8 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 src/payloads/get_me.rs
 create mode 100644 src/payloads/mod.rs
 create mode 100644 src/payloads/setters.rs
 create mode 100644 src/prelude.rs
 create mode 100644 src/requests/requester.rs

diff --git a/src/bot/api.rs b/src/bot/api.rs
index bd7e08de..be6b21f5 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1,4 +1,5 @@
 use crate::{
+    payloads,
     requests::{
         AddStickerToSet, AnswerCallbackQuery, AnswerInlineQuery, AnswerPreCheckoutQuery,
         AnswerShippingQuery, CreateNewStickerSet, DeleteChatPhoto, DeleteChatStickerSet,
@@ -8,14 +9,15 @@ use crate::{
         EditMessageReplyMarkup, EditMessageText, ExportChatInviteLink, ForwardMessage, GetChat,
         GetChatAdministrators, GetChatMember, GetChatMembersCount, GetFile, GetGameHighScores,
         GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUpdatesNonStrict, GetUserProfilePhotos,
-        GetWebhookInfo, KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember,
-        RestrictChatMember, SendAnimation, SendAudio, SendChatAction, SendChatActionKind,
-        SendContact, SendDice, SendDocument, SendGame, SendInvoice, SendLocation, SendMediaGroup,
-        SendMessage, SendPhoto, SendPoll, SendSticker, SendVenue, SendVideo, SendVideoNote,
-        SendVoice, SetChatAdministratorCustomTitle, SetChatDescription, SetChatPermissions,
-        SetChatPhoto, SetChatStickerSet, SetChatTitle, SetGameScore, SetMyCommands,
-        SetStickerPositionInSet, SetStickerSetThumb, SetWebhook, StopInlineMessageLiveLocation,
-        StopMessageLiveLocation, StopPoll, UnbanChatMember, UnpinChatMessage, UploadStickerFile,
+        GetWebhookInfo, JsonRequest, KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember,
+        Requester, RestrictChatMember, SendAnimation, SendAudio, SendChatAction,
+        SendChatActionKind, SendContact, SendDice, SendDocument, SendGame, SendInvoice,
+        SendLocation, SendMediaGroup, SendMessage, SendPhoto, SendPoll, SendSticker, SendVenue,
+        SendVideo, SendVideoNote, SendVoice, SetChatAdministratorCustomTitle, SetChatDescription,
+        SetChatPermissions, SetChatPhoto, SetChatStickerSet, SetChatTitle, SetGameScore,
+        SetMyCommands, SetStickerPositionInSet, SetStickerSetThumb, SetWebhook,
+        StopInlineMessageLiveLocation, StopMessageLiveLocation, StopPoll, UnbanChatMember,
+        UnpinChatMessage, UploadStickerFile,
     },
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
@@ -1701,3 +1703,11 @@ impl Bot {
         }
     }
 }
+
+impl Requester for Bot {
+    type GetMe = JsonRequest<payloads::GetMe>;
+
+    fn get_me(&self) -> JsonRequest<payloads::GetMe> {
+        Self::GetMe::new(self.clone(), payloads::GetMe::new())
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 4736649d..f453e1b3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -20,6 +20,8 @@ pub use self::{
     errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},
 };
 
+pub mod payloads;
+pub mod prelude;
 pub mod requests;
 pub mod types;
 
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
new file mode 100644
index 00000000..cabd6f22
--- /dev/null
+++ b/src/payloads/get_me.rs
@@ -0,0 +1,29 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    requests::{HasPayload, Payload},
+    types::User,
+};
+
+/// A filter method for testing your bot's auth token. Requires no parameters.
+/// Returns basic information about the bot in form of a [`User`] object.
+///
+/// [`User`]: crate::types::User
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Default, Deserialize, Serialize)]
+pub struct GetMe {}
+
+impl GetMe {
+    pub const fn new() -> Self {
+        GetMe {}
+    }
+}
+
+impl Payload for GetMe {
+    type Output = User;
+
+    const NAME: &'static str = "getMe";
+}
+
+pub trait GetMeSetters: HasPayload<Payload = GetMe> + Sized {}
+
+impl<P> GetMeSetters for P where P: HasPayload<Payload = GetMe> {}
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
new file mode 100644
index 00000000..e01013c2
--- /dev/null
+++ b/src/payloads/mod.rs
@@ -0,0 +1,5 @@
+pub mod setters;
+
+mod get_me;
+
+pub use get_me::{GetMe, GetMeSetters};
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
new file mode 100644
index 00000000..937d0b50
--- /dev/null
+++ b/src/payloads/setters.rs
@@ -0,0 +1 @@
+pub use crate::payloads::{GetMeSetters as _};
diff --git a/src/prelude.rs b/src/prelude.rs
new file mode 100644
index 00000000..f805598b
--- /dev/null
+++ b/src/prelude.rs
@@ -0,0 +1 @@
+pub use crate::requests::Requester;
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 188bfc11..67962379 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -9,11 +9,13 @@ pub use self::{has_payload::HasPayload, payload::Payload, request::Request};
 mod all;
 mod json;
 mod multipart;
+mod requester;
 mod utils;
 
 pub use all::*;
 pub use json::JsonRequest;
 pub use multipart::MultipartRequest;
+pub use requester::Requester;
 
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
new file mode 100644
index 00000000..8390b786
--- /dev/null
+++ b/src/requests/requester.rs
@@ -0,0 +1,15 @@
+use crate::{payloads::GetMe, requests::Request};
+
+/// The trait implemented by all bots & bot wrappers.
+/// Essentially a request builder factory (?).
+///
+/// _This trait is included in the crate's [`prelude`](crate::prelude)_.
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+pub trait Requester {
+    type GetMe: Request<Payload = GetMe>;
+
+    /// For telegram documentation of the method see [`GetMe`].
+    fn get_me(&self) -> Self::GetMe;
+
+    // FIXME(waffle): add remaining 69 methods
+}

From 954c410c1bf57b5b8e64e454ace12c075799d134 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 22 Sep 2020 22:54:52 +0300
Subject: [PATCH 097/755] implement `get_me` caching

---
 Cargo.toml                    |   1 +
 src/bot/cache_me.rs           | 155 ++++++++++++++++++++++++++++++++++
 src/bot/mod.rs                |   3 +
 src/payloads/setters.rs       |   2 +-
 src/requests/mod.rs           |   2 +
 src/requests/requester_ext.rs |  18 ++++
 6 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 src/bot/cache_me.rs
 create mode 100644 src/requests/requester_ext.rs

diff --git a/Cargo.toml b/Cargo.toml
index f97d63f3..12200248 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,6 +32,7 @@ uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
 derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
+once_cell = "1.4.0"
 
 [features]
 # features those require nightly compiler
diff --git a/src/bot/cache_me.rs b/src/bot/cache_me.rs
new file mode 100644
index 00000000..feb4954b
--- /dev/null
+++ b/src/bot/cache_me.rs
@@ -0,0 +1,155 @@
+use std::{pin::Pin, sync::Arc};
+
+use futures::{
+    future,
+    future::{ok, Ready},
+    task::{Context, Poll},
+    Future,
+};
+use once_cell::sync::OnceCell;
+
+use crate::{
+    payloads::GetMe,
+    requests::{HasPayload, Request, Requester},
+    types::User,
+};
+
+/// `get_me` cache.
+///
+/// Bot's user is hardly ever changed, so sometimes it's reasonable to cache
+/// response from `get_me` method.
+pub struct CacheMe<B> {
+    bot: B,
+    me: Arc<OnceCell<User>>,
+}
+
+impl<B> CacheMe<B> {
+    /// Creates new cache.
+    ///
+    /// Note: it's recommended to use [`RequesterExt::cache_me`] instead.
+    pub fn new(bot: B) -> CacheMe<B> {
+        Self { bot, me: Arc::new(OnceCell::new()) }
+    }
+
+    /// Allows to access inner bot
+    pub fn inner(&self) -> &B {
+        &self.bot
+    }
+
+    /// Unwraps inner bot
+    pub fn into_inner(self) -> B {
+        self.bot
+    }
+
+    /// Clear cache.
+    ///
+    /// Returns cached response from `get_me`, if it was cached.
+    ///
+    /// Note: internally this uses [`Arc::make_mut`] so this will **not**
+    /// clear cache of clones of self.
+    pub fn clear(&mut self) -> Option<User> {
+        Arc::make_mut(&mut self.me).take()
+    }
+}
+
+impl<B: Requester> Requester for CacheMe<B> {
+    type GetMe = CachedMeRequest<B::GetMe>;
+
+    fn get_me(&self) -> Self::GetMe {
+        match self.me.get() {
+            Some(user) => CachedMeRequest(Inner::Ready(user.clone()), GetMe::new()),
+            None => CachedMeRequest(
+                Inner::Pending(self.bot.get_me(), Arc::clone(&self.me)),
+                GetMe::new(),
+            ),
+        }
+    }
+}
+
+pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
+
+enum Inner<R: Request<Payload = GetMe>> {
+    Ready(User),
+    Pending(R, Arc<OnceCell<User>>),
+}
+
+impl<R: Request<Payload = GetMe>> Request for CachedMeRequest<R> {
+    type Err = R::Err;
+    type Send = Send<R>;
+    type SendRef = SendRef<R>;
+
+    fn send(self) -> Self::Send {
+        let fut = match self.0 {
+            Inner::Ready(user) => future::Either::Left(ok(user)),
+            Inner::Pending(req, cell) => future::Either::Right(Init(req.send(), cell)),
+        };
+        Send(fut)
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        let fut = match &self.0 {
+            Inner::Ready(user) => future::Either::Left(ok(user.clone())),
+            Inner::Pending(req, cell) => {
+                future::Either::Right(Init(req.send_ref(), Arc::clone(cell)))
+            }
+        };
+        SendRef(fut)
+    }
+}
+
+impl<R: Request<Payload = GetMe>> HasPayload for CachedMeRequest<R> {
+    type Payload = GetMe;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        &mut self.1
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        &self.1
+    }
+}
+
+type ReadyUser<Err> = Ready<Result<User, Err>>;
+
+#[pin_project::pin_project]
+pub struct Send<R: Request<Payload = GetMe>>(
+    #[pin] future::Either<ReadyUser<R::Err>, Init<R::Send, User>>,
+);
+
+impl<R: Request<Payload = GetMe>> Future for Send<R> {
+    type Output = Result<User, R::Err>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.0.poll(cx)
+    }
+}
+
+#[pin_project::pin_project]
+pub struct SendRef<R: Request<Payload = GetMe>>(
+    #[pin] future::Either<ReadyUser<R::Err>, Init<R::SendRef, User>>,
+);
+
+impl<R: Request<Payload = GetMe>> Future for SendRef<R> {
+    type Output = Result<User, R::Err>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.0.poll(cx)
+    }
+}
+
+#[pin_project::pin_project]
+struct Init<F, T>(#[pin] F, Arc<OnceCell<T>>);
+
+impl<F: Future<Output = Result<T, E>>, T: Clone, E> Future for Init<F, T> {
+    type Output = Result<T, E>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        match this.0.poll(cx) {
+            Poll::Ready(Ok(ok)) => Poll::Ready(Ok(this.1.get_or_init(|| ok).clone())),
+            poll @ Poll::Ready(_) | poll @ Poll::Pending => poll,
+        }
+    }
+}
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 5c46e992..f0e17e33 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -14,8 +14,11 @@ use crate::{
 };
 
 mod api;
+mod cache_me;
 mod download;
 
+pub use cache_me::CacheMe;
+
 pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
 
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 937d0b50..c7cfd823 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1 +1 @@
-pub use crate::payloads::{GetMeSetters as _};
+pub use crate::payloads::GetMeSetters as _;
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 67962379..2ba00350 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -10,12 +10,14 @@ mod all;
 mod json;
 mod multipart;
 mod requester;
+mod requester_ext;
 mod utils;
 
 pub use all::*;
 pub use json::JsonRequest;
 pub use multipart::MultipartRequest;
 pub use requester::Requester;
+pub use requester_ext::RequesterExt;
 
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
new file mode 100644
index 00000000..aa09d5ed
--- /dev/null
+++ b/src/requests/requester_ext.rs
@@ -0,0 +1,18 @@
+use crate::{bot::CacheMe, requests::Requester};
+
+pub trait RequesterExt: Requester {
+    /// Add `get_me` caching ability, see [`CacheMe`] for more.
+    fn cache_me(self) -> CacheMe<Self>
+    where
+        Self: Sized,
+    {
+        CacheMe::new(self)
+    }
+}
+
+impl<T> RequesterExt for T
+where
+    T: Requester,
+{
+    /* use default impls */
+}

From 83cc634f794402b472d0c69c22199f80f7a089fc Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 22 Sep 2020 22:56:02 +0300
Subject: [PATCH 098/755] add :std::error::Error bound on Request::Err

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

diff --git a/src/requests/request.rs b/src/requests/request.rs
index 3ec6ba63..b29a6c00 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -12,7 +12,7 @@ pub trait Request: HasPayload {
      */
 
     /// Type of error that may happen during sending the request to telegram.
-    type Err;
+    type Err: std::error::Error;
 
     /// Type of future returned by [`send`](Request::send) method.
     type Send: Future<Output = Result<Output<Self>, Self::Err>>;

From 0ec81cf753cd5ae31b94e0e55c4fe35b3fb9a977 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 23 Sep 2020 16:53:26 +0300
Subject: [PATCH 099/755] Implement auto sending requests

---
 src/bot/auto_send.rs          | 164 ++++++++++++++++++++++++++++++++++
 src/bot/cache_me.rs           |   2 +
 src/bot/mod.rs                |   2 +
 src/lib.rs                    |   3 +-
 src/requests/requester_ext.rs |  10 ++-
 5 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 src/bot/auto_send.rs

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
new file mode 100644
index 00000000..2ccc6cd5
--- /dev/null
+++ b/src/bot/auto_send.rs
@@ -0,0 +1,164 @@
+use std::{
+    future::Future,
+    pin::Pin,
+    task::{Context, Poll},
+};
+
+use crate::requests::{HasPayload, Output, Request, Requester};
+
+/// Send requests automatically.
+///
+/// Requests returned by `<AutoSend<_> as `[`Requester`]`>` are [`Future`]s
+/// which means that you can simply `.await` them instead of using
+/// `.send().await`.
+///
+/// Notes:
+/// 1. This wrapper should be the most outer i.e.: `AutoSend<CacheMe<Bot>>`
+///    will automatically send requests, while `CacheMe<AutoSend<Bot>>` - won't.
+/// 2. After first call to `poll` on a request you will unable to access payload
+///    nor could you use [`send_ref`](Request::send_ref)
+///
+/// ## Examples
+///
+/// ```rust
+/// use teloxide_core::{
+///     requests::{Requester, RequesterExt},
+///     types::User,
+///     Bot,
+/// };
+///
+/// # async {
+/// let bot = Bot::new("TOKEN").auto_send();
+/// let myself: User = bot.get_me().await?; // No .send()!
+/// # Ok::<_, teloxide_core::RequestError>(()) };
+/// ```
+pub struct AutoSend<B> {
+    bot: B,
+}
+
+impl<B> AutoSend<B> {
+    /// Creates new `AutoSend`.
+    ///
+    /// Note: it's recommended to use [`RequesterExt::auto_send`] instead.
+    ///
+    /// [`RequesterExt::auto_send`]: crate::requests::RequesterExt::auto_send
+    pub fn new(inner: B) -> AutoSend<B> {
+        Self { bot: inner }
+    }
+
+    /// Allows to access inner bot
+    pub fn inner(&self) -> &B {
+        &self.bot
+    }
+
+    /// Unwraps inner bot
+    pub fn into_inner(self) -> B {
+        self.bot
+    }
+}
+
+impl<B: Requester> Requester for AutoSend<B> {
+    type GetMe = AutoRequest<B::GetMe>;
+
+    fn get_me(&self) -> Self::GetMe {
+        AutoRequest::new(self.bot.get_me())
+    }
+}
+
+#[pin_project::pin_project]
+pub struct AutoRequest<R: Request>(#[pin] Inner<R>);
+
+impl<R: Request> AutoRequest<R> {
+    pub fn new(inner: R) -> Self {
+        Self(Inner::Request(inner))
+    }
+}
+
+#[pin_project::pin_project(project = InnerProj, project_replace = InnerRepl)]
+enum Inner<R: Request> {
+    /// Unsent modifiable request
+    Request(R),
+    /// Sent request
+    Future(#[pin] R::Send),
+    /// This is mostly redundant variant that is used only to take ownership
+    /// over `Request(R)` before creating `Future(R::Send)` in
+    /// `AutoRequest::poll`.
+    ///
+    /// Practically we don't create this variant anywhere else and it can be
+    /// ignored.
+    Tmp,
+}
+
+impl<R: Request> Request for AutoRequest<R> {
+    type Err = R::Err;
+    type Send = R::Send;
+    type SendRef = R::SendRef;
+
+    fn send(self) -> Self::Send {
+        match self.0 {
+            Inner::Request(req) => req.send(),
+            Inner::Future(fut) => fut,
+            Inner::Tmp => tmp_unreachable(),
+        }
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        match &self.0 {
+            Inner::Request(req) => req.send_ref(),
+            Inner::Future(_) => already_polled(),
+            Inner::Tmp => tmp_unreachable(),
+        }
+    }
+}
+
+impl<R: Request> HasPayload for AutoRequest<R> {
+    type Payload = R::Payload;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        match &mut self.0 {
+            Inner::Request(req) => req.payload_mut(),
+            Inner::Future(_) => already_polled(),
+            Inner::Tmp => tmp_unreachable(),
+        }
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        match &self.0 {
+            Inner::Request(req) => req.payload_ref(),
+            Inner::Future(_) => already_polled(),
+            Inner::Tmp => tmp_unreachable(),
+        }
+    }
+}
+
+impl<R: Request> Future for AutoRequest<R> {
+    type Output = Result<Output<R>, R::Err>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let mut this = self.as_mut().project();
+
+        if let InnerProj::Future(fut) = this.0.as_mut().project() {
+            return fut.poll(cx);
+        }
+
+        let inner = this.0.as_mut().project_replace(Inner::Tmp);
+        let inner = match inner {
+            InnerRepl::Request(req) => Inner::Future(req.send()),
+            // Practically this is unreachable
+            InnerRepl::Future(_) | InnerRepl::Tmp => tmp_unreachable(),
+        };
+        this.0.as_mut().project_replace(inner);
+
+        self.poll(cx)
+    }
+}
+
+#[inline(never)]
+fn tmp_unreachable() -> ! {
+    unreachable!("tmp is not created outside of AutoRequest::poll")
+}
+
+#[inline(never)]
+fn already_polled() -> ! {
+    panic!("AutoRequest was already polled")
+}
diff --git a/src/bot/cache_me.rs b/src/bot/cache_me.rs
index feb4954b..e4a4623d 100644
--- a/src/bot/cache_me.rs
+++ b/src/bot/cache_me.rs
@@ -27,6 +27,8 @@ impl<B> CacheMe<B> {
     /// Creates new cache.
     ///
     /// Note: it's recommended to use [`RequesterExt::cache_me`] instead.
+    ///
+    /// [`RequesterExt::cache_me`]: crate::requests::RequesterExt::cache_me
     pub fn new(bot: B) -> CacheMe<B> {
         Self { bot, me: Arc::new(OnceCell::new()) }
     }
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index f0e17e33..3347c932 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -14,9 +14,11 @@ use crate::{
 };
 
 mod api;
+mod auto_send;
 mod cache_me;
 mod download;
 
+pub use auto_send::AutoSend;
 pub use cache_me::CacheMe;
 
 pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
diff --git a/src/lib.rs b/src/lib.rs
index f453e1b3..3c26cd26 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,8 +15,9 @@
 #[macro_use]
 mod local_macros; // internal helper macros
 
+// FIXME(waffle): rethink modules, find a place for wrappers
 pub use self::{
-    bot::{Bot, BotBuilder},
+    bot::{AutoSend, Bot, BotBuilder, CacheMe},
     errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},
 };
 
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index aa09d5ed..6d92a531 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,4 +1,4 @@
-use crate::{bot::CacheMe, requests::Requester};
+use crate::{requests::Requester, AutoSend, CacheMe};
 
 pub trait RequesterExt: Requester {
     /// Add `get_me` caching ability, see [`CacheMe`] for more.
@@ -8,6 +8,14 @@ pub trait RequesterExt: Requester {
     {
         CacheMe::new(self)
     }
+
+    /// Send requests automatically, see [`AutoSend`] for more.
+    fn auto_send(self) -> AutoSend<Self>
+    where
+        Self: Sized,
+    {
+        AutoSend::new(self)
+    }
 }
 
 impl<T> RequesterExt for T

From 91d78b65b3b297c4970bc5065d1e955b1f5d377f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 23 Sep 2020 19:05:59 +0300
Subject: [PATCH 100/755] Refactor ChatMember

- Replace a bunch of `Option<_>` fields with `hatMemberKind`
- Remove setters (users are not expected to create this struct)
- Add getters
---
 src/types/chat_member.rs | 404 +++++++++++++++++++++++----------------
 1 file changed, 239 insertions(+), 165 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index dd809633..746c744b 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize};
 
 use crate::types::User;
 
-// TODO: ChatMemberKind?...
 /// This object contains information about one member of the chat.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#chatmember).
@@ -12,179 +11,264 @@ pub struct ChatMember {
     pub user: User,
 
     /// The member's status in the chat.
-    pub status: ChatMemberStatus,
+    #[serde(flatten)]
+    pub kind: ChatMemberKind,
+}
 
-    /// Owner and administrators only. Custom title for this user
-    pub custom_title: Option<String>,
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "status")]
+pub enum ChatMemberKind {
+    Creator {
+        /// Custom title for this user.
+        custom_title: Option<String>,
+    },
+    Administrator {
+        /// Custom title for this user.
+        custom_title: Option<String>,
 
-    /// Restricted and kicked only. Date when restrictions will be lifted for
-    /// this user, unix time.
-    pub until_date: Option<i32>,
+        /// `true`, if the bot is allowed to edit
+        /// administrator privileges of that user.
+        can_be_edited: bool,
 
-    /// Administrators only. `true`, if the bot is allowed to edit
-    /// administrator privileges of that user.
-    pub can_be_edited: Option<bool>,
+        /// `true`, if the administrator can change the chat
+        /// title, photo and other settings.
+        can_change_info: bool,
 
-    /// Administrators only. `true`, if the administrator can change the chat
-    /// title, photo and other settings.
-    pub can_change_info: Option<bool>,
+        /// `true`, if the administrator can post in the
+        /// channel, channels only.
+        can_post_messages: Option<bool>,
 
-    /// Administrators only. `true`, if the administrator can post in the
-    /// channel, channels only.
-    pub can_post_messages: Option<bool>,
+        /// `true`, if the administrator can edit messages of
+        /// other users and can pin messages, channels only.
+        can_edit_messages: Option<bool>,
 
-    /// Administrators only. `true`, if the administrator can edit messages of
-    /// other users and can pin messages, channels only.
-    pub can_edit_messages: Option<bool>,
+        /// `true`, if the administrator can delete messages
+        /// of other users.
+        can_delete_messages: bool,
 
-    /// Administrators only. `true`, if the administrator can delete messages
-    /// of other users.
-    pub can_delete_messages: Option<bool>,
+        /// `true`, if the administrator can invite new users
+        /// to the chat.
+        can_invite_users: bool,
 
-    /// Administrators only. `true`, if the administrator can invite new users
-    /// to the chat.
-    pub can_invite_users: Option<bool>,
+        /// `true`, if the administrator can restrict,
+        /// ban or unban chat members.
+        can_restrict_members: bool,
 
-    /// Administrators only. `true`, if the administrator can restrict,
-    /// ban or unban chat members.
-    pub can_restrict_members: Option<bool>,
+        /// `true`, if the administrator can pin messages,
+        /// supergroups only.
+        can_pin_messages: Option<bool>,
 
-    /// Administrators only. `true`, if the administrator can pin messages,
-    /// supergroups only.
-    pub can_pin_messages: Option<bool>,
+        /// `true`, if the administrator can add new
+        /// administrators with a subset of his own privileges or demote
+        /// administrators that he has promoted, directly or indirectly
+        /// (promoted by administrators that were appointed by the
+        /// user).
+        can_promote_members: bool,
+    },
+    Member,
+    Restricted {
+        /// Date when restrictions will be lifted for
+        /// this user, unix time.
+        until_date: i32,
 
-    /// Administrators only. `true`, if the administrator can add new
-    /// administrators with a subset of his own privileges or demote
-    /// administrators that he has promoted, directly or indirectly (promoted
-    /// by administrators that were appointed by the user).
-    pub can_promote_members: Option<bool>,
+        /// Restricted only. `true`, if the user can send text messages,
+        /// contacts, locations and venues.
+        can_send_messages: bool,
 
-    /// Restricted only. `true`, if the user can send text messages,
-    /// contacts, locations and venues.
-    pub can_send_messages: Option<bool>,
+        /// Restricted only. `true`, if the user is allowed to send audios,
+        /// documents, photos, videos, video notes and voice notes.
+        can_send_media_messages: bool,
 
-    /// Restricted only. `true`, if the user is allowed to send audios,
-    /// documents, photos, videos, video notes and voice notes.
-    pub can_send_media_messages: Option<bool>,
+        /// Restricted only. `true`, if the user is allowed to send animations,
+        /// games, stickers and use inline bots.
+        can_send_other_messages: bool,
 
-    /// Restricted only. `true`, if the user is allowed to send animations,
-    /// games, stickers and use inline bots.
-    pub can_send_other_messages: Option<bool>,
-
-    /// Restricted only. `true`, if the user is allowed to add web page
-    /// previews to their messages.
-    pub can_add_web_page_previews: Option<bool>,
+        /// Restricted only. `true`, if the user is allowed to add web page
+        /// previews to their messages.
+        can_add_web_page_previews: bool,
+    },
+    Left,
+    Kicked {
+        /// Date when restrictions will be lifted for
+        /// this user, unix time.
+        until_date: i32,
+    },
 }
 
 impl ChatMember {
-    pub fn new(user: User, status: ChatMemberStatus) -> Self {
-        Self {
-            user,
-            status,
-            custom_title: None,
-            until_date: None,
-            can_be_edited: None,
-            can_change_info: None,
-            can_post_messages: None,
-            can_edit_messages: None,
-            can_delete_messages: None,
-            can_invite_users: None,
-            can_restrict_members: None,
-            can_pin_messages: None,
-            can_promote_members: None,
-            can_send_messages: None,
-            can_send_media_messages: None,
-            can_send_other_messages: None,
-            can_add_web_page_previews: None,
+    pub fn status(&self) -> ChatMemberStatus {
+        match &self.kind {
+            ChatMemberKind::Creator { .. } => ChatMemberStatus::Creator,
+            ChatMemberKind::Administrator { .. } => ChatMemberStatus::Administrator,
+            ChatMemberKind::Member => ChatMemberStatus::Member,
+            ChatMemberKind::Restricted { .. } => ChatMemberStatus::Restricted,
+            ChatMemberKind::Left => ChatMemberStatus::Left,
+            ChatMemberKind::Kicked { .. } => ChatMemberStatus::Kicked,
+        }
+    }
+}
+impl ChatMemberKind {
+    pub fn custom_title(&self) -> Option<&str> {
+        match &self {
+            Self::Administrator { custom_title, .. } | Self::Creator { custom_title, .. } => {
+                //Some(custom_title.as_str())
+                custom_title.as_deref()
+            }
+            Self::Member | Self::Restricted { .. } | Self::Left | Self::Kicked { .. } => None,
         }
     }
 
-    pub fn user(mut self, val: User) -> Self {
-        self.user = val;
-        self
+    pub fn until_date(&self) -> Option<i32> {
+        match &self {
+            Self::Creator { .. } | Self::Administrator { .. } | Self::Member | Self::Left => None,
+            Self::Restricted { until_date, .. } | Self::Kicked { until_date, .. } => {
+                Some(*until_date)
+            }
+        }
     }
 
-    pub fn status(mut self, val: ChatMemberStatus) -> Self {
-        self.status = val;
-        self
+    pub fn can_be_edited(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_be_edited, .. } => Some(*can_be_edited),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn custom_title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.custom_title = Some(val.into());
-        self
+    pub fn can_change_info(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_change_info, .. } => Some(*can_change_info),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn until_date(mut self, val: i32) -> Self {
-        self.until_date = Some(val);
-        self
+    pub fn can_post_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_post_messages, .. } => *can_post_messages,
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_be_edited(mut self, val: bool) -> Self {
-        self.can_be_edited = Some(val);
-        self
+    pub fn can_edit_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_edit_messages, .. } => *can_edit_messages,
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_change_info(mut self, val: bool) -> Self {
-        self.can_change_info = Some(val);
-        self
+    pub fn can_delete_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_delete_messages, .. } => Some(*can_delete_messages),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_post_messages(mut self, val: bool) -> Self {
-        self.can_post_messages = Some(val);
-        self
+    pub fn can_invite_users(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_invite_users, .. } => Some(*can_invite_users),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_edit_messages(mut self, val: bool) -> Self {
-        self.can_edit_messages = Some(val);
-        self
+    pub fn can_restrict_members(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_restrict_members, .. } => Some(*can_restrict_members),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_delete_messages(mut self, val: bool) -> Self {
-        self.can_delete_messages = Some(val);
-        self
+    pub fn can_pin_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_pin_messages, .. } => *can_pin_messages,
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_invite_users(mut self, val: bool) -> Self {
-        self.can_invite_users = Some(val);
-        self
+    pub fn can_promote_members(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator { can_promote_members, .. } => Some(*can_promote_members),
+            Self::Creator { .. }
+            | Self::Member
+            | Self::Restricted { .. }
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_restrict_members(mut self, val: bool) -> Self {
-        self.can_restrict_members = Some(val);
-        self
+    pub fn can_send_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Restricted { can_send_messages, .. } => Some(*can_send_messages),
+            Self::Creator { .. }
+            | Self::Administrator { .. }
+            | Self::Member
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_pin_messages(mut self, val: bool) -> Self {
-        self.can_pin_messages = Some(val);
-        self
+    pub fn can_send_media_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Restricted { can_send_media_messages, .. } => Some(*can_send_media_messages),
+            Self::Creator { .. }
+            | Self::Administrator { .. }
+            | Self::Member
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_promote_members(mut self, val: bool) -> Self {
-        self.can_promote_members = Some(val);
-        self
+    pub fn can_send_other_messages(&self) -> Option<bool> {
+        match &self {
+            Self::Restricted { can_send_other_messages, .. } => Some(*can_send_other_messages),
+            Self::Creator { .. }
+            | Self::Administrator { .. }
+            | Self::Member
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 
-    pub fn can_send_messages(mut self, val: bool) -> Self {
-        self.can_send_messages = Some(val);
-        self
-    }
-
-    pub fn can_send_media_messages(mut self, val: bool) -> Self {
-        self.can_send_media_messages = Some(val);
-        self
-    }
-
-    pub fn can_send_other_messages(mut self, val: bool) -> Self {
-        self.can_send_other_messages = Some(val);
-        self
-    }
-
-    pub fn can_add_web_page_previews(mut self, val: bool) -> Self {
-        self.can_add_web_page_previews = Some(val);
-        self
+    pub fn can_add_web_page_previews(&self) -> Option<bool> {
+        match &self {
+            Self::Restricted { can_add_web_page_previews, .. } => Some(*can_add_web_page_previews),
+            Self::Creator { .. }
+            | Self::Administrator { .. }
+            | Self::Member
+            | Self::Left
+            | Self::Kicked { .. } => None,
+        }
     }
 }
 
@@ -207,53 +291,43 @@ mod tests {
     fn deserialize() {
         let json = r#"{
             "user":{
-                "id":12345,
+                "id":1029940401,
                 "is_bot":false,
-                "first_name":"firstName"
+                "first_name":"First",
+                "last_name":"Last",
+                "username":"fl",
+                "language_code":"en"
             },
-            "status":"creator",
-            "until_date":123456,
-            "can_be_edited":true,
-            "can_post_messages":true,
-            "can_edit_messages":true,
-            "can_delete_messages":true,
-            "can_restrict_members":true,
-            "can_promote_members":true,
+            "status":"administrator",
+            "can_be_edited":false,
             "can_change_info":true,
+            "can_delete_messages":true,
             "can_invite_users":true,
+            "can_restrict_members":true,
             "can_pin_messages":true,
-            "is_member":true,
-            "can_send_messages":true,
-            "can_send_media_messages":true,
-            "can_send_polls":true,
-            "can_send_other_messages":true,
-            "can_add_web_page_previews":true
+            "can_promote_members":true
         }"#;
         let expected = ChatMember {
             user: User {
-                id: 12345,
+                id: 1029940401,
                 is_bot: false,
-                first_name: "firstName".to_string(),
-                last_name: None,
-                username: None,
-                language_code: None,
+                first_name: "First".to_string(),
+                last_name: Some("Last".to_string()),
+                username: Some("fl".to_string()),
+                language_code: Some("en".to_string()),
+            },
+            kind: ChatMemberKind::Administrator {
+                custom_title: None,
+                can_be_edited: false,
+                can_change_info: true,
+                can_post_messages: None,
+                can_edit_messages: None,
+                can_delete_messages: true,
+                can_invite_users: true,
+                can_restrict_members: true,
+                can_pin_messages: Some(true),
+                can_promote_members: true,
             },
-            status: ChatMemberStatus::Creator,
-            custom_title: None,
-            until_date: Some(123_456),
-            can_be_edited: Some(true),
-            can_change_info: Some(true),
-            can_post_messages: Some(true),
-            can_edit_messages: Some(true),
-            can_delete_messages: Some(true),
-            can_invite_users: Some(true),
-            can_restrict_members: Some(true),
-            can_pin_messages: Some(true),
-            can_promote_members: Some(true),
-            can_send_messages: Some(true),
-            can_send_media_messages: Some(true),
-            can_send_other_messages: Some(true),
-            can_add_web_page_previews: Some(true),
         };
         let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
         assert_eq!(actual, expected)

From cd5d6fd6b9dc8a640c5824e273c6c7cd364e5375 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 23 Sep 2020 21:52:09 +0300
Subject: [PATCH 101/755] Make `AutoRequest<_>` fused

---
 src/bot/auto_send.rs | 80 +++++++++++++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index 2ccc6cd5..d1d0d458 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -4,6 +4,8 @@ use std::{
     task::{Context, Poll},
 };
 
+use futures::future::FusedFuture;
+
 use crate::requests::{HasPayload, Output, Request, Requester};
 
 /// Send requests automatically.
@@ -74,19 +76,19 @@ impl<R: Request> AutoRequest<R> {
     }
 }
 
+/// Data of the `AutoRequest` used to not expose variants (I wish there were
+/// private enum variants).
 #[pin_project::pin_project(project = InnerProj, project_replace = InnerRepl)]
 enum Inner<R: Request> {
-    /// Unsent modifiable request
+    /// Unsent modifiable request.
     Request(R),
-    /// Sent request
+    /// Sent request.
     Future(#[pin] R::Send),
-    /// This is mostly redundant variant that is used only to take ownership
-    /// over `Request(R)` before creating `Future(R::Send)` in
-    /// `AutoRequest::poll`.
+    /// Done state. Set after `R::Send::poll` returned `Ready(_)`.
     ///
-    /// Practically we don't create this variant anywhere else and it can be
-    /// ignored.
-    Tmp,
+    /// Also used as a temporary replacement to turn pinned `Request(req)`
+    /// into `Future(req.send())` in `AutoRequest::poll`.
+    Done,
 }
 
 impl<R: Request> Request for AutoRequest<R> {
@@ -98,7 +100,7 @@ impl<R: Request> Request for AutoRequest<R> {
         match self.0 {
             Inner::Request(req) => req.send(),
             Inner::Future(fut) => fut,
-            Inner::Tmp => tmp_unreachable(),
+            Inner::Done => done_unreachable(),
         }
     }
 
@@ -106,7 +108,7 @@ impl<R: Request> Request for AutoRequest<R> {
         match &self.0 {
             Inner::Request(req) => req.send_ref(),
             Inner::Future(_) => already_polled(),
-            Inner::Tmp => tmp_unreachable(),
+            Inner::Done => done_unreachable(),
         }
     }
 }
@@ -118,7 +120,7 @@ impl<R: Request> HasPayload for AutoRequest<R> {
         match &mut self.0 {
             Inner::Request(req) => req.payload_mut(),
             Inner::Future(_) => already_polled(),
-            Inner::Tmp => tmp_unreachable(),
+            Inner::Done => done_unreachable(),
         }
     }
 
@@ -126,7 +128,7 @@ impl<R: Request> HasPayload for AutoRequest<R> {
         match &self.0 {
             Inner::Request(req) => req.payload_ref(),
             Inner::Future(_) => already_polled(),
-            Inner::Tmp => tmp_unreachable(),
+            Inner::Done => done_unreachable(),
         }
     }
 }
@@ -135,30 +137,54 @@ impl<R: Request> Future for AutoRequest<R> {
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.as_mut().project();
+        let mut this: Pin<&mut Inner<_>> = self.as_mut().project().0;
 
-        if let InnerProj::Future(fut) = this.0.as_mut().project() {
-            return fut.poll(cx);
+        match this.as_mut().project() {
+            // Poll underling future
+            InnerProj::Future(fut) => {
+                let res = futures::ready!(fut.poll(cx));
+                // We've got the result, so we set the state to done
+                this.set(Inner::Done);
+                Poll::Ready(res)
+            },
+            // This future is fused
+            InnerProj::Done => Poll::Pending,
+            // The `AutoRequest` future was polled for the first time after
+            // creation. We need to transform it into sent form by calling
+            // `R::send` and doing some magic around Pin.
+            InnerProj::Request(_) => {
+                // Replace `Request(_)` by `Done(_)` to obtain ownership over
+                // the request.
+                let inner = this.as_mut().project_replace(Inner::Done);
+                // Map Request(req) to `Future(req.send())`
+                let inner = match inner {
+                    InnerRepl::Request(req) => Inner::Future(req.send()),
+                    // Practically this is unreachable, because we've just checked for
+                    // both `Future(_)` and `Done` variants.
+                    InnerRepl::Future(_) | InnerRepl::Done => done_unreachable(),
+                };
+                // Set the resulting `Future(_)` back to pin
+                this.set(inner);
+
+                // poll self again, this time
+                self.poll(cx)
+            }
         }
+    }
+}
 
-        let inner = this.0.as_mut().project_replace(Inner::Tmp);
-        let inner = match inner {
-            InnerRepl::Request(req) => Inner::Future(req.send()),
-            // Practically this is unreachable
-            InnerRepl::Future(_) | InnerRepl::Tmp => tmp_unreachable(),
-        };
-        this.0.as_mut().project_replace(inner);
-
-        self.poll(cx)
+impl<R: Request> FusedFuture for AutoRequest<R> {
+    fn is_terminated(&self) -> bool {
+        matches!(&self.0, Inner::Done)
     }
 }
 
 #[inline(never)]
-fn tmp_unreachable() -> ! {
-    unreachable!("tmp is not created outside of AutoRequest::poll")
+fn done_unreachable() -> ! {
+    unreachable!("future is completed and as such doesn't provide any functionality")
 }
 
 #[inline(never)]
 fn already_polled() -> ! {
-    panic!("AutoRequest was already polled")
+    panic!("AutoRequest was already polled once")
 }

From f4b11095a7c90886646291a471673228cde64959 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 23 Sep 2020 22:06:23 +0300
Subject: [PATCH 102/755] fmt

---
 src/bot/auto_send.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index d1d0d458..757ad2af 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -146,7 +146,7 @@ impl<R: Request> Future for AutoRequest<R> {
                 // We've got the result, so we set the state to done
                 this.set(Inner::Done);
                 Poll::Ready(res)
-            },
+            }
             // This future is fused
             InnerProj::Done => Poll::Pending,
             // The `AutoRequest` future was polled for the first time after

From 57afa34609395cad4bf01b7dbfb2893ca631e1a0 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 23 Sep 2020 23:44:53 +0300
Subject: [PATCH 103/755] rephase

---
 src/bot/auto_send.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index 757ad2af..ad082fa5 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -154,7 +154,7 @@ impl<R: Request> Future for AutoRequest<R> {
             // `R::send` and doing some magic around Pin.
             InnerProj::Request(_) => {
                 // Replace `Request(_)` by `Done(_)` to obtain ownership over
-                // the request.
+                // the former.
                 let inner = this.as_mut().project_replace(Inner::Done);
                 // Map Request(req) to `Future(req.send())`
                 let inner = match inner {

From 429ab0b74ac1ac21408cf8c24df44b17925d15eb Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 21:00:02 +0300
Subject: [PATCH 104/755] Apply suggestions from code review

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/bot/auto_send.rs | 11 ++++++-----
 src/lib.rs           |  5 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index ad082fa5..ce3593c7 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -18,7 +18,7 @@ use crate::requests::{HasPayload, Output, Request, Requester};
 /// 1. This wrapper should be the most outer i.e.: `AutoSend<CacheMe<Bot>>`
 ///    will automatically send requests, while `CacheMe<AutoSend<Bot>>` - won't.
 /// 2. After first call to `poll` on a request you will unable to access payload
-///    nor could you use [`send_ref`](Request::send_ref)
+///    nor could you use [`send_ref`](Request::send_ref).
 ///
 /// ## Examples
 ///
@@ -48,7 +48,7 @@ impl<B> AutoSend<B> {
         Self { bot: inner }
     }
 
-    /// Allows to access inner bot
+    /// Allows to access the inner bot.
     pub fn inner(&self) -> &B {
         &self.bot
     }
@@ -143,11 +143,12 @@ impl<R: Request> Future for AutoRequest<R> {
             // Poll underling future
             InnerProj::Future(fut) => {
                 let res = futures::ready!(fut.poll(cx));
-                // We've got the result, so we set the state to done
+                // We've got the result, so we set the state to done.
                 this.set(Inner::Done);
                 Poll::Ready(res)
             }
-            // This future is fused
+
+            // This future is fused.
             InnerProj::Done => Poll::Pending,
             // The `AutoRequest` future was polled for the first time after
             // creation. We need to transform it into sent form by calling
@@ -163,7 +164,7 @@ impl<R: Request> Future for AutoRequest<R> {
                     // both `Future(_)` and `Done` variants.
                     InnerRepl::Future(_) | InnerRepl::Done => done_unreachable(),
                 };
-                // Set the resulting `Future(_)` back to pin
+                // Set the resulting `Future(_)` back to pin.
                 this.set(inner);
 
                 // poll self again, this time
diff --git a/src/lib.rs b/src/lib.rs
index 3c26cd26..214553c8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,9 +13,10 @@
 //#![deny(missing_docs)]
 
 #[macro_use]
-mod local_macros; // internal helper macros
+// The internal helper macros.
+mod local_macros;
 
-// FIXME(waffle): rethink modules, find a place for wrappers
+// FIXME(waffle): rethink modules, find a place for wrappers.
 pub use self::{
     bot::{AutoSend, Bot, BotBuilder, CacheMe},
     errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},

From a7066e5e11911b88e551cc2138c2ce11680bdb3d Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 21:08:38 +0300
Subject: [PATCH 105/755] Apply suggestions from code review

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/bot/auto_send.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index ce3593c7..ed1f489c 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -53,7 +53,7 @@ impl<B> AutoSend<B> {
         &self.bot
     }
 
-    /// Unwraps inner bot
+    /// Unwraps the inner bot.
     pub fn into_inner(self) -> B {
         self.bot
     }
@@ -80,9 +80,9 @@ impl<R: Request> AutoRequest<R> {
 /// private enum variants).
 #[pin_project::pin_project(project = InnerProj, project_replace = InnerRepl)]
 enum Inner<R: Request> {
-    /// Unsent modifiable request.
+    /// An unsent modifiable request.
     Request(R),
-    /// Sent request.
+    /// A sent request.
     Future(#[pin] R::Send),
     /// Done state. Set after `R::Send::poll` returned `Ready(_)`.
     ///
@@ -140,7 +140,7 @@ impl<R: Request> Future for AutoRequest<R> {
         let mut this: Pin<&mut Inner<_>> = self.as_mut().project().0;
 
         match this.as_mut().project() {
-            // Poll underling future
+            // Poll the underling future.
             InnerProj::Future(fut) => {
                 let res = futures::ready!(fut.poll(cx));
                 // We've got the result, so we set the state to done.
@@ -157,7 +157,7 @@ impl<R: Request> Future for AutoRequest<R> {
                 // Replace `Request(_)` by `Done(_)` to obtain ownership over
                 // the former.
                 let inner = this.as_mut().project_replace(Inner::Done);
-                // Map Request(req) to `Future(req.send())`
+                // Map Request(req) to `Future(req.send())`.
                 let inner = match inner {
                     InnerRepl::Request(req) => Inner::Future(req.send()),
                     // Practically this is unreachable, because we've just checked for

From 269859eba93b7d8bafa9cf5c6f99b4735ab83b6b Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 21:11:28 +0300
Subject: [PATCH 106/755] Update src/bot/auto_send.rs

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/bot/auto_send.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index ed1f489c..e64b893c 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -167,7 +167,7 @@ impl<R: Request> Future for AutoRequest<R> {
                 // Set the resulting `Future(_)` back to pin.
                 this.set(inner);
 
-                // poll self again, this time
+                // Poll `self`. This time another brunch will be executed, returning `Poll`.
                 self.poll(cx)
             }
         }

From 8271150218eb29e74614e52593356518442f0646 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Sep 2020 00:45:04 +0300
Subject: [PATCH 107/755] add SendMessage request

---
 src/bot/api.rs               |  10 ++++
 src/bot/cache_me.rs          |  12 ++++
 src/payloads/mod.rs          |   2 +
 src/payloads/send_message.rs | 112 +++++++++++++++++++++++++++++++++++
 src/payloads/setters.rs      |   1 +
 src/requests/requester.rs    |  19 +++++-
 6 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 src/payloads/send_message.rs

diff --git a/src/bot/api.rs b/src/bot/api.rs
index be6b21f5..721f8a71 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1710,4 +1710,14 @@ impl Requester for Bot {
     fn get_me(&self) -> JsonRequest<payloads::GetMe> {
         Self::GetMe::new(self.clone(), payloads::GetMe::new())
     }
+
+    type SendMessage = JsonRequest<payloads::SendMessage>;
+
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> JsonRequest<payloads::SendMessage>
+    where
+        C: Into<ChatId>,
+        T: Into<String>
+    {
+        Self::SendMessage::new(self.clone(), payloads::SendMessage::new(chat_id, text))
+    }
 }
diff --git a/src/bot/cache_me.rs b/src/bot/cache_me.rs
index e4a4623d..51f1ba76 100644
--- a/src/bot/cache_me.rs
+++ b/src/bot/cache_me.rs
@@ -13,6 +13,8 @@ use crate::{
     requests::{HasPayload, Request, Requester},
     types::User,
 };
+use crate::payloads::SendMessage;
+use crate::types::ChatId;
 
 /// `get_me` cache.
 ///
@@ -66,6 +68,16 @@ impl<B: Requester> Requester for CacheMe<B> {
             ),
         }
     }
+
+    type SendMessage = B::SendMessage;
+
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
+    where
+        C: Into<ChatId>,
+        T: Into<String>
+    {
+        self.bot.send_message(chat_id, text)
+    }
 }
 
 pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index e01013c2..c468e562 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,5 +1,7 @@
 pub mod setters;
 
 mod get_me;
+mod send_message;
 
 pub use get_me::{GetMe, GetMeSetters};
+pub use send_message::{SendMessage, SendMessageSetters};
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
new file mode 100644
index 00000000..5d483525
--- /dev/null
+++ b/src/payloads/send_message.rs
@@ -0,0 +1,112 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    requests::{HasPayload, Payload},
+    types::{ChatId, Message, ParseMode, ReplyMarkup}
+};
+
+/// Use this method to send text messages.
+///
+/// On success, the sent [`Message`] is returned.
+///
+/// [`Message`]: crate::types::Message
+#[serde_with_macros::skip_serializing_none]
+#[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
+pub struct SendMessage {
+    ///	Unique identifier for the target chat or username of the target channel
+    /// (in the format `@channelusername`)
+    pub chat_id: ChatId,
+    /// Text of the message to be sent
+    pub text: String,
+    /// Send [Markdown] or [HTML], if you want Telegram apps to show
+    /// [bold, italic, fixed-width text or inline URLs] in your bot's message.
+    ///
+    /// [Markdown]: crate::types::ParseMode::Markdown
+    /// [HTML]: crate::types::ParseMode::HTML
+    /// [bold, italic, fixed-width text or inline URLs]:
+    /// crate::types::ParseMode
+    pub parse_mode: Option<ParseMode>,
+    /// Disables link previews for links in this message
+    pub disable_web_page_preview: Option<bool>,
+    /// Sends the message silently.
+    /// Users will receive a notification with no sound.
+    pub disable_notification: Option<bool>,
+    /// If the message is a reply, [id] of the original message
+    ///
+    /// [id]: crate::types::Message::id
+    pub reply_to_message_id: Option<i32>,
+    /// Additional interface options.
+    pub reply_markup: Option<ReplyMarkup>,
+}
+
+impl Payload for SendMessage {
+    type Output = Message;
+
+    const NAME: &'static str = "sendMessage";
+}
+
+impl SendMessage {
+    pub fn new<C, T>(chat_id: C, text: T) -> Self
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        SendMessage {
+            chat_id: chat_id.into(),
+            text: text.into(),
+            parse_mode: None,
+            disable_web_page_preview: None,
+            disable_notification: None,
+            reply_to_message_id: None,
+            reply_markup: None,
+        }
+    }
+}
+
+pub trait SendMessageSetters: HasPayload<Payload = SendMessage> + Sized {
+    fn chat_id<T>(mut self, value: T) -> Self
+    where
+        T: Into<ChatId>,
+    {
+        self.payload_mut().chat_id = value.into();
+        self
+    }
+
+    fn text<T>(mut self, value: T) -> Self
+    where
+        T: Into<String>, // TODO: into?
+    {
+        self.payload_mut().text = value.into();
+        self
+    }
+
+    fn parse_mode(mut self, value: ParseMode) -> Self {
+        self.payload_mut().parse_mode = Some(value);
+        self
+    }
+
+    fn disable_web_page_preview(mut self, value: bool) -> Self {
+        self.payload_mut().disable_web_page_preview = Some(value);
+        self
+    }
+
+    fn disable_notification(mut self, value: bool) -> Self {
+        self.payload_mut().disable_notification = Some(value);
+        self
+    }
+
+    fn reply_to_message_id(mut self, value: i32) -> Self {
+        self.payload_mut().reply_to_message_id = Some(value);
+        self
+    }
+
+    fn reply_markup<T>(mut self, value: T) -> Self
+    where
+        T: Into<ReplyMarkup>,
+    {
+        self.payload_mut().reply_markup = Some(value.into());
+        self
+    }
+}
+
+impl<P> SendMessageSetters for P where P: HasPayload<Payload = SendMessage> {}
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index c7cfd823..646f1a88 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1 +1,2 @@
 pub use crate::payloads::GetMeSetters as _;
+pub use crate::payloads::SendMessageSetters as _;
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 8390b786..69dd1d25 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1,4 +1,11 @@
-use crate::{payloads::GetMe, requests::Request};
+use crate::{
+    payloads::{
+        GetMe,
+        SendMessage
+    },
+    requests::Request,
+    types::ChatId,
+};
 
 /// The trait implemented by all bots & bot wrappers.
 /// Essentially a request builder factory (?).
@@ -11,5 +18,13 @@ pub trait Requester {
     /// For telegram documentation of the method see [`GetMe`].
     fn get_me(&self) -> Self::GetMe;
 
-    // FIXME(waffle): add remaining 69 methods
+    type SendMessage: Request<Payload = SendMessage>;
+
+    /// For telegram documentation of the method see [`SendMessage`].
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
+    where
+        C: Into<ChatId>,
+        T: Into<String>;
+
+    // FIXME(waffle): add remaining 68 methods
 }

From 4e412b39e1dcb2e1cd0a76a21de15502160b588d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Sep 2020 00:45:57 +0300
Subject: [PATCH 108/755] (very bad) initial implementation of throttling

---
 src/bot/limits.rs | 279 ++++++++++++++++++++++++++++++++++++++++++++++
 src/bot/mod.rs    |   1 +
 2 files changed, 280 insertions(+)
 create mode 100644 src/bot/limits.rs

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
new file mode 100644
index 00000000..d73ff850
--- /dev/null
+++ b/src/bot/limits.rs
@@ -0,0 +1,279 @@
+use crate::Bot;
+use std::collections::{VecDeque, HashMap};
+use std::time::Instant;
+use std::sync::Arc;
+use tokio::sync::Mutex;
+use std::cmp::max;
+use crate::requests::{Requester, Request, Output, HasPayload, Payload};
+use crate::payloads::{GetMe, SendMessage};
+use crate::types::ChatId;
+use tokio::sync::oneshot::{Sender, Receiver, channel};
+use std::future::Future;
+use futures::task::{Context, Poll};
+use pin_project::__private::Pin;
+use core::time::Duration;
+use futures::{TryFutureExt, StreamExt, FutureExt};
+use tokio::time::{delay_until, delay_for};
+use futures::stream::FuturesUnordered;
+use futures::executor::block_on;
+use futures::future::join3;
+
+const MINUTE: Duration = Duration::from_secs(10);
+const SECOND: Duration = Duration::from_secs(1);
+const DELAY: Duration = Duration::from_millis(250); // second/4
+
+pub struct Limits {
+    /// Allowed messages in one chat per second
+    pub chat_s: u32,
+    /// Allowed messages per second
+    pub overall_s: u32,
+    /// Allowed messages in one chat per minute
+    pub chat_m: u32,
+}
+
+// https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
+impl Default for Limits {
+    fn default() -> Self {
+        Self {
+            chat_s: 1,
+            overall_s: 30,
+            chat_m: 20,
+        }
+    }
+}
+
+pub struct Limited<B> {
+    // Some fields are probably only needed by the worker
+    //limits: Limits,
+    bot: B,
+    queue: Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>, // FIXME: struct with fast remove and add
+    history: Arc<Mutex<VecDeque<(ChatId, Instant)>>>,
+    hchats:  Arc<Mutex<HashMap<ChatId, u32>>>,
+}
+
+async fn worker(
+    limits: Limits,
+    queue: Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>,
+    history: Arc<Mutex<VecDeque<(ChatId, Instant)>>>,
+    hchats:  Arc<Mutex<HashMap<ChatId, u32>>>,
+) {
+    // FIXME: remove unnecessary ChatId clones
+    loop {
+        println!("1");
+        let mut history = history.lock().await;
+        let mut hchats = hchats.lock().await;
+        let mut queue = queue.lock().await;
+
+        let now = dbg!(Instant::now());
+        let min_back = now - MINUTE;
+        let sec_back = now - SECOND;
+
+        println!("2");
+
+        // make history and hchats up-to-date
+        while let Some((_, time)) = history.front() {
+            // history is sorted, we found first up-to-date thing
+            if time >= &min_back { break; }
+
+            if let Some((chat, _)) = history.pop_front() {
+                hchats
+                    .entry(chat)
+                    .and_modify(|count| { *count -= 1; }); // TODO: remove entries with count == 0
+            }
+        }
+
+        // as truncates which is ok since in case of truncation it would always be >= limits.overall_s
+        let mut allowed = limits.overall_s.saturating_sub(dbg!(&history).iter().take_while(|(_, time)| time > &sec_back).count() as u32);
+
+        if allowed == 0 {
+            delay_for(DELAY).await;
+            continue;
+        }
+
+        println!("3");
+
+        let mut hchats_s = HashMap::new();
+        for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
+            *hchats_s
+                .entry(chat.clone())
+                .or_insert(0) += 1;
+        }
+
+
+        dbg!(&hchats_s);
+        dbg!(&hchats);
+
+        dbg!(allowed);
+
+        let mut i = 0;
+        while allowed > 0 && i < queue.len() {
+            let chat = &queue[i].0;
+
+            if dbg!(hchats_s
+                .get(chat)
+                .copied()
+                .unwrap_or(0) < limits.chat_s) &&
+                dbg!(hchats
+                    .get(chat)
+                    .copied()
+                    .unwrap_or(0) < limits.chat_m)
+            {
+                let chat = chat.clone();
+                *hchats_s.entry(chat.clone()).or_insert(0) += 1;
+                *hchats.entry(chat.clone()).or_insert(0) += 1;
+
+                println!("worker send");
+                dbg!(&hchats_s);
+                dbg!(&hchats);
+                history.push_back((chat, Instant::now()));
+                queue.remove(i).unwrap().1.send(());
+                allowed -= 1;
+                dbg!(allowed);
+            } else {
+                i += 1;
+            }
+        }
+
+        delay_for(DELAY).await;
+    }
+}
+
+impl<B> Limited<B> {
+    pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
+        let history = Arc::new(Mutex::new(VecDeque::with_capacity(
+            max(limits.chat_s, max(limits.overall_s, limits.chat_m)) as _
+        )));
+
+        let queue = Arc::new(Mutex::new(VecDeque::new()));
+        let hchats = Arc::new(Mutex::new(HashMap::new()));
+
+        let worker = worker(
+            limits,
+            Arc::clone(&queue),
+            Arc::clone(&history),
+            Arc::clone(&hchats),
+        );
+
+        let this = Self {
+            //limits,
+            bot,
+            history,
+            queue,
+            hchats,
+        };
+
+        (this, worker)
+    }
+}
+
+impl<B: Requester> Requester for Limited<B> {
+    type GetMe = B::GetMe;
+
+    fn get_me(&self) -> Self::GetMe {
+        self.bot.get_me()
+    }
+
+    type SendMessage = LimitedRequest<B::SendMessage>;
+
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
+    where
+        C: Into<ChatId>,
+        T: Into<String>
+    {
+        LimitedRequest(self.bot.send_message(chat_id, text), Arc::clone(&self.queue))
+    }
+}
+
+pub trait GetChatId {
+    // FIXME(waffle): add note about false negatives with ChatId::Username
+    fn get_chat_id(&self) -> &ChatId;
+}
+
+impl GetChatId for SendMessage {
+    fn get_chat_id(&self) -> &ChatId {
+        &self.chat_id
+    }
+}
+
+pub struct LimitedRequest<R>(R, Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>);
+
+impl<R: HasPayload> HasPayload for LimitedRequest<R> {
+    type Payload = R::Payload;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self.0.payload_mut()
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self.0.payload_ref()
+    }
+}
+
+impl<R: Request> Request for LimitedRequest<R>
+where
+    <R as HasPayload>::Payload: GetChatId,
+{
+    type Err = R::Err;
+    type Send = LimitedSend<R>;
+    type SendRef = LimitedSend<R>;
+
+    fn send(self) -> Self::Send {
+        let (tx, rx) = channel();
+        // FIXME
+        let mut g = block_on(self.1.lock());
+        g.push_back((self.0.payload_ref().get_chat_id().clone(), tx));
+        LimitedSend::Pending {
+            request: self.0,
+            wait: rx,
+        }
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        unimplemented!()
+    }
+}
+
+#[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
+pub enum LimitedSend<R: Request> {
+    Pending {
+        request: R,
+        #[pin]
+        wait: Receiver<()>,
+    },
+    Sent {
+        #[pin]
+        fut: R::Send,
+    },
+    Done,
+}
+
+impl<R: Request> Future for LimitedSend<R> {
+    type Output = Result<Output<R>, R::Err>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        println!("poll");
+        match self.as_mut().project() {
+            SendProj::Pending { request: _, wait } => match wait.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(r) => {
+                    println!("pending-ready");
+                    // FIXME(waffle): remove unwrap
+                    r.unwrap();
+                    if let SendRepl::Pending { request, wait: _ } = self.as_mut().project_replace(LimitedSend::Done) {
+                        self.as_mut().project_replace(LimitedSend::Sent { fut: request.send() });
+                    }
+
+                    self.poll(cx)
+                }
+            },
+            SendProj::Sent { fut } => {
+                println!("sent");
+                let res = futures::ready!(fut.poll(cx));
+                println!("sent-ready");
+                self.set(LimitedSend::Done);
+                Poll::Ready(res)
+            }
+            SendProj::Done => Poll::Pending,
+        }
+    }
+}
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 3347c932..54154cad 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -17,6 +17,7 @@ mod api;
 mod auto_send;
 mod cache_me;
 mod download;
+mod limits;
 
 pub use auto_send::AutoSend;
 pub use cache_me::CacheMe;

From f270613e7ec5f4844baca766148c8465d8df15a3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Sep 2020 22:17:59 +0300
Subject: [PATCH 109/755] [throttle] refactor#0

- Move all data to the worker making it unshared.
- Use mpsc channel to update requests queue
- Yield if there are no requests in queue
- Remove `:0` entries from `hchats`
- Remove debug prints
- Remove use of `block_on`
---
 src/bot/limits.rs | 179 +++++++++++++++++++++++++++++-----------------
 1 file changed, 115 insertions(+), 64 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index d73ff850..539c6dee 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -2,7 +2,7 @@ use crate::Bot;
 use std::collections::{VecDeque, HashMap};
 use std::time::Instant;
 use std::sync::Arc;
-use tokio::sync::Mutex;
+use tokio::sync::{Mutex, mpsc};
 use std::cmp::max;
 use crate::requests::{Requester, Request, Output, HasPayload, Payload};
 use crate::payloads::{GetMe, SendMessage};
@@ -17,8 +17,11 @@ use tokio::time::{delay_until, delay_for};
 use futures::stream::FuturesUnordered;
 use futures::executor::block_on;
 use futures::future::join3;
+use futures::future::ready;
 
-const MINUTE: Duration = Duration::from_secs(10);
+// FIXME: rename to Throttle
+
+const MINUTE: Duration = Duration::from_secs(50); // FIXME: min = sec * 10 only in tests
 const SECOND: Duration = Duration::from_secs(1);
 const DELAY: Duration = Duration::from_millis(250); // second/4
 
@@ -43,42 +46,52 @@ impl Default for Limits {
 }
 
 pub struct Limited<B> {
-    // Some fields are probably only needed by the worker
-    //limits: Limits,
     bot: B,
-    queue: Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>, // FIXME: struct with fast remove and add
-    history: Arc<Mutex<VecDeque<(ChatId, Instant)>>>,
-    hchats:  Arc<Mutex<HashMap<ChatId, u32>>>,
+    queue: mpsc::Sender<(ChatId, Sender<()>)>,
 }
 
 async fn worker(
     limits: Limits,
-    queue: Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>,
-    history: Arc<Mutex<VecDeque<(ChatId, Instant)>>>,
-    hchats:  Arc<Mutex<HashMap<ChatId, u32>>>,
+    mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>)>,
 ) {
-    // FIXME: remove unnecessary ChatId clones
-    loop {
-        println!("1");
-        let mut history = history.lock().await;
-        let mut hchats = hchats.lock().await;
-        let mut queue = queue.lock().await;
+    // FIXME: use spawn_blocking?
 
-        let now = dbg!(Instant::now());
+    // FIXME: remove unnecessary ChatId clones
+
+    // FIXME: struct with fast random remove and append-to-the-end
+    let mut queue: VecDeque<(ChatId, Sender<()>)> = VecDeque::new(); // FIXME: with_cap
+
+    let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
+    // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
+    let mut hchats: HashMap<ChatId, u32> = HashMap::new();
+
+    loop {
+        // If there are no pending requests we are just waiting
+        if queue.is_empty() {
+            queue.push_back(queue_rx.recv().await.unwrap());
+        }
+
+        // update local queue with latest requests
+        while let Ok(e) = queue_rx.try_recv() {
+            // FIXME: properly check for errors (stop when the bot's sender is dropped?)
+            queue.push_back(e)
+        }
+
+        let now = Instant::now();
         let min_back = now - MINUTE;
         let sec_back = now - SECOND;
 
-        println!("2");
-
         // make history and hchats up-to-date
         while let Some((_, time)) = history.front() {
             // history is sorted, we found first up-to-date thing
             if time >= &min_back { break; }
 
             if let Some((chat, _)) = history.pop_front() {
-                hchats
+                if let Entry::Occupied(entry) = hchats
                     .entry(chat)
-                    .and_modify(|count| { *count -= 1; }); // TODO: remove entries with count == 0
+                    .and_modify(|count| { *count -= 1; }) {
+                    if entry.get() == 0 { entry.remove_entry(); }
+                }
             }
         }
 
@@ -90,8 +103,6 @@ async fn worker(
             continue;
         }
 
-        println!("3");
-
         let mut hchats_s = HashMap::new();
         for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
             *hchats_s
@@ -99,36 +110,26 @@ async fn worker(
                 .or_insert(0) += 1;
         }
 
-
-        dbg!(&hchats_s);
-        dbg!(&hchats);
-
-        dbg!(allowed);
-
         let mut i = 0;
         while allowed > 0 && i < queue.len() {
             let chat = &queue[i].0;
 
-            if dbg!(hchats_s
+            if hchats_s
                 .get(chat)
                 .copied()
-                .unwrap_or(0) < limits.chat_s) &&
-                dbg!(hchats
+                .unwrap_or(0) < limits.chat_s &&
+                hchats
                     .get(chat)
                     .copied()
-                    .unwrap_or(0) < limits.chat_m)
+                    .unwrap_or(0) < limits.chat_m
             {
                 let chat = chat.clone();
                 *hchats_s.entry(chat.clone()).or_insert(0) += 1;
                 *hchats.entry(chat.clone()).or_insert(0) += 1;
 
-                println!("worker send");
-                dbg!(&hchats_s);
-                dbg!(&hchats);
                 history.push_back((chat, Instant::now()));
                 queue.remove(i).unwrap().1.send(());
                 allowed -= 1;
-                dbg!(allowed);
             } else {
                 i += 1;
             }
@@ -140,27 +141,15 @@ async fn worker(
 
 impl<B> Limited<B> {
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
-        let history = Arc::new(Mutex::new(VecDeque::with_capacity(
-            max(limits.chat_s, max(limits.overall_s, limits.chat_m)) as _
-        )));
-
-        let queue = Arc::new(Mutex::new(VecDeque::new()));
-        let hchats = Arc::new(Mutex::new(HashMap::new()));
+        // FIXME: just a random number, currently
+        let (queue_tx, queue_rx) = mpsc::channel(130);
 
         let worker = worker(
             limits,
-            Arc::clone(&queue),
-            Arc::clone(&history),
-            Arc::clone(&hchats),
+            queue_rx,
         );
 
-        let this = Self {
-            //limits,
-            bot,
-            history,
-            queue,
-            hchats,
-        };
+        let this = Self { bot, queue: queue_tx, };
 
         (this, worker)
     }
@@ -180,7 +169,7 @@ impl<B: Requester> Requester for Limited<B> {
         C: Into<ChatId>,
         T: Into<String>
     {
-        LimitedRequest(self.bot.send_message(chat_id, text), Arc::clone(&self.queue))
+        LimitedRequest(self.bot.send_message(chat_id, text), self.queue.clone())
     }
 }
 
@@ -195,7 +184,7 @@ impl GetChatId for SendMessage {
     }
 }
 
-pub struct LimitedRequest<R>(R, Arc<Mutex<VecDeque<(ChatId, Sender<()>)>>>);
+pub struct LimitedRequest<R>(R, mpsc::Sender<(ChatId, Sender<()>)>);
 
 impl<R: HasPayload> HasPayload for LimitedRequest<R> {
     type Payload = R::Payload;
@@ -217,13 +206,12 @@ where
     type Send = LimitedSend<R>;
     type SendRef = LimitedSend<R>;
 
-    fn send(self) -> Self::Send {
+    fn send(mut self) -> Self::Send {
         let (tx, rx) = channel();
-        // FIXME
-        let mut g = block_on(self.1.lock());
-        g.push_back((self.0.payload_ref().get_chat_id().clone(), tx));
-        LimitedSend::Pending {
+        let send = self.1.send_t((self.0.payload_ref().get_chat_id().clone(), tx));
+        LimitedSend::Registering {
             request: self.0,
+            send,
             wait: rx,
         }
     }
@@ -235,6 +223,12 @@ where
 
 #[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
 pub enum LimitedSend<R: Request> {
+    Registering {
+        request: R,
+        #[pin]
+        send: ChanSend,
+        wait: Receiver<()>,
+    },
     Pending {
         request: R,
         #[pin]
@@ -251,12 +245,22 @@ impl<R: Request> Future for LimitedSend<R> {
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        println!("poll");
         match self.as_mut().project() {
+            SendProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(r) => {
+                    // FIXME(waffle): remove unwrap
+                    r.unwrap();
+                    if let SendRepl::Registering { request, send: _, wait } = self.as_mut().project_replace(LimitedSend::Done) {
+                        self.as_mut().project_replace(LimitedSend::Pending { request, wait });
+                    }
+
+                    self.poll(cx)
+                }
+            },
             SendProj::Pending { request: _, wait } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(r) => {
-                    println!("pending-ready");
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRepl::Pending { request, wait: _ } = self.as_mut().project_replace(LimitedSend::Done) {
@@ -267,9 +271,7 @@ impl<R: Request> Future for LimitedSend<R> {
                 }
             },
             SendProj::Sent { fut } => {
-                println!("sent");
                 let res = futures::ready!(fut.poll(cx));
-                println!("sent-ready");
                 self.set(LimitedSend::Done);
                 Poll::Ready(res)
             }
@@ -277,3 +279,52 @@ impl<R: Request> Future for LimitedSend<R> {
         }
     }
 }
+
+use chan_send::{ChanSend, SendTy as _};
+use crate::bot::limits::chan_send::SendTy;
+use std::collections::hash_map::Entry;
+
+mod chan_send {
+    use tokio::sync::mpsc;
+    use crate::types::ChatId;
+    use tokio::sync::oneshot::Sender;
+    use std::future::Future;
+    use futures::task::{Context, Poll};
+    use pin_project::__private::Pin;
+    use tokio::sync::mpsc::error::SendError;
+
+    pub(crate) trait SendTy {
+        fn send_t(self, val: (ChatId, Sender<()>)) -> ChanSend;
+    }
+
+    #[pin_project::pin_project]
+    pub/*(crate) */struct ChanSend(#[pin] Inner); // FIXME
+
+    #[cfg(not(feature = "nightly"))]
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(ChatId, Sender<()>)>>>>>;
+    #[cfg(feature = "nightly")]
+    type Inner = impl Future<Output = Result<(), SendError<(ChatId, Sender<()>)>>>;
+
+    impl SendTy for mpsc::Sender<(ChatId, Sender<()>)> {
+        fn send_t(mut self, val: (ChatId, Sender<()>)) -> ChanSend {
+            #[cfg(feature = "nightly")]
+            {
+                fn def(mut sender: mpsc::Sender<(ChatId, Sender<()>)>, val: (ChatId, Sender<()>)) -> Inner {
+                    async move { sender.send(val).await }
+                }
+                return ChanSend(def(self, val));
+            }
+            #[cfg(not(feature = "nightly"))]
+            return ChanSend(Box::pin(async move { self.send(val).await }));
+        }
+    }
+
+    impl Future for ChanSend {
+        type Output = Result<(), SendError<(ChatId, Sender<()>)>>;
+
+        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            self.project().0.poll(cx)
+        }
+    }
+
+}
\ No newline at end of file

From 3f9db1f31beda47dc07447ba7d0d03c882a59dea Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Sep 2020 19:21:35 +0300
Subject: [PATCH 110/755] [throttle] queue optimizations#0

---
 src/bot/limits.rs | 60 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 539c6dee..be8e3a12 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -59,7 +59,7 @@ async fn worker(
     // FIXME: remove unnecessary ChatId clones
 
     // FIXME: struct with fast random remove and append-to-the-end
-    let mut queue: VecDeque<(ChatId, Sender<()>)> = VecDeque::new(); // FIXME: with_cap
+    let mut queue: Vec<Option<(ChatId, Sender<()>)>> = Vec::new(); // FIXME: with_cap
 
     let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
     // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
@@ -68,13 +68,13 @@ async fn worker(
     loop {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
-            queue.push_back(queue_rx.recv().await.unwrap());
+            queue.push(Some(queue_rx.recv().await.unwrap()));
         }
 
         // update local queue with latest requests
         while let Ok(e) = queue_rx.try_recv() {
             // FIXME: properly check for errors (stop when the bot's sender is dropped?)
-            queue.push_back(e)
+            queue.push(Some(e))
         }
 
         let now = Instant::now();
@@ -90,13 +90,13 @@ async fn worker(
                 if let Entry::Occupied(entry) = hchats
                     .entry(chat)
                     .and_modify(|count| { *count -= 1; }) {
-                    if entry.get() == 0 { entry.remove_entry(); }
+                    if *entry.get() == 0 { entry.remove_entry(); }
                 }
             }
         }
 
         // as truncates which is ok since in case of truncation it would always be >= limits.overall_s
-        let mut allowed = limits.overall_s.saturating_sub(dbg!(&history).iter().take_while(|(_, time)| time > &sec_back).count() as u32);
+        let mut allowed = limits.overall_s.saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
 
         if allowed == 0 {
             delay_for(DELAY).await;
@@ -110,30 +110,45 @@ async fn worker(
                 .or_insert(0) += 1;
         }
 
-        let mut i = 0;
-        while allowed > 0 && i < queue.len() {
-            let chat = &queue[i].0;
-
-            if hchats_s
-                .get(chat)
-                .copied()
-                .unwrap_or(0) < limits.chat_s &&
-                hchats
+        let mut empty = 0;
+        for i in 0..queue.len() {
+            let chat = &queue[i].as_ref().unwrap().0;
+            let cond = {
+                hchats_s
                     .get(chat)
                     .copied()
-                    .unwrap_or(0) < limits.chat_m
-            {
-                let chat = chat.clone();
-                *hchats_s.entry(chat.clone()).or_insert(0) += 1;
-                *hchats.entry(chat.clone()).or_insert(0) += 1;
+                    .unwrap_or(0) < limits.chat_s &&
+                    hchats
+                        .get(chat)
+                        .copied()
+                        .unwrap_or(0) < limits.chat_m
+            };
+
+            if cond {
+                {
+                    *hchats_s.entry(chat.clone()).or_insert(0) += 1;
+                    *hchats.entry(chat.clone()).or_insert(0) += 1;
+                    history.push_back((chat.clone(), Instant::now()));
+                }
+                queue[i].take().unwrap().1.send(());
 
-                history.push_back((chat, Instant::now()));
-                queue.remove(i).unwrap().1.send(());
                 allowed -= 1;
+                if allowed == 0 {
+                    if empty != i {
+                        // FIXME: this could be more optimal
+                        for j in i..queue.len() {
+                            queue.swap(j, empty);
+                            empty += 1;
+                        }
+                    }
+                    break;
+                }
             } else {
-                i += 1;
+                queue.swap(i, empty);
+                empty += 1;
             }
         }
+        queue.truncate(empty);
 
         delay_for(DELAY).await;
     }
@@ -283,6 +298,7 @@ impl<R: Request> Future for LimitedSend<R> {
 use chan_send::{ChanSend, SendTy as _};
 use crate::bot::limits::chan_send::SendTy;
 use std::collections::hash_map::Entry;
+use core::mem;
 
 mod chan_send {
     use tokio::sync::mpsc;

From 5f5e42054d22da566434962c81a7c133f487de97 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Sep 2020 19:30:04 +0300
Subject: [PATCH 111/755] [throttle] queue optimizations#1

---
 Cargo.toml        |  3 +++
 src/bot/limits.rs | 27 ++++++++++-----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 12200248..b46e902b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,6 +34,9 @@ mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.4.0"
 
+# FIXME(waffle): use crates.io once published
+vecrem = { git = "https://github.com/WaffleLapkin/vecrem" }
+
 [features]
 # features those require nightly compiler
 nightly = []
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index be8e3a12..093ee9ce 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -59,7 +59,7 @@ async fn worker(
     // FIXME: remove unnecessary ChatId clones
 
     // FIXME: struct with fast random remove and append-to-the-end
-    let mut queue: Vec<Option<(ChatId, Sender<()>)>> = Vec::new(); // FIXME: with_cap
+    let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap
 
     let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
     // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
@@ -68,13 +68,13 @@ async fn worker(
     loop {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
-            queue.push(Some(queue_rx.recv().await.unwrap()));
+            queue.push(queue_rx.recv().await.unwrap());
         }
 
         // update local queue with latest requests
         while let Ok(e) = queue_rx.try_recv() {
             // FIXME: properly check for errors (stop when the bot's sender is dropped?)
-            queue.push(Some(e))
+            queue.push(e)
         }
 
         let now = Instant::now();
@@ -110,9 +110,9 @@ async fn worker(
                 .or_insert(0) += 1;
         }
 
-        let mut empty = 0;
-        for i in 0..queue.len() {
-            let chat = &queue[i].as_ref().unwrap().0;
+        let mut queue_rem = queue.removing();
+        while let Some(entry) = queue_rem.next() {
+            let chat = &entry.value().0;
             let cond = {
                 hchats_s
                     .get(chat)
@@ -130,25 +130,17 @@ async fn worker(
                     *hchats.entry(chat.clone()).or_insert(0) += 1;
                     history.push_back((chat.clone(), Instant::now()));
                 }
-                queue[i].take().unwrap().1.send(());
+                entry.remove().1.send(());
 
                 allowed -= 1;
                 if allowed == 0 {
-                    if empty != i {
-                        // FIXME: this could be more optimal
-                        for j in i..queue.len() {
-                            queue.swap(j, empty);
-                            empty += 1;
-                        }
-                    }
                     break;
                 }
             } else {
-                queue.swap(i, empty);
-                empty += 1;
+                entry.skip();
             }
         }
-        queue.truncate(empty);
+        drop(queue_rem);
 
         delay_for(DELAY).await;
     }
@@ -299,6 +291,7 @@ use chan_send::{ChanSend, SendTy as _};
 use crate::bot::limits::chan_send::SendTy;
 use std::collections::hash_map::Entry;
 use core::mem;
+use vecrem::VecExt;
 
 mod chan_send {
     use tokio::sync::mpsc;

From 6714a9c503eb28b060a6fc541468d81de1646679 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Sep 2020 21:39:45 +0300
Subject: [PATCH 112/755] [throttle] clear `hchats_s` instead of
 creating&dropping every iteration

---
 src/bot/limits.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 093ee9ce..87ee3813 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -58,13 +58,17 @@ async fn worker(
 
     // FIXME: remove unnecessary ChatId clones
 
-    // FIXME: struct with fast random remove and append-to-the-end
+    // FIXME: Make an research about data structures for this queue.
+    //        Currently this is O(n) removing (n = number of elements stayed),
+    //        amortized O(1) push (vec+vecrem).
     let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap
 
     let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
     // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
     let mut hchats: HashMap<ChatId, u32> = HashMap::new();
 
+    let mut hchats_s = HashMap::new();
+
     loop {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
@@ -99,11 +103,11 @@ async fn worker(
         let mut allowed = limits.overall_s.saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
 
         if allowed == 0 {
+            hchats_s.clear();
             delay_for(DELAY).await;
             continue;
         }
 
-        let mut hchats_s = HashMap::new();
         for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
             *hchats_s
                 .entry(chat.clone())
@@ -142,6 +146,7 @@ async fn worker(
         }
         drop(queue_rem);
 
+        hchats_s.clear();
         delay_for(DELAY).await;
     }
 }

From b38e35b63095bdbe6d9b1aae1002d40b9428edd7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Sep 2020 22:41:11 +0300
Subject: [PATCH 113/755] [throttle] format, docs, modfix and small additions

---
 Cargo.toml                    |   2 +-
 src/bot/api.rs                |   2 +-
 src/bot/cache_me.rs           |   6 +-
 src/bot/limits.rs             | 196 +++++++++++++++++++---------------
 src/bot/mod.rs                |   1 +
 src/lib.rs                    |   5 +-
 src/payloads/send_message.rs  |   2 +-
 src/payloads/setters.rs       |   3 +-
 src/requests/requester.rs     |   5 +-
 src/requests/requester_ext.rs |  19 +++-
 10 files changed, 141 insertions(+), 100 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b46e902b..01f3f1ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ thiserror = "1.0.20"
 once_cell = "1.4.0"
 
 # FIXME(waffle): use crates.io once published
-vecrem = { git = "https://github.com/WaffleLapkin/vecrem" }
+vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8b75548c6ed387072ff235429b1" }
 
 [features]
 # features those require nightly compiler
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 721f8a71..5e2cb0ad 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1716,7 +1716,7 @@ impl Requester for Bot {
     fn send_message<C, T>(&self, chat_id: C, text: T) -> JsonRequest<payloads::SendMessage>
     where
         C: Into<ChatId>,
-        T: Into<String>
+        T: Into<String>,
     {
         Self::SendMessage::new(self.clone(), payloads::SendMessage::new(chat_id, text))
     }
diff --git a/src/bot/cache_me.rs b/src/bot/cache_me.rs
index 51f1ba76..8a06ebf2 100644
--- a/src/bot/cache_me.rs
+++ b/src/bot/cache_me.rs
@@ -11,10 +11,8 @@ use once_cell::sync::OnceCell;
 use crate::{
     payloads::GetMe,
     requests::{HasPayload, Request, Requester},
-    types::User,
+    types::{ChatId, User},
 };
-use crate::payloads::SendMessage;
-use crate::types::ChatId;
 
 /// `get_me` cache.
 ///
@@ -74,7 +72,7 @@ impl<B: Requester> Requester for CacheMe<B> {
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
         C: Into<ChatId>,
-        T: Into<String>
+        T: Into<String>,
     {
         self.bot.send_message(chat_id, text)
     }
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 87ee3813..9b74ae72 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -1,30 +1,35 @@
-use crate::Bot;
-use std::collections::{VecDeque, HashMap};
-use std::time::Instant;
-use std::sync::Arc;
-use tokio::sync::{Mutex, mpsc};
-use std::cmp::max;
-use crate::requests::{Requester, Request, Output, HasPayload, Payload};
-use crate::payloads::{GetMe, SendMessage};
-use crate::types::ChatId;
-use tokio::sync::oneshot::{Sender, Receiver, channel};
-use std::future::Future;
-use futures::task::{Context, Poll};
-use pin_project::__private::Pin;
-use core::time::Duration;
-use futures::{TryFutureExt, StreamExt, FutureExt};
-use tokio::time::{delay_until, delay_for};
-use futures::stream::FuturesUnordered;
-use futures::executor::block_on;
-use futures::future::join3;
-use futures::future::ready;
+use std::{
+    collections::{hash_map::Entry, HashMap, VecDeque},
+    future::Future,
+    pin::Pin,
+    time::{Duration, Instant},
+};
 
-// FIXME: rename to Throttle
+use futures::task::{Context, Poll};
+use tokio::{
+    sync::{
+        mpsc,
+        oneshot::{channel, Receiver, Sender},
+    },
+    time::delay_for,
+};
+use vecrem::VecExt;
+
+use crate::{
+    bot::limits::chan_send::{ChanSend, SendTy},
+    payloads::SendMessage,
+    requests::{HasPayload, Output, Request, Requester},
+    types::ChatId,
+};
 
 const MINUTE: Duration = Duration::from_secs(50); // FIXME: min = sec * 10 only in tests
 const SECOND: Duration = Duration::from_secs(1);
 const DELAY: Duration = Duration::from_millis(250); // second/4
 
+/// Telegram request limits.
+///
+/// This struct is used in [`Throttle`]
+#[derive(Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Limits {
     /// Allowed messages in one chat per second
     pub chat_s: u32,
@@ -34,26 +39,21 @@ pub struct Limits {
     pub chat_m: u32,
 }
 
-// https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
+/// Defaults are taken from [telegram documentation][tgdoc].
+///
+/// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
 impl Default for Limits {
     fn default() -> Self {
-        Self {
-            chat_s: 1,
-            overall_s: 30,
-            chat_m: 20,
-        }
+        Self { chat_s: 1, overall_s: 30, chat_m: 20 }
     }
 }
 
-pub struct Limited<B> {
+pub struct Throttle<B> {
     bot: B,
     queue: mpsc::Sender<(ChatId, Sender<()>)>,
 }
 
-async fn worker(
-    limits: Limits,
-    mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>)>,
-) {
+async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>)>) {
     // FIXME: use spawn_blocking?
 
     // FIXME: remove unnecessary ChatId clones
@@ -88,19 +88,26 @@ async fn worker(
         // make history and hchats up-to-date
         while let Some((_, time)) = history.front() {
             // history is sorted, we found first up-to-date thing
-            if time >= &min_back { break; }
+            if time >= &min_back {
+                break;
+            }
 
             if let Some((chat, _)) = history.pop_front() {
-                if let Entry::Occupied(entry) = hchats
-                    .entry(chat)
-                    .and_modify(|count| { *count -= 1; }) {
-                    if *entry.get() == 0 { entry.remove_entry(); }
+                if let Entry::Occupied(entry) = hchats.entry(chat).and_modify(|count| {
+                    *count -= 1;
+                }) {
+                    if *entry.get() == 0 {
+                        entry.remove_entry();
+                    }
                 }
             }
         }
 
-        // as truncates which is ok since in case of truncation it would always be >= limits.overall_s
-        let mut allowed = limits.overall_s.saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
+        // as truncates which is ok since in case of truncation it would always be >=
+        // limits.overall_s
+        let mut allowed = limits
+            .overall_s
+            .saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
 
         if allowed == 0 {
             hchats_s.clear();
@@ -109,23 +116,15 @@ async fn worker(
         }
 
         for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
-            *hchats_s
-                .entry(chat.clone())
-                .or_insert(0) += 1;
+            *hchats_s.entry(chat.clone()).or_insert(0) += 1;
         }
 
         let mut queue_rem = queue.removing();
         while let Some(entry) = queue_rem.next() {
             let chat = &entry.value().0;
             let cond = {
-                hchats_s
-                    .get(chat)
-                    .copied()
-                    .unwrap_or(0) < limits.chat_s &&
-                    hchats
-                        .get(chat)
-                        .copied()
-                        .unwrap_or(0) < limits.chat_m
+                hchats_s.get(chat).copied().unwrap_or(0) < limits.chat_s
+                    && hchats.get(chat).copied().unwrap_or(0) < limits.chat_m
             };
 
             if cond {
@@ -151,37 +150,70 @@ async fn worker(
     }
 }
 
-impl<B> Limited<B> {
+impl<B> Throttle<B> {
+    /// Creates new [`Throttle`] alongside with worker future.
+    ///
+    /// Note: [`Throttle`] will only send requests if returned worker is
+    /// polled/spawned/awaited.
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
         // FIXME: just a random number, currently
         let (queue_tx, queue_rx) = mpsc::channel(130);
 
-        let worker = worker(
-            limits,
-            queue_rx,
-        );
+        let worker = worker(limits, queue_rx);
 
-        let this = Self { bot, queue: queue_tx, };
+        let this = Self { bot, queue: queue_tx };
 
         (this, worker)
     }
+
+    /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
+    ///
+    /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
+    pub fn new_spawn(bot: B, limits: Limits) -> Self
+    where
+        // Basically, I hate this bound.
+        // This is yet another problem caused by [rust-lang/#76882].
+        // And I think it *is* a bug.
+        //
+        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
+        //
+        // Though crucially I can't think of a case with non-static bot.
+        // But anyway, it doesn't change the fact that this bound is redundant.
+        //
+        // (waffle)
+        B: 'static,
+    {
+        let (this, worker) = Self::new(bot, limits);
+        tokio::spawn(worker);
+        this
+    }
+
+    /// Allows to access inner bot
+    pub fn inner(&self) -> &B {
+        &self.bot
+    }
+
+    /// Unwraps inner bot
+    pub fn into_inner(self) -> B {
+        self.bot
+    }
 }
 
-impl<B: Requester> Requester for Limited<B> {
+impl<B: Requester> Requester for Throttle<B> {
     type GetMe = B::GetMe;
 
     fn get_me(&self) -> Self::GetMe {
         self.bot.get_me()
     }
 
-    type SendMessage = LimitedRequest<B::SendMessage>;
+    type SendMessage = ThrottlingRequest<B::SendMessage>;
 
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
         C: Into<ChatId>,
-        T: Into<String>
+        T: Into<String>,
     {
-        LimitedRequest(self.bot.send_message(chat_id, text), self.queue.clone())
+        ThrottlingRequest(self.bot.send_message(chat_id, text), self.queue.clone())
     }
 }
 
@@ -196,9 +228,9 @@ impl GetChatId for SendMessage {
     }
 }
 
-pub struct LimitedRequest<R>(R, mpsc::Sender<(ChatId, Sender<()>)>);
+pub struct ThrottlingRequest<R>(R, mpsc::Sender<(ChatId, Sender<()>)>);
 
-impl<R: HasPayload> HasPayload for LimitedRequest<R> {
+impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
 
     fn payload_mut(&mut self) -> &mut Self::Payload {
@@ -210,7 +242,7 @@ impl<R: HasPayload> HasPayload for LimitedRequest<R> {
     }
 }
 
-impl<R: Request> Request for LimitedRequest<R>
+impl<R: Request> Request for ThrottlingRequest<R>
 where
     <R as HasPayload>::Payload: GetChatId,
 {
@@ -218,14 +250,10 @@ where
     type Send = LimitedSend<R>;
     type SendRef = LimitedSend<R>;
 
-    fn send(mut self) -> Self::Send {
+    fn send(self) -> Self::Send {
         let (tx, rx) = channel();
         let send = self.1.send_t((self.0.payload_ref().get_chat_id().clone(), tx));
-        LimitedSend::Registering {
-            request: self.0,
-            send,
-            wait: rx,
-        }
+        LimitedSend::Registering { request: self.0, send, wait: rx }
     }
 
     fn send_ref(&self) -> Self::SendRef {
@@ -263,7 +291,9 @@ impl<R: Request> Future for LimitedSend<R> {
                 Poll::Ready(r) => {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
-                    if let SendRepl::Registering { request, send: _, wait } = self.as_mut().project_replace(LimitedSend::Done) {
+                    if let SendRepl::Registering { request, send: _, wait } =
+                        self.as_mut().project_replace(LimitedSend::Done)
+                    {
                         self.as_mut().project_replace(LimitedSend::Pending { request, wait });
                     }
 
@@ -275,7 +305,9 @@ impl<R: Request> Future for LimitedSend<R> {
                 Poll::Ready(r) => {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
-                    if let SendRepl::Pending { request, wait: _ } = self.as_mut().project_replace(LimitedSend::Done) {
+                    if let SendRepl::Pending { request, wait: _ } =
+                        self.as_mut().project_replace(LimitedSend::Done)
+                    {
                         self.as_mut().project_replace(LimitedSend::Sent { fut: request.send() });
                     }
 
@@ -292,27 +324,19 @@ impl<R: Request> Future for LimitedSend<R> {
     }
 }
 
-use chan_send::{ChanSend, SendTy as _};
-use crate::bot::limits::chan_send::SendTy;
-use std::collections::hash_map::Entry;
-use core::mem;
-use vecrem::VecExt;
-
 mod chan_send {
-    use tokio::sync::mpsc;
     use crate::types::ChatId;
-    use tokio::sync::oneshot::Sender;
-    use std::future::Future;
     use futures::task::{Context, Poll};
     use pin_project::__private::Pin;
-    use tokio::sync::mpsc::error::SendError;
+    use std::future::Future;
+    use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
     pub(crate) trait SendTy {
         fn send_t(self, val: (ChatId, Sender<()>)) -> ChanSend;
     }
 
     #[pin_project::pin_project]
-    pub/*(crate) */struct ChanSend(#[pin] Inner); // FIXME
+    pub struct ChanSend(#[pin] Inner); // FIXME
 
     #[cfg(not(feature = "nightly"))]
     type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(ChatId, Sender<()>)>>>>>;
@@ -323,7 +347,10 @@ mod chan_send {
         fn send_t(mut self, val: (ChatId, Sender<()>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
-                fn def(mut sender: mpsc::Sender<(ChatId, Sender<()>)>, val: (ChatId, Sender<()>)) -> Inner {
+                fn def(
+                    mut sender: mpsc::Sender<(ChatId, Sender<()>)>,
+                    val: (ChatId, Sender<()>),
+                ) -> Inner {
                     async move { sender.send(val).await }
                 }
                 return ChanSend(def(self, val));
@@ -340,5 +367,4 @@ mod chan_send {
             self.project().0.poll(cx)
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 54154cad..01698ed5 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -21,6 +21,7 @@ mod limits;
 
 pub use auto_send::AutoSend;
 pub use cache_me::CacheMe;
+pub use limits::{Limits, Throttle};
 
 pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
diff --git a/src/lib.rs b/src/lib.rs
index 214553c8..6e7b78b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,8 +27,11 @@ pub mod prelude;
 pub mod requests;
 pub mod types;
 
+// FIXME(waffle): made `pub` to reexport bot wrappers, in future we may want to
+//                reexport them from elsewhere
+pub mod bot;
+
 // reexported
-mod bot;
 mod errors;
 
 // implementation details
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 5d483525..c2ed2e00 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     requests::{HasPayload, Payload},
-    types::{ChatId, Message, ParseMode, ReplyMarkup}
+    types::{ChatId, Message, ParseMode, ReplyMarkup},
 };
 
 /// Use this method to send text messages.
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 646f1a88..110698ae 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1,2 +1 @@
-pub use crate::payloads::GetMeSetters as _;
-pub use crate::payloads::SendMessageSetters as _;
+pub use crate::payloads::{GetMeSetters as _, SendMessageSetters as _};
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 69dd1d25..f9f342d1 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1,8 +1,5 @@
 use crate::{
-    payloads::{
-        GetMe,
-        SendMessage
-    },
+    payloads::{GetMe, SendMessage},
     requests::Request,
     types::ChatId,
 };
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 6d92a531..e6370846 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,4 +1,8 @@
-use crate::{requests::Requester, AutoSend, CacheMe};
+use crate::{
+    bot::{CacheMe, Limits, Throttle},
+    requests::Requester,
+    AutoSend,
+};
 
 pub trait RequesterExt: Requester {
     /// Add `get_me` caching ability, see [`CacheMe`] for more.
@@ -16,6 +20,19 @@ pub trait RequesterExt: Requester {
     {
         AutoSend::new(self)
     }
+
+    /// Add throttling ability, see [`Throttle`] for more.
+    ///
+    /// Note: this spawns the worker, just as [`Throttle::new_spawn`].
+    fn throttle(self, limits: Limits) -> Throttle<Self>
+    where
+        Self: Sized,
+        // >:(
+        // (waffle)
+        Self: 'static,
+    {
+        Throttle::new_spawn(self, limits)
+    }
 }
 
 impl<T> RequesterExt for T

From 23ef060d0855c029d2fad4f8b8905eacdadbe38b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 00:15:55 +0300
Subject: [PATCH 114/755] [throttle] temporary resolve `spawn_blocking` fixme

---
 src/bot/limits.rs | 47 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 9b74ae72..7c3bfa94 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -54,19 +54,19 @@ pub struct Throttle<B> {
 }
 
 async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>)>) {
-    // FIXME: use spawn_blocking?
-
     // FIXME: remove unnecessary ChatId clones
 
-    // FIXME: Make an research about data structures for this queue.
-    //        Currently this is O(n) removing (n = number of elements stayed),
-    //        amortized O(1) push (vec+vecrem).
+    // FIXME(waffle): Make an research about data structures for this queue.
+    //                Currently this is O(n) removing (n = number of elements
+    //                stayed), amortized O(1) push (vec+vecrem).
     let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap
 
+    // I wish there was special data structure for history which removed the
+    // need in 2 hashmaps
+    // (waffle)
     let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
     // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
     let mut hchats: HashMap<ChatId, u32> = HashMap::new();
-
     let mut hchats_s = HashMap::new();
 
     loop {
@@ -78,9 +78,42 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
         // update local queue with latest requests
         while let Ok(e) = queue_rx.try_recv() {
             // FIXME: properly check for errors (stop when the bot's sender is dropped?)
-            queue.push(e)
+            queue.push(e);
         }
 
+        // _Maybe_ we need to use `spawn_blocking` here, because there is
+        // decent amount of blocking work. However _for now_ I've decided not
+        // to use it here.
+        //
+        // Reasons (not to use `spawn_blocking`):
+        //
+        // 1. The work seems not very CPU-bound, it's not heavy computations,
+        //    it's more like light computations.
+        //
+        // 2. `spawn_blocking` is not zero-cost — it spawns a new system thread
+        //    + do so other work. This may actually be *worse* then current
+        //    "just do everything in this async fn" approach.
+        //
+        // 3. With `rt-threaded` feature, tokio uses [`num_cpus()`] threads
+        //    which should be enough to work fine with one a-bit-blocking task.
+        //    Crucially current behaviour will be problem mostly with
+        //    single-threaded runtimes (and in case you're using one, you
+        //    probably don't want to spawn unnecessary threads anyway).
+        //
+        // I think if we'll ever change this behaviour, we need to make it
+        // _configurable_.
+        //
+        // See also [discussion (ru)].
+        //
+        // NOTE: If you are reading this because you have any problems because
+        // of this worker, open an [issue on github]
+        //
+        // [`num_cpus()`]: https://vee.gg/JGwq2
+        // [discussion (ru)]: https://t.me/rust_async/27891
+        // [issue on github]: https://github.com/teloxide/teloxide/issues/new
+        //
+        // (waffle)
+
         let now = Instant::now();
         let min_back = now - MINUTE;
         let sec_back = now - SECOND;

From 247868a815398174717154a953885ce23ee3ed32 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 16:51:59 +0300
Subject: [PATCH 115/755] [throttle] explicit queue-closed error handling &
 comments

---
 src/bot/limits.rs | 85 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 7c3bfa94..b99586b1 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -8,7 +8,7 @@ use std::{
 use futures::task::{Context, Poll};
 use tokio::{
     sync::{
-        mpsc,
+        mpsc::{self, error::TryRecvError},
         oneshot::{channel, Receiver, Sender},
     },
     time::delay_for,
@@ -48,6 +48,23 @@ impl Default for Limits {
     }
 }
 
+/// <we need the doc here>
+///
+/// ## Note about send-by-@username
+///
+/// Telegram have limits on sending messages to _the same chat_. To check them
+/// we store `chat_id`s of several last requests. _However_ there is no good way
+/// to tell if given `ChatId::Id(x)` corresponds to the same chat as
+/// `ChatId::ChannelUsername(u)`.
+///
+/// Our current approach is to just give up and check `chat_id_a == chat_id_b`.
+/// This may give incorrect results.
+///
+/// Also, current algorithm requires to `clone` `chat_id` several times, which
+/// can be quire expensive for strings (though this may be fixed in the future)
+///
+/// As such, we encourage not to use `ChatId::ChannelUsername(u)` with this bot
+/// wrapper.
 pub struct Throttle<B> {
     bot: B,
     queue: mpsc::Sender<(ChatId, Sender<()>)>,
@@ -72,13 +89,22 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
     loop {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
-            queue.push(queue_rx.recv().await.unwrap());
+            let req = queue_rx
+                .recv()
+                .await
+                // FIXME(waffle): decide what should we do on channel close
+                .expect("Queue channel was closed");
+            queue.push(req);
         }
 
         // update local queue with latest requests
-        while let Ok(e) = queue_rx.try_recv() {
-            // FIXME: properly check for errors (stop when the bot's sender is dropped?)
-            queue.push(e);
+        loop {
+            match queue_rx.try_recv() {
+                Ok(req) => queue.push(req),
+                Err(TryRecvError::Empty) => break,
+                // FIXME(waffle): decide what should we do on channel close
+                Err(TryRecvError::Closed) => unimplemented!("Queue channel was closed"),
+            }
         }
 
         // _Maybe_ we need to use `spawn_blocking` here, because there is
@@ -126,9 +152,11 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
             }
 
             if let Some((chat, _)) = history.pop_front() {
-                if let Entry::Occupied(entry) = hchats.entry(chat).and_modify(|count| {
+                let ent = hchats.entry(chat).and_modify(|count| {
                     *count -= 1;
-                }) {
+                });
+
+                if let Entry::Occupied(entry) = ent {
                     if *entry.get() == 0 {
                         entry.remove_entry();
                     }
@@ -138,9 +166,8 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
 
         // as truncates which is ok since in case of truncation it would always be >=
         // limits.overall_s
-        let mut allowed = limits
-            .overall_s
-            .saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
+        let used = history.iter().take_while(|(_, time)| time > &sec_back).count() as u32;
+        let mut allowed = limits.overall_s.saturating_sub(used);
 
         if allowed == 0 {
             hchats_s.clear();
@@ -166,8 +193,14 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
                     *hchats.entry(chat.clone()).or_insert(0) += 1;
                     history.push_back((chat.clone(), Instant::now()));
                 }
-                entry.remove().1.send(());
 
+                // Explicitly ignore result.
+                //
+                // If request doesn't listen to unlock channel we don't want
+                // anything to do with it.
+                let _ = entry.remove().1.send(());
+
+                // We've "sent" 1 request, so now we can send 1 less
                 allowed -= 1;
                 if allowed == 0 {
                     break;
@@ -178,6 +211,8 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>
         }
         drop(queue_rem);
 
+        // It's easier to just recompute last second stats, instead of keeping
+        // track of it alongside with minute stats, so we just throw this away.
         hchats_s.clear();
         delay_for(DELAY).await;
     }
@@ -251,7 +286,6 @@ impl<B: Requester> Requester for Throttle<B> {
 }
 
 pub trait GetChatId {
-    // FIXME(waffle): add note about false negatives with ChatId::Username
     fn get_chat_id(&self) -> &ChatId;
 }
 
@@ -280,13 +314,13 @@ where
     <R as HasPayload>::Payload: GetChatId,
 {
     type Err = R::Err;
-    type Send = LimitedSend<R>;
-    type SendRef = LimitedSend<R>;
+    type Send = ThrottlingSend<R>;
+    type SendRef = ThrottlingSend<R>;
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
         let send = self.1.send_t((self.0.payload_ref().get_chat_id().clone(), tx));
-        LimitedSend::Registering { request: self.0, send, wait: rx }
+        ThrottlingSend::Registering { request: self.0, send, wait: rx }
     }
 
     fn send_ref(&self) -> Self::SendRef {
@@ -295,7 +329,7 @@ where
 }
 
 #[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
-pub enum LimitedSend<R: Request> {
+pub enum ThrottlingSend<R: Request> {
     Registering {
         request: R,
         #[pin]
@@ -314,7 +348,7 @@ pub enum LimitedSend<R: Request> {
     Done,
 }
 
-impl<R: Request> Future for LimitedSend<R> {
+impl<R: Request> Future for ThrottlingSend<R> {
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
@@ -325,9 +359,9 @@ impl<R: Request> Future for LimitedSend<R> {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRepl::Registering { request, send: _, wait } =
-                        self.as_mut().project_replace(LimitedSend::Done)
+                        self.as_mut().project_replace(ThrottlingSend::Done)
                     {
-                        self.as_mut().project_replace(LimitedSend::Pending { request, wait });
+                        self.as_mut().project_replace(ThrottlingSend::Pending { request, wait });
                     }
 
                     self.poll(cx)
@@ -339,9 +373,9 @@ impl<R: Request> Future for LimitedSend<R> {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRepl::Pending { request, wait: _ } =
-                        self.as_mut().project_replace(LimitedSend::Done)
+                        self.as_mut().project_replace(ThrottlingSend::Done)
                     {
-                        self.as_mut().project_replace(LimitedSend::Sent { fut: request.send() });
+                        self.as_mut().project_replace(ThrottlingSend::Sent { fut: request.send() });
                     }
 
                     self.poll(cx)
@@ -349,7 +383,7 @@ impl<R: Request> Future for LimitedSend<R> {
             },
             SendProj::Sent { fut } => {
                 let res = futures::ready!(fut.poll(cx));
-                self.set(LimitedSend::Done);
+                self.set(ThrottlingSend::Done);
                 Poll::Ready(res)
             }
             SendProj::Done => Poll::Pending,
@@ -358,12 +392,13 @@ impl<R: Request> Future for LimitedSend<R> {
 }
 
 mod chan_send {
-    use crate::types::ChatId;
+    use std::{future::Future, pin::Pin};
+
     use futures::task::{Context, Poll};
-    use pin_project::__private::Pin;
-    use std::future::Future;
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
+    use crate::types::ChatId;
+
     pub(crate) trait SendTy {
         fn send_t(self, val: (ChatId, Sender<()>)) -> ChanSend;
     }

From 7fdf9cd9a63f3bb2c8349ac47679cd3b0970fe75 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 1 Oct 2020 17:21:30 +0300
Subject: [PATCH 116/755] [throttle] implement send_ref

---
 Cargo.toml              |  2 +-
 src/bot/limits.rs       | 79 +++++++++++++++++++++++++++++++++++++++--
 src/requests/request.rs | 11 ++++++
 3 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 01f3f1ca..a247f0ad 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ authors = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["fs", "stream"] }
+tokio = { version = "0.2.21", features = ["fs", "stream", "full"] }
 tokio-util = "0.3.1"
 pin-project = "0.4.23"
 bytes = "0.5.5"
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index b99586b1..3cdf0f54 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -315,7 +315,7 @@ where
 {
     type Err = R::Err;
     type Send = ThrottlingSend<R>;
-    type SendRef = ThrottlingSend<R>;
+    type SendRef = ThrottlingSendRef<R>;
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
@@ -324,7 +324,18 @@ where
     }
 
     fn send_ref(&self) -> Self::SendRef {
-        unimplemented!()
+        let (tx, rx) = channel();
+        let send = self.1.clone().send_t((self.0.payload_ref().get_chat_id().clone(), tx));
+
+        // As we can't move self.0 (request) out, as we do in `send` we are
+        // forced to call `send_ref()`. This may have overhead and/or lead to
+        // wrong results because `R::send_ref` does the send.
+        //
+        // However `Request` documentation explicitly notes that `send{,_ref}`
+        // should **not** do any kind of work, so it's ok.
+        let request = self.0.send_ref();
+
+        ThrottlingSendRef::Registering { request, send, wait: rx }
     }
 }
 
@@ -391,6 +402,70 @@ impl<R: Request> Future for ThrottlingSend<R> {
     }
 }
 
+#[pin_project::pin_project(project = SendRefProj, project_replace = SendRefRepl)]
+pub enum ThrottlingSendRef<R: Request> {
+    Registering {
+        request: R::SendRef,
+        #[pin]
+        send: ChanSend,
+        wait: Receiver<()>,
+    },
+    Pending {
+        request: R::SendRef,
+        #[pin]
+        wait: Receiver<()>,
+    },
+    Sent {
+        #[pin]
+        fut: R::SendRef,
+    },
+    Done,
+}
+
+impl<R: Request> Future for ThrottlingSendRef<R> {
+    type Output = Result<Output<R>, R::Err>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        match self.as_mut().project() {
+            SendRefProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(r) => {
+                    // FIXME(waffle): remove unwrap
+                    r.unwrap();
+                    if let SendRefRepl::Registering { request, send: _, wait } =
+                        self.as_mut().project_replace(ThrottlingSendRef::Done)
+                    {
+                        self.as_mut().project_replace(ThrottlingSendRef::Pending { request, wait });
+                    }
+
+                    self.poll(cx)
+                }
+            },
+            SendRefProj::Pending { request: _, wait } => match wait.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(r) => {
+                    // FIXME(waffle): remove unwrap
+                    r.unwrap();
+                    if let SendRefRepl::Pending { request, wait: _ } =
+                        self.as_mut().project_replace(ThrottlingSendRef::Done)
+                    {
+                        self.as_mut().project_replace(ThrottlingSendRef::Sent { fut: request });
+                    }
+
+                    self.poll(cx)
+                }
+            },
+            SendRefProj::Sent { fut } => {
+                let res = futures::ready!(fut.poll(cx));
+                self.set(ThrottlingSendRef::Done);
+                Poll::Ready(res)
+            }
+            SendRefProj::Done => Poll::Pending,
+        }
+    }
+}
+
+
 mod chan_send {
     use std::{future::Future, pin::Pin};
 
diff --git a/src/requests/request.rs b/src/requests/request.rs
index b29a6c00..da2be6fa 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -3,7 +3,18 @@ use std::future::Future;
 use crate::requests::{HasPayload, Output};
 
 /// A ready-to-send telegram request.
+///
 // FIXME(waffle): Write better doc for the trait
+///
+/// ## Implementation notes
+///
+/// It is not recommended to do any kind of _work_ in `send` or `send_ref`.
+/// Instead it's recommended to do all the (possible) stuff in the returned
+/// future. In other words — keep it lazy.
+///
+/// This is crucial for request wrappers which may want to cancel and/or never
+/// send the underlying request. E.g.: [`Throttle<B>`]'s `send_ref` calls
+/// `B::send_ref` while _not_ meaning to really send the request right now.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Request: HasPayload {
     /*

From 6f03ca0954e275c04517804e2e3ca3283848586d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 2 Oct 2020 13:28:46 +0300
Subject: [PATCH 117/755] [throttle] hash `ChatId::ChannelUsername` to prevent
 expensive string cloning & make send{,_ref} enums private

The future has come!
---
 src/bot/limits.rs | 111 ++++++++++++++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 38 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 3cdf0f54..dc66bcd6 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -21,6 +21,7 @@ use crate::{
     requests::{HasPayload, Output, Request, Requester},
     types::ChatId,
 };
+use std::hash::{Hash, Hasher};
 
 const MINUTE: Duration = Duration::from_secs(50); // FIXME: min = sec * 10 only in tests
 const SECOND: Duration = Duration::from_secs(1);
@@ -60,30 +61,27 @@ impl Default for Limits {
 /// Our current approach is to just give up and check `chat_id_a == chat_id_b`.
 /// This may give incorrect results.
 ///
-/// Also, current algorithm requires to `clone` `chat_id` several times, which
-/// can be quire expensive for strings (though this may be fixed in the future)
-///
 /// As such, we encourage not to use `ChatId::ChannelUsername(u)` with this bot
 /// wrapper.
 pub struct Throttle<B> {
     bot: B,
-    queue: mpsc::Sender<(ChatId, Sender<()>)>,
+    queue: mpsc::Sender<(Id, Sender<()>)>,
 }
 
-async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(ChatId, Sender<()>)>) {
+async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<()>)>) {
     // FIXME: remove unnecessary ChatId clones
 
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap
+    let mut queue: Vec<(Id, Sender<()>)> = Vec::new(); // FIXME: with_cap
 
     // I wish there was special data structure for history which removed the
     // need in 2 hashmaps
     // (waffle)
-    let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
+    let mut history: VecDeque<(Id, Instant)> = VecDeque::new();
     // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
-    let mut hchats: HashMap<ChatId, u32> = HashMap::new();
+    let mut hchats: HashMap<Id, u32> = HashMap::new();
     let mut hchats_s = HashMap::new();
 
     loop {
@@ -285,6 +283,30 @@ impl<B: Requester> Requester for Throttle<B> {
     }
 }
 
+/// Id used in worker.
+///
+/// It is used instead of `ChatId` to make copying cheap even in case of
+/// usernames. (It just hashes username)
+#[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
+enum Id {
+    Id(i64),
+    Ch(u64),
+}
+
+impl From<&ChatId> for Id {
+    fn from(value: &ChatId) -> Self {
+        match value {
+            ChatId::Id(id) => Id::Id(*id),
+            ChatId::ChannelUsername(username) => {
+                let mut hasher = std::collections::hash_map::DefaultHasher::new();
+                username.hash(&mut hasher);
+                let hash = hasher.finish();
+                Id::Ch(hash)
+            }
+        }
+    }
+}
+
 pub trait GetChatId {
     fn get_chat_id(&self) -> &ChatId;
 }
@@ -295,7 +317,7 @@ impl GetChatId for SendMessage {
     }
 }
 
-pub struct ThrottlingRequest<R>(R, mpsc::Sender<(ChatId, Sender<()>)>);
+pub struct ThrottlingRequest<R>(R, mpsc::Sender<(Id, Sender<()>)>);
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
@@ -319,13 +341,13 @@ where
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
-        let send = self.1.send_t((self.0.payload_ref().get_chat_id().clone(), tx));
-        ThrottlingSend::Registering { request: self.0, send, wait: rx }
+        let send = self.1.send_t((self.0.payload_ref().get_chat_id().into(), tx));
+        ThrottlingSend(ThrottlingSendInner::Registering { request: self.0, send, wait: rx })
     }
 
     fn send_ref(&self) -> Self::SendRef {
         let (tx, rx) = channel();
-        let send = self.1.clone().send_t((self.0.payload_ref().get_chat_id().clone(), tx));
+        let send = self.1.clone().send_t((self.0.payload_ref().get_chat_id().into(), tx));
 
         // As we can't move self.0 (request) out, as we do in `send` we are
         // forced to call `send_ref()`. This may have overhead and/or lead to
@@ -335,12 +357,15 @@ where
         // should **not** do any kind of work, so it's ok.
         let request = self.0.send_ref();
 
-        ThrottlingSendRef::Registering { request, send, wait: rx }
+        ThrottlingSendRef(ThrottlingSendRefInner::Registering { request, send, wait: rx })
     }
 }
 
+#[pin_project::pin_project]
+pub struct ThrottlingSend<R: Request>(#[pin] ThrottlingSendInner<R>);
+
 #[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
-pub enum ThrottlingSend<R: Request> {
+enum ThrottlingSendInner<R: Request> {
     Registering {
         request: R,
         #[pin]
@@ -363,16 +388,18 @@ impl<R: Request> Future for ThrottlingSend<R> {
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match self.as_mut().project() {
+        let mut this = self.as_mut().project().0;
+
+        match this.as_mut().project() {
             SendProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(r) => {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRepl::Registering { request, send: _, wait } =
-                        self.as_mut().project_replace(ThrottlingSend::Done)
+                        this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        self.as_mut().project_replace(ThrottlingSend::Pending { request, wait });
+                        this.as_mut().project_replace(ThrottlingSendInner::Pending { request, wait });
                     }
 
                     self.poll(cx)
@@ -384,9 +411,9 @@ impl<R: Request> Future for ThrottlingSend<R> {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRepl::Pending { request, wait: _ } =
-                        self.as_mut().project_replace(ThrottlingSend::Done)
+                        this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        self.as_mut().project_replace(ThrottlingSend::Sent { fut: request.send() });
+                        this.as_mut().project_replace(ThrottlingSendInner::Sent { fut: request.send() });
                     }
 
                     self.poll(cx)
@@ -394,7 +421,7 @@ impl<R: Request> Future for ThrottlingSend<R> {
             },
             SendProj::Sent { fut } => {
                 let res = futures::ready!(fut.poll(cx));
-                self.set(ThrottlingSend::Done);
+                this.set(ThrottlingSendInner::Done);
                 Poll::Ready(res)
             }
             SendProj::Done => Poll::Pending,
@@ -402,8 +429,11 @@ impl<R: Request> Future for ThrottlingSend<R> {
     }
 }
 
+#[pin_project::pin_project]
+pub struct ThrottlingSendRef<R: Request>(#[pin] ThrottlingSendRefInner<R>);
+
 #[pin_project::pin_project(project = SendRefProj, project_replace = SendRefRepl)]
-pub enum ThrottlingSendRef<R: Request> {
+enum ThrottlingSendRefInner<R: Request> {
     Registering {
         request: R::SendRef,
         #[pin]
@@ -426,16 +456,18 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        match self.as_mut().project() {
+        let mut this = self.as_mut().project().0;
+
+        match this.as_mut().project() {
             SendRefProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(r) => {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRefRepl::Registering { request, send: _, wait } =
-                        self.as_mut().project_replace(ThrottlingSendRef::Done)
+                        this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
-                        self.as_mut().project_replace(ThrottlingSendRef::Pending { request, wait });
+                        this.as_mut().project_replace(ThrottlingSendRefInner::Pending { request, wait });
                     }
 
                     self.poll(cx)
@@ -447,9 +479,9 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
                     // FIXME(waffle): remove unwrap
                     r.unwrap();
                     if let SendRefRepl::Pending { request, wait: _ } =
-                        self.as_mut().project_replace(ThrottlingSendRef::Done)
+                        this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
-                        self.as_mut().project_replace(ThrottlingSendRef::Sent { fut: request });
+                        this.as_mut().project_replace(ThrottlingSendRefInner::Sent { fut: request });
                     }
 
                     self.poll(cx)
@@ -457,7 +489,7 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
             },
             SendRefProj::Sent { fut } => {
                 let res = futures::ready!(fut.poll(cx));
-                self.set(ThrottlingSendRef::Done);
+                this.set(ThrottlingSendRefInner::Done);
                 Poll::Ready(res)
             }
             SendRefProj::Done => Poll::Pending,
@@ -472,27 +504,30 @@ mod chan_send {
     use futures::task::{Context, Poll};
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
-    use crate::types::ChatId;
+    use crate::{
+        types::ChatId,
+        bot::limits::Id
+    };
 
-    pub(crate) trait SendTy {
-        fn send_t(self, val: (ChatId, Sender<()>)) -> ChanSend;
+    pub(super) trait SendTy {
+        fn send_t(self, val: (Id, Sender<()>)) -> ChanSend;
     }
 
     #[pin_project::pin_project]
-    pub struct ChanSend(#[pin] Inner); // FIXME
+    pub(super) struct ChanSend(#[pin] Inner); // FIXME
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(ChatId, Sender<()>)>>>>>;
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<()>)>>>>>;
     #[cfg(feature = "nightly")]
-    type Inner = impl Future<Output = Result<(), SendError<(ChatId, Sender<()>)>>>;
+    type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<()>)>>>;
 
-    impl SendTy for mpsc::Sender<(ChatId, Sender<()>)> {
-        fn send_t(mut self, val: (ChatId, Sender<()>)) -> ChanSend {
+    impl SendTy for mpsc::Sender<(Id, Sender<()>)> {
+        fn send_t(mut self, val: (Id, Sender<()>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
                 fn def(
-                    mut sender: mpsc::Sender<(ChatId, Sender<()>)>,
-                    val: (ChatId, Sender<()>),
+                    mut sender: mpsc::Sender<(Id, Sender<()>)>,
+                    val: (Id, Sender<()>),
                 ) -> Inner {
                     async move { sender.send(val).await }
                 }
@@ -504,7 +539,7 @@ mod chan_send {
     }
 
     impl Future for ChanSend {
-        type Output = Result<(), SendError<(ChatId, Sender<()>)>>;
+        type Output = Result<(), SendError<(Id, Sender<()>)>>;
 
         fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
             self.project().0.poll(cx)

From 380e189ec7fef772cdd654c0e27c18745d22efc9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 2 Oct 2020 16:23:49 +0300
Subject: [PATCH 118/755] [throttle] comment and doc improvements

---
 src/bot/limits.rs | 92 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 11 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index dc66bcd6..2b311110 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -23,13 +23,59 @@ use crate::{
 };
 use std::hash::{Hash, Hasher};
 
-const MINUTE: Duration = Duration::from_secs(50); // FIXME: min = sec * 10 only in tests
+// Throttling is quite complicated this comment describes the algorithm of current implementation.
+// NOTE: this only describes CURRENT implementation. Implementation may change at any time.
+//
+// ### Request
+//
+// When throttling request is sent, it sends a tuple of `ChatId` (more accurately, just local `Id`)
+// and `Sender<()>` to the worker. Then the request waits for notification from worker. When
+// notification is received it sends underlying request.
+//
+// ### Worker
+//
+// Worker does the most important job - it checks for limit exceed.
+//
+// The worker stores "history" of requests sent in last minute (and to which chats the were sent)
+// and queue of pending updates.
+//
+// The worker does the following algorithm loop:
+//
+// 1. If queue is empty wait for the first message in incoming channel (and adds it to queue).
+//
+// 2. Read all present messages from incoming channel and transfer them to queue.
+//
+// 3. Record current time.
+//
+// 4. Clear history from records which time < (current - minute)
+//
+// 5. Count all requests in which were sent last second, `allowed = limit.overall_s - count`
+//
+// 6. If `allowed == 0` wait a bit and `continue` to the next iteration
+//
+// 7. Count how many requests were sent to which chats (i.e.: create `Map<ChatId, Count>`)
+//    (note: the same map, but for last minute also exists, but it's updated, instead of recreation)
+//
+// 8. While `allowed >= 0` search for requests which chat hasn't exceed limits
+//    (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify request
+//    that it can be now executed, increase counts, add record to history.
+
+const MINUTE: Duration = Duration::from_secs(60);
 const SECOND: Duration = Duration::from_secs(1);
-const DELAY: Duration = Duration::from_millis(250); // second/4
+
+// Delay between worker iterations.
+//
+// For now it's `second/4`, but that number is chosen pretty randomly, we may want to change this.
+const DELAY: Duration = Duration::from_millis(250);
 
 /// Telegram request limits.
 ///
-/// This struct is used in [`Throttle`]
+/// This struct is used in [`Throttle`].
+///
+/// Note that you may ask telegram [@BotSupport] to increase limits for your
+/// particular bot if it has a lot of users (but they may or may not do that).
+///
+/// [@BotSupport]: https://t.me/botsupport
 #[derive(Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Limits {
     /// Allowed messages in one chat per second
@@ -49,9 +95,32 @@ impl Default for Limits {
     }
 }
 
-/// <we need the doc here>
+/// Automatic request limits respecting mechanism.
 ///
-/// ## Note about send-by-@username
+/// Telegram has strict [limits], which, if exceeded will sooner or later cause
+/// `RequestError::RetryAfter(_)` errors. These errors can cause users of your
+/// bot to never receive responds from the bot or receive them in wrong order.
+///
+/// This bot wrapper automatically checks for limits, suspending requests until
+/// they could be sent without exceeding limits (request order in chats is not changed).
+///
+/// It's recommended to use this wrapper before other wrappers (i.e.: `SomeWrapper<Throttle<Bot>>`)
+/// because if done otherwise inner wrappers may cause `Throttle` to miscalculate limits usage.
+///
+/// [limits]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
+///
+/// ## Examples
+///
+/// ```
+/// use teloxide_core::{bot::Limits, Bot, requests::RequesterExt};
+///
+/// let bot = Bot::new("TOKEN")
+///     .throttle(Limits::default());
+///
+/// /* send many requests here */
+/// ```
+///
+/// ## Note about send-by-@channelusername
 ///
 /// Telegram have limits on sending messages to _the same chat_. To check them
 /// we store `chat_id`s of several last requests. _However_ there is no good way
@@ -69,8 +138,6 @@ pub struct Throttle<B> {
 }
 
 async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<()>)>) {
-    // FIXME: remove unnecessary ChatId clones
-
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
@@ -222,11 +289,14 @@ impl<B> Throttle<B> {
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
-        // FIXME: just a random number, currently
-        let (queue_tx, queue_rx) = mpsc::channel(130);
+        // A buffer made slightly bigger (112.5%) than overall limit
+        // so we won't lose performance when hitting limits.
+        //
+        // (I hope this makes sense) (waffle)
+        let buffer = limits.overall_s + (limits.overall_s / 8);
+        let (queue_tx, queue_rx) = mpsc::channel(buffer as usize);
 
         let worker = worker(limits, queue_rx);
-
         let this = Self { bot, queue: queue_tx };
 
         (this, worker)
@@ -514,7 +584,7 @@ mod chan_send {
     }
 
     #[pin_project::pin_project]
-    pub(super) struct ChanSend(#[pin] Inner); // FIXME
+    pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
     type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<()>)>>>>>;

From d43f2514d3544af11000e8cc44d118dc1880f3d7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 2 Oct 2020 18:37:15 +0300
Subject: [PATCH 119/755] [throttle] use channel close to send unlock
 "messages"

Also use `with_capacity` for queue
---
 Cargo.toml              |   3 +-
 src/bot/limits.rs       | 157 ++++++++++++++++++++++++----------------
 src/requests/request.rs |   1 -
 3 files changed, 97 insertions(+), 64 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a247f0ad..e25be772 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ authors = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["fs", "stream", "full"] }
+tokio = { version = "0.2.21", features = ["fs", "stream"] }
 tokio-util = "0.3.1"
 pin-project = "0.4.23"
 bytes = "0.5.5"
@@ -33,6 +33,7 @@ derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.4.0"
+never = "0.1.0"
 
 # FIXME(waffle): use crates.io once published
 vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8b75548c6ed387072ff235429b1" }
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 2b311110..c160aa2c 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -1,11 +1,13 @@
 use std::{
     collections::{hash_map::Entry, HashMap, VecDeque},
     future::Future,
+    hash::{Hash, Hasher},
     pin::Pin,
     time::{Duration, Instant},
 };
 
 use futures::task::{Context, Poll};
+use never::Never;
 use tokio::{
     sync::{
         mpsc::{self, error::TryRecvError},
@@ -21,51 +23,58 @@ use crate::{
     requests::{HasPayload, Output, Request, Requester},
     types::ChatId,
 };
-use std::hash::{Hash, Hasher};
 
-// Throttling is quite complicated this comment describes the algorithm of current implementation.
-// NOTE: this only describes CURRENT implementation. Implementation may change at any time.
+// Throttling is quite complicated this comment describes the algorithm of
+// current implementation. NOTE: this only describes CURRENT implementation.
+// Implementation may change at any time.
 //
 // ### Request
 //
-// When throttling request is sent, it sends a tuple of `ChatId` (more accurately, just local `Id`)
-// and `Sender<()>` to the worker. Then the request waits for notification from worker. When
-// notification is received it sends underlying request.
+// When throttling request is sent, it sends a tuple of `ChatId` (more
+// accurately, just local `Id`) and `Sender<()>` to the worker. Then the request
+// waits for notification from worker. When notification is received it sends
+// underlying request.
 //
 // ### Worker
 //
 // Worker does the most important job - it checks for limit exceed.
 //
-// The worker stores "history" of requests sent in last minute (and to which chats the were sent)
-// and queue of pending updates.
+// The worker stores "history" of requests sent in last minute (and to which
+// chats the were sent) and queue of pending updates.
 //
 // The worker does the following algorithm loop:
 //
-// 1. If queue is empty wait for the first message in incoming channel (and adds it to queue).
+// 1. If queue is empty wait for the first message in incoming channel (and adds
+//    it to queue).
 //
-// 2. Read all present messages from incoming channel and transfer them to queue.
+// 2. Read all present messages from incoming channel and transfer them to
+//    queue.
 //
 // 3. Record current time.
 //
 // 4. Clear history from records which time < (current - minute)
 //
-// 5. Count all requests in which were sent last second, `allowed = limit.overall_s - count`
+// 5. Count all requests in which were sent last second,
+//    `allowed = limit.overall_s - count`
 //
 // 6. If `allowed == 0` wait a bit and `continue` to the next iteration
 //
-// 7. Count how many requests were sent to which chats (i.e.: create `Map<ChatId, Count>`)
-//    (note: the same map, but for last minute also exists, but it's updated, instead of recreation)
+// 7. Count how many requests were sent to which chats (i.e.: create
+//    `Map<ChatId, Count>`)    (note: the same map, but for last minute also
+//    exists, but it's updated, instead of recreation)
 //
 // 8. While `allowed >= 0` search for requests which chat hasn't exceed limits
-//    (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify request
-//    that it can be now executed, increase counts, add record to history.
+//    (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
+//    request that it can be now executed, increase counts, add record to
+//    history.
 
 const MINUTE: Duration = Duration::from_secs(60);
 const SECOND: Duration = Duration::from_secs(1);
 
 // Delay between worker iterations.
 //
-// For now it's `second/4`, but that number is chosen pretty randomly, we may want to change this.
+// For now it's `second/4`, but that number is chosen pretty randomly, we may
+// want to change this.
 const DELAY: Duration = Duration::from_millis(250);
 
 /// Telegram request limits.
@@ -102,20 +111,21 @@ impl Default for Limits {
 /// bot to never receive responds from the bot or receive them in wrong order.
 ///
 /// This bot wrapper automatically checks for limits, suspending requests until
-/// they could be sent without exceeding limits (request order in chats is not changed).
+/// they could be sent without exceeding limits (request order in chats is not
+/// changed).
 ///
-/// It's recommended to use this wrapper before other wrappers (i.e.: `SomeWrapper<Throttle<Bot>>`)
-/// because if done otherwise inner wrappers may cause `Throttle` to miscalculate limits usage.
+/// It's recommended to use this wrapper before other wrappers (i.e.:
+/// `SomeWrapper<Throttle<Bot>>`) because if done otherwise inner wrappers may
+/// cause `Throttle` to miscalculate limits usage.
 ///
 /// [limits]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
 ///
 /// ## Examples
 ///
 /// ```
-/// use teloxide_core::{bot::Limits, Bot, requests::RequesterExt};
+/// use teloxide_core::{bot::Limits, requests::RequesterExt, Bot};
 ///
-/// let bot = Bot::new("TOKEN")
-///     .throttle(Limits::default());
+/// let bot = Bot::new("TOKEN").throttle(Limits::default());
 ///
 /// /* send many requests here */
 /// ```
@@ -134,14 +144,17 @@ impl Default for Limits {
 /// wrapper.
 pub struct Throttle<B> {
     bot: B,
-    queue: mpsc::Sender<(Id, Sender<()>)>,
+    // Sender<Never> is used to pass the signal to unlock by closing the channel.
+    queue: mpsc::Sender<(Id, Sender<Never>)>,
 }
 
-async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<()>)>) {
+async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)>) {
+    // +- Same idea as in `Throttle::new`
+    let cap = limits.overall_s + (limits.overall_s / 4);
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(Id, Sender<()>)> = Vec::new(); // FIXME: with_cap
+    let mut queue: Vec<(Id, Sender<Never>)> = Vec::with_capacity(cap as usize);
 
     // I wish there was special data structure for history which removed the
     // need in 2 hashmaps
@@ -259,11 +272,8 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<()>)>)
                     history.push_back((chat.clone(), Instant::now()));
                 }
 
-                // Explicitly ignore result.
-                //
-                // If request doesn't listen to unlock channel we don't want
-                // anything to do with it.
-                let _ = entry.remove().1.send(());
+                // This will close the channel unlocking associated request
+                drop(entry.remove());
 
                 // We've "sent" 1 request, so now we can send 1 less
                 allowed -= 1;
@@ -387,7 +397,7 @@ impl GetChatId for SendMessage {
     }
 }
 
-pub struct ThrottlingRequest<R>(R, mpsc::Sender<(Id, Sender<()>)>);
+pub struct ThrottlingRequest<R>(R, mpsc::Sender<(Id, Sender<Never>)>);
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
@@ -440,12 +450,12 @@ enum ThrottlingSendInner<R: Request> {
         request: R,
         #[pin]
         send: ChanSend,
-        wait: Receiver<()>,
+        wait: Receiver<Never>,
     },
     Pending {
         request: R,
         #[pin]
-        wait: Receiver<()>,
+        wait: Receiver<Never>,
     },
     Sent {
         #[pin]
@@ -463,13 +473,21 @@ impl<R: Request> Future for ThrottlingSend<R> {
         match this.as_mut().project() {
             SendProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
-                Poll::Ready(r) => {
-                    // FIXME(waffle): remove unwrap
-                    r.unwrap();
+                Poll::Ready(res) => {
                     if let SendRepl::Registering { request, send: _, wait } =
                         this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        this.as_mut().project_replace(ThrottlingSendInner::Pending { request, wait });
+                        match res {
+                            Ok(()) => this
+                                .as_mut()
+                                .project_replace(ThrottlingSendInner::Pending { request, wait }),
+                            // The worker is unlikely to drop queue before sending all requests,
+                            // but just in case it has dropped the queue, we want to just send the
+                            // request.
+                            Err(_) => this
+                                .as_mut()
+                                .project_replace(ThrottlingSendInner::Sent { fut: request.send() }),
+                        };
                     }
 
                     self.poll(cx)
@@ -478,12 +496,17 @@ impl<R: Request> Future for ThrottlingSend<R> {
             SendProj::Pending { request: _, wait } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(r) => {
-                    // FIXME(waffle): remove unwrap
-                    r.unwrap();
+                    // Worker pass "message" to unlock us by closing the channel
+                    match r {
+                        Ok(never) => match never {},
+                        Err(_) => {}
+                    }
+
                     if let SendRepl::Pending { request, wait: _ } =
                         this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        this.as_mut().project_replace(ThrottlingSendInner::Sent { fut: request.send() });
+                        this.as_mut()
+                            .project_replace(ThrottlingSendInner::Sent { fut: request.send() });
                     }
 
                     self.poll(cx)
@@ -508,12 +531,12 @@ enum ThrottlingSendRefInner<R: Request> {
         request: R::SendRef,
         #[pin]
         send: ChanSend,
-        wait: Receiver<()>,
+        wait: Receiver<Never>,
     },
     Pending {
         request: R::SendRef,
         #[pin]
-        wait: Receiver<()>,
+        wait: Receiver<Never>,
     },
     Sent {
         #[pin]
@@ -531,13 +554,21 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
         match this.as_mut().project() {
             SendRefProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
-                Poll::Ready(r) => {
-                    // FIXME(waffle): remove unwrap
-                    r.unwrap();
+                Poll::Ready(res) => {
                     if let SendRefRepl::Registering { request, send: _, wait } =
                         this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
-                        this.as_mut().project_replace(ThrottlingSendRefInner::Pending { request, wait });
+                        match res {
+                            Ok(()) => this
+                                .as_mut()
+                                .project_replace(ThrottlingSendRefInner::Pending { request, wait }),
+                            // The worker is unlikely to drop queue before sending all requests,
+                            // but just in case it has dropped the queue, we want to just send the
+                            // request.
+                            Err(_) => this
+                                .as_mut()
+                                .project_replace(ThrottlingSendRefInner::Sent { fut: request }),
+                        };
                     }
 
                     self.poll(cx)
@@ -546,12 +577,17 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
             SendRefProj::Pending { request: _, wait } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(r) => {
-                    // FIXME(waffle): remove unwrap
-                    r.unwrap();
+                    // Worker pass "message" to unlock us by closing the channel
+                    match r {
+                        Ok(never) => match never {},
+                        Err(_) => {}
+                    }
+
                     if let SendRefRepl::Pending { request, wait: _ } =
                         this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
-                        this.as_mut().project_replace(ThrottlingSendRefInner::Sent { fut: request });
+                        this.as_mut()
+                            .project_replace(ThrottlingSendRefInner::Sent { fut: request });
                     }
 
                     self.poll(cx)
@@ -567,37 +603,34 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
     }
 }
 
-
 mod chan_send {
     use std::{future::Future, pin::Pin};
 
     use futures::task::{Context, Poll};
+    use never::Never;
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
-    use crate::{
-        types::ChatId,
-        bot::limits::Id
-    };
+    use crate::bot::limits::Id;
 
     pub(super) trait SendTy {
-        fn send_t(self, val: (Id, Sender<()>)) -> ChanSend;
+        fn send_t(self, val: (Id, Sender<Never>)) -> ChanSend;
     }
 
     #[pin_project::pin_project]
     pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<()>)>>>>>;
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>>>;
     #[cfg(feature = "nightly")]
-    type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<()>)>>>;
+    type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
 
-    impl SendTy for mpsc::Sender<(Id, Sender<()>)> {
-        fn send_t(mut self, val: (Id, Sender<()>)) -> ChanSend {
+    impl SendTy for mpsc::Sender<(Id, Sender<Never>)> {
+        fn send_t(mut self, val: (Id, Sender<Never>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
                 fn def(
-                    mut sender: mpsc::Sender<(Id, Sender<()>)>,
-                    val: (Id, Sender<()>),
+                    mut sender: mpsc::Sender<(Id, Sender<Never>)>,
+                    val: (Id, Sender<Never>),
                 ) -> Inner {
                     async move { sender.send(val).await }
                 }
@@ -609,7 +642,7 @@ mod chan_send {
     }
 
     impl Future for ChanSend {
-        type Output = Result<(), SendError<(Id, Sender<()>)>>;
+        type Output = Result<(), SendError<(Id, Sender<Never>)>>;
 
         fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
             self.project().0.poll(cx)
diff --git a/src/requests/request.rs b/src/requests/request.rs
index da2be6fa..8722a3e2 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -3,7 +3,6 @@ use std::future::Future;
 use crate::requests::{HasPayload, Output};
 
 /// A ready-to-send telegram request.
-///
 // FIXME(waffle): Write better doc for the trait
 ///
 /// ## Implementation notes

From 0aecda634864f03dcd272bf9261c871c334f3ace Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 2 Oct 2020 20:47:30 +0300
Subject: [PATCH 120/755] [throttle] stop worker when channel is closed

---
 src/bot/limits.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index c160aa2c..88bbadd1 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -164,15 +164,16 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
     let mut hchats: HashMap<Id, u32> = HashMap::new();
     let mut hchats_s = HashMap::new();
 
-    loop {
+    // set to true when `queue_rx` is closed
+    let mut close = false;
+
+    while !close || !queue.is_empty() {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
-            let req = queue_rx
-                .recv()
-                .await
-                // FIXME(waffle): decide what should we do on channel close
-                .expect("Queue channel was closed");
-            queue.push(req);
+            match queue_rx.recv().await {
+                Some(req) => queue.push(req),
+                None => close = true,
+            }
         }
 
         // update local queue with latest requests
@@ -180,8 +181,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
             match queue_rx.try_recv() {
                 Ok(req) => queue.push(req),
                 Err(TryRecvError::Empty) => break,
-                // FIXME(waffle): decide what should we do on channel close
-                Err(TryRecvError::Closed) => unimplemented!("Queue channel was closed"),
+                Err(TryRecvError::Closed) => close = true,
             }
         }
 

From e7579991359bd0b50899e922de7b043d1302fbe5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 2 Oct 2020 21:22:19 +0300
Subject: [PATCH 121/755] [throttle] git rebase, fmt and clippy things

---
 src/bot/auto_send.rs | 15 ++++++++++++++-
 src/bot/limits.rs    | 41 +++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index e64b893c..5f2ceb49 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -6,7 +6,10 @@ use std::{
 
 use futures::future::FusedFuture;
 
-use crate::requests::{HasPayload, Output, Request, Requester};
+use crate::{
+    requests::{HasPayload, Output, Request, Requester},
+    types::ChatId,
+};
 
 /// Send requests automatically.
 ///
@@ -65,6 +68,16 @@ impl<B: Requester> Requester for AutoSend<B> {
     fn get_me(&self) -> Self::GetMe {
         AutoRequest::new(self.bot.get_me())
     }
+
+    type SendMessage = AutoRequest<B::SendMessage>;
+
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        AutoRequest::new(self.bot.send_message(chat_id, text))
+    }
 }
 
 #[pin_project::pin_project]
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 88bbadd1..71990a53 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -254,7 +254,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
         }
 
         for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
-            *hchats_s.entry(chat.clone()).or_insert(0) += 1;
+            *hchats_s.entry(*chat).or_insert(0) += 1;
         }
 
         let mut queue_rem = queue.removing();
@@ -267,9 +267,9 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
 
             if cond {
                 {
-                    *hchats_s.entry(chat.clone()).or_insert(0) += 1;
-                    *hchats.entry(chat.clone()).or_insert(0) += 1;
-                    history.push_back((chat.clone(), Instant::now()));
+                    *hchats_s.entry(*chat).or_insert(0) += 1;
+                    *hchats.entry(*chat).or_insert(0) += 1;
+                    history.push_back((*chat, Instant::now()));
                 }
 
                 // This will close the channel unlocking associated request
@@ -495,13 +495,11 @@ impl<R: Request> Future for ThrottlingSend<R> {
             },
             SendProj::Pending { request: _, wait } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
-                Poll::Ready(r) => {
-                    // Worker pass "message" to unlock us by closing the channel
-                    match r {
-                        Ok(never) => match never {},
-                        Err(_) => {}
-                    }
-
+                // Worker pass "message" to unlock us by closing the channel,
+                // and thus we can safely ignore this result as we know it will
+                // always be `Err(_)` (because `Ok(Never)` is uninhibited)
+                // and that's what we want.
+                Poll::Ready(_) => {
                     if let SendRepl::Pending { request, wait: _ } =
                         this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
@@ -576,13 +574,11 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
             },
             SendRefProj::Pending { request: _, wait } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
-                Poll::Ready(r) => {
-                    // Worker pass "message" to unlock us by closing the channel
-                    match r {
-                        Ok(never) => match never {},
-                        Err(_) => {}
-                    }
-
+                // Worker pass "message" to unlock us by closing the channel,
+                // and thus we can safely ignore this result as we know it will
+                // always be `Err(_)` (because `Ok(Never)` is uninhibited)
+                // and that's what we want.
+                Poll::Ready(_) => {
                     if let SendRefRepl::Pending { request, wait: _ } =
                         this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
@@ -625,7 +621,9 @@ mod chan_send {
     type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
 
     impl SendTy for mpsc::Sender<(Id, Sender<Never>)> {
-        fn send_t(mut self, val: (Id, Sender<Never>)) -> ChanSend {
+        // `return`s trick IDEA not to show errors
+        #[allow(clippy::needless_return)]
+        fn send_t(self, val: (Id, Sender<Never>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
                 fn def(
@@ -637,7 +635,10 @@ mod chan_send {
                 return ChanSend(def(self, val));
             }
             #[cfg(not(feature = "nightly"))]
-            return ChanSend(Box::pin(async move { self.send(val).await }));
+            {
+                let mut this = self;
+                return ChanSend(Box::pin(async move { this.send(val).await }));
+            }
         }
     }
 

From 2d7e40a4732cdd9c7a6d03fb6920707427556d26 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 3 Oct 2020 03:30:34 +0300
Subject: [PATCH 122/755] [throttle] fix doc test

---
 src/bot/limits.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 71990a53..a5052431 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -122,9 +122,10 @@ impl Default for Limits {
 ///
 /// ## Examples
 ///
-/// ```
+/// ```no_run (throttle fails to spawn task without tokio runtime) 
 /// use teloxide_core::{bot::Limits, requests::RequesterExt, Bot};
 ///
+/// # #[allow(deprecated)]
 /// let bot = Bot::new("TOKEN").throttle(Limits::default());
 ///
 /// /* send many requests here */

From 8e44a0bcfcb364a32c7d3eaf2548d8b9b3b7b989 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 3 Oct 2020 03:39:50 +0300
Subject: [PATCH 123/755] fmt: i can't see the difference

---
 src/bot/limits.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index a5052431..52f06d44 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -122,7 +122,7 @@ impl Default for Limits {
 ///
 /// ## Examples
 ///
-/// ```no_run (throttle fails to spawn task without tokio runtime) 
+/// ```no_run (throttle fails to spawn task without tokio runtime)
 /// use teloxide_core::{bot::Limits, requests::RequesterExt, Bot};
 ///
 /// # #[allow(deprecated)]

From 2f09e9930df0268591eb4d4c28e9dc1057659d36 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 10 Oct 2020 14:17:52 +0300
Subject: [PATCH 124/755] Decompose `ChatMemberKind` as was requested per
 review

---
 src/types/chat_member.rs | 325 ++++++++++++++++++++++-----------------
 1 file changed, 185 insertions(+), 140 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 746c744b..4d7c9530 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -19,255 +19,300 @@ pub struct ChatMember {
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "status")]
 pub enum ChatMemberKind {
-    Creator {
-        /// Custom title for this user.
-        custom_title: Option<String>,
-    },
-    Administrator {
-        /// Custom title for this user.
-        custom_title: Option<String>,
-
-        /// `true`, if the bot is allowed to edit
-        /// administrator privileges of that user.
-        can_be_edited: bool,
-
-        /// `true`, if the administrator can change the chat
-        /// title, photo and other settings.
-        can_change_info: bool,
-
-        /// `true`, if the administrator can post in the
-        /// channel, channels only.
-        can_post_messages: Option<bool>,
-
-        /// `true`, if the administrator can edit messages of
-        /// other users and can pin messages, channels only.
-        can_edit_messages: Option<bool>,
-
-        /// `true`, if the administrator can delete messages
-        /// of other users.
-        can_delete_messages: bool,
-
-        /// `true`, if the administrator can invite new users
-        /// to the chat.
-        can_invite_users: bool,
-
-        /// `true`, if the administrator can restrict,
-        /// ban or unban chat members.
-        can_restrict_members: bool,
-
-        /// `true`, if the administrator can pin messages,
-        /// supergroups only.
-        can_pin_messages: Option<bool>,
-
-        /// `true`, if the administrator can add new
-        /// administrators with a subset of his own privileges or demote
-        /// administrators that he has promoted, directly or indirectly
-        /// (promoted by administrators that were appointed by the
-        /// user).
-        can_promote_members: bool,
-    },
+    Creator(Creator),
+    Administrator(Administrator),
     Member,
-    Restricted {
-        /// Date when restrictions will be lifted for
-        /// this user, unix time.
-        until_date: i32,
-
-        /// Restricted only. `true`, if the user can send text messages,
-        /// contacts, locations and venues.
-        can_send_messages: bool,
-
-        /// Restricted only. `true`, if the user is allowed to send audios,
-        /// documents, photos, videos, video notes and voice notes.
-        can_send_media_messages: bool,
-
-        /// Restricted only. `true`, if the user is allowed to send animations,
-        /// games, stickers and use inline bots.
-        can_send_other_messages: bool,
-
-        /// Restricted only. `true`, if the user is allowed to add web page
-        /// previews to their messages.
-        can_add_web_page_previews: bool,
-    },
+    Restricted(Restricted),
     Left,
-    Kicked {
-        /// Date when restrictions will be lifted for
-        /// this user, unix time.
-        until_date: i32,
-    },
+    Kicked(Kicked),
+}
+
+/// Creator of the group. This struct is part of the [`ChatmemberKind`] enum.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct Creator {
+    /// Custom title for this user.
+    pub custom_title: Option<String>,
+}
+
+/// Administrator of the group. This struct is part of the [`ChatmemberKind`]
+/// enum.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct Administrator {
+    /// Custom title for this user.
+    pub custom_title: Option<String>,
+
+    /// `true`, if the bot is allowed to edit
+    /// administrator privileges of that user.
+    pub can_be_edited: bool,
+
+    /// `true`, if the administrator can change the chat
+    /// title, photo and other settings.
+    pub can_change_info: bool,
+
+    /// `true`, if the administrator can post in the
+    /// channel, channels only.
+    pub can_post_messages: Option<bool>,
+
+    /// `true`, if the administrator can edit messages of
+    /// other users and can pin messages, channels only.
+    pub can_edit_messages: Option<bool>,
+
+    /// `true`, if the administrator can delete messages
+    /// of other users.
+    pub can_delete_messages: bool,
+
+    /// `true`, if the administrator can invite new users
+    /// to the chat.
+    pub can_invite_users: bool,
+
+    /// `true`, if the administrator can restrict,
+    /// ban or unban chat members.
+    pub can_restrict_members: bool,
+
+    /// `true`, if the administrator can pin messages,
+    /// supergroups only.
+    pub can_pin_messages: Option<bool>,
+
+    /// `true`, if the administrator can add new
+    /// administrators with a subset of his own privileges or demote
+    /// administrators that he has promoted, directly or indirectly
+    /// (promoted by administrators that were appointed by the
+    /// user).
+    pub can_promote_members: bool,
+}
+
+/// User, restricted in the group. This struct is part of the [`ChatmemberKind`]
+/// enum.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct Restricted {
+    /// Date when restrictions will be lifted for
+    /// this user, unix time.
+    pub until_date: i32,
+
+    /// Restricted only. `true`, if the user can send text messages,
+    /// contacts, locations and venues.
+    pub can_send_messages: bool,
+
+    /// Restricted only. `true`, if the user is allowed to send audios,
+    /// documents, photos, videos, video notes and voice notes.
+    pub can_send_media_messages: bool,
+
+    /// Restricted only. `true`, if the user is allowed to send animations,
+    /// games, stickers and use inline bots.
+    pub can_send_other_messages: bool,
+
+    /// Restricted only. `true`, if the user is allowed to add web page
+    /// previews to their messages.
+    pub can_add_web_page_previews: bool,
+}
+
+/// User kicked from the group. This struct is part of the [`ChatmemberKind`]
+/// enum.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct Kicked {
+    /// Date when restrictions will be lifted for
+    /// this user, unix time.
+    pub until_date: i32,
 }
 
 impl ChatMember {
     pub fn status(&self) -> ChatMemberStatus {
         match &self.kind {
-            ChatMemberKind::Creator { .. } => ChatMemberStatus::Creator,
-            ChatMemberKind::Administrator { .. } => ChatMemberStatus::Administrator,
+            ChatMemberKind::Creator(_) => ChatMemberStatus::Creator,
+            ChatMemberKind::Administrator(_) => ChatMemberStatus::Administrator,
             ChatMemberKind::Member => ChatMemberStatus::Member,
-            ChatMemberKind::Restricted { .. } => ChatMemberStatus::Restricted,
+            ChatMemberKind::Restricted(_) => ChatMemberStatus::Restricted,
             ChatMemberKind::Left => ChatMemberStatus::Left,
-            ChatMemberKind::Kicked { .. } => ChatMemberStatus::Kicked,
+            ChatMemberKind::Kicked(_) => ChatMemberStatus::Kicked,
         }
     }
 }
+
 impl ChatMemberKind {
+    /// Getter for [`Administrator::custom_title`] and [`Creator::custom_title`]
+    /// fields.
     pub fn custom_title(&self) -> Option<&str> {
         match &self {
-            Self::Administrator { custom_title, .. } | Self::Creator { custom_title, .. } => {
-                //Some(custom_title.as_str())
-                custom_title.as_deref()
-            }
-            Self::Member | Self::Restricted { .. } | Self::Left | Self::Kicked { .. } => None,
+            Self::Administrator(Administrator { custom_title, .. })
+            | Self::Creator(Creator { custom_title, .. }) => custom_title.as_deref(),
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Restricted::until_date`] and [`Kicked::until_date`] fields.
     pub fn until_date(&self) -> Option<i32> {
         match &self {
-            Self::Creator { .. } | Self::Administrator { .. } | Self::Member | Self::Left => None,
-            Self::Restricted { until_date, .. } | Self::Kicked { until_date, .. } => {
-                Some(*until_date)
-            }
+            Self::Creator(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
+            Self::Restricted(Restricted { until_date, .. })
+            | Self::Kicked(Kicked { until_date, .. }) => Some(*until_date),
         }
     }
 
+    /// Getter for [`Administrator::can_be_edited`] field.
     pub fn can_be_edited(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_be_edited, .. } => Some(*can_be_edited),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_be_edited, .. }) => Some(*can_be_edited),
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_change_info`] field.
     pub fn can_change_info(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_change_info, .. } => Some(*can_change_info),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_change_info, .. }) => Some(*can_change_info),
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_post_messages`] field.
     pub fn can_post_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_post_messages, .. } => *can_post_messages,
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_post_messages, .. }) => *can_post_messages,
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_edit_messages`] field.
     pub fn can_edit_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_edit_messages, .. } => *can_edit_messages,
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_edit_messages, .. }) => *can_edit_messages,
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_delete_messages`] field.
     pub fn can_delete_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_delete_messages, .. } => Some(*can_delete_messages),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_delete_messages, .. }) => {
+                Some(*can_delete_messages)
+            }
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_invite_users`] field.
     pub fn can_invite_users(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_invite_users, .. } => Some(*can_invite_users),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_invite_users, .. }) => Some(*can_invite_users),
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_restrict_members`] field.
     pub fn can_restrict_members(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_restrict_members, .. } => Some(*can_restrict_members),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_restrict_members, .. }) => {
+                Some(*can_restrict_members)
+            }
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_pin_messages`] field.
     pub fn can_pin_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_pin_messages, .. } => *can_pin_messages,
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_pin_messages, .. }) => *can_pin_messages,
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Administrator::can_promote_members`] field.
     pub fn can_promote_members(&self) -> Option<bool> {
         match &self {
-            Self::Administrator { can_promote_members, .. } => Some(*can_promote_members),
-            Self::Creator { .. }
+            Self::Administrator(Administrator { can_promote_members, .. }) => {
+                Some(*can_promote_members)
+            }
+            Self::Creator(_)
             | Self::Member
-            | Self::Restricted { .. }
+            | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Restricted::can_send_messages`] field.
     pub fn can_send_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted { can_send_messages, .. } => Some(*can_send_messages),
-            Self::Creator { .. }
-            | Self::Administrator { .. }
+            Self::Restricted(Restricted { can_send_messages, .. }) => Some(*can_send_messages),
+            Self::Creator(_)
+            | Self::Administrator(_)
             | Self::Member
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Restricted::can_send_media_messages`] field.
     pub fn can_send_media_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted { can_send_media_messages, .. } => Some(*can_send_media_messages),
-            Self::Creator { .. }
-            | Self::Administrator { .. }
+            Self::Restricted(Restricted { can_send_media_messages, .. }) => {
+                Some(*can_send_media_messages)
+            }
+            Self::Creator(_)
+            | Self::Administrator(_)
             | Self::Member
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Restricted::can_send_other_messages`] field.
     pub fn can_send_other_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted { can_send_other_messages, .. } => Some(*can_send_other_messages),
-            Self::Creator { .. }
-            | Self::Administrator { .. }
+            Self::Restricted(Restricted { can_send_other_messages, .. }) => {
+                Some(*can_send_other_messages)
+            }
+            Self::Creator(_)
+            | Self::Administrator(_)
             | Self::Member
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 
+    /// Getter for [`Restricted::can_add_web_page_previews`] field.
     pub fn can_add_web_page_previews(&self) -> Option<bool> {
         match &self {
-            Self::Restricted { can_add_web_page_previews, .. } => Some(*can_add_web_page_previews),
-            Self::Creator { .. }
-            | Self::Administrator { .. }
+            Self::Restricted(Restricted { can_add_web_page_previews, .. }) => {
+                Some(*can_add_web_page_previews)
+            }
+            Self::Creator(_)
+            | Self::Administrator(_)
             | Self::Member
             | Self::Left
-            | Self::Kicked { .. } => None,
+            | Self::Kicked(_) => None,
         }
     }
 }
@@ -316,7 +361,7 @@ mod tests {
                 username: Some("fl".to_string()),
                 language_code: Some("en".to_string()),
             },
-            kind: ChatMemberKind::Administrator {
+            kind: ChatMemberKind::Administrator(Administrator {
                 custom_title: None,
                 can_be_edited: false,
                 can_change_info: true,
@@ -327,7 +372,7 @@ mod tests {
                 can_restrict_members: true,
                 can_pin_messages: Some(true),
                 can_promote_members: true,
-            },
+            }),
         };
         let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
         assert_eq!(actual, expected)

From e54f45ceabb9654002ce765a1a819a0122e88e27 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 20 Oct 2020 12:17:07 +0300
Subject: [PATCH 125/755] Make the trait bounds in Request{,er} stricter

---
 src/bot/api.rs            |  2 ++
 src/bot/auto_send.rs      |  2 ++
 src/bot/cache_me.rs       | 12 ++++++++++--
 src/bot/limits.rs         | 12 +++++++++---
 src/local_macros.rs       |  2 +-
 src/requests/request.rs   |  6 +++---
 src/requests/requester.rs |  6 ++++--
 7 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 5e2cb0ad..e32bdbe9 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1705,6 +1705,8 @@ impl Bot {
 }
 
 impl Requester for Bot {
+    type Err = crate::errors::RequestError;
+
     type GetMe = JsonRequest<payloads::GetMe>;
 
     fn get_me(&self) -> JsonRequest<payloads::GetMe> {
diff --git a/src/bot/auto_send.rs b/src/bot/auto_send.rs
index 5f2ceb49..98e14ad2 100644
--- a/src/bot/auto_send.rs
+++ b/src/bot/auto_send.rs
@@ -63,6 +63,8 @@ impl<B> AutoSend<B> {
 }
 
 impl<B: Requester> Requester for AutoSend<B> {
+    type Err = B::Err;
+
     type GetMe = AutoRequest<B::GetMe>;
 
     fn get_me(&self) -> Self::GetMe {
diff --git a/src/bot/cache_me.rs b/src/bot/cache_me.rs
index 8a06ebf2..b43061e4 100644
--- a/src/bot/cache_me.rs
+++ b/src/bot/cache_me.rs
@@ -54,7 +54,12 @@ impl<B> CacheMe<B> {
     }
 }
 
-impl<B: Requester> Requester for CacheMe<B> {
+impl<B> Requester for CacheMe<B>
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
     type GetMe = CachedMeRequest<B::GetMe>;
 
     fn get_me(&self) -> Self::GetMe {
@@ -85,7 +90,10 @@ enum Inner<R: Request<Payload = GetMe>> {
     Pending(R, Arc<OnceCell<User>>),
 }
 
-impl<R: Request<Payload = GetMe>> Request for CachedMeRequest<R> {
+impl<R> Request for CachedMeRequest<R>
+where
+    R: Request<Payload = GetMe>,
+{
     type Err = R::Err;
     type Send = Send<R>;
     type SendRef = SendRef<R>;
diff --git a/src/bot/limits.rs b/src/bot/limits.rs
index 52f06d44..412057a9 100644
--- a/src/bot/limits.rs
+++ b/src/bot/limits.rs
@@ -346,7 +346,12 @@ impl<B> Throttle<B> {
     }
 }
 
-impl<B: Requester> Requester for Throttle<B> {
+impl<B: Requester> Requester for Throttle<B>
+where
+    B::SendMessage: Send,
+{
+    type Err = B::Err;
+
     type GetMe = B::GetMe;
 
     fn get_me(&self) -> Self::GetMe {
@@ -412,8 +417,9 @@ impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     }
 }
 
-impl<R: Request> Request for ThrottlingRequest<R>
+impl<R> Request for ThrottlingRequest<R>
 where
+    R: Request + Send,
     <R as HasPayload>::Payload: GetChatId,
 {
     type Err = R::Err;
@@ -617,7 +623,7 @@ mod chan_send {
     pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>>>;
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>> + Send>>;
     #[cfg(feature = "nightly")]
     type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index c2aed978..5a48a207 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -83,7 +83,7 @@ macro_rules! req_future {
 
             #[cfg(not(feature = "nightly"))]
             pub(crate) type $i<$T>
-            $(where $($wh)*)?  = ::core::pin::Pin<Box<dyn ::core::future::Future<Output = $Out>>>;
+            $(where $($wh)*)?  = ::core::pin::Pin<Box<dyn ::core::future::Future<Output = $Out> + ::core::marker::Send + 'static>>;
 
             #[cfg(not(feature = "nightly"))]
             pub(crate) fn def<$T>($( $arg: $ArgTy ),*) -> $i<$T>
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 8722a3e2..6abb457e 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -22,16 +22,16 @@ pub trait Request: HasPayload {
      */
 
     /// Type of error that may happen during sending the request to telegram.
-    type Err: std::error::Error;
+    type Err: std::error::Error + Send;
 
     /// Type of future returned by [`send`](Request::send) method.
-    type Send: Future<Output = Result<Output<Self>, Self::Err>>;
+    type Send: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
     /// Type of future returned by [`send_ref`](Request::send_ref) method.
     ///
     /// NOTE: it intentionally forbids borrowing from self
     // though anyway we couldn't allow borrowing without GATs :sob:
-    type SendRef: Future<Output = Result<Output<Self>, Self::Err>>;
+    type SendRef: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
     /// Send the request.
     ///
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index f9f342d1..91f297af 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -10,12 +10,14 @@ use crate::{
 /// _This trait is included in the crate's [`prelude`](crate::prelude)_.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Requester {
-    type GetMe: Request<Payload = GetMe>;
+    type Err: std::error::Error + Send;
+
+    type GetMe: Request<Payload = GetMe, Err = Self::Err>;
 
     /// For telegram documentation of the method see [`GetMe`].
     fn get_me(&self) -> Self::GetMe;
 
-    type SendMessage: Request<Payload = SendMessage>;
+    type SendMessage: Request<Payload = SendMessage, Err = Self::Err>;
 
     /// For telegram documentation of the method see [`SendMessage`].
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage

From 193dd692657f14627d388ed2e6955973c6c44054 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 20 Oct 2020 15:07:10 +0300
Subject: [PATCH 126/755] Cleanup errors

---
 src/errors.rs                | 969 ++++++++++++++++++-----------------
 src/lib.rs                   |   2 +-
 src/local_macros.rs          |  82 +++
 src/net/mod.rs               |   4 +-
 src/net/telegram_response.rs |  31 +-
 5 files changed, 592 insertions(+), 496 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index 999692be..fe749693 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -8,9 +8,11 @@ use thiserror::Error;
 /// An error caused by downloading a file.
 #[derive(Debug, Error, From)]
 pub enum DownloadError {
+    /// Network error while downloading file from telegram.
     #[error("A network error: {0}")]
     NetworkError(#[source] reqwest::Error),
 
+    /// I/O error while writing file to destination.
     #[error("An I/O error: {0}")]
     Io(#[source] std::io::Error),
 }
@@ -18,8 +20,14 @@ pub enum DownloadError {
 /// An error caused by sending a request to Telegram.
 #[derive(Debug, Error)]
 pub enum RequestError {
+    /// Telegram API error
     #[error("A Telegram's error #{status_code}: {kind:?}")]
-    ApiError { status_code: StatusCode, kind: ApiErrorKind },
+    ApiError { 
+        /// Kind of api error
+        kind: ApiError,    
+        /// HTTP code returned by telegram, not very usefull in practice.
+        status_code: StatusCode ,
+    },
 
     /// The group has been migrated to a supergroup with the specified
     /// identifier.
@@ -31,9 +39,16 @@ pub enum RequestError {
     #[error("Retry after {0} seconds")]
     RetryAfter(i32),
 
+    /// Network error while sending request to telegram.
     #[error("A network error: {0}")]
     NetworkError(#[source] reqwest::Error),
 
+    /// Error while parsing response from telegram.
+    ///
+    /// If you've received this error, please, [open an issue] with the
+    /// description of the error.
+    ///
+    /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
     #[error("An error while parsing JSON: {0}")]
     InvalidJson(#[source] serde_json::Error),
 
@@ -42,480 +57,480 @@ pub enum RequestError {
     Io(#[source] io::Error),
 }
 
-/// A kind of an API error.
-///
-/// If you receive [`ApiErrorKind::Unknown`], please [open an issue] with
-/// the description of the error.
-///
-/// [`ApiErrorKind::Unknown`]: crate::ApiErrorKind::Unknown
-/// [open an issue]: https://github.com/teloxide/teloxide/issues/new
-#[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
-#[serde(untagged)]
-pub enum ApiErrorKind {
-    Known(KnownApiErrorKind),
-    Unknown(String),
-}
-
-/// A kind of a known API error.
-#[derive(Debug, Deserialize, PartialEq, Copy, Hash, Eq, Clone)]
-pub enum KnownApiErrorKind {
-    /// Occurs when the bot tries to send message to user who blocked the bot.
-    #[serde(rename = "Forbidden: bot was blocked by the user")]
-    BotBlocked,
-
-    /// Occurs when bot tries to modify a message without modification content.
-    ///
-    /// May happen in methods:
-    /// 1. [`EditMessageText`]
-    ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
-    #[serde(rename = "Bad Request: message is not modified: specified new message content and \
-                      reply markup are exactly the same as a current content and reply markup \
-                      of the message")]
-    MessageNotModified,
-
-    /// Occurs when bot tries to forward or delete a message which was deleted.
-    ///
-    /// May happen in methods:
-    /// 1. [`ForwardMessage`]
-    /// 2. [`DeleteMessage`]
-    ///
-    /// [`ForwardMessage`]: crate::requests::ForwardMessage
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
-    #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
-    MessageIdInvalid,
-
-    /// Occurs when bot tries to forward a message which does not exists.
-    ///
-    /// May happen in methods:
-    /// 1. [`ForwardMessage`]
-    ///
-    /// [`ForwardMessage`]: crate::requests::ForwardMessage
-    #[serde(rename = "Bad Request: message to forward not found")]
-    MessageToForwardNotFound,
-
-    /// Occurs when bot tries to delete a message which does not exists.
-    ///
-    /// May happen in methods:
-    /// 1. [`DeleteMessage`]
-    ///
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
-    #[serde(rename = "Bad Request: message to delete not found")]
-    MessageToDeleteNotFound,
-
-    /// Occurs when bot tries to send a text message without text.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: message text is empty")]
-    MessageTextIsEmpty,
-
-    /// Occurs when bot tries to edit a message after long time.
-    ///
-    /// May happen in methods:
-    /// 1. [`EditMessageText`]
-    ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
-    #[serde(rename = "Bad Request: message can't be edited")]
-    MessageCantBeEdited,
-
-    /// Occurs when bot tries to delete a someone else's message in group where
-    /// it does not have enough rights.
-    ///
-    /// May happen in methods:
-    /// 1. [`DeleteMessage`]
-    ///
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
-    #[serde(rename = "Bad Request: message can't be deleted")]
-    MessageCantBeDeleted,
-
-    /// Occurs when bot tries to edit a message which does not exists.
-    ///
-    /// May happen in methods:
-    /// 1. [`EditMessageText`]
-    ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
-    #[serde(rename = "Bad Request: message to edit not found")]
-    MessageToEditNotFound,
-
-    /// Occurs when bot tries to reply to a message which does not exists.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: reply message not found")]
-    MessageToReplyNotFound,
-
-    /// Occurs when bot tries to
-    #[serde(rename = "Bad Request: message identifier is not specified")]
-    MessageIdentifierNotSpecified,
-
-    /// Occurs when bot tries to send a message with text size greater then
-    /// 4096 symbols.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: message is too long")]
-    MessageIsTooLong,
-
-    /// Occurs when bot tries to send media group with more than 10 items.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMediaGroup`]
-    ///
-    /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
-    #[serde(rename = "Bad Request: Too much messages to send as an album")]
-    ToMuchMessages,
-
-    /// Occurs when bot tries to stop poll that has already been stopped.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll has already been closed")]
-    PollHasAlreadyClosed,
-
-    /// Occurs when bot tries to send poll with less than 2 options.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll must have at least 2 option")]
-    PollMustHaveMoreOptions,
-
-    /// Occurs when bot tries to send poll with more than 10 options.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll can't have more than 10 options")]
-    PollCantHaveMoreOptions,
-
-    /// Occurs when bot tries to send poll with empty option (without text).
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll options must be non-empty")]
-    PollOptionsMustBeNonEmpty,
-
-    /// Occurs when bot tries to send poll with empty question (without text).
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll question must be non-empty")]
-    PollQuestionMustBeNonEmpty,
-
-    /// Occurs when bot tries to send poll with total size of options more than
-    /// 100 symbols.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll options length must not exceed 100")]
-    PollOptionsLengthTooLong,
-
-    /// Occurs when bot tries to send poll with question size more than 255
-    /// symbols.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendPoll`]
-    ///
-    /// [`SendPoll`]: crate::requests::SendPoll
-    #[serde(rename = "Bad Request: poll question length must not exceed 255")]
-    PollQuestionLengthTooLong,
-
-    /// Occurs when bot tries to stop poll with message without poll.
-    ///
-    /// May happen in methods:
-    /// 1. [`StopPoll`]
-    ///
-    /// [`StopPoll`]: crate::requests::StopPoll
-    #[serde(rename = "Bad Request: message with poll to stop not found")]
-    MessageWithPollNotFound,
-
-    /// Occurs when bot tries to stop poll with message without poll.
-    ///
-    /// May happen in methods:
-    /// 1. [`StopPoll`]
-    ///
-    /// [`StopPoll`]: crate::requests::StopPoll
-    #[serde(rename = "Bad Request: message is not a poll")]
-    MessageIsNotAPoll,
-
-    /// Occurs when bot tries to send a message to chat in which it is not a
-    /// member.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: chat not found")]
-    ChatNotFound,
-
-    /// Occurs when bot tries to send method with unknown user_id.
-    ///
-    /// May happen in methods:
-    /// 1. [`getUserProfilePhotos`]
-    ///
-    /// [`getUserProfilePhotos`]:
-    /// crate::requests::GetUserProfilePhotos
-    #[serde(rename = "Bad Request: user not found")]
-    UserNotFound,
-
-    /// Occurs when bot tries to send [`SetChatDescription`] with same text as
-    /// in the current description.
-    ///
-    /// May happen in methods:
-    /// 1. [`SetChatDescription`]
-    ///
-    /// [`SetChatDescription`]: crate::requests::SetChatDescription
-    #[serde(rename = "Bad Request: chat description is not modified")]
-    ChatDescriptionIsNotModified,
-
-    /// Occurs when bot tries to answer to query after timeout expire.
-    ///
-    /// May happen in methods:
-    /// 1. [`AnswerCallbackQuery`]
-    ///
-    /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
-    #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
-                      invalid")]
-    InvalidQueryID,
-
-    /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
-    /// url.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
-    ButtonURLInvalid,
-
-    /// Occurs when bot tries to send button with data size more than 64 bytes.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
-    ButtonDataInvalid,
-
-    /// Occurs when bot tries to send button with data size == 0.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
-                      unallowed in the inline keyboard")]
-    TextButtonsAreUnallowed,
-
-    /// Occurs when bot tries to get file by wrong file id.
-    ///
-    /// May happen in methods:
-    /// 1. [`GetFile`]
-    ///
-    /// [`GetFile`]: crate::requests::GetFile
-    #[serde(rename = "Bad Request: wrong file id")]
-    WrongFileID,
-
-    /// Occurs when bot tries to do some with group which was deactivated.
-    #[serde(rename = "Bad Request: group is deactivated")]
-    GroupDeactivated,
-
-    /// Occurs when bot tries to set chat photo from file ID
-    ///
-    /// May happen in methods:
-    /// 1. [`SetChatPhoto`]
-    ///
-    /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
-    #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
-    PhotoAsInputFileRequired,
-
-    /// Occurs when bot tries to add sticker to stickerset by invalid name.
-    ///
-    /// May happen in methods:
-    /// 1. [`AddStickerToSet`]
-    ///
-    /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
-    #[serde(rename = "Bad Request: STICKERSET_INVALID")]
-    InvalidStickersSet,
-
-    /// Occurs when bot tries to pin a message without rights to pin in this
-    /// chat.
-    ///
-    /// May happen in methods:
-    /// 1. [`PinChatMessage`]
-    ///
-    /// [`PinChatMessage`]: crate::requests::PinChatMessage
-    #[serde(rename = "Bad Request: not enough rights to pin a message")]
-    NotEnoughRightsToPinMessage,
-
-    /// Occurs when bot tries to use method in group which is allowed only in a
-    /// supergroup or channel.
-    #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
-    MethodNotAvailableInPrivateChats,
-
-    /// Occurs when bot tries to demote chat creator.
-    ///
-    /// May happen in methods:
-    /// 1. [`PromoteChatMember`]
-    ///
-    /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
-    #[serde(rename = "Bad Request: can't demote chat creator")]
-    CantDemoteChatCreator,
-
-    /// Occurs when bot tries to restrict self in group chats.
-    ///
-    /// May happen in methods:
-    /// 1. [`RestrictChatMember`]
-    ///
-    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
-    #[serde(rename = "Bad Request: can't restrict self")]
-    CantRestrictSelf,
-
-    /// Occurs when bot tries to restrict chat member without rights to
-    /// restrict in this chat.
-    ///
-    /// May happen in methods:
-    /// 1. [`RestrictChatMember`]
-    ///
-    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
-    #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
-    NotEnoughRightsToRestrict,
-
-    /// Occurs when bot tries set webhook to protocol other than HTTPS.
-    ///
-    /// May happen in methods:
-    /// 1. [`SetWebhook`]
-    ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
-    #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
-    WebhookRequireHTTPS,
-
-    /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
-    /// 8443.
-    ///
-    /// May happen in methods:
-    /// 1. [`SetWebhook`]
-    ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
-    #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
-                      or 8443")]
-    BadWebhookPort,
-
-    /// Occurs when bot tries to set webhook to unknown host.
-    ///
-    /// May happen in methods:
-    /// 1. [`SetWebhook`]
-    ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
-    #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
-    UnknownHost,
-
-    /// Occurs when bot tries to set webhook to invalid URL.
-    ///
-    /// May happen in methods:
-    /// 1. [`SetWebhook`]
-    ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
-    #[serde(rename = "Bad Request: can't parse URL")]
-    CantParseUrl,
-
-    /// Occurs when bot tries to send message with unfinished entities.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: can't parse entities")]
-    CantParseEntities,
-
-    /// Occurs when bot tries to use getUpdates while webhook is active.
-    ///
-    /// May happen in methods:
-    /// 1. [`GetUpdates`]
-    ///
-    /// [`GetUpdates`]: crate::requests::GetUpdates
-    #[serde(rename = "can't use getUpdates method while webhook is active")]
-    CantGetUpdates,
-
-    /// Occurs when bot tries to do some in group where bot was kicked.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Unauthorized: bot was kicked from a chat")]
-    BotKicked,
-
-    /// Occurs when bot tries to send message to deactivated user.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Unauthorized: user is deactivated")]
-    UserDeactivated,
-
-    /// Occurs when you tries to initiate conversation with a user.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
-    CantInitiateConversation,
-
-    /// Occurs when you tries to send message to bot.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Unauthorized: bot can't send messages to bots")]
-    CantTalkWithBots,
-
-    /// Occurs when bot tries to send button with invalid http url.
-    ///
-    /// May happen in methods:
-    /// 1. [`SendMessage`]
-    ///
-    /// [`SendMessage`]: crate::requests::SendMessage
-    #[serde(rename = "Bad Request: wrong HTTP URL")]
-    WrongHTTPurl,
-
-    /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
-    /// one Updater is running.
-    ///
-    /// May happen in methods:
-    /// 1. [`GetUpdates`]
-    ///
-    /// [`GetUpdates`]: crate::requests::GetUpdates
-    #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
-                      bot instance is running")]
-    TerminatedByOtherGetUpdates,
-
-    /// Occurs when bot tries to get file by invalid file id.
-    ///
-    /// May happen in methods:
-    /// 1. [`GetFile`]
-    ///
-    /// [`GetFile`]: crate::requests::GetFile
-    #[serde(rename = "Bad Request: invalid file id")]
-    FileIdInvalid,
+serde_or_unknown! {
+    #[unknown_mod = api_error_internals]
+    #[unknown_kind = Kind]
+    #[unknown_path = "api_error_internals::Kind"]
+
+    /// A kind of an API error.
+    #[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
+    pub enum ApiError {
+        #[unknown]
+        /// Error which is not known to `teloxide`.
+        ///
+        /// If you've received this error, please [open an issue] with the description of the error.
+        ///
+        /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
+        Unknown(String),
+
+        /// Occurs when the bot tries to send message to user who blocked the bot.
+        #[serde(rename = "Forbidden: bot was blocked by the user")]
+        BotBlocked,
+
+        /// Occurs when bot tries to modify a message without modification content.
+        ///
+        /// May happen in methods:
+        /// 1. [`EditMessageText`]
+        ///
+        /// [`EditMessageText`]: crate::requests::EditMessageText
+        #[serde(rename = "Bad Request: message is not modified: specified new message content and \
+                        reply markup are exactly the same as a current content and reply markup \
+                        of the message")]
+        MessageNotModified,
+
+        /// Occurs when bot tries to forward or delete a message which was deleted.
+        ///
+        /// May happen in methods:
+        /// 1. [`ForwardMessage`]
+        /// 2. [`DeleteMessage`]
+        ///
+        /// [`ForwardMessage`]: crate::requests::ForwardMessage
+        /// [`DeleteMessage`]: crate::requests::DeleteMessage
+        #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
+        MessageIdInvalid,
+
+        /// Occurs when bot tries to forward a message which does not exists.
+        ///
+        /// May happen in methods:
+        /// 1. [`ForwardMessage`]
+        ///
+        /// [`ForwardMessage`]: crate::requests::ForwardMessage
+        #[serde(rename = "Bad Request: message to forward not found")]
+        MessageToForwardNotFound,
+
+        /// Occurs when bot tries to delete a message which does not exists.
+        ///
+        /// May happen in methods:
+        /// 1. [`DeleteMessage`]
+        ///
+        /// [`DeleteMessage`]: crate::requests::DeleteMessage
+        #[serde(rename = "Bad Request: message to delete not found")]
+        MessageToDeleteNotFound,
+
+        /// Occurs when bot tries to send a text message without text.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: message text is empty")]
+        MessageTextIsEmpty,
+
+        /// Occurs when bot tries to edit a message after long time.
+        ///
+        /// May happen in methods:
+        /// 1. [`EditMessageText`]
+        ///
+        /// [`EditMessageText`]: crate::requests::EditMessageText
+        #[serde(rename = "Bad Request: message can't be edited")]
+        MessageCantBeEdited,
+
+        /// Occurs when bot tries to delete a someone else's message in group where
+        /// it does not have enough rights.
+        ///
+        /// May happen in methods:
+        /// 1. [`DeleteMessage`]
+        ///
+        /// [`DeleteMessage`]: crate::requests::DeleteMessage
+        #[serde(rename = "Bad Request: message can't be deleted")]
+        MessageCantBeDeleted,
+
+        /// Occurs when bot tries to edit a message which does not exists.
+        ///
+        /// May happen in methods:
+        /// 1. [`EditMessageText`]
+        ///
+        /// [`EditMessageText`]: crate::requests::EditMessageText
+        #[serde(rename = "Bad Request: message to edit not found")]
+        MessageToEditNotFound,
+
+        /// Occurs when bot tries to reply to a message which does not exists.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: reply message not found")]
+        MessageToReplyNotFound,
+
+        /// Occurs when bot tries to
+        #[serde(rename = "Bad Request: message identifier is not specified")]
+        MessageIdentifierNotSpecified,
+
+        /// Occurs when bot tries to send a message with text size greater then
+        /// 4096 symbols.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: message is too long")]
+        MessageIsTooLong,
+
+        /// Occurs when bot tries to send media group with more than 10 items.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMediaGroup`]
+        ///
+        /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
+        #[serde(rename = "Bad Request: Too much messages to send as an album")]
+        ToMuchMessages,
+
+        /// Occurs when bot tries to stop poll that has already been stopped.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll has already been closed")]
+        PollHasAlreadyClosed,
+
+        /// Occurs when bot tries to send poll with less than 2 options.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll must have at least 2 option")]
+        PollMustHaveMoreOptions,
+
+        /// Occurs when bot tries to send poll with more than 10 options.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll can't have more than 10 options")]
+        PollCantHaveMoreOptions,
+
+        /// Occurs when bot tries to send poll with empty option (without text).
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll options must be non-empty")]
+        PollOptionsMustBeNonEmpty,
+
+        /// Occurs when bot tries to send poll with empty question (without text).
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll question must be non-empty")]
+        PollQuestionMustBeNonEmpty,
+
+        /// Occurs when bot tries to send poll with total size of options more than
+        /// 100 symbols.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll options length must not exceed 100")]
+        PollOptionsLengthTooLong,
+
+        /// Occurs when bot tries to send poll with question size more than 255
+        /// symbols.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendPoll`]
+        ///
+        /// [`SendPoll`]: crate::requests::SendPoll
+        #[serde(rename = "Bad Request: poll question length must not exceed 255")]
+        PollQuestionLengthTooLong,
+
+        /// Occurs when bot tries to stop poll with message without poll.
+        ///
+        /// May happen in methods:
+        /// 1. [`StopPoll`]
+        ///
+        /// [`StopPoll`]: crate::requests::StopPoll
+        #[serde(rename = "Bad Request: message with poll to stop not found")]
+        MessageWithPollNotFound,
+
+        /// Occurs when bot tries to stop poll with message without poll.
+        ///
+        /// May happen in methods:
+        /// 1. [`StopPoll`]
+        ///
+        /// [`StopPoll`]: crate::requests::StopPoll
+        #[serde(rename = "Bad Request: message is not a poll")]
+        MessageIsNotAPoll,
+
+        /// Occurs when bot tries to send a message to chat in which it is not a
+        /// member.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: chat not found")]
+        ChatNotFound,
+
+        /// Occurs when bot tries to send method with unknown user_id.
+        ///
+        /// May happen in methods:
+        /// 1. [`getUserProfilePhotos`]
+        ///
+        /// [`getUserProfilePhotos`]:
+        /// crate::requests::GetUserProfilePhotos
+        #[serde(rename = "Bad Request: user not found")]
+        UserNotFound,
+
+        /// Occurs when bot tries to send [`SetChatDescription`] with same text as
+        /// in the current description.
+        ///
+        /// May happen in methods:
+        /// 1. [`SetChatDescription`]
+        ///
+        /// [`SetChatDescription`]: crate::requests::SetChatDescription
+        #[serde(rename = "Bad Request: chat description is not modified")]
+        ChatDescriptionIsNotModified,
+
+        /// Occurs when bot tries to answer to query after timeout expire.
+        ///
+        /// May happen in methods:
+        /// 1. [`AnswerCallbackQuery`]
+        ///
+        /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
+        #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
+                        invalid")]
+        InvalidQueryID,
+
+        /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
+        /// url.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
+        ButtonURLInvalid,
+
+        /// Occurs when bot tries to send button with data size more than 64 bytes.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
+        ButtonDataInvalid,
+
+        /// Occurs when bot tries to send button with data size == 0.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
+                        unallowed in the inline keyboard")]
+        TextButtonsAreUnallowed,
+
+        /// Occurs when bot tries to get file by wrong file id.
+        ///
+        /// May happen in methods:
+        /// 1. [`GetFile`]
+        ///
+        /// [`GetFile`]: crate::requests::GetFile
+        #[serde(rename = "Bad Request: wrong file id")]
+        WrongFileID,
+
+        /// Occurs when bot tries to do some with group which was deactivated.
+        #[serde(rename = "Bad Request: group is deactivated")]
+        GroupDeactivated,
+
+        /// Occurs when bot tries to set chat photo from file ID
+        ///
+        /// May happen in methods:
+        /// 1. [`SetChatPhoto`]
+        ///
+        /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
+        #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
+        PhotoAsInputFileRequired,
+
+        /// Occurs when bot tries to add sticker to stickerset by invalid name.
+        ///
+        /// May happen in methods:
+        /// 1. [`AddStickerToSet`]
+        ///
+        /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
+        #[serde(rename = "Bad Request: STICKERSET_INVALID")]
+        InvalidStickersSet,
+
+        /// Occurs when bot tries to pin a message without rights to pin in this
+        /// chat.
+        ///
+        /// May happen in methods:
+        /// 1. [`PinChatMessage`]
+        ///
+        /// [`PinChatMessage`]: crate::requests::PinChatMessage
+        #[serde(rename = "Bad Request: not enough rights to pin a message")]
+        NotEnoughRightsToPinMessage,
+
+        /// Occurs when bot tries to use method in group which is allowed only in a
+        /// supergroup or channel.
+        #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
+        MethodNotAvailableInPrivateChats,
+
+        /// Occurs when bot tries to demote chat creator.
+        ///
+        /// May happen in methods:
+        /// 1. [`PromoteChatMember`]
+        ///
+        /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
+        #[serde(rename = "Bad Request: can't demote chat creator")]
+        CantDemoteChatCreator,
+
+        /// Occurs when bot tries to restrict self in group chats.
+        ///
+        /// May happen in methods:
+        /// 1. [`RestrictChatMember`]
+        ///
+        /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+        #[serde(rename = "Bad Request: can't restrict self")]
+        CantRestrictSelf,
+
+        /// Occurs when bot tries to restrict chat member without rights to
+        /// restrict in this chat.
+        ///
+        /// May happen in methods:
+        /// 1. [`RestrictChatMember`]
+        ///
+        /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+        #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
+        NotEnoughRightsToRestrict,
+
+        /// Occurs when bot tries set webhook to protocol other than HTTPS.
+        ///
+        /// May happen in methods:
+        /// 1. [`SetWebhook`]
+        ///
+        /// [`SetWebhook`]: crate::requests::SetWebhook
+        #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
+        WebhookRequireHTTPS,
+
+        /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
+        /// 8443.
+        ///
+        /// May happen in methods:
+        /// 1. [`SetWebhook`]
+        ///
+        /// [`SetWebhook`]: crate::requests::SetWebhook
+        #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
+                        or 8443")]
+        BadWebhookPort,
+
+        /// Occurs when bot tries to set webhook to unknown host.
+        ///
+        /// May happen in methods:
+        /// 1. [`SetWebhook`]
+        ///
+        /// [`SetWebhook`]: crate::requests::SetWebhook
+        #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
+        UnknownHost,
+
+        /// Occurs when bot tries to set webhook to invalid URL.
+        ///
+        /// May happen in methods:
+        /// 1. [`SetWebhook`]
+        ///
+        /// [`SetWebhook`]: crate::requests::SetWebhook
+        #[serde(rename = "Bad Request: can't parse URL")]
+        CantParseUrl,
+
+        /// Occurs when bot tries to send message with unfinished entities.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: can't parse entities")]
+        CantParseEntities,
+
+        /// Occurs when bot tries to use getUpdates while webhook is active.
+        ///
+        /// May happen in methods:
+        /// 1. [`GetUpdates`]
+        ///
+        /// [`GetUpdates`]: crate::requests::GetUpdates
+        #[serde(rename = "can't use getUpdates method while webhook is active")]
+        CantGetUpdates,
+
+        /// Occurs when bot tries to do some in group where bot was kicked.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Unauthorized: bot was kicked from a chat")]
+        BotKicked,
+
+        /// Occurs when bot tries to send message to deactivated user.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Unauthorized: user is deactivated")]
+        UserDeactivated,
+
+        /// Occurs when you tries to initiate conversation with a user.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
+        CantInitiateConversation,
+
+        /// Occurs when you tries to send message to bot.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Unauthorized: bot can't send messages to bots")]
+        CantTalkWithBots,
+
+        /// Occurs when bot tries to send button with invalid http url.
+        ///
+        /// May happen in methods:
+        /// 1. [`SendMessage`]
+        ///
+        /// [`SendMessage`]: crate::requests::SendMessage
+        #[serde(rename = "Bad Request: wrong HTTP URL")]
+        WrongHTTPurl,
+
+        /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
+        /// one Updater is running.
+        ///
+        /// May happen in methods:
+        /// 1. [`GetUpdates`]
+        ///
+        /// [`GetUpdates`]: crate::requests::GetUpdates
+        #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
+                        bot instance is running")]
+        TerminatedByOtherGetUpdates,
+
+        /// Occurs when bot tries to get file by invalid file id.
+        ///
+        /// May happen in methods:
+        /// 1. [`GetFile`]
+        ///
+        /// [`GetFile`]: crate::requests::GetFile
+        #[serde(rename = "Bad Request: invalid file id")]
+        FileIdInvalid,
+    }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 6e7b78b0..e12421e4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,7 +19,7 @@ mod local_macros;
 // FIXME(waffle): rethink modules, find a place for wrappers.
 pub use self::{
     bot::{AutoSend, Bot, BotBuilder, CacheMe},
-    errors::{ApiErrorKind, DownloadError, KnownApiErrorKind, RequestError},
+    errors::{ApiError, DownloadError, RequestError},
 };
 
 pub mod payloads;
diff --git a/src/local_macros.rs b/src/local_macros.rs
index c2aed978..0b3ac6fa 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -106,3 +106,85 @@ macro_rules! req_future {
 
     };
 }
+
+#[macro_use]
+macro_rules! serde_or_unknown {
+    (
+        #[unknown_mod = $mod_:ident]
+        #[unknown_kind = $Kind:ident]
+        #[unknown_path = $path:literal]
+        $(
+            #[ $($meta:tt)* ]
+        )*
+        $v:vis enum $Name:ident {
+            #[unknown]
+            $(
+                #[ $($unknown_meta:tt)* ]
+            )*
+            $Unknown:ident(String)
+
+            $(
+                ,
+                $(
+                    #[ $($var_meta:tt)* ]
+                )*
+                $Var:ident
+            )*
+            $(,)?
+        }
+    ) => {
+        mod $mod_ {
+            #[allow(unused_imports)]
+            use super::{*, $Name as _};
+
+            $(
+                #[ $($meta)* ]
+            )*
+            $v enum $Name {
+                $(
+                    $(
+                        #[ $($var_meta)* ]
+                    )*
+                    $Var,
+                )*
+            }
+
+            #[derive(::serde::Deserialize)]
+            #[serde(untagged)]
+            $v enum $Kind {
+                Known($Name),
+                Unknown(String),
+            }
+
+            impl ::core::convert::From<$Kind> for super::$Name {
+                fn from(kind: $Kind) -> Self {
+                    match kind {
+                        $Kind::Unknown(string) => Self::Unknown(string),
+                        $Kind::Known(known) => match known {
+                            $(
+                                $Name::$Var => Self::$Var,
+                            )*
+                        }
+                    }
+                }
+            }
+        }
+
+        $(
+            #[ $($meta)* ]
+        )*
+        #[serde(from = $path)]
+        $v enum $Name {
+            $(
+                $(
+                    #[ $($var_meta)* ]
+                )*
+                $Var,
+            )*
+            $(
+                #[ $($unknown_meta)* ]
+            )*
+            $Unknown(String),
+        }
+    }
+}
diff --git a/src/net/mod.rs b/src/net/mod.rs
index de38dacc..97db838a 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -1,7 +1,7 @@
 #[cfg(feature = "unstable-stream")]
-pub use download::download_file_stream;
+pub(crate) use download::download_file_stream;
 
-pub use self::{
+pub(crate) use self::{
     download::download_file,
     request::{request_json, request_json2, request_multipart, request_multipart2},
     telegram_response::TelegramResponse,
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index d5062e8f..4bf3849b 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -4,18 +4,18 @@ use serde::Deserialize;
 use crate::{
     requests::ResponseResult,
     types::{False, ResponseParameters, True},
-    ApiErrorKind, RequestError,
+    ApiError, RequestError,
 };
 
 #[derive(Deserialize)]
 #[serde(untagged)]
-pub enum TelegramResponse<R> {
+pub(crate) enum TelegramResponse<R> {
     Ok {
         /// A dummy field. Used only for deserialization.
         #[allow(dead_code)]
         ok: True,
 
-        result: R,
+        response: R,
     },
     Err {
         /// A dummy field. Used only for deserialization.
@@ -23,7 +23,7 @@ pub enum TelegramResponse<R> {
         ok: False,
 
         #[serde(rename = "description")]
-        kind: ApiErrorKind,
+        error: ApiError,
         error_code: u16,
         response_parameters: Option<ResponseParameters>,
     },
@@ -32,8 +32,8 @@ pub enum TelegramResponse<R> {
 impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
     fn into(self) -> Result<R, RequestError> {
         match self {
-            TelegramResponse::Ok { result, .. } => Ok(result),
-            TelegramResponse::Err { kind, error_code, response_parameters, .. } => {
+            TelegramResponse::Ok { response, .. } => Ok(response),
+            TelegramResponse::Err { error, error_code, response_parameters, .. } => {
                 if let Some(params) = response_parameters {
                     match params {
                         ResponseParameters::RetryAfter(i) => Err(RequestError::RetryAfter(i)),
@@ -43,7 +43,7 @@ impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
                     }
                 } else {
                     Err(RequestError::ApiError {
-                        kind,
+                        kind: error,
                         status_code: StatusCode::from_u16(error_code).unwrap(),
                     })
                 }
@@ -55,16 +55,15 @@ impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{errors::KnownApiErrorKind, types::Update};
+    use crate::{errors::ApiError, types::Update};
 
     #[test]
-    fn terminated_by_other_get_updates() {
-        let expected = ApiErrorKind::Known(KnownApiErrorKind::TerminatedByOtherGetUpdates);
-        if let TelegramResponse::Err{ kind, .. } = serde_json::from_str::<TelegramResponse<Update>>(r#"{"ok":false,"error_code":409,"description":"Conflict: terminated by other getUpdates request; make sure that only one bot instance is running"}"#).unwrap() {
-            assert_eq!(expected, kind);
-        }
-        else {
-            panic!("Expected ApiErrorKind::TerminatedByOtherGetUpdates");
-        }
+    fn parse_terminated_by_other_get_updates() {
+        let s = r#"{"ok":false,"error_code":409,"description":"Conflict: terminated by other getUpdates request; make sure that only one bot instance is running"}"#;
+        let val = serde_json::from_str::<TelegramResponse<Update>>(s).unwrap();
+
+        assert!(
+            matches!(val, TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. })
+        );
     }
 }

From 41afdb554d31131b4a20e92d1e3da6e6441ac3a1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 20 Oct 2020 17:02:31 +0300
Subject: [PATCH 127/755] fmt

---
 src/errors.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index fe749693..da2666b2 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -22,11 +22,11 @@ pub enum DownloadError {
 pub enum RequestError {
     /// Telegram API error
     #[error("A Telegram's error #{status_code}: {kind:?}")]
-    ApiError { 
+    ApiError {
         /// Kind of api error
-        kind: ApiError,    
+        kind: ApiError,
         /// HTTP code returned by telegram, not very usefull in practice.
-        status_code: StatusCode ,
+        status_code: StatusCode,
     },
 
     /// The group has been migrated to a supergroup with the specified

From e79f83d4a1a0597f23f67bab239d667d9a0b700c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 20 Oct 2020 15:33:22 +0300
Subject: [PATCH 128/755] Move bot adaptors to own module and place then under
 features

This commit moves `bot::{auto_send,cache_me,limits}` modules to
`adaptors::{auto_send,cache_me,throttle}.

ALso it adds 4 crate features:
- `throttle`
- `cache_me`
- `auto_send`
- `full` (enables all features, except `nightly`)
---
 Cargo.toml                                  | 18 +++++++++++++++++-
 src/adaptors.rs                             | 19 +++++++++++++++++++
 src/{bot => adaptors}/auto_send.rs          |  0
 src/{bot => adaptors}/cache_me.rs           |  0
 src/{bot/limits.rs => adaptors/throttle.rs} | 16 +++++-----------
 src/bot/mod.rs                              |  7 -------
 src/lib.rs                                  |  8 +++-----
 src/requests/requester_ext.rs               |  3 +--
 8 files changed, 45 insertions(+), 26 deletions(-)
 create mode 100644 src/adaptors.rs
 rename src/{bot => adaptors}/auto_send.rs (100%)
 rename src/{bot => adaptors}/cache_me.rs (100%)
 rename src/{bot/limits.rs => adaptors/throttle.rs} (98%)

diff --git a/Cargo.toml b/Cargo.toml
index e25be772..d550d1f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,9 +39,25 @@ never = "0.1.0"
 vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8b75548c6ed387072ff235429b1" }
 
 [features]
-# features those require nightly compiler
+default = []
+
+# Features which require nightly compiler.
+#
+# Currently the only used compiler feature is feature(type_alias_impl_trait)
+# which allow implementing `Future`s without boxing.
 nightly = []
 
+# Throttling bot adaptor
+throttle = []
+
+# CacheMe bot adaptor
+cache_me = []
+
+# AutoSend bot adaptor
+auto_send = []
+
+full = ["throttle", "cache_me", "auto_send"]
+
 [package.metadata."docs.rs"]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/src/adaptors.rs b/src/adaptors.rs
new file mode 100644
index 00000000..3d7c4611
--- /dev/null
+++ b/src/adaptors.rs
@@ -0,0 +1,19 @@
+//! Bot adaptors
+
+#[cfg(feature = "auto_send")]
+#[cfg_attr(docsrs, doc(cfg(feature = "auto_send")))]
+pub mod auto_send;
+#[cfg(feature = "cache_me")]
+#[cfg_attr(docsrs, doc(cfg(feature = "cache_me")))]
+pub mod cache_me;
+#[cfg(feature = "throttle")]
+#[cfg_attr(docsrs, doc(cfg(feature = "throttle")))]
+pub mod throttle;
+
+pub use {
+    auto_send::AutoSend,
+    cache_me::CacheMe,
+    throttle::Throttle,
+};
+
+// FIXME: move default `parse_mode` to adaptor
diff --git a/src/bot/auto_send.rs b/src/adaptors/auto_send.rs
similarity index 100%
rename from src/bot/auto_send.rs
rename to src/adaptors/auto_send.rs
diff --git a/src/bot/cache_me.rs b/src/adaptors/cache_me.rs
similarity index 100%
rename from src/bot/cache_me.rs
rename to src/adaptors/cache_me.rs
diff --git a/src/bot/limits.rs b/src/adaptors/throttle.rs
similarity index 98%
rename from src/bot/limits.rs
rename to src/adaptors/throttle.rs
index 412057a9..f1c40180 100644
--- a/src/bot/limits.rs
+++ b/src/adaptors/throttle.rs
@@ -18,7 +18,7 @@ use tokio::{
 use vecrem::VecExt;
 
 use crate::{
-    bot::limits::chan_send::{ChanSend, SendTy},
+    adaptors::throttle::chan_send::{ChanSend, SendTy},
     payloads::SendMessage,
     requests::{HasPayload, Output, Request, Requester},
     types::ChatId,
@@ -346,12 +346,7 @@ impl<B> Throttle<B> {
     }
 }
 
-impl<B: Requester> Requester for Throttle<B>
-where
-    B::SendMessage: Send,
-{
-    type Err = B::Err;
-
+impl<B: Requester> Requester for Throttle<B> {
     type GetMe = B::GetMe;
 
     fn get_me(&self) -> Self::GetMe {
@@ -417,9 +412,8 @@ impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     }
 }
 
-impl<R> Request for ThrottlingRequest<R>
+impl<R: Request> Request for ThrottlingRequest<R>
 where
-    R: Request + Send,
     <R as HasPayload>::Payload: GetChatId,
 {
     type Err = R::Err;
@@ -613,7 +607,7 @@ mod chan_send {
     use never::Never;
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
-    use crate::bot::limits::Id;
+    use crate::adaptors::throttle::Id;
 
     pub(super) trait SendTy {
         fn send_t(self, val: (Id, Sender<Never>)) -> ChanSend;
@@ -623,7 +617,7 @@ mod chan_send {
     pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>> + Send>>;
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>>>;
     #[cfg(feature = "nightly")]
     type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
 
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 01698ed5..5c46e992 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -14,14 +14,7 @@ use crate::{
 };
 
 mod api;
-mod auto_send;
-mod cache_me;
 mod download;
-mod limits;
-
-pub use auto_send::AutoSend;
-pub use cache_me::CacheMe;
-pub use limits::{Limits, Throttle};
 
 pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
diff --git a/src/lib.rs b/src/lib.rs
index e12421e4..1b4d5dac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,7 @@ mod local_macros;
 
 // FIXME(waffle): rethink modules, find a place for wrappers.
 pub use self::{
-    bot::{AutoSend, Bot, BotBuilder, CacheMe},
+    bot::{Bot, BotBuilder},
     errors::{ApiError, DownloadError, RequestError},
 };
 
@@ -26,13 +26,11 @@ pub mod payloads;
 pub mod prelude;
 pub mod requests;
 pub mod types;
-
-// FIXME(waffle): made `pub` to reexport bot wrappers, in future we may want to
-//                reexport them from elsewhere
-pub mod bot;
+pub mod adaptors;
 
 // reexported
 mod errors;
+mod bot;
 
 // implementation details
 mod net;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index e6370846..00b41b32 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,7 +1,6 @@
 use crate::{
-    bot::{CacheMe, Limits, Throttle},
+    adaptors::{CacheMe, throttle::Limits, Throttle, AutoSend},
     requests::Requester,
-    AutoSend,
 };
 
 pub trait RequesterExt: Requester {

From 9bf8c02c9df2e87315048d8a23db8e6da59166f3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 20 Oct 2020 16:52:29 +0300
Subject: [PATCH 129/755] doc & feature fixes

- Remove `unstable-stream` feature
- Doc fixes
---
 src/adaptors.rs               | 31 ++++++++++++++++++++++---------
 src/adaptors/throttle.rs      |  4 +++-
 src/bot/download.rs           | 15 +++++++--------
 src/lib.rs                    |  5 +++--
 src/net/download.rs           |  3 +--
 src/net/mod.rs                |  5 +----
 src/payloads/mod.rs           |  1 +
 src/prelude.rs                |  2 ++
 src/requests/mod.rs           |  2 +-
 src/requests/request.rs       |  2 ++
 src/requests/requester.rs     |  2 +-
 src/requests/requester_ext.rs | 22 ++++++++++++++++++----
 src/types/chat_member.rs      |  8 ++++----
 src/types/mod.rs              |  2 +-
 14 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 3d7c4611..09c4fec8 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -1,19 +1,32 @@
-//! Bot adaptors
+//! ## Bot adaptors
+//!
+//! Bot adaptors are very similar to [`Iterator`] adaptors —
+//! they are bots (implement [`Requester`]) which wrap other bots
+//! adding new functionality.
+//!
+//! E.g. [`AutoSend`] allows `await`ing requests directly,
+//! without need to use `.send()`.
+//!
+//! [`Requester`]: crate::requests::Requester
 
 #[cfg(feature = "auto_send")]
-#[cfg_attr(docsrs, doc(cfg(feature = "auto_send")))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
 pub mod auto_send;
 #[cfg(feature = "cache_me")]
-#[cfg_attr(docsrs, doc(cfg(feature = "cache_me")))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
 pub mod cache_me;
 #[cfg(feature = "throttle")]
-#[cfg_attr(docsrs, doc(cfg(feature = "throttle")))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
 pub mod throttle;
 
-pub use {
-    auto_send::AutoSend,
-    cache_me::CacheMe,
-    throttle::Throttle,
-};
+#[cfg(feature = "auto_send")]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
+pub use auto_send::AutoSend;
+#[cfg(feature = "cache_me")]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
+pub use cache_me::CacheMe;
+#[cfg(feature = "throttle")]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
+pub use throttle::Throttle;
 
 // FIXME: move default `parse_mode` to adaptor
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index f1c40180..6d9fdd84 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -123,7 +123,7 @@ impl Default for Limits {
 /// ## Examples
 ///
 /// ```no_run (throttle fails to spawn task without tokio runtime)
-/// use teloxide_core::{bot::Limits, requests::RequesterExt, Bot};
+/// use teloxide_core::{adaptors::throttle::Limits, requests::RequesterExt, Bot};
 ///
 /// # #[allow(deprecated)]
 /// let bot = Bot::new("TOKEN").throttle(Limits::default());
@@ -316,6 +316,8 @@ impl<B> Throttle<B> {
     /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
     ///
     /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
+    ///
+    /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
     pub fn new_spawn(bot: B, limits: Limits) -> Self
     where
         // Basically, I hate this bound.
diff --git a/src/bot/download.rs b/src/bot/download.rs
index 241ef325..eed32b1c 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -1,11 +1,11 @@
-use tokio::io::AsyncWrite;
+use bytes::Bytes;
+use tokio::{io::AsyncWrite, stream::Stream};
 
-#[cfg(feature = "unstable-stream")]
-use ::{bytes::Bytes, tokio::stream::Stream};
-
-#[cfg(feature = "unstable-stream")]
-use crate::net::download_file_stream;
-use crate::{bot::Bot, net::download_file, DownloadError};
+use crate::{
+    bot::Bot,
+    net::{download_file, download_file_stream},
+    DownloadError,
+};
 
 impl Bot {
     /// Download a file from Telegram into `destination`.
@@ -55,7 +55,6 @@ impl Bot {
     /// [`AsyncWrite`]: tokio::io::AsyncWrite
     /// [`tokio::fs::File`]: tokio::fs::File
     /// [`Bot::download_file`]: crate::Bot::download_file
-    #[cfg(feature = "unstable-stream")]
     pub async fn download_file_stream(
         &self,
         path: &str,
diff --git a/src/lib.rs b/src/lib.rs
index 1b4d5dac..ef19a9c9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,6 +10,7 @@
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![forbid(unsafe_code)]
+#![cfg_attr(feature = "full", deny(broken_intra_doc_links))]
 //#![deny(missing_docs)]
 
 #[macro_use]
@@ -22,15 +23,15 @@ pub use self::{
     errors::{ApiError, DownloadError, RequestError},
 };
 
+pub mod adaptors;
 pub mod payloads;
 pub mod prelude;
 pub mod requests;
 pub mod types;
-pub mod adaptors;
 
 // reexported
-mod errors;
 mod bot;
+mod errors;
 
 // implementation details
 mod net;
diff --git a/src/net/download.rs b/src/net/download.rs
index 05f08f5d..aa54f4f0 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -27,12 +27,11 @@ where
     Ok(())
 }
 
-#[cfg(feature = "unstable-stream")]
 pub async fn download_file_stream(
     client: &Client,
     token: &str,
     path: &str,
-) -> Result<impl Stream<Item = reqwest::Result<Bytes>>, reqwest::Error> {
+) -> Result<impl futures::Stream<Item = reqwest::Result<bytes::Bytes>>, reqwest::Error> {
     let res = client
         .get(&super::file_url(TELEGRAM_API_URL, token, path))
         .send()
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 97db838a..ede6cc0b 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -1,8 +1,5 @@
-#[cfg(feature = "unstable-stream")]
-pub(crate) use download::download_file_stream;
-
 pub(crate) use self::{
-    download::download_file,
+    download::{download_file, download_file_stream},
     request::{request_json, request_json2, request_multipart, request_multipart2},
     telegram_response::TelegramResponse,
 };
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index c468e562..22276002 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,3 +1,4 @@
+/// Payloads - data types sended to relegram
 pub mod setters;
 
 mod get_me;
diff --git a/src/prelude.rs b/src/prelude.rs
index f805598b..886b201a 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1 +1,3 @@
+//! Crate prelude
+
 pub use crate::requests::Requester;
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 2ba00350..cc134a48 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -1,4 +1,4 @@
-//! API requests.
+//! Telegram API requests.
 
 mod has_payload;
 mod payload;
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 6abb457e..0d6692d9 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -14,6 +14,8 @@ use crate::requests::{HasPayload, Output};
 /// This is crucial for request wrappers which may want to cancel and/or never
 /// send the underlying request. E.g.: [`Throttle<B>`]'s `send_ref` calls
 /// `B::send_ref` while _not_ meaning to really send the request right now.
+///
+/// [`Throttle<B>`]: crate::adaptors::Throttle
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Request: HasPayload {
     /*
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 91f297af..4b31950b 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -4,7 +4,7 @@ use crate::{
     types::ChatId,
 };
 
-/// The trait implemented by all bots & bot wrappers.
+/// The trait implemented by all bots & bot adaptors.
 /// Essentially a request builder factory (?).
 ///
 /// _This trait is included in the crate's [`prelude`](crate::prelude)_.
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 00b41b32..1b5530b2 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,10 +1,20 @@
-use crate::{
-    adaptors::{CacheMe, throttle::Limits, Throttle, AutoSend},
-    requests::Requester,
-};
+use crate::requests::Requester;
+
+#[cfg(feature = "cache_me")]
+use crate::adaptors::CacheMe;
+
+#[cfg(feature = "auto_send")]
+use crate::adaptors::AutoSend;
+
+#[cfg(feature = "throttle")]
+use crate::adaptors::throttle::{Limits, Throttle};
 
 pub trait RequesterExt: Requester {
     /// Add `get_me` caching ability, see [`CacheMe`] for more.
+    ///
+    /// [`CacheMe`]:
+    #[cfg(feature = "cache_me")]
+    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
     fn cache_me(self) -> CacheMe<Self>
     where
         Self: Sized,
@@ -13,6 +23,8 @@ pub trait RequesterExt: Requester {
     }
 
     /// Send requests automatically, see [`AutoSend`] for more.
+    #[cfg(feature = "auto_send")]
+    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
     fn auto_send(self) -> AutoSend<Self>
     where
         Self: Sized,
@@ -23,6 +35,8 @@ pub trait RequesterExt: Requester {
     /// Add throttling ability, see [`Throttle`] for more.
     ///
     /// Note: this spawns the worker, just as [`Throttle::new_spawn`].
+    #[cfg(feature = "throttle")]
+    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
         Self: Sized,
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 4d7c9530..46c5c7cf 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -27,14 +27,14 @@ pub enum ChatMemberKind {
     Kicked(Kicked),
 }
 
-/// Creator of the group. This struct is part of the [`ChatmemberKind`] enum.
+/// Creator of the group. This struct is part of the [`ChatMemberKind`] enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Creator {
     /// Custom title for this user.
     pub custom_title: Option<String>,
 }
 
-/// Administrator of the group. This struct is part of the [`ChatmemberKind`]
+/// Administrator of the group. This struct is part of the [`ChatMemberKind`]
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Administrator {
@@ -81,7 +81,7 @@ pub struct Administrator {
     pub can_promote_members: bool,
 }
 
-/// User, restricted in the group. This struct is part of the [`ChatmemberKind`]
+/// User, restricted in the group. This struct is part of the [`ChatMemberKind`]
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Restricted {
@@ -106,7 +106,7 @@ pub struct Restricted {
     pub can_add_web_page_previews: bool,
 }
 
-/// User kicked from the group. This struct is part of the [`ChatmemberKind`]
+/// User kicked from the group. This struct is part of the [`ChatMemberKind`]
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Kicked {
diff --git a/src/types/mod.rs b/src/types/mod.rs
index e6f7e5fa..52bf56a2 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -1,4 +1,4 @@
-//! API types.
+//! Telergam API types.
 
 pub use allowed_update::*;
 pub use animation::*;

From 1eeac6d2da3334c0e0fcfd6915e93167895cf3bd Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 21 Oct 2020 19:45:03 +0300
Subject: [PATCH 130/755] update changelog

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7619e079..966b84ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `throttle`, `cache_me`, `auto_send` and `full` crate features
+- `payloads` module
+- `RequesterExt` trait which is implemented for all `Requester`s and allows easily wrapping them in adaptors
+- `adaptors` module
+  - Request throttling - opt-in feature represented by `Throttle` bot adapter which allows automatically checking telegram limits ([#10][pr10])
+  - Request auto sending - ability to `.await` requests without need to call `.send()` (opt-in feature represented by `AutoSend` bot adapter, [#8][pr8])
+  - `get_me` caching (opt-in feature represented by `CacheMe` bot adapter)
+- `Requester` trait which represents bot-clients ([#7][pr7])
+- `{Json,Multipart}Request` the `Bot` requests types ([#6][pr6])
+- `Output<T>` alias to `<<T as HasPayload>::Payload as Payload>::Output`
+- `Payload`, `HasPayload` and `Request` traits which represent different parts of the request ([#5][pr5])
+- `GetUpdatesNonStrict` - fail proof version of `GetUpdates`
 - Move core code here from the [`teloxide`] main repo, for older changes see it's [`CHANGELOG.md`].
   - Following modules were moved:
     - `bot`
@@ -22,16 +34,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `GetUpdatesNonStrict` 'telegram' method, that behaves just like `GetUpdates` but doesn't 
   fail if one of updates fails to be deserialized 
 
+[pr5]: https://github.com/teloxide/teloxide-core/pull/5
+[pr6]: https://github.com/teloxide/teloxide-core/pull/6
+[pr7]: https://github.com/teloxide/teloxide-core/pull/7
+[pr8]: https://github.com/teloxide/teloxide-core/pull/8
+[pr10]: https://github.com/teloxide/teloxide-core/pull/10
+
 ### Changed
 
+- Merge `ApiErrorKind` and `KnownApiErrorKind` into `ApiError` ([#13][pr13])
+- Refactor ChatMember ([#9][pr9])
+  - Replace a bunch of `Option<_>` fields with `ChatMemberKind`
+  - Remove setters (users are not expected to create this struct)
+  - Add getters
 - Changed internal mechanism of sending multipart requests
 - Added `RequestError::Io(io::Error)` to wrap I/O error those can happen while sending files to telegram
 - Change `StickerType`: instead of newtypes (`Png(InputFile)`) use structs (`Png { png_sticker: InputFile }`), add 
   `StickerType::{png,tgs}` constructors
 - Make all fields of all methods `pub`
 
+[pr9]: https://github.com/teloxide/teloxide-core/pull/9
+[pr13]: https://github.com/teloxide/teloxide-core/pull/13
+
 ### Removed
 
+- `unstable-stream` feature (now `Bot::download_file_stream` is accesable by default)
+- old `Request` trait
 - `RequestWithFile`, now multipart requests use `Request`
 - Remove all `#[non_exhaustive]` annotations
   

From d47036012b65acc4e752f3598d79152ebce2dbb9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 21 Oct 2020 19:51:00 +0300
Subject: [PATCH 131/755] fix rebase mistakes

---
 src/adaptors/throttle.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 6d9fdd84..ad923fd4 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -348,7 +348,12 @@ impl<B> Throttle<B> {
     }
 }
 
-impl<B: Requester> Requester for Throttle<B> {
+impl<B: Requester> Requester for Throttle<B>
+where	
+    B::SendMessage: Send,	
+{	
+    type Err = B::Err;
+    
     type GetMe = B::GetMe;
 
     fn get_me(&self) -> Self::GetMe {
@@ -414,8 +419,9 @@ impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     }
 }
 
-impl<R: Request> Request for ThrottlingRequest<R>
+impl<R> Request for ThrottlingRequest<R>
 where
+    R: Request + Send,
     <R as HasPayload>::Payload: GetChatId,
 {
     type Err = R::Err;
@@ -619,7 +625,7 @@ mod chan_send {
     pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>>>;
+    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>> + Send>>;
     #[cfg(feature = "nightly")]
     type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
 

From 2dfe8a15c5d150c0a21977097b122554252d2b59 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 21 Oct 2020 19:53:39 +0300
Subject: [PATCH 132/755] fmt

---
 src/adaptors/throttle.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index ad923fd4..8a9481d4 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -349,11 +349,11 @@ impl<B> Throttle<B> {
 }
 
 impl<B: Requester> Requester for Throttle<B>
-where	
-    B::SendMessage: Send,	
-{	
+where
+    B::SendMessage: Send,
+{
     type Err = B::Err;
-    
+
     type GetMe = B::GetMe;
 
     fn get_me(&self) -> Self::GetMe {

From d2b97b21206c2d731f9c3340533657b2c87a01d4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 22 Oct 2020 00:42:06 +0300
Subject: [PATCH 133/755] Use `#[serde(field_identifier)]` instead of hand-made
 workarounds

This attribute doesn't seem to be documented btw...
---
 src/errors.rs                | 845 +++++++++++++++++------------------
 src/local_macros.rs          |  82 ----
 src/net/telegram_response.rs |  10 +
 3 files changed, 430 insertions(+), 507 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index da2666b2..d12296ae 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -57,480 +57,475 @@ pub enum RequestError {
     Io(#[source] io::Error),
 }
 
-serde_or_unknown! {
-    #[unknown_mod = api_error_internals]
-    #[unknown_kind = Kind]
-    #[unknown_path = "api_error_internals::Kind"]
+/// A kind of an API error.
+#[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
+#[serde(field_identifier)]
+pub enum ApiError {
+    /// Occurs when the bot tries to send message to user who blocked the bot.
+    #[serde(rename = "Forbidden: bot was blocked by the user")]
+    BotBlocked,
 
-    /// A kind of an API error.
-    #[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
-    pub enum ApiError {
-        #[unknown]
-        /// Error which is not known to `teloxide`.
-        ///
-        /// If you've received this error, please [open an issue] with the description of the error.
-        ///
-        /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
-        Unknown(String),
+    /// Occurs when bot tries to modify a message without modification content.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message is not modified: specified new message content and \
+                      reply markup are exactly the same as a current content and reply markup \
+                      of the message")]
+    MessageNotModified,
 
-        /// Occurs when the bot tries to send message to user who blocked the bot.
-        #[serde(rename = "Forbidden: bot was blocked by the user")]
-        BotBlocked,
+    /// Occurs when bot tries to forward or delete a message which was deleted.
+    ///
+    /// May happen in methods:
+    /// 1. [`ForwardMessage`]
+    /// 2. [`DeleteMessage`]
+    ///
+    /// [`ForwardMessage`]: crate::requests::ForwardMessage
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
+    MessageIdInvalid,
 
-        /// Occurs when bot tries to modify a message without modification content.
-        ///
-        /// May happen in methods:
-        /// 1. [`EditMessageText`]
-        ///
-        /// [`EditMessageText`]: crate::requests::EditMessageText
-        #[serde(rename = "Bad Request: message is not modified: specified new message content and \
-                        reply markup are exactly the same as a current content and reply markup \
-                        of the message")]
-        MessageNotModified,
+    /// Occurs when bot tries to forward a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`ForwardMessage`]
+    ///
+    /// [`ForwardMessage`]: crate::requests::ForwardMessage
+    #[serde(rename = "Bad Request: message to forward not found")]
+    MessageToForwardNotFound,
 
-        /// Occurs when bot tries to forward or delete a message which was deleted.
-        ///
-        /// May happen in methods:
-        /// 1. [`ForwardMessage`]
-        /// 2. [`DeleteMessage`]
-        ///
-        /// [`ForwardMessage`]: crate::requests::ForwardMessage
-        /// [`DeleteMessage`]: crate::requests::DeleteMessage
-        #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
-        MessageIdInvalid,
+    /// Occurs when bot tries to delete a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`DeleteMessage`]
+    ///
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: message to delete not found")]
+    MessageToDeleteNotFound,
 
-        /// Occurs when bot tries to forward a message which does not exists.
-        ///
-        /// May happen in methods:
-        /// 1. [`ForwardMessage`]
-        ///
-        /// [`ForwardMessage`]: crate::requests::ForwardMessage
-        #[serde(rename = "Bad Request: message to forward not found")]
-        MessageToForwardNotFound,
+    /// Occurs when bot tries to send a text message without text.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: message text is empty")]
+    MessageTextIsEmpty,
 
-        /// Occurs when bot tries to delete a message which does not exists.
-        ///
-        /// May happen in methods:
-        /// 1. [`DeleteMessage`]
-        ///
-        /// [`DeleteMessage`]: crate::requests::DeleteMessage
-        #[serde(rename = "Bad Request: message to delete not found")]
-        MessageToDeleteNotFound,
+    /// Occurs when bot tries to edit a message after long time.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message can't be edited")]
+    MessageCantBeEdited,
 
-        /// Occurs when bot tries to send a text message without text.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: message text is empty")]
-        MessageTextIsEmpty,
+    /// Occurs when bot tries to delete a someone else's message in group where
+    /// it does not have enough rights.
+    ///
+    /// May happen in methods:
+    /// 1. [`DeleteMessage`]
+    ///
+    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    #[serde(rename = "Bad Request: message can't be deleted")]
+    MessageCantBeDeleted,
 
-        /// Occurs when bot tries to edit a message after long time.
-        ///
-        /// May happen in methods:
-        /// 1. [`EditMessageText`]
-        ///
-        /// [`EditMessageText`]: crate::requests::EditMessageText
-        #[serde(rename = "Bad Request: message can't be edited")]
-        MessageCantBeEdited,
+    /// Occurs when bot tries to edit a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    ///
+    /// [`EditMessageText`]: crate::requests::EditMessageText
+    #[serde(rename = "Bad Request: message to edit not found")]
+    MessageToEditNotFound,
 
-        /// Occurs when bot tries to delete a someone else's message in group where
-        /// it does not have enough rights.
-        ///
-        /// May happen in methods:
-        /// 1. [`DeleteMessage`]
-        ///
-        /// [`DeleteMessage`]: crate::requests::DeleteMessage
-        #[serde(rename = "Bad Request: message can't be deleted")]
-        MessageCantBeDeleted,
+    /// Occurs when bot tries to reply to a message which does not exists.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: reply message not found")]
+    MessageToReplyNotFound,
 
-        /// Occurs when bot tries to edit a message which does not exists.
-        ///
-        /// May happen in methods:
-        /// 1. [`EditMessageText`]
-        ///
-        /// [`EditMessageText`]: crate::requests::EditMessageText
-        #[serde(rename = "Bad Request: message to edit not found")]
-        MessageToEditNotFound,
+    /// Occurs when bot tries to
+    #[serde(rename = "Bad Request: message identifier is not specified")]
+    MessageIdentifierNotSpecified,
 
-        /// Occurs when bot tries to reply to a message which does not exists.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: reply message not found")]
-        MessageToReplyNotFound,
+    /// Occurs when bot tries to send a message with text size greater then
+    /// 4096 symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: message is too long")]
+    MessageIsTooLong,
 
-        /// Occurs when bot tries to
-        #[serde(rename = "Bad Request: message identifier is not specified")]
-        MessageIdentifierNotSpecified,
+    /// Occurs when bot tries to send media group with more than 10 items.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMediaGroup`]
+    ///
+    /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
+    #[serde(rename = "Bad Request: Too much messages to send as an album")]
+    ToMuchMessages,
 
-        /// Occurs when bot tries to send a message with text size greater then
-        /// 4096 symbols.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: message is too long")]
-        MessageIsTooLong,
+    /// Occurs when bot tries to stop poll that has already been stopped.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll has already been closed")]
+    PollHasAlreadyClosed,
 
-        /// Occurs when bot tries to send media group with more than 10 items.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMediaGroup`]
-        ///
-        /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
-        #[serde(rename = "Bad Request: Too much messages to send as an album")]
-        ToMuchMessages,
+    /// Occurs when bot tries to send poll with less than 2 options.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll must have at least 2 option")]
+    PollMustHaveMoreOptions,
 
-        /// Occurs when bot tries to stop poll that has already been stopped.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll has already been closed")]
-        PollHasAlreadyClosed,
+    /// Occurs when bot tries to send poll with more than 10 options.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll can't have more than 10 options")]
+    PollCantHaveMoreOptions,
 
-        /// Occurs when bot tries to send poll with less than 2 options.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll must have at least 2 option")]
-        PollMustHaveMoreOptions,
+    /// Occurs when bot tries to send poll with empty option (without text).
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll options must be non-empty")]
+    PollOptionsMustBeNonEmpty,
 
-        /// Occurs when bot tries to send poll with more than 10 options.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll can't have more than 10 options")]
-        PollCantHaveMoreOptions,
+    /// Occurs when bot tries to send poll with empty question (without text).
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll question must be non-empty")]
+    PollQuestionMustBeNonEmpty,
 
-        /// Occurs when bot tries to send poll with empty option (without text).
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll options must be non-empty")]
-        PollOptionsMustBeNonEmpty,
+    /// Occurs when bot tries to send poll with total size of options more than
+    /// 100 symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll options length must not exceed 100")]
+    PollOptionsLengthTooLong,
 
-        /// Occurs when bot tries to send poll with empty question (without text).
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll question must be non-empty")]
-        PollQuestionMustBeNonEmpty,
+    /// Occurs when bot tries to send poll with question size more than 255
+    /// symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendPoll`]
+    ///
+    /// [`SendPoll`]: crate::requests::SendPoll
+    #[serde(rename = "Bad Request: poll question length must not exceed 255")]
+    PollQuestionLengthTooLong,
 
-        /// Occurs when bot tries to send poll with total size of options more than
-        /// 100 symbols.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll options length must not exceed 100")]
-        PollOptionsLengthTooLong,
+    /// Occurs when bot tries to stop poll with message without poll.
+    ///
+    /// May happen in methods:
+    /// 1. [`StopPoll`]
+    ///
+    /// [`StopPoll`]: crate::requests::StopPoll
+    #[serde(rename = "Bad Request: message with poll to stop not found")]
+    MessageWithPollNotFound,
 
-        /// Occurs when bot tries to send poll with question size more than 255
-        /// symbols.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendPoll`]
-        ///
-        /// [`SendPoll`]: crate::requests::SendPoll
-        #[serde(rename = "Bad Request: poll question length must not exceed 255")]
-        PollQuestionLengthTooLong,
+    /// Occurs when bot tries to stop poll with message without poll.
+    ///
+    /// May happen in methods:
+    /// 1. [`StopPoll`]
+    ///
+    /// [`StopPoll`]: crate::requests::StopPoll
+    #[serde(rename = "Bad Request: message is not a poll")]
+    MessageIsNotAPoll,
 
-        /// Occurs when bot tries to stop poll with message without poll.
-        ///
-        /// May happen in methods:
-        /// 1. [`StopPoll`]
-        ///
-        /// [`StopPoll`]: crate::requests::StopPoll
-        #[serde(rename = "Bad Request: message with poll to stop not found")]
-        MessageWithPollNotFound,
+    /// Occurs when bot tries to send a message to chat in which it is not a
+    /// member.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: chat not found")]
+    ChatNotFound,
 
-        /// Occurs when bot tries to stop poll with message without poll.
-        ///
-        /// May happen in methods:
-        /// 1. [`StopPoll`]
-        ///
-        /// [`StopPoll`]: crate::requests::StopPoll
-        #[serde(rename = "Bad Request: message is not a poll")]
-        MessageIsNotAPoll,
+    /// Occurs when bot tries to send method with unknown user_id.
+    ///
+    /// May happen in methods:
+    /// 1. [`getUserProfilePhotos`]
+    ///
+    /// [`getUserProfilePhotos`]:
+    /// crate::requests::GetUserProfilePhotos
+    #[serde(rename = "Bad Request: user not found")]
+    UserNotFound,
 
-        /// Occurs when bot tries to send a message to chat in which it is not a
-        /// member.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: chat not found")]
-        ChatNotFound,
+    /// Occurs when bot tries to send [`SetChatDescription`] with same text as
+    /// in the current description.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetChatDescription`]
+    ///
+    /// [`SetChatDescription`]: crate::requests::SetChatDescription
+    #[serde(rename = "Bad Request: chat description is not modified")]
+    ChatDescriptionIsNotModified,
 
-        /// Occurs when bot tries to send method with unknown user_id.
-        ///
-        /// May happen in methods:
-        /// 1. [`getUserProfilePhotos`]
-        ///
-        /// [`getUserProfilePhotos`]:
-        /// crate::requests::GetUserProfilePhotos
-        #[serde(rename = "Bad Request: user not found")]
-        UserNotFound,
+    /// Occurs when bot tries to answer to query after timeout expire.
+    ///
+    /// May happen in methods:
+    /// 1. [`AnswerCallbackQuery`]
+    ///
+    /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
+    #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
+                      invalid")]
+    InvalidQueryID,
 
-        /// Occurs when bot tries to send [`SetChatDescription`] with same text as
-        /// in the current description.
-        ///
-        /// May happen in methods:
-        /// 1. [`SetChatDescription`]
-        ///
-        /// [`SetChatDescription`]: crate::requests::SetChatDescription
-        #[serde(rename = "Bad Request: chat description is not modified")]
-        ChatDescriptionIsNotModified,
+    /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
+    /// url.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
+    ButtonURLInvalid,
 
-        /// Occurs when bot tries to answer to query after timeout expire.
-        ///
-        /// May happen in methods:
-        /// 1. [`AnswerCallbackQuery`]
-        ///
-        /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
-        #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
-                        invalid")]
-        InvalidQueryID,
+    /// Occurs when bot tries to send button with data size more than 64 bytes.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
+    ButtonDataInvalid,
 
-        /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
-        /// url.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
-        ButtonURLInvalid,
+    /// Occurs when bot tries to send button with data size == 0.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
+                      unallowed in the inline keyboard")]
+    TextButtonsAreUnallowed,
 
-        /// Occurs when bot tries to send button with data size more than 64 bytes.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
-        ButtonDataInvalid,
+    /// Occurs when bot tries to get file by wrong file id.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetFile`]
+    ///
+    /// [`GetFile`]: crate::requests::GetFile
+    #[serde(rename = "Bad Request: wrong file id")]
+    WrongFileID,
 
-        /// Occurs when bot tries to send button with data size == 0.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
-                        unallowed in the inline keyboard")]
-        TextButtonsAreUnallowed,
+    /// Occurs when bot tries to do some with group which was deactivated.
+    #[serde(rename = "Bad Request: group is deactivated")]
+    GroupDeactivated,
 
-        /// Occurs when bot tries to get file by wrong file id.
-        ///
-        /// May happen in methods:
-        /// 1. [`GetFile`]
-        ///
-        /// [`GetFile`]: crate::requests::GetFile
-        #[serde(rename = "Bad Request: wrong file id")]
-        WrongFileID,
+    /// Occurs when bot tries to set chat photo from file ID
+    ///
+    /// May happen in methods:
+    /// 1. [`SetChatPhoto`]
+    ///
+    /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
+    #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
+    PhotoAsInputFileRequired,
 
-        /// Occurs when bot tries to do some with group which was deactivated.
-        #[serde(rename = "Bad Request: group is deactivated")]
-        GroupDeactivated,
+    /// Occurs when bot tries to add sticker to stickerset by invalid name.
+    ///
+    /// May happen in methods:
+    /// 1. [`AddStickerToSet`]
+    ///
+    /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
+    #[serde(rename = "Bad Request: STICKERSET_INVALID")]
+    InvalidStickersSet,
 
-        /// Occurs when bot tries to set chat photo from file ID
-        ///
-        /// May happen in methods:
-        /// 1. [`SetChatPhoto`]
-        ///
-        /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
-        #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
-        PhotoAsInputFileRequired,
+    /// Occurs when bot tries to pin a message without rights to pin in this
+    /// chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`PinChatMessage`]
+    ///
+    /// [`PinChatMessage`]: crate::requests::PinChatMessage
+    #[serde(rename = "Bad Request: not enough rights to pin a message")]
+    NotEnoughRightsToPinMessage,
 
-        /// Occurs when bot tries to add sticker to stickerset by invalid name.
-        ///
-        /// May happen in methods:
-        /// 1. [`AddStickerToSet`]
-        ///
-        /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
-        #[serde(rename = "Bad Request: STICKERSET_INVALID")]
-        InvalidStickersSet,
+    /// Occurs when bot tries to use method in group which is allowed only in a
+    /// supergroup or channel.
+    #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
+    MethodNotAvailableInPrivateChats,
 
-        /// Occurs when bot tries to pin a message without rights to pin in this
-        /// chat.
-        ///
-        /// May happen in methods:
-        /// 1. [`PinChatMessage`]
-        ///
-        /// [`PinChatMessage`]: crate::requests::PinChatMessage
-        #[serde(rename = "Bad Request: not enough rights to pin a message")]
-        NotEnoughRightsToPinMessage,
+    /// Occurs when bot tries to demote chat creator.
+    ///
+    /// May happen in methods:
+    /// 1. [`PromoteChatMember`]
+    ///
+    /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
+    #[serde(rename = "Bad Request: can't demote chat creator")]
+    CantDemoteChatCreator,
 
-        /// Occurs when bot tries to use method in group which is allowed only in a
-        /// supergroup or channel.
-        #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
-        MethodNotAvailableInPrivateChats,
+    /// Occurs when bot tries to restrict self in group chats.
+    ///
+    /// May happen in methods:
+    /// 1. [`RestrictChatMember`]
+    ///
+    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    #[serde(rename = "Bad Request: can't restrict self")]
+    CantRestrictSelf,
 
-        /// Occurs when bot tries to demote chat creator.
-        ///
-        /// May happen in methods:
-        /// 1. [`PromoteChatMember`]
-        ///
-        /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
-        #[serde(rename = "Bad Request: can't demote chat creator")]
-        CantDemoteChatCreator,
+    /// Occurs when bot tries to restrict chat member without rights to
+    /// restrict in this chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`RestrictChatMember`]
+    ///
+    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
+    NotEnoughRightsToRestrict,
 
-        /// Occurs when bot tries to restrict self in group chats.
-        ///
-        /// May happen in methods:
-        /// 1. [`RestrictChatMember`]
-        ///
-        /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
-        #[serde(rename = "Bad Request: can't restrict self")]
-        CantRestrictSelf,
+    /// Occurs when bot tries set webhook to protocol other than HTTPS.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
+    WebhookRequireHTTPS,
 
-        /// Occurs when bot tries to restrict chat member without rights to
-        /// restrict in this chat.
-        ///
-        /// May happen in methods:
-        /// 1. [`RestrictChatMember`]
-        ///
-        /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
-        #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
-        NotEnoughRightsToRestrict,
+    /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
+    /// 8443.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
+                      or 8443")]
+    BadWebhookPort,
 
-        /// Occurs when bot tries set webhook to protocol other than HTTPS.
-        ///
-        /// May happen in methods:
-        /// 1. [`SetWebhook`]
-        ///
-        /// [`SetWebhook`]: crate::requests::SetWebhook
-        #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
-        WebhookRequireHTTPS,
+    /// Occurs when bot tries to set webhook to unknown host.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
+    UnknownHost,
 
-        /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
-        /// 8443.
-        ///
-        /// May happen in methods:
-        /// 1. [`SetWebhook`]
-        ///
-        /// [`SetWebhook`]: crate::requests::SetWebhook
-        #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
-                        or 8443")]
-        BadWebhookPort,
+    /// Occurs when bot tries to set webhook to invalid URL.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetWebhook`]
+    ///
+    /// [`SetWebhook`]: crate::requests::SetWebhook
+    #[serde(rename = "Bad Request: can't parse URL")]
+    CantParseUrl,
 
-        /// Occurs when bot tries to set webhook to unknown host.
-        ///
-        /// May happen in methods:
-        /// 1. [`SetWebhook`]
-        ///
-        /// [`SetWebhook`]: crate::requests::SetWebhook
-        #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
-        UnknownHost,
+    /// Occurs when bot tries to send message with unfinished entities.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: can't parse entities")]
+    CantParseEntities,
 
-        /// Occurs when bot tries to set webhook to invalid URL.
-        ///
-        /// May happen in methods:
-        /// 1. [`SetWebhook`]
-        ///
-        /// [`SetWebhook`]: crate::requests::SetWebhook
-        #[serde(rename = "Bad Request: can't parse URL")]
-        CantParseUrl,
+    /// Occurs when bot tries to use getUpdates while webhook is active.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetUpdates`]
+    ///
+    /// [`GetUpdates`]: crate::requests::GetUpdates
+    #[serde(rename = "can't use getUpdates method while webhook is active")]
+    CantGetUpdates,
 
-        /// Occurs when bot tries to send message with unfinished entities.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: can't parse entities")]
-        CantParseEntities,
+    /// Occurs when bot tries to do some in group where bot was kicked.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot was kicked from a chat")]
+    BotKicked,
 
-        /// Occurs when bot tries to use getUpdates while webhook is active.
-        ///
-        /// May happen in methods:
-        /// 1. [`GetUpdates`]
-        ///
-        /// [`GetUpdates`]: crate::requests::GetUpdates
-        #[serde(rename = "can't use getUpdates method while webhook is active")]
-        CantGetUpdates,
+    /// Occurs when bot tries to send message to deactivated user.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: user is deactivated")]
+    UserDeactivated,
 
-        /// Occurs when bot tries to do some in group where bot was kicked.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Unauthorized: bot was kicked from a chat")]
-        BotKicked,
+    /// Occurs when you tries to initiate conversation with a user.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
+    CantInitiateConversation,
 
-        /// Occurs when bot tries to send message to deactivated user.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Unauthorized: user is deactivated")]
-        UserDeactivated,
+    /// Occurs when you tries to send message to bot.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Unauthorized: bot can't send messages to bots")]
+    CantTalkWithBots,
 
-        /// Occurs when you tries to initiate conversation with a user.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
-        CantInitiateConversation,
+    /// Occurs when bot tries to send button with invalid http url.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::requests::SendMessage
+    #[serde(rename = "Bad Request: wrong HTTP URL")]
+    WrongHTTPurl,
 
-        /// Occurs when you tries to send message to bot.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Unauthorized: bot can't send messages to bots")]
-        CantTalkWithBots,
+    /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
+    /// one Updater is running.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetUpdates`]
+    ///
+    /// [`GetUpdates`]: crate::requests::GetUpdates
+    #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
+                      bot instance is running")]
+    TerminatedByOtherGetUpdates,
 
-        /// Occurs when bot tries to send button with invalid http url.
-        ///
-        /// May happen in methods:
-        /// 1. [`SendMessage`]
-        ///
-        /// [`SendMessage`]: crate::requests::SendMessage
-        #[serde(rename = "Bad Request: wrong HTTP URL")]
-        WrongHTTPurl,
+    /// Occurs when bot tries to get file by invalid file id.
+    ///
+    /// May happen in methods:
+    /// 1. [`GetFile`]
+    ///
+    /// [`GetFile`]: crate::requests::GetFile
+    #[serde(rename = "Bad Request: invalid file id")]
+    FileIdInvalid,
 
-        /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
-        /// one Updater is running.
-        ///
-        /// May happen in methods:
-        /// 1. [`GetUpdates`]
-        ///
-        /// [`GetUpdates`]: crate::requests::GetUpdates
-        #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
-                        bot instance is running")]
-        TerminatedByOtherGetUpdates,
-
-        /// Occurs when bot tries to get file by invalid file id.
-        ///
-        /// May happen in methods:
-        /// 1. [`GetFile`]
-        ///
-        /// [`GetFile`]: crate::requests::GetFile
-        #[serde(rename = "Bad Request: invalid file id")]
-        FileIdInvalid,
-    }
+    /// Error which is not known to `teloxide`.
+    ///
+    /// If you've received this error, please [open an issue] with the
+    /// description of the error.
+    ///
+    /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
+    Unknown(String),
 }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 85c421f6..5a48a207 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -106,85 +106,3 @@ macro_rules! req_future {
 
     };
 }
-
-#[macro_use]
-macro_rules! serde_or_unknown {
-    (
-        #[unknown_mod = $mod_:ident]
-        #[unknown_kind = $Kind:ident]
-        #[unknown_path = $path:literal]
-        $(
-            #[ $($meta:tt)* ]
-        )*
-        $v:vis enum $Name:ident {
-            #[unknown]
-            $(
-                #[ $($unknown_meta:tt)* ]
-            )*
-            $Unknown:ident(String)
-
-            $(
-                ,
-                $(
-                    #[ $($var_meta:tt)* ]
-                )*
-                $Var:ident
-            )*
-            $(,)?
-        }
-    ) => {
-        mod $mod_ {
-            #[allow(unused_imports)]
-            use super::{*, $Name as _};
-
-            $(
-                #[ $($meta)* ]
-            )*
-            $v enum $Name {
-                $(
-                    $(
-                        #[ $($var_meta)* ]
-                    )*
-                    $Var,
-                )*
-            }
-
-            #[derive(::serde::Deserialize)]
-            #[serde(untagged)]
-            $v enum $Kind {
-                Known($Name),
-                Unknown(String),
-            }
-
-            impl ::core::convert::From<$Kind> for super::$Name {
-                fn from(kind: $Kind) -> Self {
-                    match kind {
-                        $Kind::Unknown(string) => Self::Unknown(string),
-                        $Kind::Known(known) => match known {
-                            $(
-                                $Name::$Var => Self::$Var,
-                            )*
-                        }
-                    }
-                }
-            }
-        }
-
-        $(
-            #[ $($meta)* ]
-        )*
-        #[serde(from = $path)]
-        $v enum $Name {
-            $(
-                $(
-                    #[ $($var_meta)* ]
-                )*
-                $Var,
-            )*
-            $(
-                #[ $($unknown_meta)* ]
-            )*
-            $Unknown(String),
-        }
-    }
-}
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index 4bf3849b..82fc73aa 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -66,4 +66,14 @@ mod tests {
             matches!(val, TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. })
         );
     }
+
+    #[test]
+    fn parse_unknown() {
+        let s = r#"{"ok":false,"error_code":111,"description":"Unknown description that won't match anything"}"#;
+        let val = serde_json::from_str::<TelegramResponse<Update>>(s).unwrap();
+
+        assert!(
+            matches!(val, TelegramResponse::Err { error: ApiError::Unknown(s), .. } if s == "Unknown description that won't match anything")
+        );
+    }
 }

From 69d503e6109a916754b49a342b72cbc83f534d72 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Oct 2020 21:32:57 +0300
Subject: [PATCH 134/755] add internal impl_payload macro

---
 src/local_macros.rs          | 201 +++++++++++++++++++++++++++++++++++
 src/payloads/get_me.rs       |  33 ++----
 src/payloads/mod.rs          |   3 +-
 src/payloads/send_message.rs | 138 ++++++------------------
 4 files changed, 245 insertions(+), 130 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 85c421f6..6cf4d543 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -107,6 +107,207 @@ macro_rules! req_future {
     };
 }
 
+/// Declares an item with a doc attribute computed by some macro expression.
+/// This allows documentation to be dynamically generated based on input.
+/// Necessary to work around https://github.com/rust-lang/rust/issues/52607.
+#[macro_use]
+macro_rules! calculated_doc {
+    (
+        $(
+            #[doc = $doc:expr]
+            $thing:item
+        )*
+    ) => (
+        $(
+            #[doc = $doc]
+            $thing
+        )*
+    );
+}
+
+/// Declare payload type, implement `Payload` trait amd ::new method for it, 
+/// declare setters trait and implement it for all type which have payload.
+#[macro_use]
+macro_rules! impl_payload {
+    (
+        $(
+            #[ $($method_meta:tt)* ]
+        )*
+        $vi:vis $Method:ident ($Setters:ident) => $Ret:ty {
+            $(
+                required {
+                    $(
+                        $(
+                            #[ $($field_meta:tt)* ]
+                        )*
+                        $v:vis $fields:ident : $FTy:ty $([$into:ident])?
+                        ,
+                    )*
+                }
+            )?
+
+            $(
+                optional {
+                    $(
+                        $(
+                            #[ $($opt_field_meta:tt)* ]
+                        )*
+                        $opt_v:vis $opt_fields:ident : $OptFTy:ty $([$opt_into:ident])?
+                    ),*
+                    $(,)?
+                }
+            )?
+        }
+    ) => {
+        $(
+            #[ $($method_meta)* ]
+        )*
+        $vi struct $Method {
+            $(
+                $(
+                    $(
+                        #[ $($field_meta)* ]
+                    )*
+                    $v $fields : $FTy,
+                )*
+            )?
+            $(
+                $(
+                    $(
+                        #[ $($opt_field_meta)* ]
+                    )*
+                    $opt_v $opt_fields : core::option::Option<$OptFTy>,
+                )*
+            )?
+        }
+
+        impl $Method {
+            $vi fn new($($($fields : impl_payload!(@into? $FTy $([$into])?)),*)?) -> Self {
+                Self {
+                    $(
+                        $(
+                            $fields: $fields $(.$into())?,
+                        )*
+                    )?
+                    $(
+                        $(
+                            $opt_fields: None,
+                        )*
+                    )?
+                }
+            }
+        }
+
+        impl $crate::requests::Payload for $Method {
+            type Output = $Ret;
+
+            const NAME: &'static str = stringify!($Method);
+        }
+
+        calculated_doc! {
+            #[doc = concat!(
+                "Setters for fields of [`",
+                stringify!($Method),
+                "`]"
+            )]
+            $vi trait $Setters: $crate::requests::HasPayload<Payload = $Method> + ::core::marker::Sized {
+                $(
+                    $(
+                        impl_payload! { @setter $Method $fields : $FTy $([$into])? }
+                    )*
+                )?
+                $(
+                    $(
+                        impl_payload! { @setter_opt $Method $opt_fields : $OptFTy $([$opt_into])? }
+                    )*
+                )?
+            }
+        }
+
+        impl<P> $Setters for P where P: crate::requests::HasPayload<Payload = $Method> {}
+    };
+    (@setter_opt $Method:ident $field:ident : $FTy:ty [into]) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field<T>(mut self, value: T) -> Self
+            where
+                T: Into<$FTy>,
+            {
+                self.payload_mut().$field = Some(value.into());
+                self
+            }
+        }
+    };
+    (@setter_opt $Method:ident $field:ident : $FTy:ty) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field(mut self, value: $FTy) -> Self {
+                self.payload_mut().$field = Some(value);
+                self
+            }
+        }
+    };
+    (@setter $Method:ident $field:ident : $FTy:ty [into]) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field<T>(mut self, value: T) -> Self
+            where
+                T: Into<$FTy>,
+            {
+                self.payload_mut().$field = value.into();
+                self
+            }
+        }
+    };
+    (@setter $Method:ident $field:ident : $FTy:ty) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field(mut self, value: $FTy) -> Self {
+                self.payload_mut().$field = value;
+                self
+            }
+        }
+    };
+    (@into? $T:ty [into]) => {
+        impl ::core::convert::Into<$T>
+    };
+    (@into? $T:ty) => {
+        $T
+    };
+}
+
 #[macro_use]
 macro_rules! serde_or_unknown {
     (
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index cabd6f22..4df0b815 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,29 +1,12 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    requests::{HasPayload, Payload},
-    types::User,
-};
+use crate::types::User;
 
-/// A filter method for testing your bot's auth token. Requires no parameters.
-/// Returns basic information about the bot in form of a [`User`] object.
-///
-/// [`User`]: crate::types::User
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Default, Deserialize, Serialize)]
-pub struct GetMe {}
-
-impl GetMe {
-    pub const fn new() -> Self {
-        GetMe {}
-    }
+impl_payload! {
+    /// A filter method for testing your bot's auth token. Requires no parameters.
+    /// Returns basic information about the bot in form of a [`User`] object.
+    ///
+    /// [`User`]: crate::types::User
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Default, Deserialize, Serialize)]
+    pub GetMe (GetMeSetters) => User {}
 }
-
-impl Payload for GetMe {
-    type Output = User;
-
-    const NAME: &'static str = "getMe";
-}
-
-pub trait GetMeSetters: HasPayload<Payload = GetMe> + Sized {}
-
-impl<P> GetMeSetters for P where P: HasPayload<Payload = GetMe> {}
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 22276002..33da224a 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,4 +1,5 @@
-/// Payloads - data types sended to relegram
+//! Payloads - data types sended to relegram
+
 pub mod setters;
 
 mod get_me;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index c2ed2e00..5262fb0d 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,112 +1,42 @@
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    requests::{HasPayload, Payload},
-    types::{ChatId, Message, ParseMode, ReplyMarkup},
-};
+use crate::types::{ChatId, Message, ParseMode, ReplyMarkup};
 
-/// Use this method to send text messages.
-///
-/// On success, the sent [`Message`] is returned.
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
-pub struct SendMessage {
-    ///	Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub chat_id: ChatId,
-    /// Text of the message to be sent
-    pub text: String,
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in your bot's message.
+impl_payload! {
+    /// Use this method to send text messages.
     ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub parse_mode: Option<ParseMode>,
-    /// Disables link previews for links in this message
-    pub disable_web_page_preview: Option<bool>,
-    /// Sends the message silently.
-    /// Users will receive a notification with no sound.
-    pub disable_notification: Option<bool>,
-    /// If the message is a reply, [id] of the original message
+    /// On success, the sent [`Message`] is returned.
     ///
-    /// [id]: crate::types::Message::id
-    pub reply_to_message_id: Option<i32>,
-    /// Additional interface options.
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-impl Payload for SendMessage {
-    type Output = Message;
-
-    const NAME: &'static str = "sendMessage";
-}
-
-impl SendMessage {
-    pub fn new<C, T>(chat_id: C, text: T) -> Self
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        SendMessage {
-            chat_id: chat_id.into(),
-            text: text.into(),
-            parse_mode: None,
-            disable_web_page_preview: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
+    /// [`Message`]: crate::types::Message
+    #[serde_with_macros::skip_serializing_none]
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
+    pub SendMessage (SendMessageSetters) => Message {
+        required {
+            ///	Unique identifier for the target chat or username of the target channel
+            /// (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Text of the message to be sent
+            pub text: String [into],
+        }
+        optional {
+            /// Send [Markdown] or [HTML], if you want Telegram apps to show
+            /// [bold, italic, fixed-width text or inline URLs] in your bot's message.
+            ///
+            /// [Markdown]: crate::types::ParseMode::Markdown
+            /// [HTML]: crate::types::ParseMode::HTML
+            /// [bold, italic, fixed-width text or inline URLs]: crate::types::ParseMode
+            pub parse_mode: ParseMode,
+            /// Disables link previews for links in this message
+            pub disable_web_page_preview: bool,
+            /// Sends the message silently.
+            /// Users will receive a notification with no sound.
+            pub disable_notification: bool,
+            /// If the message is a reply, [id] of the original message
+            ///
+            /// [id]: crate::types::Message::id
+            pub reply_to_message_id: i32,
+            /// Additional interface options.
+            pub reply_markup: ReplyMarkup,
         }
     }
 }
-
-pub trait SendMessageSetters: HasPayload<Payload = SendMessage> + Sized {
-    fn chat_id<T>(mut self, value: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.payload_mut().chat_id = value.into();
-        self
-    }
-
-    fn text<T>(mut self, value: T) -> Self
-    where
-        T: Into<String>, // TODO: into?
-    {
-        self.payload_mut().text = value.into();
-        self
-    }
-
-    fn parse_mode(mut self, value: ParseMode) -> Self {
-        self.payload_mut().parse_mode = Some(value);
-        self
-    }
-
-    fn disable_web_page_preview(mut self, value: bool) -> Self {
-        self.payload_mut().disable_web_page_preview = Some(value);
-        self
-    }
-
-    fn disable_notification(mut self, value: bool) -> Self {
-        self.payload_mut().disable_notification = Some(value);
-        self
-    }
-
-    fn reply_to_message_id(mut self, value: i32) -> Self {
-        self.payload_mut().reply_to_message_id = Some(value);
-        self
-    }
-
-    fn reply_markup<T>(mut self, value: T) -> Self
-    where
-        T: Into<ReplyMarkup>,
-    {
-        self.payload_mut().reply_markup = Some(value.into());
-        self
-    }
-}
-
-impl<P> SendMessageSetters for P where P: HasPayload<Payload = SendMessage> {}

From fe9314f87ca0d65762ca0055bc59849f8128c3eb Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 24 Oct 2020 09:23:28 +0300
Subject: [PATCH 135/755] serde-rename `TelegramResponse::reponse` to `result`

---
 src/net/telegram_response.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index 4bf3849b..46d5ff82 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -14,7 +14,7 @@ pub(crate) enum TelegramResponse<R> {
         /// A dummy field. Used only for deserialization.
         #[allow(dead_code)]
         ok: True,
-
+        #[serde(rename = "result")]
         response: R,
     },
     Err {

From 4b21e8ea6860de1200925217aaf218098a9054f9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 24 Oct 2020 22:20:58 +0300
Subject: [PATCH 136/755] fmt

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

diff --git a/src/local_macros.rs b/src/local_macros.rs
index ed5cd08f..756cbdf1 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -125,7 +125,7 @@ macro_rules! calculated_doc {
     );
 }
 
-/// Declare payload type, implement `Payload` trait amd ::new method for it, 
+/// Declare payload type, implement `Payload` trait amd ::new method for it,
 /// declare setters trait and implement it for all type which have payload.
 #[macro_use]
 macro_rules! impl_payload {

From 6ae9db4edd85c141853021031c6d843a31320fbf Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 28 Oct 2020 19:05:28 +0300
Subject: [PATCH 137/755] make MessageDice::dice public

---
 src/types/message.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index fb51b0ae..8a6890a1 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1023,7 +1023,7 @@ impl MediaVenue {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageDice {
     /// Message is a dice with random value from 1 to 6.
-    dice: Dice,
+    pub dice: Dice,
 }
 
 mod getters {

From 5ddbd50b37e2f1f63915dec3867be0b747d6ebf5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 2 Nov 2020 01:35:02 +0300
Subject: [PATCH 138/755] Implement IntoIterator-based convert for
 impl_payload! macro

---
 src/local_macros.rs | 68 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 756cbdf1..f5e6adee 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -140,7 +140,7 @@ macro_rules! impl_payload {
                         $(
                             #[ $($field_meta:tt)* ]
                         )*
-                        $v:vis $fields:ident : $FTy:ty $([$into:ident])?
+                        $v:vis $fields:ident : $FTy:ty $([$conv:ident])?
                         ,
                     )*
                 }
@@ -152,7 +152,7 @@ macro_rules! impl_payload {
                         $(
                             #[ $($opt_field_meta:tt)* ]
                         )*
-                        $opt_v:vis $opt_fields:ident : $OptFTy:ty $([$opt_into:ident])?
+                        $opt_v:vis $opt_fields:ident : $OptFTy:ty $([$opt_conv:ident])?
                     ),*
                     $(,)?
                 }
@@ -182,11 +182,11 @@ macro_rules! impl_payload {
         }
 
         impl $Method {
-            $vi fn new($($($fields : impl_payload!(@into? $FTy $([$into])?)),*)?) -> Self {
+            $vi fn new($($($fields : impl_payload!(@convert? $FTy $([$conv])?)),*)?) -> Self {
                 Self {
                     $(
                         $(
-                            $fields: $fields $(.$into())?,
+                            $fields: impl_payload!(@convert_map ($fields) $([$conv])?),
                         )*
                     )?
                     $(
@@ -213,12 +213,12 @@ macro_rules! impl_payload {
             $vi trait $Setters: $crate::requests::HasPayload<Payload = $Method> + ::core::marker::Sized {
                 $(
                     $(
-                        impl_payload! { @setter $Method $fields : $FTy $([$into])? }
+                        impl_payload! { @setter $Method $fields : $FTy $([$conv])? }
                     )*
                 )?
                 $(
                     $(
-                        impl_payload! { @setter_opt $Method $opt_fields : $OptFTy $([$opt_into])? }
+                        impl_payload! { @setter_opt $Method $opt_fields : $OptFTy $([$opt_conv])? }
                     )*
                 )?
             }
@@ -246,6 +246,26 @@ macro_rules! impl_payload {
             }
         }
     };
+    (@setter_opt $Method:ident $field:ident : $FTy:ty [collect]) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field<T>(mut self, value: T) -> Self
+            where
+                T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
+            {
+                self.payload_mut().$field = Some(value.into_iter().collect());
+                self
+            }
+        }
+    };
     (@setter_opt $Method:ident $field:ident : $FTy:ty) => {
         calculated_doc! {
             #[doc = concat!(
@@ -283,6 +303,26 @@ macro_rules! impl_payload {
             }
         }
     };
+    (@setter $Method:ident $field:ident : $FTy:ty [collect]) => {
+        calculated_doc! {
+            #[doc = concat!(
+                "Setter for [`",
+                stringify!($field),
+                "`](",
+                stringify!($Method),
+                "::",
+                stringify!($field),
+                ") field."
+            )]
+            fn $field<T>(mut self, value: T) -> Self
+            where
+                T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
+            {
+                self.payload_mut().$field = value.into_iter().collect();
+                self
+            }
+        }
+    };
     (@setter $Method:ident $field:ident : $FTy:ty) => {
         calculated_doc! {
             #[doc = concat!(
@@ -300,10 +340,22 @@ macro_rules! impl_payload {
             }
         }
     };
-    (@into? $T:ty [into]) => {
+    (@convert? $T:ty [into]) => {
         impl ::core::convert::Into<$T>
     };
-    (@into? $T:ty) => {
+    (@convert? $T:ty [collect]) => {
+        impl ::core::iter::IntoIterator<Item = <$T as ::core::iter::IntoIterator>::Item>
+    };
+    (@convert? $T:ty) => {
         $T
     };
+    (@convert_map ($e:expr) [into]) => {
+        $e.into()
+    };
+    (@convert_map ($e:expr) [collect]) => {
+        $e.into_iter().collect()
+    };
+    (@convert_map ($e:expr)) => {
+        $e
+    };
 }

From 106c49fa464b06d21d1fe2fd707fac43e6fd1be7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 2 Nov 2020 02:21:02 +0300
Subject: [PATCH 139/755] add #[serde_with_macros::skip_serializing_none]
 annotation to the impl_payload output

---
 src/local_macros.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index f5e6adee..98afd698 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -159,6 +159,7 @@ macro_rules! impl_payload {
             )?
         }
     ) => {
+        #[serde_with_macros::skip_serializing_none]
         $(
             #[ $($method_meta)* ]
         )*

From a138d6824be34c0127f603f20da6d4743eceeda5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 2 Nov 2020 21:14:32 +0300
Subject: [PATCH 140/755] add #[must_use] attr to payloads implemented by macro

---
 src/local_macros.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 98afd698..1a60dcbf 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -160,6 +160,7 @@ macro_rules! impl_payload {
         }
     ) => {
         #[serde_with_macros::skip_serializing_none]
+        #[must_use = "Requests do nothing unless sent"]
         $(
             #[ $($method_meta)* ]
         )*

From 9d887e51bbaff3420f9342d1f7274111cd30808b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 4 Nov 2020 16:00:40 +0300
Subject: [PATCH 141/755] Rename `StickerType`

- Rename `StickerType` => `InputSticker`
- Rename `{CreateNewStickerSet,AddStickerToSet}::sticker_type}` => `sticker`

This just makes more sense.
---
 CHANGELOG.md                               |  6 ++++++
 src/bot/api.rs                             |  6 +++---
 src/requests/all/add_sticker_to_set.rs     |  8 ++++----
 src/requests/all/create_new_sticker_set.rs | 12 ++++++------
 src/types/sticker_type.rs                  |  9 +++++----
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 966b84ef..cc5baac2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Rename `StickerType` => `InputSticker`, `{CreateNewStickerSet,AddStickerToSet}::sticker_type}` => `sticker` ([#23][pr23])
+- Use `_: IntoIterator<Item = T>` bound instead of `_: Into<Vec<T>>` in telegram methods which accept collections ([#21][pr21])
+- Make `MessageDice::dice` pub ([#20][pr20])
 - Merge `ApiErrorKind` and `KnownApiErrorKind` into `ApiError` ([#13][pr13])
 - Refactor ChatMember ([#9][pr9])
   - Replace a bunch of `Option<_>` fields with `ChatMemberKind`
@@ -55,6 +58,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr9]: https://github.com/teloxide/teloxide-core/pull/9
 [pr13]: https://github.com/teloxide/teloxide-core/pull/13
+[pr20]: https://github.com/teloxide/teloxide-core/pull/20
+[pr21]: https://github.com/teloxide/teloxide-core/pull/21
+[pr23]: https://github.com/teloxide/teloxide-core/pull/23
 
 ### Removed
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index e32bdbe9..621ae3f0 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -21,7 +21,7 @@ use crate::{
     },
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        LabeledPrice, ParseMode, StickerType, TargetMessage,
+        LabeledPrice, ParseMode, InputSticker, TargetMessage,
     },
     Bot,
 };
@@ -1366,7 +1366,7 @@ impl Bot {
         user_id: i32,
         name: N,
         title: T,
-        sticker_type: StickerType,
+        sticker_type: InputSticker,
         emojis: E,
     ) -> CreateNewStickerSet
     where
@@ -1389,7 +1389,7 @@ impl Bot {
         &self,
         user_id: i32,
         name: N,
-        sticker_type: StickerType,
+        sticker_type: InputSticker,
         emojis: E,
     ) -> AddStickerToSet
     where
diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
index 31e68f68..a881e17e 100644
--- a/src/requests/all/add_sticker_to_set.rs
+++ b/src/requests/all/add_sticker_to_set.rs
@@ -8,7 +8,7 @@ use crate::{
 
 use crate::{
     requests::{RequestOld, ResponseResult},
-    types::StickerType,
+    types::InputSticker,
 };
 
 /// Use this method to add a new sticker to a set created by the bot.
@@ -22,7 +22,7 @@ pub struct AddStickerToSet {
     pub user_id: i32,
     pub name: String,
     #[serde(flatten)]
-    pub sticker_type: StickerType,
+    pub sticker_type: InputSticker,
     pub emojis: String,
     pub mask_position: Option<MaskPosition>,
 }
@@ -41,7 +41,7 @@ impl AddStickerToSet {
         bot: Bot,
         user_id: i32,
         name: N,
-        sticker_type: StickerType,
+        sticker_type: InputSticker,
         emojis: E,
     ) -> Self
     where
@@ -73,7 +73,7 @@ impl AddStickerToSet {
         self
     }
 
-    pub fn sticker_type(mut self, val: StickerType) -> Self {
+    pub fn sticker_type(mut self, val: InputSticker) -> Self {
         self.sticker_type = val;
         self
     }
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
index 85027a07..090c5b47 100644
--- a/src/requests/all/create_new_sticker_set.rs
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -3,7 +3,7 @@ use serde::Serialize;
 use crate::{
     net,
     requests::{RequestOld, ResponseResult},
-    types::{MaskPosition, StickerType, True},
+    types::{MaskPosition, InputSticker, True},
     Bot,
 };
 
@@ -20,7 +20,7 @@ pub struct CreateNewStickerSet {
     pub name: String,
     pub title: String,
     #[serde(flatten)]
-    pub sticker_type: StickerType,
+    pub sticker: InputSticker,
     pub emojis: String,
     pub contains_masks: Option<bool>,
     pub mask_position: Option<MaskPosition>,
@@ -42,7 +42,7 @@ impl CreateNewStickerSet {
         user_id: i32,
         name: N,
         title: T,
-        sticker_type: StickerType,
+        sticker_type: InputSticker,
         emojis: E,
     ) -> Self
     where
@@ -55,7 +55,7 @@ impl CreateNewStickerSet {
             user_id,
             name: name.into(),
             title: title.into(),
-            sticker_type,
+            sticker: sticker_type,
             emojis: emojis.into(),
             contains_masks: None,
             mask_position: None,
@@ -91,8 +91,8 @@ impl CreateNewStickerSet {
         self
     }
 
-    pub fn sticker_type(mut self, val: StickerType) -> Self {
-        self.sticker_type = val;
+    pub fn sticker_type(mut self, val: InputSticker) -> Self {
+        self.sticker = val;
         self
     }
 
diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index 1b6da91a..6a6647b0 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -2,9 +2,10 @@ use serde::Serialize;
 
 use crate::types::InputFile;
 
+/// Sticker file that may be uploaded to telegram.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
 #[serde(untagged)]
-pub enum StickerType {
+pub enum InputSticker {
     /// PNG image with the sticker, must be up to 512 kilobytes in size,
     /// dimensions must not exceed 512px, and either width or height must be
     /// exactly 512px.
@@ -27,8 +28,8 @@ pub enum StickerType {
     Tgs { tgs_sticker: InputFile },
 }
 
-impl StickerType {
-    /// Create png-`StickerType`.
+impl InputSticker {
+    /// Create png-`InputSticker`.
     ///
     /// See [`StickerType::Png`] for more
     ///
@@ -37,7 +38,7 @@ impl StickerType {
         Self::Png { png_sticker }
     }
 
-    /// Create tgs-`StickerType`.
+    /// Create tgs-`InputSticker`.
     ///
     /// See [`StickerType::Tgs`] for more
     ///

From a213459cc365898257c9756cea764a9e7e34240e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 5 Nov 2020 03:22:23 +0300
Subject: [PATCH 142/755] fmt

---
 src/bot/api.rs                             | 2 +-
 src/requests/all/create_new_sticker_set.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 621ae3f0..d831738e 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -21,7 +21,7 @@ use crate::{
     },
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        LabeledPrice, ParseMode, InputSticker, TargetMessage,
+        InputSticker, LabeledPrice, ParseMode, TargetMessage,
     },
     Bot,
 };
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
index 090c5b47..4d781bee 100644
--- a/src/requests/all/create_new_sticker_set.rs
+++ b/src/requests/all/create_new_sticker_set.rs
@@ -3,7 +3,7 @@ use serde::Serialize;
 use crate::{
     net,
     requests::{RequestOld, ResponseResult},
-    types::{MaskPosition, InputSticker, True},
+    types::{InputSticker, MaskPosition, True},
     Bot,
 };
 

From 0deb42e16796dab473a9e3aae8669ba43446c99f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 5 Nov 2020 03:25:32 +0300
Subject: [PATCH 143/755] fix docs for `InputSticker`

---
 src/types/sticker_type.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/types/sticker_type.rs b/src/types/sticker_type.rs
index 6a6647b0..d15a4812 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/sticker_type.rs
@@ -31,18 +31,18 @@ pub enum InputSticker {
 impl InputSticker {
     /// Create png-`InputSticker`.
     ///
-    /// See [`StickerType::Png`] for more
+    /// See [`InputSticker::Png`] for more
     ///
-    /// [`StickerType::Png`]: crate::types::StickerType::Png
+    /// [`InputSticker::Png`]: crate::types::InputSticker::Png
     pub fn png(png_sticker: InputFile) -> Self {
         Self::Png { png_sticker }
     }
 
     /// Create tgs-`InputSticker`.
     ///
-    /// See [`StickerType::Tgs`] for more
+    /// See [`InputSticker::Tgs`] for more
     ///
-    /// [`StickerType::Tgs`]: crate::types::StickerType::Tgs
+    /// [`InputSticker::Tgs`]: crate::types::InputSticker::Tgs
     pub fn tgs(tgs_sticker: InputFile) -> Self {
         Self::Tgs { tgs_sticker }
     }

From 8f85cffe9496d33d7de1e6b625e86414e1c0f0c5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 11 Nov 2020 22:41:44 +0300
Subject: [PATCH 144/755] Implement all payloads

---
 src/payloads/add_sticker_to_set.rs            |  30 ++++
 src/payloads/answer_callback_query.rs         |  38 +++++
 src/payloads/answer_inline_query.rs           |  36 +++++
 src/payloads/answer_pre_checkout_query.rs     |  25 +++
 src/payloads/answer_shipping_query.rs         |  27 ++++
 src/payloads/create_new_sticker_set.rs        |  35 ++++
 src/payloads/delete_chat_photo.rs             |  17 ++
 src/payloads/delete_chat_sticker_set.rs       |  19 +++
 src/payloads/delete_message.rs                |  28 ++++
 src/payloads/delete_sticker_from_set.rs       |  17 ++
 src/payloads/delete_webhook.rs                |  16 ++
 src/payloads/edit_message_caption.rs          |  33 ++++
 src/payloads/edit_message_caption_inline.rs   |  31 ++++
 src/payloads/edit_message_live_location.rs    |  34 ++++
 .../edit_message_live_location_inline.rs      |  32 ++++
 src/payloads/edit_message_media.rs            |  29 ++++
 src/payloads/edit_message_media_inline.rs     |  27 ++++
 src/payloads/edit_message_reply_markup.rs     |  27 ++++
 .../edit_message_reply_markup_inline.rs       |  25 +++
 src/payloads/edit_message_text.rs             |  37 +++++
 src/payloads/edit_message_text_inline.rs      |  35 ++++
 src/payloads/export_chat_invite_link.rs       |  19 +++
 src/payloads/forward_message.rs               |  29 ++++
 src/payloads/get_chat.rs                      |  19 +++
 src/payloads/get_chat_administrators.rs       |  19 +++
 src/payloads/get_chat_member.rs               |  21 +++
 src/payloads/get_chat_members_count.rs        |  17 ++
 src/payloads/get_file.rs                      |  20 +++
 src/payloads/get_me.rs                        |  14 +-
 src/payloads/get_my_commands.rs               |  14 ++
 src/payloads/get_sticker_set.rs               |  17 ++
 src/payloads/get_updates.rs                   |  33 ++++
 src/payloads/get_user_profile_photos.rs       |  25 +++
 src/payloads/get_webhook_info.rs              |  17 ++
 src/payloads/kick_chat_member.rs              |  25 +++
 src/payloads/leave_chat.rs                    |  17 ++
 src/payloads/mod.rs                           | 153 ++++++++++++++++++
 src/payloads/pin_chat_message.rs              |  23 +++
 src/payloads/promote_chat_member.rs           |  37 +++++
 src/payloads/restrict_chat_member.rs          |  25 +++
 src/payloads/send_animation.rs                |  52 ++++++
 src/payloads/send_audio.rs                    |  55 +++++++
 src/payloads/send_chat_action.rs              |  33 ++++
 src/payloads/send_contact.rs                  |  42 +++++
 src/payloads/send_dice.rs                     |  34 ++++
 src/payloads/send_document.rs                 |  46 ++++++
 src/payloads/send_invoice.rs                  |  71 ++++++++
 src/payloads/send_location.rs                 |  40 +++++
 src/payloads/send_media_group.rs              |  29 ++++
 src/payloads/send_message.rs                  |  42 +++--
 src/payloads/send_photo.rs                    |  42 +++++
 src/payloads/send_poll.rs                     |  56 +++++++
 src/payloads/send_sticker.rs                  |  36 +++++
 src/payloads/send_venue.rs                    |  44 +++++
 src/payloads/send_video.rs                    |  55 +++++++
 src/payloads/send_video_note.rs               |  45 ++++++
 src/payloads/send_voice.rs                    |  46 ++++++
 .../set_chat_administrator_custom_title.rs    |  21 +++
 src/payloads/set_chat_description.rs          |  21 +++
 src/payloads/set_chat_permissions.rs          |  19 +++
 src/payloads/set_chat_photo.rs                |  19 +++
 src/payloads/set_chat_sticker_set.rs          |  19 +++
 src/payloads/set_chat_title.rs                |  19 +++
 src/payloads/set_my_commands.rs               |  17 ++
 src/payloads/set_passport_data_errors.rs      |  21 +++
 src/payloads/set_sticker_position_in_set.rs   |  19 +++
 src/payloads/set_sticker_set_thumb.rs         |  25 +++
 src/payloads/set_webhook.rs                   |  35 ++++
 src/payloads/setters.rs                       |  35 +++-
 src/payloads/stop_message_live_location.rs    |  35 ++++
 .../stop_message_live_location_inline.rs      |  32 ++++
 src/payloads/stop_poll.rs                     |  25 +++
 src/payloads/unban_chat_member.rs             |  19 +++
 src/payloads/unpin_chat_message.rs            |  17 ++
 src/payloads/upload_sticker_file.rs           |  21 +++
 75 files changed, 2301 insertions(+), 28 deletions(-)
 create mode 100644 src/payloads/add_sticker_to_set.rs
 create mode 100644 src/payloads/answer_callback_query.rs
 create mode 100644 src/payloads/answer_inline_query.rs
 create mode 100644 src/payloads/answer_pre_checkout_query.rs
 create mode 100644 src/payloads/answer_shipping_query.rs
 create mode 100644 src/payloads/create_new_sticker_set.rs
 create mode 100644 src/payloads/delete_chat_photo.rs
 create mode 100644 src/payloads/delete_chat_sticker_set.rs
 create mode 100644 src/payloads/delete_message.rs
 create mode 100644 src/payloads/delete_sticker_from_set.rs
 create mode 100644 src/payloads/delete_webhook.rs
 create mode 100644 src/payloads/edit_message_caption.rs
 create mode 100644 src/payloads/edit_message_caption_inline.rs
 create mode 100644 src/payloads/edit_message_live_location.rs
 create mode 100644 src/payloads/edit_message_live_location_inline.rs
 create mode 100644 src/payloads/edit_message_media.rs
 create mode 100644 src/payloads/edit_message_media_inline.rs
 create mode 100644 src/payloads/edit_message_reply_markup.rs
 create mode 100644 src/payloads/edit_message_reply_markup_inline.rs
 create mode 100644 src/payloads/edit_message_text.rs
 create mode 100644 src/payloads/edit_message_text_inline.rs
 create mode 100644 src/payloads/export_chat_invite_link.rs
 create mode 100644 src/payloads/forward_message.rs
 create mode 100644 src/payloads/get_chat.rs
 create mode 100644 src/payloads/get_chat_administrators.rs
 create mode 100644 src/payloads/get_chat_member.rs
 create mode 100644 src/payloads/get_chat_members_count.rs
 create mode 100644 src/payloads/get_file.rs
 create mode 100644 src/payloads/get_my_commands.rs
 create mode 100644 src/payloads/get_sticker_set.rs
 create mode 100644 src/payloads/get_updates.rs
 create mode 100644 src/payloads/get_user_profile_photos.rs
 create mode 100644 src/payloads/get_webhook_info.rs
 create mode 100644 src/payloads/kick_chat_member.rs
 create mode 100644 src/payloads/leave_chat.rs
 create mode 100644 src/payloads/pin_chat_message.rs
 create mode 100644 src/payloads/promote_chat_member.rs
 create mode 100644 src/payloads/restrict_chat_member.rs
 create mode 100644 src/payloads/send_animation.rs
 create mode 100644 src/payloads/send_audio.rs
 create mode 100644 src/payloads/send_chat_action.rs
 create mode 100644 src/payloads/send_contact.rs
 create mode 100644 src/payloads/send_dice.rs
 create mode 100644 src/payloads/send_document.rs
 create mode 100644 src/payloads/send_invoice.rs
 create mode 100644 src/payloads/send_location.rs
 create mode 100644 src/payloads/send_media_group.rs
 create mode 100644 src/payloads/send_photo.rs
 create mode 100644 src/payloads/send_poll.rs
 create mode 100644 src/payloads/send_sticker.rs
 create mode 100644 src/payloads/send_venue.rs
 create mode 100644 src/payloads/send_video.rs
 create mode 100644 src/payloads/send_video_note.rs
 create mode 100644 src/payloads/send_voice.rs
 create mode 100644 src/payloads/set_chat_administrator_custom_title.rs
 create mode 100644 src/payloads/set_chat_description.rs
 create mode 100644 src/payloads/set_chat_permissions.rs
 create mode 100644 src/payloads/set_chat_photo.rs
 create mode 100644 src/payloads/set_chat_sticker_set.rs
 create mode 100644 src/payloads/set_chat_title.rs
 create mode 100644 src/payloads/set_my_commands.rs
 create mode 100644 src/payloads/set_passport_data_errors.rs
 create mode 100644 src/payloads/set_sticker_position_in_set.rs
 create mode 100644 src/payloads/set_sticker_set_thumb.rs
 create mode 100644 src/payloads/set_webhook.rs
 create mode 100644 src/payloads/stop_message_live_location.rs
 create mode 100644 src/payloads/stop_message_live_location_inline.rs
 create mode 100644 src/payloads/stop_poll.rs
 create mode 100644 src/payloads/unban_chat_member.rs
 create mode 100644 src/payloads/unpin_chat_message.rs
 create mode 100644 src/payloads/upload_sticker_file.rs

diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
new file mode 100644
index 00000000..518c780e
--- /dev/null
+++ b/src/payloads/add_sticker_to_set.rs
@@ -0,0 +1,30 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InputSticker, MaskPosition, True};
+
+impl_payload! {
+    /// Use this method to add a new sticker to a set created by the bot. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub AddStickerToSet (AddStickerToSetSetters) => True {
+        required {
+            /// User identifier of sticker file owner
+            pub user_id: u32,
+            /// Sticker set name
+            pub name: String [into],
+            /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            #[serde(flatten)]
+            pub sticker: InputSticker,
+            /// One or more emoji corresponding to the sticker
+            pub emojis: String [into],
+        }
+        optional {
+            /// A JSON-serialized object for position where the mask should be placed on faces
+            pub mask_position: MaskPosition,
+        }
+    }
+}
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
new file mode 100644
index 00000000..10a9e487
--- /dev/null
+++ b/src/payloads/answer_callback_query.rs
@@ -0,0 +1,38 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to send answers to callback queries sent from [inline keyboards]. The answer will be displayed to the user as a notification at the top of the chat screen or as an alert. On success, True is returned.
+    ///
+    /// >Alternatively, the user can be redirected to the specified Game URL. For this option to work, you must first create a game for your bot via [@Botfather] and accept the terms. Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open your bot with a parameter.
+    ///
+    /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [@Botfather]: https://t.me/botfather
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub AnswerCallbackQuery (AnswerCallbackQuerySetters) => True {
+        required {
+            /// Unique identifier for the query to be answered
+            pub callback_query_id: String [into],
+        }
+        optional {
+            /// Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters
+            pub text: String [into],
+            /// If true, an alert will be shown by the client instead of a notification at the top of the chat screen. Defaults to false.
+            pub show_alert: bool,
+            /// URL that will be opened by the user's client. If you have created a [`Game`] and accepted the conditions via [@Botfather], specify the URL that opens your game — note that this will only work if the query comes from a _[callback\_game]_ button.
+            ///
+            /// Otherwise, you may use links like `t.me/your\_bot?start=XXXX` that open your bot with a parameter.
+            ///
+            /// [@Botfather]: https://t.me/botfather
+            /// [`Game`]: crate::types::Game
+            /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
+            pub url: String [into],
+            /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
+            pub cache_time: u32,
+        }
+    }
+}
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
new file mode 100644
index 00000000..f892959b
--- /dev/null
+++ b/src/payloads/answer_inline_query.rs
@@ -0,0 +1,36 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineQueryResult, True};
+
+impl_payload! {
+    /// Use this method to send answers to an inline query. On success, _True_ is returned. No more than **50** results per query are allowed.
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub AnswerInlineQuery (AnswerInlineQuerySetters) => True {
+        required {
+            /// Unique identifier for the answered query
+            pub inline_query_id: String [into],
+            /// A JSON-serialized array of results for the inline query
+            pub results: Vec<InlineQueryResult> [collect],
+        }
+        optional {
+            /// The maximum amount of time in seconds that the result of the inline query may be cached on the server. Defaults to 300.
+            pub cache_time: u32,
+            /// Pass _True_, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query
+            pub is_personal: bool,
+            /// Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don't support pagination. Offset length can't exceed 64 bytes.
+            pub next_offset: String [into],
+            /// If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter switch_pm_parameter
+            pub switch_pm_text: String [into],
+            /// [Deep-linking] parameter for the /start message sent to the bot when user presses the switch button. 1-64 characters, only `A-Z`, `a-z`, `0-9`, `_` and `-` are allowed.
+            ///
+            /// _Example_: An inline bot that sends YouTube videos can ask the user to connect the bot to their YouTube account to adapt search results accordingly. To do this, it displays a 'Connect your YouTube account' button above the results, or even before showing any. The user presses the button, switches to a private chat with the bot and, in doing so, passes a start parameter that instructs the bot to return an oauth link. Once done, the bot can offer a [switch_inline] button so that the user can easily return to the chat where they wanted to use the bot's inline capabilities.
+            ///
+            /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
+            /// [switch_inline]: https://core.telegram.org/bots/api#inlinekeyboardmarkup
+            pub switch_pm_parameter: String [into],
+        }
+    }
+}
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
new file mode 100644
index 00000000..8cfbd7d5
--- /dev/null
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Once the user has confirmed their payment and shipping details, the Bot API sends the final confirmation in the form of an [`Update`] with the field pre\_checkout\_query. Use this method to respond to such pre-checkout queries. On success, True is returned. **Note:** The Bot API must receive an answer within 10 seconds after the pre-checkout query was sent.
+    ///
+    /// [`Update`]: crate::types::Update
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub AnswerPreCheckoutQuery (AnswerPreCheckoutQuerySetters) => True {
+        required {
+            /// Unique identifier for the query to be answered
+            pub pre_checkout_query_id: String [into],
+            /// Specify True if everything is alright (goods are available, etc.) and the bot is ready to proceed with the order. Use False if there are any problems.
+            pub ok: bool,
+        }
+        optional {
+            /// Required if ok is False. Error message in human readable form that explains the reason for failure to proceed with the checkout (e.g. "Sorry, somebody just bought the last of our amazing black T-shirts while you were busy filling out your payment details. Please choose a different color or garment!"). Telegram will display this message to the user.
+            pub error_message: String [into],
+        }
+    }
+}
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
new file mode 100644
index 00000000..471b35b9
--- /dev/null
+++ b/src/payloads/answer_shipping_query.rs
@@ -0,0 +1,27 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ShippingOption, True};
+
+impl_payload! {
+    /// If you sent an invoice requesting a shipping address and the parameter _is\_flexible_ was specified, the Bot API will send an [`Update`] with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is returned.
+    ///
+    /// [`Update`]: crate::types::Update
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub AnswerShippingQuery (AnswerShippingQuerySetters) => True {
+        required {
+            /// Unique identifier for the query to be answered
+            pub shipping_query_id: String [into],
+            /// Specify True if delivery to the specified address is possible and False if there are any problems (for example, if delivery to the specified address is not possible)
+            pub ok: bool,
+        }
+        optional {
+            /// Required if ok is True. A JSON-serialized array of available shipping options.
+            pub shipping_options: Vec<ShippingOption> [collect],
+            /// Required if ok is False. Error message in human readable form that explains why it is impossible to complete the order (e.g. 'Sorry, delivery to your desired address is unavailable'). Telegram will display this message to the user.
+            pub error_message: String [into],
+        }
+    }
+}
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
new file mode 100644
index 00000000..cbeb51a8
--- /dev/null
+++ b/src/payloads/create_new_sticker_set.rs
@@ -0,0 +1,35 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InputFile, MaskPosition, True};
+
+impl_payload! {
+    /// Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\_sticker_ or _tgs\_sticker_. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
+        required {
+            /// User identifier of sticker file owner
+            pub user_id: u32,
+            /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g., _animals_). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in _“\_by\_<bot username>”. <bot\_username>_ is case insensitive. 1-64 characters.
+            pub name: String [into],
+            /// Sticker set title, 1-64 characters
+            pub title: String [into],
+            /// One or more emoji corresponding to the sticker
+            pub emojis: String [into],
+        }
+        optional {
+            /// **PNG** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub png_sticker: InputFile,
+            /// **TGS** animation with the sticker, uploaded using multipart/form-data. See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
+            pub tgs_sticker: InputFile,
+            /// Pass _True_, if a set of mask stickers should be created
+            pub contains_masks: bool,
+            /// A JSON-serialized object for position where the mask should be placed on faces
+            pub mask_position: MaskPosition,
+        }
+    }
+}
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
new file mode 100644
index 00000000..2bd8a6cc
--- /dev/null
+++ b/src/payloads/delete_chat_photo.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to delete a chat photo. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeleteChatPhoto (DeleteChatPhotoSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
new file mode 100644
index 00000000..e5ca6230
--- /dev/null
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to delete a group sticker set from a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field `can_set_sticker_set` optionally returned in [`GetChat`] requests to check if the bot can use this method. Returns _True_ on success.
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeleteChatStickerSet (DeleteChatStickerSetSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
new file mode 100644
index 00000000..039bcb38
--- /dev/null
+++ b/src/payloads/delete_message.rs
@@ -0,0 +1,28 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to delete a message, including service messages, with the following limitations:
+    /// - A message can only be deleted if it was sent less than 48 hours ago.
+    /// - A dice message in a private chat can only be deleted if it was sent more than 24 hours ago.
+    /// - Bots can delete outgoing messages in private chats, groups, and supergroups.
+    /// - Bots can delete incoming messages in private chats.
+    /// - Bots granted can_post_messages permissions can delete outgoing messages in channels.
+    /// - If the bot is an administrator of a group, it can delete any message there.
+    /// - If the bot has can_delete_messages permission in a supergroup or a channel, it can delete any message there.
+    ///
+    /// Returns True on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeleteMessage (DeleteMessageSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to delete
+            pub message_id: i64,
+        }
+    }
+}
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
new file mode 100644
index 00000000..2b6396aa
--- /dev/null
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to delete a sticker from a set created by the bot. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeleteStickerFromSet (DeleteStickerFromSetSetters) => True {
+        required {
+            /// File identifier of the sticker
+            pub sticker: String [into],
+        }
+    }
+}
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
new file mode 100644
index 00000000..ae4907c4
--- /dev/null
+++ b/src/payloads/delete_webhook.rs
@@ -0,0 +1,16 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to remove webhook integration if you decide to switch back to [`GetUpdates`]. Returns True on success. Requires no parameters.
+    ///
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeleteWebhook (DeleteWebhookSetters) => True {
+
+    }
+}
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
new file mode 100644
index 00000000..725986b9
--- /dev/null
+++ b/src/payloads/edit_message_caption.rs
@@ -0,0 +1,33 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InlineKeyboardMarkup, Message, ParseMode};
+
+impl_payload! {
+    /// Use this method to edit captions of messages. On success, the edited Message is returned.
+    ///
+    /// See also: [`EditMessageCaptionInline`](crate::payloads::EditMessageCaptionInline)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageCaption (EditMessageCaptionSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+            /// New caption of the message, 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
new file mode 100644
index 00000000..de4b1ebb
--- /dev/null
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -0,0 +1,31 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineKeyboardMarkup, ParseMode, True};
+
+impl_payload! {
+    /// Use this method to edit captions of messages. On success, _True_ is returned.
+    ///
+    /// See also: [`EditMessageCaption`](crate::payloads::EditMessageCaption)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageCaptionInline (EditMessageCaptionInlineSetters) => True {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+            /// New caption of the message, 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
new file mode 100644
index 00000000..8d22ea0b
--- /dev/null
+++ b/src/payloads/edit_message_live_location.rs
@@ -0,0 +1,34 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
+    ///
+    /// See also: [`EditMessageLiveLocationInline`](crate::payloads::EditMessageLiveLocationInline)
+    ///
+    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub EditMessageLiveLocation (EditMessageLiveLocationSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+            /// Latitude of new location
+            pub latitude: f64,
+            /// Longitude of new location
+            pub longitude: f64,
+        }
+        optional {
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
new file mode 100644
index 00000000..cf26c12a
--- /dev/null
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -0,0 +1,32 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, True is returned.
+    ///
+    /// See also: [`EditMessageLiveLocation`](crate::payloads::EditMessageLiveLocation)
+    ///
+    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub EditMessageLiveLocationInline (EditMessageLiveLocationInlineSetters) => Message {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+            /// Latitude of new location
+            pub latitude: f64,
+            /// Longitude of new location
+            pub longitude: f64,
+        }
+        optional {
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
new file mode 100644
index 00000000..9fda6118
--- /dev/null
+++ b/src/payloads/edit_message_media.rs
@@ -0,0 +1,29 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InlineKeyboardMarkup, InputMedia, Message};
+
+impl_payload! {
+    /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, the edited Message is returned.
+    ///
+    /// See also: [`EditMessageMediaInline`](crate::payloads::EditMessageMediaInline)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageMedia (EditMessageMediaSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+            /// A JSON-serialized object for a new media content of the message
+            pub media: InputMedia,
+        }
+        optional {
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
new file mode 100644
index 00000000..bdc4fd53
--- /dev/null
+++ b/src/payloads/edit_message_media_inline.rs
@@ -0,0 +1,27 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineKeyboardMarkup, InputMedia, True};
+
+impl_payload! {
+    /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, _True_ is returned.
+    ///
+    /// See also: [`EditMessageMedia`](crate::payloads::EditMessageMedia)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageMediaInline (EditMessageMediaInlineSetters) => True {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+            /// A JSON-serialized object for a new media content of the message
+            pub media: InputMedia,
+        }
+        optional {
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
new file mode 100644
index 00000000..2103165e
--- /dev/null
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -0,0 +1,27 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InlineKeyboardMarkup, Message};
+
+impl_payload! {
+    /// Use this method to edit only the reply markup of messages. On success, the edited Message is returned.
+    ///
+    /// See also: [`EditMessageMediaInline`](crate::payloads::EditMessageMediaInline)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageReplyMarkup (EditMessageReplyMarkupSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+        }
+        optional {
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
new file mode 100644
index 00000000..439b85dc
--- /dev/null
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineKeyboardMarkup, True};
+
+impl_payload! {
+    /// Use this method to edit only the reply markup of messages. On success, _True_ is returned.
+    ///
+    /// See also: [`EditMessageReplyMarkup`](crate::payloads::EditMessageReplyMarkup)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageReplyMarkupInline (EditMessageReplyMarkupInlineSetters) => True {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+        }
+        optional {
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
new file mode 100644
index 00000000..94a1b7d4
--- /dev/null
+++ b/src/payloads/edit_message_text.rs
@@ -0,0 +1,37 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InlineKeyboardMarkup, Message, ParseMode};
+
+impl_payload! {
+    /// Use this method to edit text and [games] messages. On success, the edited Message is returned.
+    ///
+    /// See also: [`EditMessageTextInline`](crate::payloads::EditMessageTextInline)
+    ///
+    /// [games]: https://core.telegram.org/bots/api#games
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageText (EditMessageTextSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+            /// New text of the message, 1-4096 characters after entities parsing
+            pub text: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Disables link previews for links in this message
+            pub disable_web_page_preview: bool,
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
new file mode 100644
index 00000000..33837594
--- /dev/null
+++ b/src/payloads/edit_message_text_inline.rs
@@ -0,0 +1,35 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineKeyboardMarkup, ParseMode, True};
+
+impl_payload! {
+    /// Use this method to edit text and [games] messages. On success, _True_ is returned.
+    ///
+    /// See also: [`EditMessageText`](crate::payloads::EditMessageText)
+    ///
+    /// [games]: https://core.telegram.org/bots/api#games
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditMessageTextInline (EditMessageTextInlineSetters) => True {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+            /// New text of the message, 1-4096 characters after entities parsing
+            pub text: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Disables link previews for links in this message
+            pub disable_web_page_preview: bool,
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
new file mode 100644
index 00000000..8ced7840
--- /dev/null
+++ b/src/payloads/export_chat_invite_link.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to generate a new invite link for a chat; any previously generated link is revoked. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the new invite link as String on success.
+    ///
+    /// > Note: Each administrator in a chat generates their own invite links. Bots can't use invite links generated by other administrators. If you want your bot to work with invite links, it will need to generate its own link using exportChatInviteLink — after this the link will become available to the bot via the getChat method. If your bot needs to generate a new invite link replacing its previous one, use exportChatInviteLink again.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub ExportChatInviteLink (ExportChatInviteLinkSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
new file mode 100644
index 00000000..70fc8a19
--- /dev/null
+++ b/src/payloads/forward_message.rs
@@ -0,0 +1,29 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message};
+
+impl_payload! {
+    /// Use this method to forward messages of any kind. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub ForwardMessage (ForwardMessageSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
+            pub from_chat_id: ChatId [into],
+            /// Message identifier in the chat specified in _from\_chat\_id_
+            pub message_id: i64,
+        }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+        }
+    }
+}
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
new file mode 100644
index 00000000..cfc13aab
--- /dev/null
+++ b/src/payloads/get_chat.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{Chat, ChatId};
+
+impl_payload! {
+    /// Use this method to get up to date information about the chat (current name of the user for one-on-one conversations, current username of a user, group or channel, etc.). Returns a [`Chat`] object on success.
+    ///
+    /// [`Chat`]: crate::types::Chat
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetChat (GetChatSetters) => Chat {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
new file mode 100644
index 00000000..c0eae482
--- /dev/null
+++ b/src/payloads/get_chat_administrators.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, ChatMember};
+
+impl_payload! {
+    /// Use this method to get a list of administrators in a chat. On success, returns an Array of [`ChatMember`] objects that contains information about all chat administrators except other bots. If the chat is a group or a supergroup and no administrators were appointed, only the creator will be returned.
+    ///
+    /// [`ChatMember`]: crate::types::ChatMember
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetChatAdministrators (GetChatAdministratorsSetters) => ChatMember {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
new file mode 100644
index 00000000..008681c3
--- /dev/null
+++ b/src/payloads/get_chat_member.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, ChatMember};
+
+impl_payload! {
+    /// Use this method to get information about a member of a chat. Returns a [`ChatMember`] object on success.
+    ///
+    /// [`ChatMember`]: crate::types::ChatMember
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetChatMember (GetChatMemberSetters) => ChatMember {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+        }
+    }
+}
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
new file mode 100644
index 00000000..3223c5fa
--- /dev/null
+++ b/src/payloads/get_chat_members_count.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to get the number of members in a chat. Returns _Int_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetChatMembersCount (GetChatMembersCountSetters) => u32 {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
new file mode 100644
index 00000000..3037bbe6
--- /dev/null
+++ b/src/payloads/get_file.rs
@@ -0,0 +1,20 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::File;
+
+impl_payload! {
+    /// Use this method to get basic info about a file and prepare it for downloading. For the moment, bots can download files of up to 20MB in size. On success, a [`File`] object is returned. The file can then be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>` is taken from the response. It is guaranteed that the link will be valid for at least 1 hour. When the link expires, a new one can be requested by calling [`GetFile`] again.
+    ///
+    /// [`GetFile`]: crate::payloads::GetFile
+    /// [`File`]: crate::types::File
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetFile (GetFileSetters) => File {
+        required {
+            /// File identifier to get info about
+            pub file_id: String [into],
+        }
+    }
+}
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 4df0b815..eef1103e 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,12 +1,16 @@
-use serde::{Deserialize, Serialize};
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
 
 use crate::types::User;
 
 impl_payload! {
-    /// A filter method for testing your bot's auth token. Requires no parameters.
-    /// Returns basic information about the bot in form of a [`User`] object.
+    /// A simple method for testing your bot's auth token. Requires no parameters. Returns basic information about the bot in form of a [`User`] object.
     ///
     /// [`User`]: crate::types::User
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy, Default, Deserialize, Serialize)]
-    pub GetMe (GetMeSetters) => User {}
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetMe (GetMeSetters) => User {
+
+    }
 }
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
new file mode 100644
index 00000000..a7ffb195
--- /dev/null
+++ b/src/payloads/get_my_commands.rs
@@ -0,0 +1,14 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+impl_payload! {
+    /// Use this method to get the current list of the bot's commands. Requires no parameters. Returns Array of [`BotCommand`] on success.
+    ///
+    /// [`BotCommand`]: crate::types::BotCommand
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetMyCommands (GetMyCommandsSetters) => u32 {
+
+    }
+}
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
new file mode 100644
index 00000000..e0b061a1
--- /dev/null
+++ b/src/payloads/get_sticker_set.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to get a sticker set. On success, a StickerSet object is returned.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetStickerSet (GetStickerSetSetters) => True {
+        required {
+            /// Name of the sticker set
+            pub name: String [into],
+        }
+    }
+}
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
new file mode 100644
index 00000000..d7484c8e
--- /dev/null
+++ b/src/payloads/get_updates.rs
@@ -0,0 +1,33 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{AllowedUpdate, Update};
+
+impl_payload! {
+    /// Use this method to receive incoming updates using long polling ([wiki]). An Array of [`Update`] objects is returned.
+    ///
+    /// [`Update`]: crate::types::Update
+    /// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetUpdates (GetUpdatesSetters) => Vec<Update> {
+
+        optional {
+            /// Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as [`GetUpdates`] is called with an offset higher than its update_id. The negative offset can be specified to retrieve updates starting from -offset update from the end of the updates queue. All previous updates will forgotten.
+            ///
+            /// [`GetUpdates`]: crate::payloads::GetUpdates
+            pub offset: i64,
+            /// Limits the number of updates to be retrieved. Values between 1-100 are accepted. Defaults to 100.
+            pub limit: u8,
+            /// Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. Should be positive, short polling should be used for testing purposes only.
+            pub timeout: u32,
+            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
+            ///
+            /// Please note that this parameter doesn't affect updates created before the call to the getUpdates, so unwanted updates may be received for a short period of time.
+            ///
+            /// [`Update`]: crate::types::Update
+            pub allowed_updates: Vec<AllowedUpdate> [collect],
+        }
+    }
+}
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
new file mode 100644
index 00000000..ac95ee08
--- /dev/null
+++ b/src/payloads/get_user_profile_photos.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::UserProfilePhotos;
+
+impl_payload! {
+    /// Use this method to get a list of profile pictures for a user. Returns a [`UserProfilePhotos`] object.
+    ///
+    /// [`UserProfilePhotos`]: crate::types::UserProfilePhotos
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetUserProfilePhotos (GetUserProfilePhotosSetters) => UserProfilePhotos {
+        required {
+            /// Unique identifier of the target user
+            pub user_id: u32,
+        }
+        optional {
+            /// Sequential number of the first photo to be returned. By default, all photos are returned.
+            pub offset: u32,
+            /// Limits the number of photos to be retrieved. Values between 1-100 are accepted. Defaults to 100.
+            pub limit: u8,
+        }
+    }
+}
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
new file mode 100644
index 00000000..9430960d
--- /dev/null
+++ b/src/payloads/get_webhook_info.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::WebhookInfo;
+
+impl_payload! {
+    /// Use this method to get current webhook status. Requires no parameters. On success, returns a [`WebhookInfo`] object. If the bot is using [`GetUpdates`], will return an object with the _url_ field empty.
+    ///
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
+    /// [`WebhookInfo`]: crate::types::WebhookInfo
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetWebhookInfo (GetWebhookInfoSetters) => WebhookInfo {
+
+    }
+}
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
new file mode 100644
index 00000000..decbc8bf
--- /dev/null
+++ b/src/payloads/kick_chat_member.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to kick a user from a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the group on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
+    ///
+    /// [unbanned]: crate::payloads::UnbanChatMember
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub KickChatMember (KickChatMemberSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+        }
+        optional {
+            /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
+            pub until_date: u64,
+        }
+    }
+}
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
new file mode 100644
index 00000000..e3c05bad
--- /dev/null
+++ b/src/payloads/leave_chat.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method for your bot to leave a group, supergroup or channel. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub LeaveChat (LeaveChatSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 33da224a..2316d16e 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -2,8 +2,161 @@
 
 pub mod setters;
 
+// This block is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).
+// **DO NOT EDIT THIS BLOCK**,
+// edit `cg` instead.
+mod add_sticker_to_set;
+mod answer_callback_query;
+mod answer_inline_query;
+mod answer_pre_checkout_query;
+mod answer_shipping_query;
+mod create_new_sticker_set;
+mod delete_chat_photo;
+mod delete_chat_sticker_set;
+mod delete_message;
+mod delete_sticker_from_set;
+mod delete_webhook;
+mod edit_message_caption;
+mod edit_message_caption_inline;
+mod edit_message_live_location;
+mod edit_message_live_location_inline;
+mod edit_message_media;
+mod edit_message_media_inline;
+mod edit_message_reply_markup;
+mod edit_message_reply_markup_inline;
+mod edit_message_text;
+mod edit_message_text_inline;
+mod export_chat_invite_link;
+mod forward_message;
+mod get_chat;
+mod get_chat_administrators;
+mod get_chat_member;
+mod get_chat_members_count;
+mod get_file;
 mod get_me;
+mod get_my_commands;
+mod get_sticker_set;
+mod get_updates;
+mod get_user_profile_photos;
+mod get_webhook_info;
+mod kick_chat_member;
+mod leave_chat;
+mod pin_chat_message;
+mod promote_chat_member;
+mod restrict_chat_member;
+mod send_animation;
+mod send_audio;
+mod send_chat_action;
+mod send_contact;
+mod send_dice;
+mod send_document;
+mod send_invoice;
+mod send_location;
+mod send_media_group;
 mod send_message;
+mod send_photo;
+mod send_poll;
+mod send_sticker;
+mod send_venue;
+mod send_video;
+mod send_video_note;
+mod send_voice;
+mod set_chat_administrator_custom_title;
+mod set_chat_description;
+mod set_chat_permissions;
+mod set_chat_photo;
+mod set_chat_sticker_set;
+mod set_chat_title;
+mod set_my_commands;
+mod set_passport_data_errors;
+mod set_sticker_position_in_set;
+mod set_sticker_set_thumb;
+mod set_webhook;
+mod stop_message_live_location;
+mod stop_message_live_location_inline;
+mod stop_poll;
+mod unban_chat_member;
+mod unpin_chat_message;
+mod upload_sticker_file;
 
+pub use add_sticker_to_set::{AddStickerToSet, AddStickerToSetSetters};
+pub use answer_callback_query::{AnswerCallbackQuery, AnswerCallbackQuerySetters};
+pub use answer_inline_query::{AnswerInlineQuery, AnswerInlineQuerySetters};
+pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQuerySetters};
+pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
+pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters};
+pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
+pub use delete_chat_sticker_set::{DeleteChatStickerSet, DeleteChatStickerSetSetters};
+pub use delete_message::{DeleteMessage, DeleteMessageSetters};
+pub use delete_sticker_from_set::{DeleteStickerFromSet, DeleteStickerFromSetSetters};
+pub use delete_webhook::{DeleteWebhook, DeleteWebhookSetters};
+pub use edit_message_caption::{EditMessageCaption, EditMessageCaptionSetters};
+pub use edit_message_caption_inline::{EditMessageCaptionInline, EditMessageCaptionInlineSetters};
+pub use edit_message_live_location::{EditMessageLiveLocation, EditMessageLiveLocationSetters};
+pub use edit_message_live_location_inline::{
+    EditMessageLiveLocationInline, EditMessageLiveLocationInlineSetters,
+};
+pub use edit_message_media::{EditMessageMedia, EditMessageMediaSetters};
+pub use edit_message_media_inline::{EditMessageMediaInline, EditMessageMediaInlineSetters};
+pub use edit_message_reply_markup::{EditMessageReplyMarkup, EditMessageReplyMarkupSetters};
+pub use edit_message_reply_markup_inline::{
+    EditMessageReplyMarkupInline, EditMessageReplyMarkupInlineSetters,
+};
+pub use edit_message_text::{EditMessageText, EditMessageTextSetters};
+pub use edit_message_text_inline::{EditMessageTextInline, EditMessageTextInlineSetters};
+pub use export_chat_invite_link::{ExportChatInviteLink, ExportChatInviteLinkSetters};
+pub use forward_message::{ForwardMessage, ForwardMessageSetters};
+pub use get_chat::{GetChat, GetChatSetters};
+pub use get_chat_administrators::{GetChatAdministrators, GetChatAdministratorsSetters};
+pub use get_chat_member::{GetChatMember, GetChatMemberSetters};
+pub use get_chat_members_count::{GetChatMembersCount, GetChatMembersCountSetters};
+pub use get_file::{GetFile, GetFileSetters};
 pub use get_me::{GetMe, GetMeSetters};
+pub use get_my_commands::{GetMyCommands, GetMyCommandsSetters};
+pub use get_sticker_set::{GetStickerSet, GetStickerSetSetters};
+pub use get_updates::{GetUpdates, GetUpdatesSetters};
+pub use get_user_profile_photos::{GetUserProfilePhotos, GetUserProfilePhotosSetters};
+pub use get_webhook_info::{GetWebhookInfo, GetWebhookInfoSetters};
+pub use kick_chat_member::{KickChatMember, KickChatMemberSetters};
+pub use leave_chat::{LeaveChat, LeaveChatSetters};
+pub use pin_chat_message::{PinChatMessage, PinChatMessageSetters};
+pub use promote_chat_member::{PromoteChatMember, PromoteChatMemberSetters};
+pub use restrict_chat_member::{RestrictChatMember, RestrictChatMemberSetters};
+pub use send_animation::{SendAnimation, SendAnimationSetters};
+pub use send_audio::{SendAudio, SendAudioSetters};
+pub use send_chat_action::{SendChatAction, SendChatActionSetters};
+pub use send_contact::{SendContact, SendContactSetters};
+pub use send_dice::{SendDice, SendDiceSetters};
+pub use send_document::{SendDocument, SendDocumentSetters};
+pub use send_invoice::{SendInvoice, SendInvoiceSetters};
+pub use send_location::{SendLocation, SendLocationSetters};
+pub use send_media_group::{SendMediaGroup, SendMediaGroupSetters};
 pub use send_message::{SendMessage, SendMessageSetters};
+pub use send_photo::{SendPhoto, SendPhotoSetters};
+pub use send_poll::{SendPoll, SendPollSetters};
+pub use send_sticker::{SendSticker, SendStickerSetters};
+pub use send_venue::{SendVenue, SendVenueSetters};
+pub use send_video::{SendVideo, SendVideoSetters};
+pub use send_video_note::{SendVideoNote, SendVideoNoteSetters};
+pub use send_voice::{SendVoice, SendVoiceSetters};
+pub use set_chat_administrator_custom_title::{
+    SetChatAdministratorCustomTitle, SetChatAdministratorCustomTitleSetters,
+};
+pub use set_chat_description::{SetChatDescription, SetChatDescriptionSetters};
+pub use set_chat_permissions::{SetChatPermissions, SetChatPermissionsSetters};
+pub use set_chat_photo::{SetChatPhoto, SetChatPhotoSetters};
+pub use set_chat_sticker_set::{SetChatStickerSet, SetChatStickerSetSetters};
+pub use set_chat_title::{SetChatTitle, SetChatTitleSetters};
+pub use set_my_commands::{SetMyCommands, SetMyCommandsSetters};
+pub use set_passport_data_errors::{SetPassportDataErrors, SetPassportDataErrorsSetters};
+pub use set_sticker_position_in_set::{SetStickerPositionInSet, SetStickerPositionInSetSetters};
+pub use set_sticker_set_thumb::{SetStickerSetThumb, SetStickerSetThumbSetters};
+pub use set_webhook::{SetWebhook, SetWebhookSetters};
+pub use stop_message_live_location::{StopMessageLiveLocation, StopMessageLiveLocationSetters};
+pub use stop_message_live_location_inline::{
+    StopMessageLiveLocationInline, StopMessageLiveLocationInlineSetters,
+};
+pub use stop_poll::{StopPoll, StopPollSetters};
+pub use unban_chat_member::{UnbanChatMember, UnbanChatMemberSetters};
+pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
+pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
new file mode 100644
index 00000000..43aff985
--- /dev/null
+++ b/src/payloads/pin_chat_message.rs
@@ -0,0 +1,23 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to pin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub PinChatMessage (PinChatMessageSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Identifier of a message to pin
+            pub message_id: i64,
+        }
+        optional {
+            /// Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels.
+            pub disable_notification: bool,
+        }
+    }
+}
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
new file mode 100644
index 00000000..f79afc4e
--- /dev/null
+++ b/src/payloads/promote_chat_member.rs
@@ -0,0 +1,37 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to promote or demote a user in a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Pass _False_ for all boolean parameters to demote a user. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub PromoteChatMember (PromoteChatMemberSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+        }
+        optional {
+            /// Pass True, if the administrator can change chat title, photo and other settings
+            pub can_change_info: bool,
+            /// Pass True, if the administrator can create channel posts, channels only
+            pub can_post_messages: bool,
+            /// Pass True, if the administrator can edit messages of other users and can pin messages, channels only
+            pub can_edit_messages: bool,
+            /// Pass True, if the administrator can delete messages of other users
+            pub can_delete_messages: bool,
+            /// Pass True, if the administrator can invite new users to the chat
+            pub can_invite_users: bool,
+            /// Pass True, if the administrator can restrict, ban or unban chat members
+            pub can_restrict_members: bool,
+            /// Pass True, if the administrator can pin messages, supergroups only
+            pub can_pin_messages: bool,
+            /// Pass True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by him)
+            pub can_promote_members: bool,
+        }
+    }
+}
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
new file mode 100644
index 00000000..3cce3797
--- /dev/null
+++ b/src/payloads/restrict_chat_member.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, ChatPermissions, True};
+
+impl_payload! {
+    /// Use this method to restrict a user in a supergroup. The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights. Pass _True_ for all permissions to lift restrictions from a user. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub RestrictChatMember (RestrictChatMemberSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+            /// A JSON-serialized object for new user permissions
+            pub permissions: ChatPermissions,
+        }
+        optional {
+            /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
+            pub until_date: u64,
+        }
+    }
+}
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
new file mode 100644
index 00000000..81741c9b
--- /dev/null
+++ b/src/payloads/send_animation.rs
@@ -0,0 +1,52 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). On success, the sent [`Message`] is returned. Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendAnimation (SendAnimationSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Animation to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub animation: InputFile,
+            /// Animation caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Duration of the animation in seconds
+            pub duration: u32,
+            /// Animation width
+            pub width: u32,
+            /// Animation height
+            pub height: u32,
+            /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+            /// Mode for parsing entities in the animation caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
new file mode 100644
index 00000000..2992df9b
--- /dev/null
+++ b/src/payloads/send_audio.rs
@@ -0,0 +1,55 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send audio files, if you want Telegram clients to display them in the music player. Your audio must be in the .MP3 or .M4A format. On success, the sent [`Message`] is returned. Bots can currently send audio files of up to 50 MB in size, this limit may be changed in the future.
+    ///
+    /// For sending voice messages, use the [`SendVoice`] method instead.
+    ///
+    /// [`SendVoice`]: crate::payloads::SendVoice
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendAudio (SendAudioSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub audio: InputFile,
+            /// Audio caption, 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the audio caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Duration of the audio in seconds
+            pub duration: u32,
+            /// Performer
+            pub performer: String [into],
+            /// Track name
+            pub title: String [into],
+            /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
new file mode 100644
index 00000000..9d012a7e
--- /dev/null
+++ b/src/payloads/send_chat_action.rs
@@ -0,0 +1,33 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatAction, ChatId, Message};
+
+impl_payload! {
+    /// Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns True on success.
+    ///
+    /// > Example: The [ImageBot] needs some time to process a request and upload the image. Instead of sending a text message along the lines of “Retrieving image, please wait…”, the bot may use sendChatAction with action = upload_photo. The user will see a “sending photo” status for the bot.
+    ///
+    /// We only recommend using this method when a response from the bot will take a **noticeable** amount of time to arrive.
+    ///
+    /// [ImageBot]: https://t.me/imagebot
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendChatAction (SendChatActionSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
+            ///
+            /// [audio files]: crate::payloads::SendAudio
+            /// [video notes]: crate::payloads::SendVideoNote
+            /// [videos]: crate::payloads::SendVideo
+            /// [location data]: crate::payloads::SendLocation
+            /// [text messages]: crate::payloads::SendMessage
+            /// [general files]: crate::payloads::SendDocument
+            /// [photos]: crate::payloads::SendPhoto
+            pub action: ChatAction,
+        }
+    }
+}
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
new file mode 100644
index 00000000..3d3d75de
--- /dev/null
+++ b/src/payloads/send_contact.rs
@@ -0,0 +1,42 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub SendContact (SendContactSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Contact's phone number
+            pub phone_number: f64,
+            /// Contact's first name
+            pub first_name: f64,
+        }
+        optional {
+            /// Contact's last name
+            pub last_name: String [into],
+            /// Additional data about the contact in the form of a [vCard], 0-2048 bytes
+            ///
+            /// [vCard]: https://en.wikipedia.org/wiki/VCard
+            pub vcard: String [into],
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
new file mode 100644
index 00000000..6fb35e15
--- /dev/null
+++ b/src/payloads/send_dice.rs
@@ -0,0 +1,34 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, DiceEmoji, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send an animated emoji that will display a random value. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendDice (SendDiceSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲”
+            pub emoji: DiceEmoji,
+        }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
new file mode 100644
index 00000000..206281c7
--- /dev/null
+++ b/src/payloads/send_document.rs
@@ -0,0 +1,46 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send general files. On success, the sent [`Message`] is returned. Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendDocument (SendDocumentSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// File to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub document: InputFile,
+            /// Document caption (may also be used when resending documents by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+            /// Mode for parsing entities in the audio caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
new file mode 100644
index 00000000..1b9afc4d
--- /dev/null
+++ b/src/payloads/send_invoice.rs
@@ -0,0 +1,71 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InlineKeyboardMarkup, LabeledPrice, Message};
+
+impl_payload! {
+    /// Use this method to send invoices. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendInvoice (SendInvoiceSetters) => Message {
+        required {
+            /// Unique identifier for the target private chat
+            pub chat_id: u32,
+            /// Product name, 1-32 characters
+            pub title: String [into],
+            /// Product description, 1-255 characters
+            pub description: String [into],
+            /// Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes.
+            pub payload: String [into],
+            /// Payments provider token, obtained via [Botfather]
+            ///
+            /// [Botfather]: https://t.me/botfather
+            pub provider_token: String [into],
+            /// Unique deep-linking parameter that can be used to generate this invoice when used as a start parameter
+            pub start_parameter: String [into],
+            /// Three-letter ISO 4217 currency code, see more on currencies
+            pub currency: String [into],
+            /// Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
+            pub prices: Vec<LabeledPrice> [collect],
+        }
+        optional {
+            /// A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.
+            pub provider_data: String [into],
+            /// URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
+            pub photo_url: String [into],
+            /// Photo size
+            pub photo_size: String [into],
+            /// Photo width
+            pub photo_width: String [into],
+            /// Photo height
+            pub photo_height: String [into],
+            /// Pass _True_, if you require the user's full name to complete the order
+            pub need_name: bool,
+            /// Pass _True_, if you require the user's phone number to complete the order
+            pub need_phone_number: bool,
+            /// Pass _True_, if you require the user's email address to complete the order
+            pub need_email: bool,
+            /// Pass _True_, if you require the user's shipping address to complete the order
+            pub need_shipping_address: bool,
+            /// Pass _True_, if user's phone number should be sent to provider
+            pub send_phone_number_to_provider: bool,
+            /// Pass _True_, if user's email address should be sent to provider
+            pub send_email_to_provider: bool,
+            /// Pass _True_, if the final price depends on the shipping method
+            pub is_flexible: bool,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// A JSON-serialized object for an [inline keyboard]. If empty, one 'Pay `total price`' button will be shown. If not empty, the first button must be a Pay button.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
new file mode 100644
index 00000000..45a988ce
--- /dev/null
+++ b/src/payloads/send_location.rs
@@ -0,0 +1,40 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send point on the map. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub SendLocation (SendLocationSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Latitude of the location
+            pub latitude: f64,
+            /// Longitude of the location
+            pub longitude: f64,
+            /// Period in seconds for which the location will be updated (see [Live Locations], should be between 60 and 86400.
+            ///
+            /// [Live Locations]: https://telegram.org/blog/live-locations
+            pub live_period: u32,
+        }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
new file mode 100644
index 00000000..30a01a1e
--- /dev/null
+++ b/src/payloads/send_media_group.rs
@@ -0,0 +1,29 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputMedia, Message};
+
+impl_payload! {
+    /// Use this method to send a group of photos or videos as an album. On success, an array of the sent [`Message`]s is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendMediaGroup (SendMediaGroupSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// A JSON-serialized array describing photos and videos to be sent, must include 2-10 items
+            pub media: Vec<InputMedia> [collect],
+        }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+        }
+    }
+}
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 5262fb0d..ece90beb 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,42 +1,40 @@
-use serde::{Deserialize, Serialize};
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
 
 use crate::types::{ChatId, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    /// Use this method to send text messages.
-    ///
-    /// On success, the sent [`Message`] is returned.
+    /// Use this method to send text messages. On success, the sent [`Message`] is returned.
     ///
     /// [`Message`]: crate::types::Message
-    #[serde_with_macros::skip_serializing_none]
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendMessage (SendMessageSetters) => Message {
         required {
-            ///	Unique identifier for the target chat or username of the target channel
-            /// (in the format `@channelusername`)
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// Text of the message to be sent
+            /// Text of the message to be sent, 1-4096 characters after entities parsing
             pub text: String [into],
         }
         optional {
-            /// Send [Markdown] or [HTML], if you want Telegram apps to show
-            /// [bold, italic, fixed-width text or inline URLs] in your bot's message.
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
             ///
-            /// [Markdown]: crate::types::ParseMode::Markdown
-            /// [HTML]: crate::types::ParseMode::HTML
-            /// [bold, italic, fixed-width text or inline URLs]: crate::types::ParseMode
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
             /// Disables link previews for links in this message
             pub disable_web_page_preview: bool,
-            /// Sends the message silently.
-            /// Users will receive a notification with no sound.
-            pub disable_notification: bool,
-            /// If the message is a reply, [id] of the original message
+            /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
-            /// [id]: crate::types::Message::id
-            pub reply_to_message_id: i32,
-            /// Additional interface options.
-            pub reply_markup: ReplyMarkup,
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
         }
     }
 }
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
new file mode 100644
index 00000000..dc6ad339
--- /dev/null
+++ b/src/payloads/send_photo.rs
@@ -0,0 +1,42 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send photos. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendPhoto (SendPhotoSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Photo to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub photo: InputFile,
+            /// Photo caption (may also be used when resending photos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the photo caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
new file mode 100644
index 00000000..8011d77b
--- /dev/null
+++ b/src/payloads/send_poll.rs
@@ -0,0 +1,56 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ParseMode, PollType, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendPoll (SendPollSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Poll question, 1-255 characters
+            pub question: String [into],
+            /// A JSON-serialized list of answer options, 2-10 strings 1-100 characters each
+            pub options: Vec<String> [collect],
+            /// Poll type, “quiz” or “regular”, defaults to “regular”
+            pub type_: PollType,
+        }
+        optional {
+            /// True, if the poll needs to be anonymous, defaults to True
+            pub is_anonymous: bool,
+            /// True, if the poll allows multiple answers, ignored for polls in quiz mode, defaults to False
+            pub allows_multiple_answers: bool,
+            /// 0-based identifier of the correct answer option, required for polls in quiz mode
+            pub correct_option_id: u8,
+            /// Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line feeds after entities parsing
+            pub explanation: String [into],
+            /// Mode for parsing entities in the message text. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub explanation_parse_mode: ParseMode,
+            /// Amount of time in seconds the poll will be active after creation, 5-600. Can't be used together with close_date.
+            pub open_period: u16,
+            /// Point in time (Unix timestamp) when the poll will be automatically closed. Must be at least 5 and no more than 600 seconds in the future. Can't be used together with open_period.
+            pub close_date: u64,
+            /// Pass True, if the poll needs to be immediately closed. This can be useful for poll preview.
+            pub is_closed: bool,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
new file mode 100644
index 00000000..8a797b6e
--- /dev/null
+++ b/src/payloads/send_sticker.rs
@@ -0,0 +1,36 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send static .WEBP or [animated] .TGS stickers. On success, the sent Message is returned.
+    ///
+    /// [animated]: https://telegram.org/blog/animated-stickers
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendSticker (SendStickerSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Sticker to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub sticker: InputFile,
+        }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
new file mode 100644
index 00000000..f8394ec3
--- /dev/null
+++ b/src/payloads/send_venue.rs
@@ -0,0 +1,44 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send information about a venue. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub SendVenue (SendVenueSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Latitude of new location
+            pub latitude: f64,
+            /// Longitude of new location
+            pub longitude: f64,
+            /// Name of the venue
+            pub title: String [into],
+            /// Address of the venue
+            pub address: String [into],
+        }
+        optional {
+            /// Foursquare identifier of the venue
+            pub foursquare_id: String [into],
+            /// Foursquare type of the venue, if known. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
+            pub foursquare_type: String [into],
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
new file mode 100644
index 00000000..a23bb980
--- /dev/null
+++ b/src/payloads/send_video.rs
@@ -0,0 +1,55 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send video files of up to 50 MB in size, this limit may be changed in the future.
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`Document`]: crate::types::Document
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendVideo (SendVideoSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Video to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub video: InputFile,
+            /// Video caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Duration of the video in seconds
+            pub duration: u32,
+            /// Video width
+            pub width: u32,
+            /// Video height
+            pub height: u32,
+            /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+            /// Mode for parsing entities in the video caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Pass _True_, if the uploaded video is suitable for streaming
+            pub supports_streaming: bool,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
new file mode 100644
index 00000000..282c990a
--- /dev/null
+++ b/src/payloads/send_video_note.rs
@@ -0,0 +1,45 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
+
+impl_payload! {
+    /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [v.4.0]: https://core.telegram.org/bots/api#document
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendVideoNote (SendVideoNoteSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Video note to send. Pass a file_id as String to send a video note that exists on the Telegram servers (recommended) or upload a new video using multipart/form-data. [More info on Sending Files »]. Sending video notes by a URL is currently unsupported
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub video_note: InputFile,
+        }
+        optional {
+            /// Duration of the video in seconds
+            pub duration: u32,
+            /// Video width and height, i.e. diameter of the video message
+            pub length: u32,
+            /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
new file mode 100644
index 00000000..0a27dfa4
--- /dev/null
+++ b/src/payloads/send_voice.rs
@@ -0,0 +1,46 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`Document`]: crate::types::Document
+    /// [`Audio`]: crate::types::Audio
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendVoice (SendVoiceSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub voice: InputFile,
+            /// Voice message caption, 0-1024 characters after entities parsing
+            pub caption: String [into],
+        }
+        optional {
+            /// Mode for parsing entities in the voice message caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// Duration of the voice message in seconds
+            pub duration: u32,
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i64,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
new file mode 100644
index 00000000..144f0f9d
--- /dev/null
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to set a custom title for an administrator in a supergroup promoted by the bot. Returns _True_on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatAdministratorCustomTitle (SetChatAdministratorCustomTitleSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+            /// New custom title for the administrator; 0-16 characters, emoji are not allowed
+            pub custom_title: String [into],
+        }
+    }
+}
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
new file mode 100644
index 00000000..f42c7908
--- /dev/null
+++ b/src/payloads/set_chat_description.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to change the description of a group, a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatDescription (SetChatDescriptionSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+        optional {
+            /// New chat description, 0-255 characters
+            pub description: String [into],
+        }
+    }
+}
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
new file mode 100644
index 00000000..1b2e0ea4
--- /dev/null
+++ b/src/payloads/set_chat_permissions.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, ChatPermissions, True};
+
+impl_payload! {
+    /// Use this method to set default chat permissions for all members. The bot must be an administrator in the group or a supergroup for this to work and must have the _can_restrict_members_ admin rights. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatPermissions (SetChatPermissionsSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// New default chat permissions
+            pub permissions: ChatPermissions,
+        }
+    }
+}
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
new file mode 100644
index 00000000..cbeeba58
--- /dev/null
+++ b/src/payloads/set_chat_photo.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InputFile};
+
+impl_payload! {
+    /// Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatPhoto (SetChatPhotoSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// New chat photo, uploaded using multipart/form-data
+            pub photo: InputFile,
+        }
+    }
+}
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
new file mode 100644
index 00000000..42e0e8e8
--- /dev/null
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to set a new group sticker set for a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field _can\_set\_sticker\_set_ optionally returned in getChat requests to check if the bot can use this method. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatStickerSet (SetChatStickerSetSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Name of the sticker set to be set as the group sticker set
+            pub sticker_set_name: String [into],
+        }
+    }
+}
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
new file mode 100644
index 00000000..9c1982c7
--- /dev/null
+++ b/src/payloads/set_chat_title.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to change the title of a chat. Titles can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetChatTitle (SetChatTitleSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// New chat title, 1-255 characters
+            pub title: String [into],
+        }
+    }
+}
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
new file mode 100644
index 00000000..4224b9f1
--- /dev/null
+++ b/src/payloads/set_my_commands.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::BotCommand;
+
+impl_payload! {
+    /// Use this method to change the list of the bot's commands. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetMyCommands (SetMyCommandsSetters) => u32 {
+        required {
+            /// A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most 100 commands can be specified.
+            pub commands: Vec<BotCommand> [collect],
+        }
+    }
+}
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
new file mode 100644
index 00000000..686b63b4
--- /dev/null
+++ b/src/payloads/set_passport_data_errors.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{PassportElementError, True};
+
+impl_payload! {
+    /// Informs a user that some of the Telegram Passport elements they provided contains errors. The user will not be able to re-submit their Passport to you until the errors are fixed (the contents of the field for which you returned the error must change). Returns _True_ on success.
+    ///
+    /// Use this if the data submitted by the user doesn't satisfy the standards your service requires for any reason. For example, if a birthday date seems invalid, a submitted document is blurry, a scan shows evidence of tampering, etc. Supply some details in the error message to make sure the user knows how to correct the issues.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetPassportDataErrors (SetPassportDataErrorsSetters) => True {
+        required {
+            /// User identifier
+            pub user_id: u32,
+            /// A JSON-serialized array describing the errors
+            pub errors: Vec<PassportElementError> [collect],
+        }
+    }
+}
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
new file mode 100644
index 00000000..05ef8b1c
--- /dev/null
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to move a sticker in a set created by the bot to a specific position. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetStickerPositionInSet (SetStickerPositionInSetSetters) => True {
+        required {
+            /// File identifier of the sticker
+            pub sticker: String [into],
+            /// New sticker position in the set, zero-based
+            pub position: u32,
+        }
+    }
+}
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
new file mode 100644
index 00000000..a9cef002
--- /dev/null
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{InputFile, True};
+
+impl_payload! {
+    /// Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetStickerSetThumb (SetStickerSetThumbSetters) => True {
+        required {
+            /// Name of the sticker set
+            pub name: String [into],
+            /// User identifier of sticker file owner
+            pub user_id: u32,
+        }
+        optional {
+            /// A **PNG** image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a **TGS** animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]. Animated sticker set thumbnail can't be uploaded via HTTP URL.
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub thumb: InputFile,
+        }
+    }
+}
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
new file mode 100644
index 00000000..c3c8c53f
--- /dev/null
+++ b/src/payloads/set_webhook.rs
@@ -0,0 +1,35 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{AllowedUpdate, InputFile, True};
+
+impl_payload! {
+    /// Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized [`Update`]. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
+    ///
+    /// If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. `https://www.example.com/<token>`. Since nobody else knows your bot's token, you can be pretty sure it's us.
+    ///
+    /// [`Update`]: crate::types::Update
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetWebhook (SetWebhookSetters) => True {
+        required {
+            /// HTTPS url to send updates to. Use an empty string to remove webhook integration
+            pub url: String [into],
+            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
+            ///
+            /// Please note that this parameter doesn't affect updates created before the call to the setWebhook, so unwanted updates may be received for a short period of time.
+            ///
+            /// [`Update`]: crate::types::Update
+            pub allowed_updates: Vec<AllowedUpdate> [collect],
+        }
+        optional {
+            /// Upload your public key certificate so that the root certificate in use can be checked. See our [self-signed guide] for details.
+            ///
+            /// [self-signed guide]: https://core.telegram.org/bots/self-signed
+            pub certificate: InputFile,
+            /// Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery, 1-100. Defaults to 40. Use lower values to limit the load on your bot's server, and higher values to increase your bot's throughput.
+            pub max_connections: u8,
+        }
+    }
+}
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 110698ae..98b55c80 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1 +1,34 @@
-pub use crate::payloads::{GetMeSetters as _, SendMessageSetters as _};
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+
+#[doc(no_inline)]
+pub use crate::payloads::{
+    AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
+    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
+    CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _,
+    DeleteMessageSetters as _, DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _,
+    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
+    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
+    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
+    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
+    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
+    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    GetChatAdministratorsSetters as _, GetChatMemberSetters as _, GetChatMembersCountSetters as _,
+    GetChatSetters as _, GetFileSetters as _, GetMeSetters as _, GetMyCommandsSetters as _,
+    GetStickerSetSetters as _, GetUpdatesSetters as _, GetUserProfilePhotosSetters as _,
+    GetWebhookInfoSetters as _, KickChatMemberSetters as _, LeaveChatSetters as _,
+    PinChatMessageSetters as _, PromoteChatMemberSetters as _, RestrictChatMemberSetters as _,
+    SendAnimationSetters as _, SendAudioSetters as _, SendChatActionSetters as _,
+    SendContactSetters as _, SendDiceSetters as _, SendDocumentSetters as _,
+    SendInvoiceSetters as _, SendLocationSetters as _, SendMediaGroupSetters as _,
+    SendMessageSetters as _, SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _,
+    SendVenueSetters as _, SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
+    SetChatAdministratorCustomTitleSetters as _, SetChatDescriptionSetters as _,
+    SetChatPermissionsSetters as _, SetChatPhotoSetters as _, SetChatStickerSetSetters as _,
+    SetChatTitleSetters as _, SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
+    SetStickerPositionInSetSetters as _, SetStickerSetThumbSetters as _, SetWebhookSetters as _,
+    StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
+    StopPollSetters as _, UnbanChatMemberSetters as _, UnpinChatMessageSetters as _,
+    UploadStickerFileSetters as _,
+};
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
new file mode 100644
index 00000000..bec8af47
--- /dev/null
+++ b/src/payloads/stop_message_live_location.rs
@@ -0,0 +1,35 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
+    ///
+    /// See also: [`StopMessageLiveLocationInline`](crate::payloads::StopMessageLiveLocationInline)
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub StopMessageLiveLocation (StopMessageLiveLocationSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+            /// Latitude of new location
+            pub latitude: f64,
+            /// Longitude of new location
+            pub longitude: f64,
+        }
+        optional {
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
new file mode 100644
index 00000000..b9b7c40c
--- /dev/null
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -0,0 +1,32 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{Message, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, True is returned.
+    ///
+    /// See also: [`StopMessageLiveLocation`](crate::payloads::StopMessageLiveLocation)
+    ///
+    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub StopMessageLiveLocationInline (StopMessageLiveLocationInlineSetters) => Message {
+        required {
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+            /// Latitude of new location
+            pub latitude: f64,
+            /// Longitude of new location
+            pub longitude: f64,
+        }
+        optional {
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
new file mode 100644
index 00000000..fc624c05
--- /dev/null
+++ b/src/payloads/stop_poll.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, InlineKeyboardMarkup, Poll};
+
+impl_payload! {
+    /// Use this method to stop a poll which was sent by the bot. On success, the stopped Poll with the final results is returned.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub StopPoll (StopPollSetters) => Poll {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
+            pub chat_id: ChatId [into],
+            /// Identifier of the message to edit
+            pub message_id: i64,
+        }
+        optional {
+            /// A JSON-serialized object for an [inline keyboard].
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: InlineKeyboardMarkup,
+        }
+    }
+}
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
new file mode 100644
index 00000000..83ba27d5
--- /dev/null
+++ b/src/payloads/unban_chat_member.rs
@@ -0,0 +1,19 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub UnbanChatMember (UnbanChatMemberSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: u32,
+        }
+    }
+}
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
new file mode 100644
index 00000000..dc6e35fe
--- /dev/null
+++ b/src/payloads/unpin_chat_message.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to unpin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub UnpinChatMessage (UnpinChatMessageSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
new file mode 100644
index 00000000..46e8976e
--- /dev/null
+++ b/src/payloads/upload_sticker_file.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{File, InputFile};
+
+impl_payload! {
+    /// Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub UploadStickerFile (UploadStickerFileSetters) => File {
+        required {
+            /// User identifier of sticker file owner
+            pub user_id: u32,
+            /// PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            pub png_sticker: InputFile,
+        }
+    }
+}

From f0609c06bc8c06fbb8b9a232014f5b4846f75422 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 13 Nov 2020 19:15:09 +0300
Subject: [PATCH 145/755] Add docs for setters mod

---
 src/payloads/mod.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 2316d16e..3867431b 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,5 +1,10 @@
 //! Payloads - data types sended to relegram
 
+/// This module reexports all setters traits as `_`. When used with a glob import:
+/// ```
+/// use teloxide_core::payloads::setters::*;
+/// ```
+/// It allows you to use all payloads setters, without polluting your namespace.
 pub mod setters;
 
 // This block is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).

From 62b65cb7a64df30767de45720f21f223fc907d2b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 13 Nov 2020 20:47:47 +0300
Subject: [PATCH 146/755] clippy

---
 src/local_macros.rs                                 |  4 ++++
 src/payloads/add_sticker_to_set.rs                  |  2 +-
 src/payloads/answer_callback_query.rs               |  6 +++---
 src/payloads/answer_inline_query.rs                 |  2 +-
 src/payloads/answer_pre_checkout_query.rs           |  2 +-
 src/payloads/answer_shipping_query.rs               |  2 +-
 src/payloads/create_new_sticker_set.rs              |  2 +-
 src/payloads/delete_chat_photo.rs                   |  2 +-
 src/payloads/delete_chat_sticker_set.rs             |  2 +-
 src/payloads/delete_message.rs                      |  2 +-
 src/payloads/delete_sticker_from_set.rs             |  2 +-
 src/payloads/delete_webhook.rs                      |  4 ++--
 src/payloads/edit_message_caption.rs                |  2 +-
 src/payloads/edit_message_caption_inline.rs         |  2 +-
 src/payloads/edit_message_live_location.rs          |  4 ++--
 src/payloads/edit_message_live_location_inline.rs   |  2 +-
 src/payloads/edit_message_media.rs                  |  2 +-
 src/payloads/edit_message_media_inline.rs           |  2 +-
 src/payloads/edit_message_reply_markup.rs           |  2 +-
 src/payloads/edit_message_reply_markup_inline.rs    |  2 +-
 src/payloads/edit_message_text.rs                   |  2 +-
 src/payloads/edit_message_text_inline.rs            |  2 +-
 src/payloads/export_chat_invite_link.rs             |  2 +-
 src/payloads/forward_message.rs                     |  2 +-
 src/payloads/get_chat.rs                            |  2 +-
 src/payloads/get_chat_administrators.rs             |  2 +-
 src/payloads/get_chat_member.rs                     |  2 +-
 src/payloads/get_chat_members_count.rs              |  2 +-
 src/payloads/get_file.rs                            |  2 +-
 src/payloads/get_me.rs                              |  4 ++--
 src/payloads/get_my_commands.rs                     |  4 ++--
 src/payloads/get_sticker_set.rs                     |  2 +-
 src/payloads/get_updates.rs                         |  6 +++---
 src/payloads/get_user_profile_photos.rs             |  2 +-
 src/payloads/get_webhook_info.rs                    |  4 ++--
 src/payloads/kick_chat_member.rs                    |  2 +-
 src/payloads/leave_chat.rs                          |  2 +-
 src/payloads/mod.rs                                 |  3 ++-
 src/payloads/pin_chat_message.rs                    |  2 +-
 src/payloads/promote_chat_member.rs                 |  2 +-
 src/payloads/restrict_chat_member.rs                |  2 +-
 src/payloads/send_animation.rs                      |  4 ++--
 src/payloads/send_audio.rs                          |  6 +++---
 src/payloads/send_chat_action.rs                    | 10 +++++-----
 src/payloads/send_contact.rs                        |  2 +-
 src/payloads/send_dice.rs                           |  4 ++--
 src/payloads/send_document.rs                       |  2 +-
 src/payloads/send_invoice.rs                        |  2 +-
 src/payloads/send_location.rs                       |  4 ++--
 src/payloads/send_media_group.rs                    |  2 +-
 src/payloads/send_message.rs                        |  4 ++--
 src/payloads/send_photo.rs                          |  2 +-
 src/payloads/send_poll.rs                           |  2 +-
 src/payloads/send_sticker.rs                        |  4 ++--
 src/payloads/send_venue.rs                          |  4 ++--
 src/payloads/send_video.rs                          |  4 ++--
 src/payloads/send_video_note.rs                     |  4 ++--
 src/payloads/send_voice.rs                          |  4 ++--
 src/payloads/set_chat_administrator_custom_title.rs |  2 +-
 src/payloads/set_chat_description.rs                |  2 +-
 src/payloads/set_chat_permissions.rs                |  2 +-
 src/payloads/set_chat_photo.rs                      |  2 +-
 src/payloads/set_chat_sticker_set.rs                |  2 +-
 src/payloads/set_chat_title.rs                      |  2 +-
 src/payloads/set_my_commands.rs                     |  2 +-
 src/payloads/set_passport_data_errors.rs            |  2 +-
 src/payloads/set_sticker_position_in_set.rs         |  2 +-
 src/payloads/set_sticker_set_thumb.rs               |  2 +-
 src/payloads/set_webhook.rs                         |  2 +-
 src/payloads/stop_message_live_location.rs          |  4 ++--
 src/payloads/stop_message_live_location_inline.rs   |  2 +-
 src/payloads/stop_poll.rs                           |  2 +-
 src/payloads/unban_chat_member.rs                   |  2 +-
 src/payloads/unpin_chat_message.rs                  |  2 +-
 src/payloads/upload_sticker_file.rs                 |  2 +-
 75 files changed, 104 insertions(+), 99 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 1a60dcbf..9f6947b3 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -184,6 +184,10 @@ macro_rules! impl_payload {
         }
 
         impl $Method {
+            // We mirror telegram API and can't do anything with too many arguments
+            #[allow(clippy::too_many_arguments)]
+            // It's just easier for macros to generate such code
+            #[allow(clippy::redundant_field_names)]
             $vi fn new($($($fields : impl_payload!(@convert? $FTy $([$conv])?)),*)?) -> Self {
                 Self {
                     $(
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 518c780e..12a287cb 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 10a9e487..cc269c57 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,8 +10,8 @@ impl_payload! {
     ///
     /// >Alternatively, the user can be redirected to the specified Game URL. For this option to work, you must first create a game for your bot via [@Botfather] and accept the terms. Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open your bot with a parameter.
     ///
-    /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
     /// [@Botfather]: https://t.me/botfather
+    /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub AnswerCallbackQuery (AnswerCallbackQuerySetters) => True {
         required {
@@ -28,8 +28,8 @@ impl_payload! {
             /// Otherwise, you may use links like `t.me/your\_bot?start=XXXX` that open your bot with a parameter.
             ///
             /// [@Botfather]: https://t.me/botfather
-            /// [`Game`]: crate::types::Game
             /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
+            /// [`Game`]: crate::types::Game
             pub url: String [into],
             /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
             pub cache_time: u32,
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index f892959b..3c41547b 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index 8cfbd7d5..e5a2b4ff 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index 471b35b9..b04c3995 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index cbeb51a8..07d822c5 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index 2bd8a6cc..4a9672fd 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index e5ca6230..0acad4c9 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 039bcb38..a1eecabd 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index 2b6396aa..faa1b962 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index ae4907c4..22011bbf 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -9,7 +9,7 @@ impl_payload! {
     /// Use this method to remove webhook integration if you decide to switch back to [`GetUpdates`]. Returns True on success. Requires no parameters.
     ///
     /// [`GetUpdates`]: crate::payloads::GetUpdates
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub DeleteWebhook (DeleteWebhookSetters) => True {
 
     }
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 725986b9..822ab78c 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index de4b1ebb..9cc64ad9 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 8d22ea0b..076cf7c6 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -26,8 +26,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index cf26c12a..26d60b16 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 9fda6118..204ab1b0 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index bdc4fd53..e8dc7402 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 2103165e..c33a3d24 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 439b85dc..507b55c0 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index 94a1b7d4..fe366882 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 33837594..7ae99cb0 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index 8ced7840..d754f18c 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 70fc8a19..45c09eb3 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index cfc13aab..1cf35dab 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index c0eae482..422727a0 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index 008681c3..779c331a 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 3223c5fa..7c1e17c0 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 3037bbe6..267e9d4b 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index eef1103e..5cf408cf 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -9,7 +9,7 @@ impl_payload! {
     /// A simple method for testing your bot's auth token. Requires no parameters. Returns basic information about the bot in form of a [`User`] object.
     ///
     /// [`User`]: crate::types::User
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetMe (GetMeSetters) => User {
 
     }
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index a7ffb195..79759912 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -7,7 +7,7 @@ impl_payload! {
     /// Use this method to get the current list of the bot's commands. Requires no parameters. Returns Array of [`BotCommand`] on success.
     ///
     /// [`BotCommand`]: crate::types::BotCommand
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetMyCommands (GetMyCommandsSetters) => u32 {
 
     }
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index e0b061a1..9baec391 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index d7484c8e..a9ab9fe1 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,9 +8,9 @@ use crate::types::{AllowedUpdate, Update};
 impl_payload! {
     /// Use this method to receive incoming updates using long polling ([wiki]). An Array of [`Update`] objects is returned.
     ///
-    /// [`Update`]: crate::types::Update
     /// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    /// [`Update`]: crate::types::Update
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetUpdates (GetUpdatesSetters) => Vec<Update> {
 
         optional {
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index ac95ee08..73349590 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index 9430960d..f885b9e3 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,7 +10,7 @@ impl_payload! {
     ///
     /// [`GetUpdates`]: crate::payloads::GetUpdates
     /// [`WebhookInfo`]: crate::types::WebhookInfo
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetWebhookInfo (GetWebhookInfoSetters) => WebhookInfo {
 
     }
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index decbc8bf..49eaf2a0 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index e3c05bad..8c00a049 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 3867431b..171588be 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,6 +1,7 @@
 //! Payloads - data types sended to relegram
 
-/// This module reexports all setters traits as `_`. When used with a glob import:
+/// This module reexports all setters traits as `_`. When used with a glob
+/// import:
 /// ```
 /// use teloxide_core::payloads::setters::*;
 /// ```
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 43aff985..762c58de 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index f79afc4e..2badffea 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 3cce3797..c26fc645 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 81741c9b..d351e9e8 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -44,8 +44,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 2992df9b..3aad0cfd 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,8 +10,8 @@ impl_payload! {
     ///
     /// For sending voice messages, use the [`SendVoice`] method instead.
     ///
-    /// [`SendVoice`]: crate::payloads::SendVoice
     /// [`Message`]: crate::types::Message
+    /// [`SendVoice`]: crate::payloads::SendVoice
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendAudio (SendAudioSetters) => Message {
         required {
@@ -47,8 +47,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 9d012a7e..f7918b1b 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -20,13 +20,13 @@ impl_payload! {
             pub chat_id: ChatId [into],
             /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
-            /// [audio files]: crate::payloads::SendAudio
-            /// [video notes]: crate::payloads::SendVideoNote
             /// [videos]: crate::payloads::SendVideo
-            /// [location data]: crate::payloads::SendLocation
             /// [text messages]: crate::payloads::SendMessage
-            /// [general files]: crate::payloads::SendDocument
+            /// [video notes]: crate::payloads::SendVideoNote
             /// [photos]: crate::payloads::SendPhoto
+            /// [location data]: crate::payloads::SendLocation
+            /// [audio files]: crate::payloads::SendAudio
+            /// [general files]: crate::payloads::SendDocument
             pub action: ChatAction,
         }
     }
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 3d3d75de..24b09d8a 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 6fb35e15..51df0b75 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -26,8 +26,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 206281c7..c0317d9a 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 1b9afc4d..3cc12c5a 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 45a988ce..8cb63f3b 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 30a01a1e..77ebb879 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index ece90beb..cff316d5 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index dc6ad339..3495d48a 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 8011d77b..2d24d198 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 8a797b6e..6f102f33 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -28,8 +28,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index f8394ec3..b8774605 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -36,8 +36,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index a23bb980..bb704927 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 impl_payload! {
     /// Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send video files of up to 50 MB in size, this limit may be changed in the future.
     ///
-    /// [`Message`]: crate::types::Message
     /// [`Document`]: crate::types::Document
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVideo (SendVideoSetters) => Message {
         required {
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 282c990a..eb02474f 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -37,8 +37,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 0a27dfa4..51291852 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,9 +8,9 @@ use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 impl_payload! {
     /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
     ///
+    /// [`Audio`]: crate::types::Audio
     /// [`Message`]: crate::types::Message
     /// [`Document`]: crate::types::Document
-    /// [`Audio`]: crate::types::Audio
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVoice (SendVoiceSetters) => Message {
         required {
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 144f0f9d..684b83c0 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index f42c7908..f663d94a 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 1b2e0ea4..fb942cd6 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index cbeeba58..afba0e27 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 42e0e8e8..36a7126d 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 9c1982c7..bfb72e0d 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 4224b9f1..e8135915 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 686b63b4..88b93f47 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 05ef8b1c..84c18bb1 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index a9cef002..c86afa76 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index c3c8c53f..1870b93e 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index bec8af47..b56d0790 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,8 +10,8 @@ impl_payload! {
     ///
     /// See also: [`StopMessageLiveLocationInline`](crate::payloads::StopMessageLiveLocationInline)
     ///
-    /// [`Message`]: crate::types::Message
     /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Clone, Serialize)]
     pub StopMessageLiveLocation (StopMessageLiveLocationSetters) => Message {
         required {
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index b9b7c40c..559a51ca 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index fc624c05..ba3475e8 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 83ba27d5..86e1fd19 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index dc6e35fe..e4cd1a78 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 46e8976e..54875c17 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (bc65e6f).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;

From 79b5c41bb5de8d6e1d9d3f68984386bc2f8f0114 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Sun, 15 Nov 2020 10:51:36 +0300
Subject: [PATCH 147/755] Apply suggestions from code review

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/local_macros.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 9f6947b3..971b2fa5 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -184,9 +184,9 @@ macro_rules! impl_payload {
         }
 
         impl $Method {
-            // We mirror telegram API and can't do anything with too many arguments
+            // We mirror Telegram API and can't do anything with too many arguments.
             #[allow(clippy::too_many_arguments)]
-            // It's just easier for macros to generate such code
+            // It's just easier for macros to generate such code.
             #[allow(clippy::redundant_field_names)]
             $vi fn new($($($fields : impl_payload!(@convert? $FTy $([$conv])?)),*)?) -> Self {
                 Self {

From 5d576455d9f49152f02e5dfa3a5580569b707672 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 15 Nov 2020 11:17:33 +0300
Subject: [PATCH 148/755] fix user_id param type

---
 src/payloads/add_sticker_to_set.rs                  | 4 ++--
 src/payloads/answer_callback_query.rs               | 4 ++--
 src/payloads/answer_inline_query.rs                 | 4 ++--
 src/payloads/answer_pre_checkout_query.rs           | 2 +-
 src/payloads/answer_shipping_query.rs               | 2 +-
 src/payloads/create_new_sticker_set.rs              | 4 ++--
 src/payloads/delete_chat_photo.rs                   | 2 +-
 src/payloads/delete_chat_sticker_set.rs             | 2 +-
 src/payloads/delete_message.rs                      | 2 +-
 src/payloads/delete_sticker_from_set.rs             | 2 +-
 src/payloads/delete_webhook.rs                      | 2 +-
 src/payloads/edit_message_caption.rs                | 2 +-
 src/payloads/edit_message_caption_inline.rs         | 2 +-
 src/payloads/edit_message_live_location.rs          | 4 ++--
 src/payloads/edit_message_live_location_inline.rs   | 2 +-
 src/payloads/edit_message_media.rs                  | 2 +-
 src/payloads/edit_message_media_inline.rs           | 2 +-
 src/payloads/edit_message_reply_markup.rs           | 2 +-
 src/payloads/edit_message_reply_markup_inline.rs    | 2 +-
 src/payloads/edit_message_text.rs                   | 2 +-
 src/payloads/edit_message_text_inline.rs            | 2 +-
 src/payloads/export_chat_invite_link.rs             | 2 +-
 src/payloads/forward_message.rs                     | 2 +-
 src/payloads/get_chat.rs                            | 2 +-
 src/payloads/get_chat_administrators.rs             | 2 +-
 src/payloads/get_chat_member.rs                     | 4 ++--
 src/payloads/get_chat_members_count.rs              | 2 +-
 src/payloads/get_file.rs                            | 4 ++--
 src/payloads/get_me.rs                              | 2 +-
 src/payloads/get_my_commands.rs                     | 2 +-
 src/payloads/get_sticker_set.rs                     | 2 +-
 src/payloads/get_updates.rs                         | 2 +-
 src/payloads/get_user_profile_photos.rs             | 4 ++--
 src/payloads/get_webhook_info.rs                    | 2 +-
 src/payloads/kick_chat_member.rs                    | 4 ++--
 src/payloads/leave_chat.rs                          | 2 +-
 src/payloads/pin_chat_message.rs                    | 2 +-
 src/payloads/promote_chat_member.rs                 | 4 ++--
 src/payloads/restrict_chat_member.rs                | 4 ++--
 src/payloads/send_animation.rs                      | 2 +-
 src/payloads/send_audio.rs                          | 4 ++--
 src/payloads/send_chat_action.rs                    | 8 ++++----
 src/payloads/send_contact.rs                        | 2 +-
 src/payloads/send_dice.rs                           | 2 +-
 src/payloads/send_document.rs                       | 2 +-
 src/payloads/send_invoice.rs                        | 2 +-
 src/payloads/send_location.rs                       | 2 +-
 src/payloads/send_media_group.rs                    | 2 +-
 src/payloads/send_message.rs                        | 2 +-
 src/payloads/send_photo.rs                          | 4 ++--
 src/payloads/send_poll.rs                           | 2 +-
 src/payloads/send_sticker.rs                        | 4 ++--
 src/payloads/send_venue.rs                          | 2 +-
 src/payloads/send_video.rs                          | 4 ++--
 src/payloads/send_video_note.rs                     | 6 +++---
 src/payloads/send_voice.rs                          | 2 +-
 src/payloads/set_chat_administrator_custom_title.rs | 4 ++--
 src/payloads/set_chat_description.rs                | 2 +-
 src/payloads/set_chat_permissions.rs                | 2 +-
 src/payloads/set_chat_photo.rs                      | 2 +-
 src/payloads/set_chat_sticker_set.rs                | 2 +-
 src/payloads/set_chat_title.rs                      | 2 +-
 src/payloads/set_my_commands.rs                     | 2 +-
 src/payloads/set_passport_data_errors.rs            | 4 ++--
 src/payloads/set_sticker_position_in_set.rs         | 2 +-
 src/payloads/set_sticker_set_thumb.rs               | 4 ++--
 src/payloads/set_webhook.rs                         | 2 +-
 src/payloads/stop_message_live_location.rs          | 4 ++--
 src/payloads/stop_message_live_location_inline.rs   | 4 ++--
 src/payloads/stop_poll.rs                           | 2 +-
 src/payloads/unban_chat_member.rs                   | 4 ++--
 src/payloads/unpin_chat_message.rs                  | 2 +-
 src/payloads/upload_sticker_file.rs                 | 4 ++--
 73 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 12a287cb..7836bd43 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -11,7 +11,7 @@ impl_payload! {
     pub AddStickerToSet (AddStickerToSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: u32,
+            pub user_id: i32,
             /// Sticker set name
             pub name: String [into],
             /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index cc269c57..fda34ae4 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -28,8 +28,8 @@ impl_payload! {
             /// Otherwise, you may use links like `t.me/your\_bot?start=XXXX` that open your bot with a parameter.
             ///
             /// [@Botfather]: https://t.me/botfather
-            /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
             /// [`Game`]: crate::types::Game
+            /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
             pub url: String [into],
             /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
             pub cache_time: u32,
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index 3c41547b..7032695b 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -28,8 +28,8 @@ impl_payload! {
             ///
             /// _Example_: An inline bot that sends YouTube videos can ask the user to connect the bot to their YouTube account to adapt search results accordingly. To do this, it displays a 'Connect your YouTube account' button above the results, or even before showing any. The user presses the button, switches to a private chat with the bot and, in doing so, passes a start parameter that instructs the bot to return an oauth link. Once done, the bot can offer a [switch_inline] button so that the user can easily return to the chat where they wanted to use the bot's inline capabilities.
             ///
-            /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
             /// [switch_inline]: https://core.telegram.org/bots/api#inlinekeyboardmarkup
+            /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
             pub switch_pm_parameter: String [into],
         }
     }
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index e5a2b4ff..821bb4ae 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index b04c3995..a4fc80f7 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 07d822c5..93f945c4 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -11,7 +11,7 @@ impl_payload! {
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: u32,
+            pub user_id: i32,
             /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g., _animals_). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in _“\_by\_<bot username>”. <bot\_username>_ is case insensitive. 1-64 characters.
             pub name: String [into],
             /// Sticker set title, 1-64 characters
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index 4a9672fd..dc447a48 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index 0acad4c9..fef2f48b 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index a1eecabd..881b5003 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index faa1b962..ec8ca0fb 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index 22011bbf..3c6906af 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 822ab78c..37f4e924 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 9cc64ad9..fe94044f 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 076cf7c6..5e517259 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -26,8 +26,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 26d60b16..41bb41a8 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 204ab1b0..07b76417 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index e8dc7402..b5247819 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index c33a3d24..90254d04 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 507b55c0..0999db8a 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index fe366882..b3d0dc7f 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 7ae99cb0..d498d71c 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index d754f18c..d1d8ce6d 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 45c09eb3..29d627e8 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index 1cf35dab..ce6d6b87 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 422727a0..169987f2 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index 779c331a..22eb2aaf 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
         }
     }
 }
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 7c1e17c0..e353ff6d 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 267e9d4b..3dfdcfac 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::File;
 impl_payload! {
     /// Use this method to get basic info about a file and prepare it for downloading. For the moment, bots can download files of up to 20MB in size. On success, a [`File`] object is returned. The file can then be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>` is taken from the response. It is guaranteed that the link will be valid for at least 1 hour. When the link expires, a new one can be requested by calling [`GetFile`] again.
     ///
-    /// [`GetFile`]: crate::payloads::GetFile
     /// [`File`]: crate::types::File
+    /// [`GetFile`]: crate::payloads::GetFile
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub GetFile (GetFileSetters) => File {
         required {
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 5cf408cf..86cae760 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 79759912..405b6847 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index 9baec391..10ff4917 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index a9ab9fe1..514002da 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 73349590..590096e2 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
     pub GetUserProfilePhotos (GetUserProfilePhotosSetters) => UserProfilePhotos {
         required {
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
         }
         optional {
             /// Sequential number of the first photo to be returned. By default, all photos are returned.
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index f885b9e3..c342b2a0 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 49eaf2a0..835f33d3 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 8c00a049..4c4ee3e2 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 762c58de..e1410799 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 2badffea..71c8cbeb 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
         }
         optional {
             /// Pass True, if the administrator can change chat title, photo and other settings
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index c26fc645..81aa68ff 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
             /// A JSON-serialized object for new user permissions
             pub permissions: ChatPermissions,
         }
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index d351e9e8..0868d053 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 3aad0cfd..711d8236 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -47,8 +47,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index f7918b1b..d5a4a390 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -20,13 +20,13 @@ impl_payload! {
             pub chat_id: ChatId [into],
             /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
+            /// [audio files]: crate::payloads::SendAudio
+            /// [video notes]: crate::payloads::SendVideoNote
             /// [videos]: crate::payloads::SendVideo
             /// [text messages]: crate::payloads::SendMessage
-            /// [video notes]: crate::payloads::SendVideoNote
             /// [photos]: crate::payloads::SendPhoto
-            /// [location data]: crate::payloads::SendLocation
-            /// [audio files]: crate::payloads::SendAudio
             /// [general files]: crate::payloads::SendDocument
+            /// [location data]: crate::payloads::SendLocation
             pub action: ChatAction,
         }
     }
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 24b09d8a..b3f4e8fd 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 51df0b75..8f750ee8 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index c0317d9a..8cf41457 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 3cc12c5a..1b0fe5fa 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 8cb63f3b..9954d928 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 77ebb879..48bedf78 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index cff316d5..96d6bcb0 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 3495d48a..726d9bc9 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -34,8 +34,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 2d24d198..bc99ae45 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 6f102f33..3bdfd768 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -28,8 +28,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index b8774605..87dce49e 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index bb704927..5adf5aba 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -47,8 +47,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index eb02474f..25281eec 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 impl_payload! {
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
     ///
-    /// [`Message`]: crate::types::Message
     /// [v.4.0]: https://core.telegram.org/bots/api#document
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVideoNote (SendVideoNoteSetters) => Message {
         required {
@@ -37,8 +37,8 @@ impl_payload! {
             pub reply_to_message_id: i64,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 51291852..a9315683 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 684b83c0..414ca72f 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
             /// New custom title for the administrator; 0-16 characters, emoji are not allowed
             pub custom_title: String [into],
         }
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index f663d94a..35b88b3f 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index fb942cd6..2c3a5cf9 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index afba0e27..f72c682f 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 36a7126d..9c09328e 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index bfb72e0d..76b72b8d 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index e8135915..4916fb6a 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 88b93f47..74ab729a 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
     pub SetPassportDataErrors (SetPassportDataErrorsSetters) => True {
         required {
             /// User identifier
-            pub user_id: u32,
+            pub user_id: i32,
             /// A JSON-serialized array describing the errors
             pub errors: Vec<PassportElementError> [collect],
         }
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 84c18bb1..80fad985 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index c86afa76..b9301535 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
             /// Name of the sticker set
             pub name: String [into],
             /// User identifier of sticker file owner
-            pub user_id: u32,
+            pub user_id: i32,
         }
         optional {
             /// A **PNG** image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a **TGS** animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]. Animated sticker set thumbnail can't be uploaded via HTTP URL.
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 1870b93e..b04b5bbc 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index b56d0790..4e337d38 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -27,8 +27,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index 559a51ca..9b0813be 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -24,8 +24,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index ba3475e8..a12c9a01 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 86e1fd19..cd9e4fde 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: u32,
+            pub user_id: i32,
         }
     }
 }
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index e4cd1a78..dc78f594 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 54875c17..908f50a3 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (455146e).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -11,7 +11,7 @@ impl_payload! {
     pub UploadStickerFile (UploadStickerFileSetters) => File {
         required {
             /// User identifier of sticker file owner
-            pub user_id: u32,
+            pub user_id: i32,
             /// PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile

From 40bbfb05ea16a3e04efe10f461210c943545aa3e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 16 Nov 2020 02:48:24 +0300
Subject: [PATCH 149/755] fixup SendInvice::chat_id type

---
 src/payloads/send_invoice.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 1b0fe5fa..c9069c1f 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -13,7 +13,7 @@ impl_payload! {
     pub SendInvoice (SendInvoiceSetters) => Message {
         required {
             /// Unique identifier for the target private chat
-            pub chat_id: u32,
+            pub chat_id: i32,
             /// Product name, 1-32 characters
             pub title: String [into],
             /// Product description, 1-255 characters

From 19c375f5e01649c47f653792f4339b9f5d1d2a59 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 16 Nov 2020 12:58:55 +0300
Subject: [PATCH 150/755] fix message_id type

---
 src/payloads/delete_message.rs             | 2 +-
 src/payloads/edit_message_caption.rs       | 2 +-
 src/payloads/edit_message_live_location.rs | 2 +-
 src/payloads/edit_message_media.rs         | 2 +-
 src/payloads/edit_message_reply_markup.rs  | 2 +-
 src/payloads/edit_message_text.rs          | 2 +-
 src/payloads/forward_message.rs            | 2 +-
 src/payloads/pin_chat_message.rs           | 2 +-
 src/payloads/send_animation.rs             | 2 +-
 src/payloads/send_audio.rs                 | 2 +-
 src/payloads/send_contact.rs               | 2 +-
 src/payloads/send_dice.rs                  | 2 +-
 src/payloads/send_document.rs              | 2 +-
 src/payloads/send_invoice.rs               | 2 +-
 src/payloads/send_location.rs              | 2 +-
 src/payloads/send_media_group.rs           | 2 +-
 src/payloads/send_message.rs               | 2 +-
 src/payloads/send_photo.rs                 | 2 +-
 src/payloads/send_poll.rs                  | 2 +-
 src/payloads/send_sticker.rs               | 2 +-
 src/payloads/send_venue.rs                 | 2 +-
 src/payloads/send_video.rs                 | 2 +-
 src/payloads/send_video_note.rs            | 2 +-
 src/payloads/send_voice.rs                 | 2 +-
 src/payloads/stop_message_live_location.rs | 2 +-
 src/payloads/stop_poll.rs                  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 881b5003..cc94d937 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -22,7 +22,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to delete
-            pub message_id: i64,
+            pub message_id: i32,
         }
     }
 }
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 37f4e924..aafa4f69 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
             /// New caption of the message, 0-1024 characters after entities parsing
             pub caption: String [into],
         }
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 5e517259..727f46d4 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -17,7 +17,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
             /// Latitude of new location
             pub latitude: f64,
             /// Longitude of new location
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 07b76417..5e687339 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
             /// A JSON-serialized object for a new media content of the message
             pub media: InputMedia,
         }
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 90254d04..4deafeb4 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
         }
         optional {
             /// A JSON-serialized object for an [inline keyboard].
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index b3d0dc7f..00a8aa72 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -17,7 +17,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
             /// New text of the message, 1-4096 characters after entities parsing
             pub text: String [into],
         }
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 29d627e8..336004e6 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -17,7 +17,7 @@ impl_payload! {
             /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
             pub from_chat_id: ChatId [into],
             /// Message identifier in the chat specified in _from\_chat\_id_
-            pub message_id: i64,
+            pub message_id: i32,
         }
         optional {
             /// Sends the message [silently]. Users will receive a notification with no sound.
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index e1410799..73b03b5f 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Identifier of a message to pin
-            pub message_id: i64,
+            pub message_id: i32,
         }
         optional {
             /// Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels.
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 0868d053..168c5681 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -41,7 +41,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 711d8236..6c7e636c 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -44,7 +44,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index b3f4e8fd..6980c662 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -31,7 +31,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 8f750ee8..755b2b2f 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -23,7 +23,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 8cf41457..2d66f28e 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -35,7 +35,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index c9069c1f..292cb81a 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -61,7 +61,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// A JSON-serialized object for an [inline keyboard]. If empty, one 'Pay `total price`' button will be shown. If not empty, the first button must be a Pay button.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 9954d928..fbaef731 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -29,7 +29,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 48bedf78..3799557d 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -23,7 +23,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
         }
     }
 }
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 96d6bcb0..a4f30955 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -29,7 +29,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 726d9bc9..10eeb698 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -31,7 +31,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index bc99ae45..59f96801 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -45,7 +45,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 3bdfd768..fddf0ddb 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -25,7 +25,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 87dce49e..355806d1 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -33,7 +33,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 5adf5aba..c4b40121 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -44,7 +44,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 25281eec..47d5808a 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -34,7 +34,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index a9315683..bcea5f38 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -35,7 +35,7 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i64,
+            pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index 4e337d38..60c35d58 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
             /// Latitude of new location
             pub latitude: f64,
             /// Longitude of new location
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index a12c9a01..b0abacbb 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
-            pub message_id: i64,
+            pub message_id: i32,
         }
         optional {
             /// A JSON-serialized object for an [inline keyboard].

From fa0e86c547b804c42d41596d18cf2101fe1cb023 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 16 Nov 2020 14:14:00 +0300
Subject: [PATCH 151/755] Add internal ability to change API url

Recently, telegram has published [Telegram Bot API Server] - HTTP API <->
MTPROTO proxy which is used internally by telegram. Now it's possible to run
the server locally.

However currently it's not possible to use teloxide with such local server,
because API url is hardcoded into teloxide.

This commit makes _internall_ changes to allow setting the API url. It doesn't
yet allow to set the url from user code (i.e.: no changes in public API), in my
opinion such additions are blocked on some bot refactorings.

`Bot::api_url` is made `Option<Arc<str>>` to minimize costs in case of 'default
url' (probably the most common case).

Progress of this issue is tracked in https://github.com/teloxide/teloxide/issues/317

[Telegram Bot API Server]: https://github.com/tdlib/telegram-bot-api
---
 src/bot/mod.rs     | 18 +++++++++++++-----
 src/net/request.rs |  6 ++++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 5c46e992..56ef13b3 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -27,6 +27,7 @@ pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
 #[derive(Debug, Clone)]
 pub struct Bot {
     token: Arc<str>,
+    api_url: Option<Arc<str>>,
     client: Client,
     parse_mode: Option<ParseMode>,
 }
@@ -102,6 +103,7 @@ impl Bot {
     {
         Self {
             token: Into::<Arc<str>>::into(Into::<String>::into(token)),
+            api_url: None,
             client,
             parse_mode: None,
         }
@@ -119,13 +121,16 @@ impl Bot {
     {
         let client = self.client.clone();
         let token = Arc::clone(&self.token);
+        let api_url = self.api_url.clone();
 
         let params = serde_json::to_vec(payload)
             // this `expect` should be ok since we don't write request those may trigger error here
             .expect("serialization of request to be infallible");
 
-        // async move to capture client&token
-        async move { net::request_json2(&client, token.as_ref(), P::NAME, params).await }
+        // async move to capture client&token&api_url&params
+        async move {
+            net::request_json2(&client, token.as_ref(), api_url.as_deref(), P::NAME, params).await
+        }
     }
 
     pub(crate) fn execute_multipart<P>(
@@ -138,13 +143,15 @@ impl Bot {
     {
         let client = self.client.clone();
         let token = Arc::clone(&self.token);
+        let api_url = self.api_url.clone();
 
         let params = serde_multipart::to_form(payload);
 
-        // async move to capture client&token&params
+        // async move to capture client&token&api_url&params
         async move {
             let params = params.await?;
-            net::request_multipart2(&client, token.as_ref(), P::NAME, params).await
+            net::request_multipart2(&client, token.as_ref(), api_url.as_deref(), P::NAME, params)
+                .await
         }
     }
 }
@@ -281,8 +288,9 @@ impl BotBuilder {
     #[must_use]
     pub fn build(self) -> Bot {
         Bot {
-            client: self.client.unwrap_or_else(crate::client_from_env),
             token: self.token.unwrap_or_else(|| get_env(TELOXIDE_TOKEN)).into(),
+            api_url: None,
+            client: self.client.unwrap_or_else(crate::client_from_env),
             parse_mode: self.parse_mode,
         }
     }
diff --git a/src/net/request.rs b/src/net/request.rs
index 824fa03c..6a2a65b1 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -72,6 +72,7 @@ where
 pub async fn request_multipart2<T>(
     client: &Client,
     token: &str,
+    api_url: Option<&str>,
     method_name: &str,
     params: reqwest::multipart::Form,
 ) -> ResponseResult<T>
@@ -79,7 +80,7 @@ where
     T: DeserializeOwned,
 {
     let response = client
-        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .post(&super::method_url(api_url.unwrap_or(TELEGRAM_API_URL), token, method_name))
         .multipart(params)
         .send()
         .await
@@ -91,6 +92,7 @@ where
 pub async fn request_json2<T>(
     client: &Client,
     token: &str,
+    api_url: Option<&str>,
     method_name: &str,
     params: Vec<u8>,
 ) -> ResponseResult<T>
@@ -98,7 +100,7 @@ where
     T: DeserializeOwned,
 {
     let response = client
-        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .post(&super::method_url(api_url.unwrap_or(TELEGRAM_API_URL), token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
         .body(params)
         .send()

From 17b44db578ab7adaca3971f284f53c43a98d6d28 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 17 Nov 2020 22:38:30 +0300
Subject: [PATCH 152/755] Add `ApiUrl`

Add `ApiUrl` and also use `Url` instead of `&str` for urls to clean code
---
 src/bot/api_url.rs  | 17 +++++++++++++++++
 src/bot/mod.rs      | 15 +++++++--------
 src/net/download.rs | 14 ++++++++++----
 src/net/mod.rs      | 22 ++++++++++++----------
 src/net/request.rs  | 20 ++++++++++++++------
 5 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 src/bot/api_url.rs

diff --git a/src/bot/api_url.rs b/src/bot/api_url.rs
new file mode 100644
index 00000000..8c33a38f
--- /dev/null
+++ b/src/bot/api_url.rs
@@ -0,0 +1,17 @@
+#[derive(Debug, Clone)]
+pub(crate) enum ApiUrl {
+    Default,
+    #[allow(dead_code)]
+    Custom(reqwest::Url),
+}
+
+impl ApiUrl {
+    pub(crate) fn get(&self) -> reqwest::Url {
+        match self {
+            // FIXME(waffle): parse once
+            ApiUrl::Default => reqwest::Url::parse(crate::net::TELEGRAM_API_URL)
+                .expect("failed to parse default url"),
+            ApiUrl::Custom(url) => url.clone(),
+        }
+    }
+}
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 56ef13b3..bdba198b 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -7,6 +7,7 @@ use reqwest::{
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
+    bot::api_url::ApiUrl,
     net,
     requests::{Payload, ResponseResult},
     serde_multipart,
@@ -14,6 +15,7 @@ use crate::{
 };
 
 mod api;
+mod api_url;
 mod download;
 
 pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
@@ -27,7 +29,7 @@ pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
 #[derive(Debug, Clone)]
 pub struct Bot {
     token: Arc<str>,
-    api_url: Option<Arc<str>>,
+    api_url: ApiUrl,
     client: Client,
     parse_mode: Option<ParseMode>,
 }
@@ -103,7 +105,7 @@ impl Bot {
     {
         Self {
             token: Into::<Arc<str>>::into(Into::<String>::into(token)),
-            api_url: None,
+            api_url: ApiUrl::Default,
             client,
             parse_mode: None,
         }
@@ -128,9 +130,7 @@ impl Bot {
             .expect("serialization of request to be infallible");
 
         // async move to capture client&token&api_url&params
-        async move {
-            net::request_json2(&client, token.as_ref(), api_url.as_deref(), P::NAME, params).await
-        }
+        async move { net::request_json2(&client, token.as_ref(), api_url.get(), P::NAME, params).await }
     }
 
     pub(crate) fn execute_multipart<P>(
@@ -150,8 +150,7 @@ impl Bot {
         // async move to capture client&token&api_url&params
         async move {
             let params = params.await?;
-            net::request_multipart2(&client, token.as_ref(), api_url.as_deref(), P::NAME, params)
-                .await
+            net::request_multipart2(&client, token.as_ref(), api_url.get(), P::NAME, params).await
         }
     }
 }
@@ -289,7 +288,7 @@ impl BotBuilder {
     pub fn build(self) -> Bot {
         Bot {
             token: self.token.unwrap_or_else(|| get_env(TELOXIDE_TOKEN)).into(),
-            api_url: None,
+            api_url: ApiUrl::Default,
             client: self.client.unwrap_or_else(crate::client_from_env),
             parse_mode: self.parse_mode,
         }
diff --git a/src/net/download.rs b/src/net/download.rs
index aa54f4f0..3a507ad2 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -3,8 +3,6 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
 
 use crate::errors::DownloadError;
 
-use super::TELEGRAM_API_URL;
-
 pub async fn download_file<D>(
     client: &Client,
     token: &str,
@@ -15,7 +13,11 @@ where
     D: AsyncWrite + Unpin,
 {
     let mut res = client
-        .get(&super::file_url(TELEGRAM_API_URL, token, path))
+        .get(crate::net::file_url(
+            reqwest::Url::parse(crate::net::TELEGRAM_API_URL).expect("failed to parse default url"),
+            token,
+            path,
+        ))
         .send()
         .await?
         .error_for_status()?;
@@ -33,7 +35,11 @@ pub async fn download_file_stream(
     path: &str,
 ) -> Result<impl futures::Stream<Item = reqwest::Result<bytes::Bytes>>, reqwest::Error> {
     let res = client
-        .get(&super::file_url(TELEGRAM_API_URL, token, path))
+        .get(crate::net::file_url(
+            reqwest::Url::parse(crate::net::TELEGRAM_API_URL).expect("failed to parse default url"),
+            token,
+            path,
+        ))
         .send()
         .await?
         .error_for_status()?;
diff --git a/src/net/mod.rs b/src/net/mod.rs
index ede6cc0b..88f857cb 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -8,36 +8,38 @@ mod download;
 mod request;
 mod telegram_response;
 
-const TELEGRAM_API_URL: &str = "https://api.telegram.org";
+pub(crate) const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests
-fn method_url(base: &str, token: &str, method_name: &str) -> String {
-    format!("{url}/bot{token}/{method}", url = base, token = token, method = method_name)
+fn method_url(base: reqwest::Url, token: &str, method_name: &str) -> reqwest::Url {
+    base.join(&format!("/bot{token}/{method}", token = token, method = method_name))
+        .expect("failed to format url")
 }
 
 /// Creates URL for downloading a file. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#file
-fn file_url(base: &str, token: &str, file_path: &str) -> String {
-    format!("{url}/file/bot{token}/{file}", url = base, token = token, file = file_path,)
+fn file_url(base: reqwest::Url, token: &str, file_path: &str) -> reqwest::Url {
+    base.join(&format!("file/bot{token}/{file}", token = token, file = file_path))
+        .expect("failed to format url")
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use crate::net::*;
 
     #[test]
     fn method_url_test() {
         let url = method_url(
-            TELEGRAM_API_URL,
+            reqwest::Url::parse(TELEGRAM_API_URL).unwrap(),
             "535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao",
             "methodName",
         );
 
         assert_eq!(
-            url,
+            url.as_str(),
             "https://api.telegram.org/bot535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao/methodName"
         );
     }
@@ -45,13 +47,13 @@ mod tests {
     #[test]
     fn file_url_test() {
         let url = file_url(
-            TELEGRAM_API_URL,
+            reqwest::Url::parse(TELEGRAM_API_URL).unwrap(),
             "535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao",
             "AgADAgADyqoxG2g8aEsu_KjjVsGF4-zetw8ABAEAAwIAA20AA_8QAwABFgQ",
         );
 
         assert_eq!(
-            url,
+            url.as_str(),
             "https://api.telegram.org/file/bot535362388:AAF7-g0gYncWnm5IyfZlpPRqRRv6kNAGlao/AgADAgADyqoxG2g8aEsu_KjjVsGF4-zetw8ABAEAAwIAA20AA_8QAwABFgQ"
         );
     }
diff --git a/src/net/request.rs b/src/net/request.rs
index 6a2a65b1..887199e5 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -35,7 +35,11 @@ where
     };
 
     let response = client
-        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .post(crate::net::method_url(
+            reqwest::Url::parse(TELEGRAM_API_URL).expect("failed to parse default url"),
+            token,
+            method_name,
+        ))
         .multipart(form)
         .send()
         .await
@@ -55,7 +59,11 @@ where
     R: DeserializeOwned,
 {
     let response = client
-        .post(&super::method_url(TELEGRAM_API_URL, token, method_name))
+        .post(crate::net::method_url(
+            reqwest::Url::parse(TELEGRAM_API_URL).expect("failed to parse default url"),
+            token,
+            method_name,
+        ))
         .json(params)
         .send()
         .await
@@ -72,7 +80,7 @@ where
 pub async fn request_multipart2<T>(
     client: &Client,
     token: &str,
-    api_url: Option<&str>,
+    api_url: reqwest::Url,
     method_name: &str,
     params: reqwest::multipart::Form,
 ) -> ResponseResult<T>
@@ -80,7 +88,7 @@ where
     T: DeserializeOwned,
 {
     let response = client
-        .post(&super::method_url(api_url.unwrap_or(TELEGRAM_API_URL), token, method_name))
+        .post(crate::net::method_url(api_url, token, method_name))
         .multipart(params)
         .send()
         .await
@@ -92,7 +100,7 @@ where
 pub async fn request_json2<T>(
     client: &Client,
     token: &str,
-    api_url: Option<&str>,
+    api_url: reqwest::Url,
     method_name: &str,
     params: Vec<u8>,
 ) -> ResponseResult<T>
@@ -100,7 +108,7 @@ where
     T: DeserializeOwned,
 {
     let response = client
-        .post(&super::method_url(api_url.unwrap_or(TELEGRAM_API_URL), token, method_name))
+        .post(crate::net::method_url(api_url, token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
         .body(params)
         .send()

From 05582de2fdea1e6132237c3de67afe22ab5cdf70 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 17 Nov 2020 22:43:34 +0300
Subject: [PATCH 153/755] Add fixme to #[allow] attr in api_url

---
 src/bot/api_url.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bot/api_url.rs b/src/bot/api_url.rs
index 8c33a38f..ed10afc8 100644
--- a/src/bot/api_url.rs
+++ b/src/bot/api_url.rs
@@ -1,6 +1,7 @@
 #[derive(Debug, Clone)]
 pub(crate) enum ApiUrl {
     Default,
+    // FIXME: remove #[allow] when we use this variant
     #[allow(dead_code)]
     Custom(reqwest::Url),
 }

From d7d8bc62464302b12bb53d9200c3b79468c5ea9b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 Nov 2020 19:15:46 +0300
Subject: [PATCH 154/755] Add all tba methods to Requester trait

---
 Cargo.toml                |   2 +-
 src/adaptors/auto_send.rs |  44 +-
 src/adaptors/cache_me.rs  |  32 +-
 src/adaptors/throttle.rs  | 128 +++++-
 src/bot/api.rs            | 910 +++++++++++++++++++++++++++++++++++++-
 src/local_macros.rs       | 627 ++++++++++++++++++++++++++
 src/requests/requester.rs | 684 +++++++++++++++++++++++++++-
 7 files changed, 2376 insertions(+), 51 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d550d1f5..e9a9a648 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
 serde_with_macros = "1.1.0"
 uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
-
+ 
 derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 98e14ad2..f5c71e61 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -8,7 +8,7 @@ use futures::future::FusedFuture;
 
 use crate::{
     requests::{HasPayload, Output, Request, Requester},
-    types::ChatId,
+    types::*,
 };
 
 /// Send requests automatically.
@@ -62,23 +62,37 @@ impl<B> AutoSend<B> {
     }
 }
 
+macro_rules! f {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        AutoRequest::new($this.inner().$m($($arg),*))
+    };
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        AutoRequest<B::$T>
+    };
+}
+
 impl<B: Requester> Requester for AutoSend<B> {
     type Err = B::Err;
 
-    type GetMe = AutoRequest<B::GetMe>;
-
-    fn get_me(&self) -> Self::GetMe {
-        AutoRequest::new(self.bot.get_me())
-    }
-
-    type SendMessage = AutoRequest<B::SendMessage>;
-
-    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        AutoRequest::new(self.bot.send_message(chat_id, text))
+    requester_forward! {
+        get_me, send_message, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, send_photo, send_audio, send_document, send_video,
+        send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
+        stop_message_live_location_inline, send_venue, send_contact, send_poll, send_dice,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
+        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
+        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
+        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
+        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
+        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => f, fty
     }
 }
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index b43061e4..3f8000fe 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -11,7 +11,7 @@ use once_cell::sync::OnceCell;
 use crate::{
     payloads::GetMe,
     requests::{HasPayload, Request, Requester},
-    types::{ChatId, User},
+    types::{ChatId, User, *},
 };
 
 /// `get_me` cache.
@@ -54,6 +54,18 @@ impl<B> CacheMe<B> {
     }
 }
 
+macro_rules! f {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        $this.inner().$m($($arg),*)
+    };
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        B::$T
+    };
+}
+
 impl<B> Requester for CacheMe<B>
 where
     B: Requester,
@@ -81,6 +93,24 @@ where
     {
         self.bot.send_message(chat_id, text)
     }
+
+    requester_forward! {
+        get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, send_photo, send_audio, send_document, send_video,
+        send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
+        stop_message_live_location_inline, send_venue, send_contact, send_poll, send_dice,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
+        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
+        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
+        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
+        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
+        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => f, fty
+    }
 }
 
 pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 8a9481d4..2401e04c 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -19,9 +19,8 @@ use vecrem::VecExt;
 
 use crate::{
     adaptors::throttle::chan_send::{ChanSend, SendTy},
-    payloads::SendMessage,
     requests::{HasPayload, Output, Request, Requester},
-    types::ChatId,
+    types::*,
 };
 
 // Throttling is quite complicated this comment describes the algorithm of
@@ -348,26 +347,113 @@ impl<B> Throttle<B> {
     }
 }
 
+macro_rules! f {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        ThrottlingRequest(
+            $this.inner().$m($($arg),*),
+            $this.queue.clone(),
+            |p| (&p.payload_ref().chat_id).into(),
+        )
+    };
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        ThrottlingRequest<B::$T>
+    };
+}
+
+macro_rules! fid {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        $this.inner().$m($($arg),*)
+    };
+}
+
+macro_rules! ftyid {
+    ($T:ident) => {
+        B::$T
+    };
+}
+
 impl<B: Requester> Requester for Throttle<B>
 where
     B::SendMessage: Send,
+    B::ForwardMessage: Send,
+    B::SendPhoto: Send,
+    B::SendAudio: Send,
+    B::SendDocument: Send,
+    B::SendVideo: Send,
+    B::SendAnimation: Send,
+    B::SendVoice: Send,
+    B::SendVideoNote: Send,
+    B::SendMediaGroup: Send,
+    B::SendLocation: Send,
+    B::SendVenue: Send,
+    B::SendContact: Send,
+    B::SendPoll: Send,
+    B::SendDice: Send,
+    B::SendSticker: Send,
+    B::SendInvoice: Send,
 {
     type Err = B::Err;
 
-    type GetMe = B::GetMe;
-
-    fn get_me(&self) -> Self::GetMe {
-        self.bot.get_me()
+    requester_forward! {
+        send_message,
+        forward_message, send_photo, send_audio, send_document, send_video,
+        send_animation, send_voice, send_video_note, send_media_group, send_location,
+        send_venue, send_contact, send_poll, send_dice, send_sticker,  => f, fty
     }
 
-    type SendMessage = ThrottlingRequest<B::SendMessage>;
+    type SendInvoice = ThrottlingRequest<B::SendInvoice>;
 
-    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
+    fn send_invoice<T, D, Pa, P, S, C, Pri>(
+        &self,
+        chat_id: i32,
+        title: T,
+        description: D,
+        payload: Pa,
+        provider_token: P,
+        start_parameter: S,
+        currency: C,
+        prices: Pri,
+    ) -> Self::SendInvoice
     where
-        C: Into<ChatId>,
         T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice>,
     {
-        ThrottlingRequest(self.bot.send_message(chat_id, text), self.queue.clone())
+        ThrottlingRequest(
+            self.inner().send_invoice(
+                chat_id,
+                title,
+                description,
+                payload,
+                provider_token,
+                start_parameter,
+                currency,
+                prices,
+            ),
+            self.queue.clone(),
+            |p| Id::Id(p.payload_ref().chat_id as _),
+        )
+    }
+
+    requester_forward! {
+        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info, edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
+        stop_message_live_location_inline, send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
+        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
+        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
+        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
+        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, get_sticker_set, upload_sticker_file,
+        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => fid, ftyid
     }
 }
 
@@ -395,17 +481,11 @@ impl From<&ChatId> for Id {
     }
 }
 
-pub trait GetChatId {
-    fn get_chat_id(&self) -> &ChatId;
-}
-
-impl GetChatId for SendMessage {
-    fn get_chat_id(&self) -> &ChatId {
-        &self.chat_id
-    }
-}
-
-pub struct ThrottlingRequest<R>(R, mpsc::Sender<(Id, Sender<Never>)>);
+pub struct ThrottlingRequest<R: HasPayload>(
+    R,
+    mpsc::Sender<(Id, Sender<Never>)>,
+    fn(&R::Payload) -> Id,
+);
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
@@ -422,7 +502,6 @@ impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
 impl<R> Request for ThrottlingRequest<R>
 where
     R: Request + Send,
-    <R as HasPayload>::Payload: GetChatId,
 {
     type Err = R::Err;
     type Send = ThrottlingSend<R>;
@@ -430,13 +509,14 @@ where
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
-        let send = self.1.send_t((self.0.payload_ref().get_chat_id().into(), tx));
+        let id = self.2(self.payload_ref());
+        let send = self.1.send_t((id, tx));
         ThrottlingSend(ThrottlingSendInner::Registering { request: self.0, send, wait: rx })
     }
 
     fn send_ref(&self) -> Self::SendRef {
         let (tx, rx) = channel();
-        let send = self.1.clone().send_t((self.0.payload_ref().get_chat_id().into(), tx));
+        let send = self.1.clone().send_t((self.2(self.payload_ref()), tx));
 
         // As we can't move self.0 (request) out, as we do in `send` we are
         // forced to call `send_ref()`. This may have overhead and/or lead to
diff --git a/src/bot/api.rs b/src/bot/api.rs
index d831738e..8427ddba 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -9,8 +9,8 @@ use crate::{
         EditMessageReplyMarkup, EditMessageText, ExportChatInviteLink, ForwardMessage, GetChat,
         GetChatAdministrators, GetChatMember, GetChatMembersCount, GetFile, GetGameHighScores,
         GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUpdatesNonStrict, GetUserProfilePhotos,
-        GetWebhookInfo, JsonRequest, KickChatMember, LeaveChat, PinChatMessage, PromoteChatMember,
-        Requester, RestrictChatMember, SendAnimation, SendAudio, SendChatAction,
+        GetWebhookInfo, JsonRequest, KickChatMember, LeaveChat, MultipartRequest, PinChatMessage,
+        PromoteChatMember, Requester, RestrictChatMember, SendAnimation, SendAudio, SendChatAction,
         SendChatActionKind, SendContact, SendDice, SendDocument, SendGame, SendInvoice,
         SendLocation, SendMediaGroup, SendMessage, SendPhoto, SendPoll, SendSticker, SendVenue,
         SendVideo, SendVideoNote, SendVoice, SetChatAdministratorCustomTitle, SetChatDescription,
@@ -1707,19 +1707,921 @@ impl Bot {
 impl Requester for Bot {
     type Err = crate::errors::RequestError;
 
+    type GetUpdates = JsonRequest<payloads::GetUpdates>;
+
+    fn get_updates(&self) -> Self::GetUpdates where {
+        Self::GetUpdates::new(self.clone(), payloads::GetUpdates::new())
+    }
+
+    type SetWebhook = JsonRequest<payloads::SetWebhook>;
+
+    fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook
+    where
+        U: Into<String>,
+        A: IntoIterator<Item = crate::types::AllowedUpdate>,
+    {
+        Self::SetWebhook::new(self.clone(), payloads::SetWebhook::new(url, allowed_updates))
+    }
+
+    type DeleteWebhook = JsonRequest<payloads::DeleteWebhook>;
+
+    fn delete_webhook(&self) -> Self::DeleteWebhook where {
+        Self::DeleteWebhook::new(self.clone(), payloads::DeleteWebhook::new())
+    }
+
+    type GetWebhookInfo = JsonRequest<payloads::GetWebhookInfo>;
+
+    fn get_webhook_info(&self) -> Self::GetWebhookInfo where {
+        Self::GetWebhookInfo::new(self.clone(), payloads::GetWebhookInfo::new())
+    }
+
     type GetMe = JsonRequest<payloads::GetMe>;
 
-    fn get_me(&self) -> JsonRequest<payloads::GetMe> {
+    fn get_me(&self) -> Self::GetMe where {
         Self::GetMe::new(self.clone(), payloads::GetMe::new())
     }
 
     type SendMessage = JsonRequest<payloads::SendMessage>;
 
-    fn send_message<C, T>(&self, chat_id: C, text: T) -> JsonRequest<payloads::SendMessage>
+    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
         C: Into<ChatId>,
         T: Into<String>,
     {
         Self::SendMessage::new(self.clone(), payloads::SendMessage::new(chat_id, text))
     }
+
+    type ForwardMessage = JsonRequest<payloads::ForwardMessage>;
+
+    fn forward_message<C, F>(
+        &self,
+        chat_id: C,
+        from_chat_id: F,
+        message_id: i32,
+    ) -> Self::ForwardMessage
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>,
+    {
+        Self::ForwardMessage::new(
+            self.clone(),
+            payloads::ForwardMessage::new(chat_id, from_chat_id, message_id),
+        )
+    }
+
+    type SendPhoto = MultipartRequest<payloads::SendPhoto>;
+
+    fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendPhoto::new(self.clone(), payloads::SendPhoto::new(chat_id, photo, caption))
+    }
+
+    type SendAudio = MultipartRequest<payloads::SendAudio>;
+
+    fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendAudio::new(self.clone(), payloads::SendAudio::new(chat_id, audio, caption))
+    }
+
+    type SendDocument = MultipartRequest<payloads::SendDocument>;
+
+    fn send_document<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        document: InputFile,
+        caption: Ca,
+    ) -> Self::SendDocument
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendDocument::new(
+            self.clone(),
+            payloads::SendDocument::new(chat_id, document, caption),
+        )
+    }
+
+    type SendVideo = MultipartRequest<payloads::SendVideo>;
+
+    fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendVideo::new(self.clone(), payloads::SendVideo::new(chat_id, video, caption))
+    }
+
+    type SendAnimation = MultipartRequest<payloads::SendAnimation>;
+
+    fn send_animation<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        animation: InputFile,
+        caption: Ca,
+    ) -> Self::SendAnimation
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendAnimation::new(
+            self.clone(),
+            payloads::SendAnimation::new(chat_id, animation, caption),
+        )
+    }
+
+    type SendVoice = MultipartRequest<payloads::SendVoice>;
+
+    fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::SendVoice::new(self.clone(), payloads::SendVoice::new(chat_id, voice, caption))
+    }
+
+    type SendVideoNote = MultipartRequest<payloads::SendVideoNote>;
+
+    fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendVideoNote::new(self.clone(), payloads::SendVideoNote::new(chat_id, video_note))
+    }
+
+    type SendMediaGroup = MultipartRequest<payloads::SendMediaGroup>;
+
+    fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup
+    where
+        C: Into<ChatId>,
+        M: IntoIterator<Item = InputMedia>,
+    {
+        Self::SendMediaGroup::new(self.clone(), payloads::SendMediaGroup::new(chat_id, media))
+    }
+
+    type SendLocation = JsonRequest<payloads::SendLocation>;
+
+    fn send_location<C>(
+        &self,
+        chat_id: C,
+        latitude: f64,
+        longitude: f64,
+        live_period: u32,
+    ) -> Self::SendLocation
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendLocation::new(
+            self.clone(),
+            payloads::SendLocation::new(chat_id, latitude, longitude, live_period),
+        )
+    }
+
+    type EditMessageLiveLocation = JsonRequest<payloads::EditMessageLiveLocation>;
+
+    fn edit_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::EditMessageLiveLocation
+    where
+        C: Into<ChatId>,
+    {
+        Self::EditMessageLiveLocation::new(
+            self.clone(),
+            payloads::EditMessageLiveLocation::new(chat_id, message_id, latitude, longitude),
+        )
+    }
+
+    type EditMessageLiveLocationInline = JsonRequest<payloads::EditMessageLiveLocationInline>;
+
+    fn edit_message_live_location_inline<I>(
+        &self,
+        inline_message_id: I,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::EditMessageLiveLocationInline
+    where
+        I: Into<String>,
+    {
+        Self::EditMessageLiveLocationInline::new(
+            self.clone(),
+            payloads::EditMessageLiveLocationInline::new(inline_message_id, latitude, longitude),
+        )
+    }
+
+    type StopMessageLiveLocation = JsonRequest<payloads::StopMessageLiveLocation>;
+
+    fn stop_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::StopMessageLiveLocation
+    where
+        C: Into<ChatId>,
+    {
+        Self::StopMessageLiveLocation::new(
+            self.clone(),
+            payloads::StopMessageLiveLocation::new(chat_id, message_id, latitude, longitude),
+        )
+    }
+
+    type StopMessageLiveLocationInline = JsonRequest<payloads::StopMessageLiveLocationInline>;
+
+    fn stop_message_live_location_inline<I>(
+        &self,
+        inline_message_id: I,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::StopMessageLiveLocationInline
+    where
+        I: Into<String>,
+    {
+        Self::StopMessageLiveLocationInline::new(
+            self.clone(),
+            payloads::StopMessageLiveLocationInline::new(inline_message_id, latitude, longitude),
+        )
+    }
+
+    type SendVenue = JsonRequest<payloads::SendVenue>;
+
+    fn send_venue<C, T, A>(
+        &self,
+        chat_id: C,
+        latitude: f64,
+        longitude: f64,
+        title: T,
+        address: A,
+    ) -> Self::SendVenue
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+        A: Into<String>,
+    {
+        Self::SendVenue::new(
+            self.clone(),
+            payloads::SendVenue::new(chat_id, latitude, longitude, title, address),
+        )
+    }
+
+    type SendContact = JsonRequest<payloads::SendContact>;
+
+    fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendContact::new(
+            self.clone(),
+            payloads::SendContact::new(chat_id, phone_number, first_name),
+        )
+    }
+
+    type SendPoll = JsonRequest<payloads::SendPoll>;
+
+    fn send_poll<C, Q, O>(
+        &self,
+        chat_id: C,
+        question: Q,
+        options: O,
+        type_: crate::types::PollType,
+    ) -> Self::SendPoll
+    where
+        C: Into<ChatId>,
+        Q: Into<String>,
+        O: IntoIterator<Item = String>,
+    {
+        Self::SendPoll::new(
+            self.clone(),
+            payloads::SendPoll::new(chat_id, question, options, type_),
+        )
+    }
+
+    type SendDice = JsonRequest<payloads::SendDice>;
+
+    fn send_dice<C>(&self, chat_id: C, emoji: crate::types::DiceEmoji) -> Self::SendDice
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendDice::new(self.clone(), payloads::SendDice::new(chat_id, emoji))
+    }
+
+    type SendChatAction = JsonRequest<payloads::SendChatAction>;
+
+    fn send_chat_action<C>(
+        &self,
+        chat_id: C,
+        action: crate::types::ChatAction,
+    ) -> Self::SendChatAction
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendChatAction::new(self.clone(), payloads::SendChatAction::new(chat_id, action))
+    }
+
+    type GetUserProfilePhotos = JsonRequest<payloads::GetUserProfilePhotos>;
+
+    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos where {
+        Self::GetUserProfilePhotos::new(self.clone(), payloads::GetUserProfilePhotos::new(user_id))
+    }
+
+    type GetFile = JsonRequest<payloads::GetFile>;
+
+    fn get_file<F>(&self, file_id: F) -> Self::GetFile
+    where
+        F: Into<String>,
+    {
+        Self::GetFile::new(self.clone(), payloads::GetFile::new(file_id))
+    }
+
+    type KickChatMember = JsonRequest<payloads::KickChatMember>;
+
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::KickChatMember::new(self.clone(), payloads::KickChatMember::new(chat_id, user_id))
+    }
+
+    type UnbanChatMember = JsonRequest<payloads::UnbanChatMember>;
+
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::UnbanChatMember::new(self.clone(), payloads::UnbanChatMember::new(chat_id, user_id))
+    }
+
+    type RestrictChatMember = JsonRequest<payloads::RestrictChatMember>;
+
+    fn restrict_chat_member<C>(
+        &self,
+        chat_id: C,
+        user_id: i32,
+        permissions: ChatPermissions,
+    ) -> Self::RestrictChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::RestrictChatMember::new(
+            self.clone(),
+            payloads::RestrictChatMember::new(chat_id, user_id, permissions),
+        )
+    }
+
+    type PromoteChatMember = JsonRequest<payloads::PromoteChatMember>;
+
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::PromoteChatMember::new(
+            self.clone(),
+            payloads::PromoteChatMember::new(chat_id, user_id),
+        )
+    }
+
+    type SetChatAdministratorCustomTitle = JsonRequest<payloads::SetChatAdministratorCustomTitle>;
+
+    fn set_chat_administrator_custom_title<Ch, Cu>(
+        &self,
+        chat_id: Ch,
+        user_id: i32,
+        custom_title: Cu,
+    ) -> Self::SetChatAdministratorCustomTitle
+    where
+        Ch: Into<ChatId>,
+        Cu: Into<String>,
+    {
+        Self::SetChatAdministratorCustomTitle::new(
+            self.clone(),
+            payloads::SetChatAdministratorCustomTitle::new(chat_id, user_id, custom_title),
+        )
+    }
+
+    type SetChatPermissions = JsonRequest<payloads::SetChatPermissions>;
+
+    fn set_chat_permissions<C>(
+        &self,
+        chat_id: C,
+        permissions: ChatPermissions,
+    ) -> Self::SetChatPermissions
+    where
+        C: Into<ChatId>,
+    {
+        Self::SetChatPermissions::new(
+            self.clone(),
+            payloads::SetChatPermissions::new(chat_id, permissions),
+        )
+    }
+
+    type ExportChatInviteLink = JsonRequest<payloads::ExportChatInviteLink>;
+
+    fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink
+    where
+        C: Into<ChatId>,
+    {
+        Self::ExportChatInviteLink::new(self.clone(), payloads::ExportChatInviteLink::new(chat_id))
+    }
+
+    type SetChatPhoto = MultipartRequest<payloads::SetChatPhoto>;
+
+    fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
+    where
+        C: Into<ChatId>,
+    {
+        Self::SetChatPhoto::new(self.clone(), payloads::SetChatPhoto::new(chat_id, photo))
+    }
+
+    type DeleteChatPhoto = JsonRequest<payloads::DeleteChatPhoto>;
+
+    fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto
+    where
+        C: Into<ChatId>,
+    {
+        Self::DeleteChatPhoto::new(self.clone(), payloads::DeleteChatPhoto::new(chat_id))
+    }
+
+    type SetChatTitle = JsonRequest<payloads::SetChatTitle>;
+
+    fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        Self::SetChatTitle::new(self.clone(), payloads::SetChatTitle::new(chat_id, title))
+    }
+
+    type SetChatDescription = JsonRequest<payloads::SetChatDescription>;
+
+    fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription
+    where
+        C: Into<ChatId>,
+    {
+        Self::SetChatDescription::new(self.clone(), payloads::SetChatDescription::new(chat_id))
+    }
+
+    type PinChatMessage = JsonRequest<payloads::PinChatMessage>;
+
+    fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
+    where
+        C: Into<ChatId>,
+    {
+        Self::PinChatMessage::new(self.clone(), payloads::PinChatMessage::new(chat_id, message_id))
+    }
+
+    type UnpinChatMessage = JsonRequest<payloads::UnpinChatMessage>;
+
+    fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage
+    where
+        C: Into<ChatId>,
+    {
+        Self::UnpinChatMessage::new(self.clone(), payloads::UnpinChatMessage::new(chat_id))
+    }
+
+    type LeaveChat = JsonRequest<payloads::LeaveChat>;
+
+    fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat
+    where
+        C: Into<ChatId>,
+    {
+        Self::LeaveChat::new(self.clone(), payloads::LeaveChat::new(chat_id))
+    }
+
+    type GetChat = JsonRequest<payloads::GetChat>;
+
+    fn get_chat<C>(&self, chat_id: C) -> Self::GetChat
+    where
+        C: Into<ChatId>,
+    {
+        Self::GetChat::new(self.clone(), payloads::GetChat::new(chat_id))
+    }
+
+    type GetChatAdministrators = JsonRequest<payloads::GetChatAdministrators>;
+
+    fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators
+    where
+        C: Into<ChatId>,
+    {
+        Self::GetChatAdministrators::new(
+            self.clone(),
+            payloads::GetChatAdministrators::new(chat_id),
+        )
+    }
+
+    type GetChatMembersCount = JsonRequest<payloads::GetChatMembersCount>;
+
+    fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount
+    where
+        C: Into<ChatId>,
+    {
+        Self::GetChatMembersCount::new(self.clone(), payloads::GetChatMembersCount::new(chat_id))
+    }
+
+    type GetChatMember = JsonRequest<payloads::GetChatMember>;
+
+    fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::GetChatMember::new(self.clone(), payloads::GetChatMember::new(chat_id, user_id))
+    }
+
+    type SetChatStickerSet = JsonRequest<payloads::SetChatStickerSet>;
+
+    fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> Self::SetChatStickerSet
+    where
+        C: Into<ChatId>,
+        S: Into<String>,
+    {
+        Self::SetChatStickerSet::new(
+            self.clone(),
+            payloads::SetChatStickerSet::new(chat_id, sticker_set_name),
+        )
+    }
+
+    type DeleteChatStickerSet = JsonRequest<payloads::DeleteChatStickerSet>;
+
+    fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet
+    where
+        C: Into<ChatId>,
+    {
+        Self::DeleteChatStickerSet::new(self.clone(), payloads::DeleteChatStickerSet::new(chat_id))
+    }
+
+    type AnswerCallbackQuery = JsonRequest<payloads::AnswerCallbackQuery>;
+
+    fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery
+    where
+        C: Into<String>,
+    {
+        Self::AnswerCallbackQuery::new(
+            self.clone(),
+            payloads::AnswerCallbackQuery::new(callback_query_id),
+        )
+    }
+
+    type SetMyCommands = JsonRequest<payloads::SetMyCommands>;
+
+    fn set_my_commands<C>(&self, commands: C) -> Self::SetMyCommands
+    where
+        C: IntoIterator<Item = BotCommand>,
+    {
+        Self::SetMyCommands::new(self.clone(), payloads::SetMyCommands::new(commands))
+    }
+
+    type GetMyCommands = JsonRequest<payloads::GetMyCommands>;
+
+    fn get_my_commands(&self) -> Self::GetMyCommands where {
+        Self::GetMyCommands::new(self.clone(), payloads::GetMyCommands::new())
+    }
+
+    type AnswerInlineQuery = JsonRequest<payloads::AnswerInlineQuery>;
+
+    fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> Self::AnswerInlineQuery
+    where
+        I: Into<String>,
+        R: IntoIterator<Item = InlineQueryResult>,
+    {
+        Self::AnswerInlineQuery::new(
+            self.clone(),
+            payloads::AnswerInlineQuery::new(inline_query_id, results),
+        )
+    }
+
+    type EditMessageText = JsonRequest<payloads::EditMessageText>;
+
+    fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+    {
+        Self::EditMessageText::new(
+            self.clone(),
+            payloads::EditMessageText::new(chat_id, message_id, text),
+        )
+    }
+
+    type EditMessageTextInline = JsonRequest<payloads::EditMessageTextInline>;
+
+    fn edit_message_text_inline<I, T>(
+        &self,
+        inline_message_id: I,
+        text: T,
+    ) -> Self::EditMessageTextInline
+    where
+        I: Into<String>,
+        T: Into<String>,
+    {
+        Self::EditMessageTextInline::new(
+            self.clone(),
+            payloads::EditMessageTextInline::new(inline_message_id, text),
+        )
+    }
+
+    type EditMessageCaption = JsonRequest<payloads::EditMessageCaption>;
+
+    fn edit_message_caption<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        message_id: i32,
+        caption: Ca,
+    ) -> Self::EditMessageCaption
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>,
+    {
+        Self::EditMessageCaption::new(
+            self.clone(),
+            payloads::EditMessageCaption::new(chat_id, message_id, caption),
+        )
+    }
+
+    type EditMessageCaptionInline = JsonRequest<payloads::EditMessageCaptionInline>;
+
+    fn edit_message_caption_inline<I, C>(
+        &self,
+        inline_message_id: I,
+        caption: C,
+    ) -> Self::EditMessageCaptionInline
+    where
+        I: Into<String>,
+        C: Into<String>,
+    {
+        Self::EditMessageCaptionInline::new(
+            self.clone(),
+            payloads::EditMessageCaptionInline::new(inline_message_id, caption),
+        )
+    }
+
+    type EditMessageMedia = MultipartRequest<payloads::EditMessageMedia>;
+
+    fn edit_message_media<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        media: InputMedia,
+    ) -> Self::EditMessageMedia
+    where
+        C: Into<ChatId>,
+    {
+        Self::EditMessageMedia::new(
+            self.clone(),
+            payloads::EditMessageMedia::new(chat_id, message_id, media),
+        )
+    }
+
+    type EditMessageMediaInline = MultipartRequest<payloads::EditMessageMediaInline>;
+
+    fn edit_message_media_inline<I>(
+        &self,
+        inline_message_id: I,
+        media: InputMedia,
+    ) -> Self::EditMessageMediaInline
+    where
+        I: Into<String>,
+    {
+        Self::EditMessageMediaInline::new(
+            self.clone(),
+            payloads::EditMessageMediaInline::new(inline_message_id, media),
+        )
+    }
+
+    type EditMessageReplyMarkup = JsonRequest<payloads::EditMessageReplyMarkup>;
+
+    fn edit_message_reply_markup<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+    ) -> Self::EditMessageReplyMarkup
+    where
+        C: Into<ChatId>,
+    {
+        Self::EditMessageReplyMarkup::new(
+            self.clone(),
+            payloads::EditMessageReplyMarkup::new(chat_id, message_id),
+        )
+    }
+
+    type EditMessageReplyMarkupInline = JsonRequest<payloads::EditMessageReplyMarkupInline>;
+
+    fn edit_message_reply_markup_inline<I>(
+        &self,
+        inline_message_id: I,
+    ) -> Self::EditMessageReplyMarkupInline
+    where
+        I: Into<String>,
+    {
+        Self::EditMessageReplyMarkupInline::new(
+            self.clone(),
+            payloads::EditMessageReplyMarkupInline::new(inline_message_id),
+        )
+    }
+
+    type StopPoll = JsonRequest<payloads::StopPoll>;
+
+    fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
+    where
+        C: Into<ChatId>,
+    {
+        Self::StopPoll::new(self.clone(), payloads::StopPoll::new(chat_id, message_id))
+    }
+
+    type DeleteMessage = JsonRequest<payloads::DeleteMessage>;
+
+    fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
+    where
+        C: Into<ChatId>,
+    {
+        Self::DeleteMessage::new(self.clone(), payloads::DeleteMessage::new(chat_id, message_id))
+    }
+
+    type SendSticker = MultipartRequest<payloads::SendSticker>;
+
+    fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker
+    where
+        C: Into<ChatId>,
+    {
+        Self::SendSticker::new(self.clone(), payloads::SendSticker::new(chat_id, sticker))
+    }
+
+    type GetStickerSet = JsonRequest<payloads::GetStickerSet>;
+
+    fn get_sticker_set<N>(&self, name: N) -> Self::GetStickerSet
+    where
+        N: Into<String>,
+    {
+        Self::GetStickerSet::new(self.clone(), payloads::GetStickerSet::new(name))
+    }
+
+    type UploadStickerFile = MultipartRequest<payloads::UploadStickerFile>;
+
+    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where
+    {
+        Self::UploadStickerFile::new(
+            self.clone(),
+            payloads::UploadStickerFile::new(user_id, png_sticker),
+        )
+    }
+
+    type CreateNewStickerSet = JsonRequest<payloads::CreateNewStickerSet>;
+
+    fn create_new_sticker_set<N, T, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        title: T,
+        emojis: E,
+    ) -> Self::CreateNewStickerSet
+    where
+        N: Into<String>,
+        T: Into<String>,
+        E: Into<String>,
+    {
+        Self::CreateNewStickerSet::new(
+            self.clone(),
+            payloads::CreateNewStickerSet::new(user_id, name, title, emojis),
+        )
+    }
+
+    type AddStickerToSet = MultipartRequest<payloads::AddStickerToSet>;
+
+    fn add_sticker_to_set<N, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        sticker: InputSticker,
+        emojis: E,
+    ) -> Self::AddStickerToSet
+    where
+        N: Into<String>,
+        E: Into<String>,
+    {
+        Self::AddStickerToSet::new(
+            self.clone(),
+            payloads::AddStickerToSet::new(user_id, name, sticker, emojis),
+        )
+    }
+
+    type SetStickerPositionInSet = JsonRequest<payloads::SetStickerPositionInSet>;
+
+    fn set_sticker_position_in_set<S>(
+        &self,
+        sticker: S,
+        position: u32,
+    ) -> Self::SetStickerPositionInSet
+    where
+        S: Into<String>,
+    {
+        Self::SetStickerPositionInSet::new(
+            self.clone(),
+            payloads::SetStickerPositionInSet::new(sticker, position),
+        )
+    }
+
+    type DeleteStickerFromSet = JsonRequest<payloads::DeleteStickerFromSet>;
+
+    fn delete_sticker_from_set<S>(&self, sticker: S) -> Self::DeleteStickerFromSet
+    where
+        S: Into<String>,
+    {
+        Self::DeleteStickerFromSet::new(self.clone(), payloads::DeleteStickerFromSet::new(sticker))
+    }
+
+    type SetStickerSetThumb = MultipartRequest<payloads::SetStickerSetThumb>;
+
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb
+    where
+        N: Into<String>,
+    {
+        Self::SetStickerSetThumb::new(
+            self.clone(),
+            payloads::SetStickerSetThumb::new(name, user_id),
+        )
+    }
+
+    type SendInvoice = JsonRequest<payloads::SendInvoice>;
+
+    fn send_invoice<T, D, Pa, P, S, C, Pri>(
+        &self,
+        chat_id: i32,
+        title: T,
+        description: D,
+        payload: Pa,
+        provider_token: P,
+        start_parameter: S,
+        currency: C,
+        prices: Pri,
+    ) -> Self::SendInvoice
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice>,
+    {
+        Self::SendInvoice::new(
+            self.clone(),
+            payloads::SendInvoice::new(
+                chat_id,
+                title,
+                description,
+                payload,
+                provider_token,
+                start_parameter,
+                currency,
+                prices,
+            ),
+        )
+    }
+
+    type AnswerShippingQuery = JsonRequest<payloads::AnswerShippingQuery>;
+
+    fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> Self::AnswerShippingQuery
+    where
+        S: Into<String>,
+    {
+        Self::AnswerShippingQuery::new(
+            self.clone(),
+            payloads::AnswerShippingQuery::new(shipping_query_id, ok),
+        )
+    }
+
+    type AnswerPreCheckoutQuery = JsonRequest<payloads::AnswerPreCheckoutQuery>;
+
+    fn answer_pre_checkout_query<P>(
+        &self,
+        pre_checkout_query_id: P,
+        ok: bool,
+    ) -> Self::AnswerPreCheckoutQuery
+    where
+        P: Into<String>,
+    {
+        Self::AnswerPreCheckoutQuery::new(
+            self.clone(),
+            payloads::AnswerPreCheckoutQuery::new(pre_checkout_query_id, ok),
+        )
+    }
+
+    type SetPassportDataErrors = JsonRequest<payloads::SetPassportDataErrors>;
+
+    fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
+    where
+        E: IntoIterator<Item = crate::types::PassportElementError>,
+    {
+        Self::SetPassportDataErrors::new(
+            self.clone(),
+            payloads::SetPassportDataErrors::new(user_id, errors),
+        )
+    }
 }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 971b2fa5..fc522950 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -365,3 +365,630 @@ macro_rules! impl_payload {
         $e
     };
 }
+
+#[macro_use]
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (fea4d31).
+// **DO NOT EDIT THIS MACRO**,
+// edit `cg` instead.
+macro_rules! requester_forward {
+    ($i:ident $(, $rest:ident )* $(,)? => $body:ident, $ty:ident ) => {
+        requester_forward!(@method $i $body $ty);
+        $(
+            requester_forward!(@method $rest $body $ty);
+        )*
+    };
+    (@method get_updates $body:ident $ty:ident) => {
+        type GetUpdates = $ty![GetUpdates];
+
+        fn get_updates<>(&self, ) -> Self::GetUpdates where  {
+            let this = self;
+            $body!(get_updates this ())
+        }
+    };
+    (@method set_webhook $body:ident $ty:ident) => {
+        type SetWebhook = $ty![SetWebhook];
+
+        fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook where U: Into<String>,
+        A: IntoIterator<Item = AllowedUpdate> {
+            let this = self;
+            $body!(set_webhook this (url: U, allowed_updates: A))
+        }
+    };
+    (@method delete_webhook $body:ident $ty:ident) => {
+        type DeleteWebhook = $ty![DeleteWebhook];
+
+        fn delete_webhook<>(&self, ) -> Self::DeleteWebhook where  {
+            let this = self;
+            $body!(delete_webhook this ())
+        }
+    };
+    (@method get_webhook_info $body:ident $ty:ident) => {
+        type GetWebhookInfo = $ty![GetWebhookInfo];
+
+        fn get_webhook_info<>(&self, ) -> Self::GetWebhookInfo where  {
+            let this = self;
+            $body!(get_webhook_info this ())
+        }
+    };
+    (@method get_me $body:ident $ty:ident) => {
+        type GetMe = $ty![GetMe];
+
+        fn get_me<>(&self, ) -> Self::GetMe where  {
+            let this = self;
+            $body!(get_me this ())
+        }
+    };
+    (@method send_message $body:ident $ty:ident) => {
+        type SendMessage = $ty![SendMessage];
+
+        fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage where C: Into<ChatId>,
+        T: Into<String> {
+            let this = self;
+            $body!(send_message this (chat_id: C, text: T))
+        }
+    };
+    (@method forward_message $body:ident $ty:ident) => {
+        type ForwardMessage = $ty![ForwardMessage];
+
+        fn forward_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::ForwardMessage where C: Into<ChatId>,
+        F: Into<ChatId> {
+            let this = self;
+            $body!(forward_message this (chat_id: C, from_chat_id: F, message_id: i32))
+        }
+    };
+    (@method send_photo $body:ident $ty:ident) => {
+        type SendPhoto = $ty![SendPhoto];
+
+        fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_photo this (chat_id: Ch, photo: InputFile, caption: Ca))
+        }
+    };
+    (@method send_audio $body:ident $ty:ident) => {
+        type SendAudio = $ty![SendAudio];
+
+        fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_audio this (chat_id: Ch, audio: InputFile, caption: Ca))
+        }
+    };
+    (@method send_document $body:ident $ty:ident) => {
+        type SendDocument = $ty![SendDocument];
+
+        fn send_document<Ch, Ca>(&self, chat_id: Ch, document: InputFile, caption: Ca) -> Self::SendDocument where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_document this (chat_id: Ch, document: InputFile, caption: Ca))
+        }
+    };
+    (@method send_video $body:ident $ty:ident) => {
+        type SendVideo = $ty![SendVideo];
+
+        fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_video this (chat_id: Ch, video: InputFile, caption: Ca))
+        }
+    };
+    (@method send_animation $body:ident $ty:ident) => {
+        type SendAnimation = $ty![SendAnimation];
+
+        fn send_animation<Ch, Ca>(&self, chat_id: Ch, animation: InputFile, caption: Ca) -> Self::SendAnimation where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_animation this (chat_id: Ch, animation: InputFile, caption: Ca))
+        }
+    };
+    (@method send_voice $body:ident $ty:ident) => {
+        type SendVoice = $ty![SendVoice];
+
+        fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(send_voice this (chat_id: Ch, voice: InputFile, caption: Ca))
+        }
+    };
+    (@method send_video_note $body:ident $ty:ident) => {
+        type SendVideoNote = $ty![SendVideoNote];
+
+        fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote where C: Into<ChatId> {
+            let this = self;
+            $body!(send_video_note this (chat_id: C, video_note: InputFile))
+        }
+    };
+    (@method send_media_group $body:ident $ty:ident) => {
+        type SendMediaGroup = $ty![SendMediaGroup];
+
+        fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup where C: Into<ChatId>,
+        M: IntoIterator<Item = InputMedia> {
+            let this = self;
+            $body!(send_media_group this (chat_id: C, media: M))
+        }
+    };
+    (@method send_location $body:ident $ty:ident) => {
+        type SendLocation = $ty![SendLocation];
+
+        fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64, live_period: u32) -> Self::SendLocation where C: Into<ChatId> {
+            let this = self;
+            $body!(send_location this (chat_id: C, latitude: f64, longitude: f64, live_period: u32))
+        }
+    };
+    (@method edit_message_live_location $body:ident $ty:ident) => {
+        type EditMessageLiveLocation = $ty![EditMessageLiveLocation];
+
+        fn edit_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocation where C: Into<ChatId> {
+            let this = self;
+            $body!(edit_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
+        }
+    };
+    (@method edit_message_live_location_inline $body:ident $ty:ident) => {
+        type EditMessageLiveLocationInline = $ty![EditMessageLiveLocationInline];
+
+        fn edit_message_live_location_inline<I>(&self, inline_message_id: I, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocationInline where I: Into<String> {
+            let this = self;
+            $body!(edit_message_live_location_inline this (inline_message_id: I, latitude: f64, longitude: f64))
+        }
+    };
+    (@method stop_message_live_location $body:ident $ty:ident) => {
+        type StopMessageLiveLocation = $ty![StopMessageLiveLocation];
+
+        fn stop_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocation where C: Into<ChatId> {
+            let this = self;
+            $body!(stop_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
+        }
+    };
+    (@method stop_message_live_location_inline $body:ident $ty:ident) => {
+        type StopMessageLiveLocationInline = $ty![StopMessageLiveLocationInline];
+
+        fn stop_message_live_location_inline<I>(&self, inline_message_id: I, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocationInline where I: Into<String> {
+            let this = self;
+            $body!(stop_message_live_location_inline this (inline_message_id: I, latitude: f64, longitude: f64))
+        }
+    };
+    (@method send_venue $body:ident $ty:ident) => {
+        type SendVenue = $ty![SendVenue];
+
+        fn send_venue<C, T, A>(&self, chat_id: C, latitude: f64, longitude: f64, title: T, address: A) -> Self::SendVenue where C: Into<ChatId>,
+        T: Into<String>,
+        A: Into<String> {
+            let this = self;
+            $body!(send_venue this (chat_id: C, latitude: f64, longitude: f64, title: T, address: A))
+        }
+    };
+    (@method send_contact $body:ident $ty:ident) => {
+        type SendContact = $ty![SendContact];
+
+        fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact where C: Into<ChatId> {
+            let this = self;
+            $body!(send_contact this (chat_id: C, phone_number: f64, first_name: f64))
+        }
+    };
+    (@method send_poll $body:ident $ty:ident) => {
+        type SendPoll = $ty![SendPoll];
+
+        fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O, type_: PollType) -> Self::SendPoll where C: Into<ChatId>,
+        Q: Into<String>,
+        O: IntoIterator<Item = String> {
+            let this = self;
+            $body!(send_poll this (chat_id: C, question: Q, options: O, type_: PollType))
+        }
+    };
+    (@method send_dice $body:ident $ty:ident) => {
+        type SendDice = $ty![SendDice];
+
+        fn send_dice<C>(&self, chat_id: C, emoji: DiceEmoji) -> Self::SendDice where C: Into<ChatId> {
+            let this = self;
+            $body!(send_dice this (chat_id: C, emoji: DiceEmoji))
+        }
+    };
+    (@method send_chat_action $body:ident $ty:ident) => {
+        type SendChatAction = $ty![SendChatAction];
+
+        fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction where C: Into<ChatId> {
+            let this = self;
+            $body!(send_chat_action this (chat_id: C, action: ChatAction))
+        }
+    };
+    (@method get_user_profile_photos $body:ident $ty:ident) => {
+        type GetUserProfilePhotos = $ty![GetUserProfilePhotos];
+
+        fn get_user_profile_photos<>(&self, user_id: i32) -> Self::GetUserProfilePhotos where  {
+            let this = self;
+            $body!(get_user_profile_photos this (user_id: i32))
+        }
+    };
+    (@method get_file $body:ident $ty:ident) => {
+        type GetFile = $ty![GetFile];
+
+        fn get_file<F>(&self, file_id: F) -> Self::GetFile where F: Into<String> {
+            let this = self;
+            $body!(get_file this (file_id: F))
+        }
+    };
+    (@method kick_chat_member $body:ident $ty:ident) => {
+        type KickChatMember = $ty![KickChatMember];
+
+        fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(kick_chat_member this (chat_id: C, user_id: i32))
+        }
+    };
+    (@method unban_chat_member $body:ident $ty:ident) => {
+        type UnbanChatMember = $ty![UnbanChatMember];
+
+        fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(unban_chat_member this (chat_id: C, user_id: i32))
+        }
+    };
+    (@method restrict_chat_member $body:ident $ty:ident) => {
+        type RestrictChatMember = $ty![RestrictChatMember];
+
+        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i32, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(restrict_chat_member this (chat_id: C, user_id: i32, permissions: ChatPermissions))
+        }
+    };
+    (@method promote_chat_member $body:ident $ty:ident) => {
+        type PromoteChatMember = $ty![PromoteChatMember];
+
+        fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(promote_chat_member this (chat_id: C, user_id: i32))
+        }
+    };
+    (@method set_chat_administrator_custom_title $body:ident $ty:ident) => {
+        type SetChatAdministratorCustomTitle = $ty![SetChatAdministratorCustomTitle];
+
+        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i32, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<ChatId>,
+        Cu: Into<String> {
+            let this = self;
+            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i32, custom_title: Cu))
+        }
+    };
+    (@method set_chat_permissions $body:ident $ty:ident) => {
+        type SetChatPermissions = $ty![SetChatPermissions];
+
+        fn set_chat_permissions<C>(&self, chat_id: C, permissions: ChatPermissions) -> Self::SetChatPermissions where C: Into<ChatId> {
+            let this = self;
+            $body!(set_chat_permissions this (chat_id: C, permissions: ChatPermissions))
+        }
+    };
+    (@method export_chat_invite_link $body:ident $ty:ident) => {
+        type ExportChatInviteLink = $ty![ExportChatInviteLink];
+
+        fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink where C: Into<ChatId> {
+            let this = self;
+            $body!(export_chat_invite_link this (chat_id: C))
+        }
+    };
+    (@method set_chat_photo $body:ident $ty:ident) => {
+        type SetChatPhoto = $ty![SetChatPhoto];
+
+        fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto where C: Into<ChatId> {
+            let this = self;
+            $body!(set_chat_photo this (chat_id: C, photo: InputFile))
+        }
+    };
+    (@method delete_chat_photo $body:ident $ty:ident) => {
+        type DeleteChatPhoto = $ty![DeleteChatPhoto];
+
+        fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto where C: Into<ChatId> {
+            let this = self;
+            $body!(delete_chat_photo this (chat_id: C))
+        }
+    };
+    (@method set_chat_title $body:ident $ty:ident) => {
+        type SetChatTitle = $ty![SetChatTitle];
+
+        fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle where C: Into<ChatId>,
+        T: Into<String> {
+            let this = self;
+            $body!(set_chat_title this (chat_id: C, title: T))
+        }
+    };
+    (@method set_chat_description $body:ident $ty:ident) => {
+        type SetChatDescription = $ty![SetChatDescription];
+
+        fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription where C: Into<ChatId> {
+            let this = self;
+            $body!(set_chat_description this (chat_id: C))
+        }
+    };
+    (@method pin_chat_message $body:ident $ty:ident) => {
+        type PinChatMessage = $ty![PinChatMessage];
+
+        fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage where C: Into<ChatId> {
+            let this = self;
+            $body!(pin_chat_message this (chat_id: C, message_id: i32))
+        }
+    };
+    (@method unpin_chat_message $body:ident $ty:ident) => {
+        type UnpinChatMessage = $ty![UnpinChatMessage];
+
+        fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage where C: Into<ChatId> {
+            let this = self;
+            $body!(unpin_chat_message this (chat_id: C))
+        }
+    };
+    (@method leave_chat $body:ident $ty:ident) => {
+        type LeaveChat = $ty![LeaveChat];
+
+        fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat where C: Into<ChatId> {
+            let this = self;
+            $body!(leave_chat this (chat_id: C))
+        }
+    };
+    (@method get_chat $body:ident $ty:ident) => {
+        type GetChat = $ty![GetChat];
+
+        fn get_chat<C>(&self, chat_id: C) -> Self::GetChat where C: Into<ChatId> {
+            let this = self;
+            $body!(get_chat this (chat_id: C))
+        }
+    };
+    (@method get_chat_administrators $body:ident $ty:ident) => {
+        type GetChatAdministrators = $ty![GetChatAdministrators];
+
+        fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators where C: Into<ChatId> {
+            let this = self;
+            $body!(get_chat_administrators this (chat_id: C))
+        }
+    };
+    (@method get_chat_members_count $body:ident $ty:ident) => {
+        type GetChatMembersCount = $ty![GetChatMembersCount];
+
+        fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount where C: Into<ChatId> {
+            let this = self;
+            $body!(get_chat_members_count this (chat_id: C))
+        }
+    };
+    (@method get_chat_member $body:ident $ty:ident) => {
+        type GetChatMember = $ty![GetChatMember];
+
+        fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(get_chat_member this (chat_id: C, user_id: i32))
+        }
+    };
+    (@method set_chat_sticker_set $body:ident $ty:ident) => {
+        type SetChatStickerSet = $ty![SetChatStickerSet];
+
+        fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> Self::SetChatStickerSet where C: Into<ChatId>,
+        S: Into<String> {
+            let this = self;
+            $body!(set_chat_sticker_set this (chat_id: C, sticker_set_name: S))
+        }
+    };
+    (@method delete_chat_sticker_set $body:ident $ty:ident) => {
+        type DeleteChatStickerSet = $ty![DeleteChatStickerSet];
+
+        fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet where C: Into<ChatId> {
+            let this = self;
+            $body!(delete_chat_sticker_set this (chat_id: C))
+        }
+    };
+    (@method answer_callback_query $body:ident $ty:ident) => {
+        type AnswerCallbackQuery = $ty![AnswerCallbackQuery];
+
+        fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery where C: Into<String> {
+            let this = self;
+            $body!(answer_callback_query this (callback_query_id: C))
+        }
+    };
+    (@method set_my_commands $body:ident $ty:ident) => {
+        type SetMyCommands = $ty![SetMyCommands];
+
+        fn set_my_commands<C>(&self, commands: C) -> Self::SetMyCommands where C: IntoIterator<Item = BotCommand> {
+            let this = self;
+            $body!(set_my_commands this (commands: C))
+        }
+    };
+    (@method get_my_commands $body:ident $ty:ident) => {
+        type GetMyCommands = $ty![GetMyCommands];
+
+        fn get_my_commands<>(&self, ) -> Self::GetMyCommands where  {
+            let this = self;
+            $body!(get_my_commands this ())
+        }
+    };
+    (@method answer_inline_query $body:ident $ty:ident) => {
+        type AnswerInlineQuery = $ty![AnswerInlineQuery];
+
+        fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> Self::AnswerInlineQuery where I: Into<String>,
+        R: IntoIterator<Item = InlineQueryResult> {
+            let this = self;
+            $body!(answer_inline_query this (inline_query_id: I, results: R))
+        }
+    };
+    (@method edit_message_text $body:ident $ty:ident) => {
+        type EditMessageText = $ty![EditMessageText];
+
+        fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText where C: Into<ChatId>,
+        T: Into<String> {
+            let this = self;
+            $body!(edit_message_text this (chat_id: C, message_id: i32, text: T))
+        }
+    };
+    (@method edit_message_text_inline $body:ident $ty:ident) => {
+        type EditMessageTextInline = $ty![EditMessageTextInline];
+
+        fn edit_message_text_inline<I, T>(&self, inline_message_id: I, text: T) -> Self::EditMessageTextInline where I: Into<String>,
+        T: Into<String> {
+            let this = self;
+            $body!(edit_message_text_inline this (inline_message_id: I, text: T))
+        }
+    };
+    (@method edit_message_caption $body:ident $ty:ident) => {
+        type EditMessageCaption = $ty![EditMessageCaption];
+
+        fn edit_message_caption<Ch, Ca>(&self, chat_id: Ch, message_id: i32, caption: Ca) -> Self::EditMessageCaption where Ch: Into<ChatId>,
+        Ca: Into<String> {
+            let this = self;
+            $body!(edit_message_caption this (chat_id: Ch, message_id: i32, caption: Ca))
+        }
+    };
+    (@method edit_message_caption_inline $body:ident $ty:ident) => {
+        type EditMessageCaptionInline = $ty![EditMessageCaptionInline];
+
+        fn edit_message_caption_inline<I, C>(&self, inline_message_id: I, caption: C) -> Self::EditMessageCaptionInline where I: Into<String>,
+        C: Into<String> {
+            let this = self;
+            $body!(edit_message_caption_inline this (inline_message_id: I, caption: C))
+        }
+    };
+    (@method edit_message_media $body:ident $ty:ident) => {
+        type EditMessageMedia = $ty![EditMessageMedia];
+
+        fn edit_message_media<C>(&self, chat_id: C, message_id: i32, media: InputMedia) -> Self::EditMessageMedia where C: Into<ChatId> {
+            let this = self;
+            $body!(edit_message_media this (chat_id: C, message_id: i32, media: InputMedia))
+        }
+    };
+    (@method edit_message_media_inline $body:ident $ty:ident) => {
+        type EditMessageMediaInline = $ty![EditMessageMediaInline];
+
+        fn edit_message_media_inline<I>(&self, inline_message_id: I, media: InputMedia) -> Self::EditMessageMediaInline where I: Into<String> {
+            let this = self;
+            $body!(edit_message_media_inline this (inline_message_id: I, media: InputMedia))
+        }
+    };
+    (@method edit_message_reply_markup $body:ident $ty:ident) => {
+        type EditMessageReplyMarkup = $ty![EditMessageReplyMarkup];
+
+        fn edit_message_reply_markup<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageReplyMarkup where C: Into<ChatId> {
+            let this = self;
+            $body!(edit_message_reply_markup this (chat_id: C, message_id: i32))
+        }
+    };
+    (@method edit_message_reply_markup_inline $body:ident $ty:ident) => {
+        type EditMessageReplyMarkupInline = $ty![EditMessageReplyMarkupInline];
+
+        fn edit_message_reply_markup_inline<I>(&self, inline_message_id: I) -> Self::EditMessageReplyMarkupInline where I: Into<String> {
+            let this = self;
+            $body!(edit_message_reply_markup_inline this (inline_message_id: I))
+        }
+    };
+    (@method stop_poll $body:ident $ty:ident) => {
+        type StopPoll = $ty![StopPoll];
+
+        fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll where C: Into<ChatId> {
+            let this = self;
+            $body!(stop_poll this (chat_id: C, message_id: i32))
+        }
+    };
+    (@method delete_message $body:ident $ty:ident) => {
+        type DeleteMessage = $ty![DeleteMessage];
+
+        fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage where C: Into<ChatId> {
+            let this = self;
+            $body!(delete_message this (chat_id: C, message_id: i32))
+        }
+    };
+    (@method send_sticker $body:ident $ty:ident) => {
+        type SendSticker = $ty![SendSticker];
+
+        fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker where C: Into<ChatId> {
+            let this = self;
+            $body!(send_sticker this (chat_id: C, sticker: InputFile))
+        }
+    };
+    (@method get_sticker_set $body:ident $ty:ident) => {
+        type GetStickerSet = $ty![GetStickerSet];
+
+        fn get_sticker_set<N>(&self, name: N) -> Self::GetStickerSet where N: Into<String> {
+            let this = self;
+            $body!(get_sticker_set this (name: N))
+        }
+    };
+    (@method upload_sticker_file $body:ident $ty:ident) => {
+        type UploadStickerFile = $ty![UploadStickerFile];
+
+        fn upload_sticker_file<>(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where  {
+            let this = self;
+            $body!(upload_sticker_file this (user_id: i32, png_sticker: InputFile))
+        }
+    };
+    (@method create_new_sticker_set $body:ident $ty:ident) => {
+        type CreateNewStickerSet = $ty![CreateNewStickerSet];
+
+        fn create_new_sticker_set<N, T, E>(&self, user_id: i32, name: N, title: T, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
+        T: Into<String>,
+        E: Into<String> {
+            let this = self;
+            $body!(create_new_sticker_set this (user_id: i32, name: N, title: T, emojis: E))
+        }
+    };
+    (@method add_sticker_to_set $body:ident $ty:ident) => {
+        type AddStickerToSet = $ty![AddStickerToSet];
+
+        fn add_sticker_to_set<N, E>(&self, user_id: i32, name: N, sticker: InputSticker, emojis: E) -> Self::AddStickerToSet where N: Into<String>,
+        E: Into<String> {
+            let this = self;
+            $body!(add_sticker_to_set this (user_id: i32, name: N, sticker: InputSticker, emojis: E))
+        }
+    };
+    (@method set_sticker_position_in_set $body:ident $ty:ident) => {
+        type SetStickerPositionInSet = $ty![SetStickerPositionInSet];
+
+        fn set_sticker_position_in_set<S>(&self, sticker: S, position: u32) -> Self::SetStickerPositionInSet where S: Into<String> {
+            let this = self;
+            $body!(set_sticker_position_in_set this (sticker: S, position: u32))
+        }
+    };(@method delete_sticker_from_set $body:ident $ty:ident) => {
+        type DeleteStickerFromSet = $ty![DeleteStickerFromSet];
+
+        fn delete_sticker_from_set<S>(&self, sticker: S) -> Self::DeleteStickerFromSet where S: Into<String> {
+            let this = self;
+            $body!(delete_sticker_from_set this (sticker: S))
+        }
+    };
+    (@method set_sticker_set_thumb $body:ident $ty:ident) => {
+        type SetStickerSetThumb = $ty![SetStickerSetThumb];
+
+        fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb where N: Into<String> {
+            let this = self;
+            $body!(set_sticker_set_thumb this (name: N, user_id: i32))
+        }
+    };
+    (@method send_invoice $body:ident $ty:ident) => {
+        type SendInvoice = $ty![SendInvoice];
+
+        fn send_invoice<T, D, Pa, P, S, C, Pri>(&self, chat_id: i32, title: T, description: D, payload: Pa, provider_token: P, start_parameter: S, currency: C, prices: Pri) -> Self::SendInvoice where T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice> {
+            let this = self;
+            $body!(send_invoice this (chat_id: i32, title: T, description: D, payload: Pa, provider_token: P, start_parameter: S, currency: C, prices: Pri))
+        }
+    };
+    (@method answer_shipping_query $body:ident $ty:ident) => {
+        type AnswerShippingQuery = $ty![AnswerShippingQuery];
+
+        fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> Self::AnswerShippingQuery where S: Into<String> {
+            let this = self;
+            $body!(answer_shipping_query this (shipping_query_id: S, ok: bool))
+        }
+    };
+    (@method answer_pre_checkout_query $body:ident $ty:ident) => {
+        type AnswerPreCheckoutQuery = $ty![AnswerPreCheckoutQuery];
+
+        fn answer_pre_checkout_query<P>(&self, pre_checkout_query_id: P, ok: bool) -> Self::AnswerPreCheckoutQuery where P: Into<String> {
+            let this = self;
+            $body!(answer_pre_checkout_query this (pre_checkout_query_id: P, ok: bool))
+        }
+    };
+    (@method set_passport_data_errors $body:ident $ty:ident) => {
+        type SetPassportDataErrors = $ty![SetPassportDataErrors];
+
+        fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors where E: IntoIterator<Item = PassportElementError> {
+            let this = self;
+            $body!(set_passport_data_errors this (user_id: i32, errors: E))
+        }
+    };
+}
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 4b31950b..573ab79f 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1,7 +1,11 @@
 use crate::{
-    payloads::{GetMe, SendMessage},
+    payloads::{GetMe, SendMessage, *},
     requests::Request,
-    types::ChatId,
+    types::{
+        AllowedUpdate, BotCommand, ChatAction, ChatId, ChatPermissions, DiceEmoji,
+        InlineQueryResult, InputFile, InputMedia, InputSticker, LabeledPrice, PassportElementError,
+        PollType,
+    },
 };
 
 /// The trait implemented by all bots & bot adaptors.
@@ -12,18 +16,686 @@ use crate::{
 pub trait Requester {
     type Err: std::error::Error + Send;
 
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (fea4d31).
+    // **DO NOT EDIT THIS BLOCK**,
+    // edit `cg` instead.
+
+    type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetUpdates`]
+    fn get_updates(&self) -> Self::GetUpdates where;
+
+    type SetWebhook: Request<Payload = SetWebhook, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetWebhook`]
+    fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook
+    where
+        U: Into<String>,
+        A: IntoIterator<Item = AllowedUpdate>;
+
+    type DeleteWebhook: Request<Payload = DeleteWebhook, Err = Self::Err>;
+
+    /// For telegram documentation see [`DeleteWebhook`]
+    fn delete_webhook(&self) -> Self::DeleteWebhook where;
+
+    type GetWebhookInfo: Request<Payload = GetWebhookInfo, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetWebhookInfo`]
+    fn get_webhook_info(&self) -> Self::GetWebhookInfo where;
+
     type GetMe: Request<Payload = GetMe, Err = Self::Err>;
 
-    /// For telegram documentation of the method see [`GetMe`].
-    fn get_me(&self) -> Self::GetMe;
+    /// For telegram documentation see [`GetMe`]
+    fn get_me(&self) -> Self::GetMe where;
 
     type SendMessage: Request<Payload = SendMessage, Err = Self::Err>;
 
-    /// For telegram documentation of the method see [`SendMessage`].
+    /// For telegram documentation see [`SendMessage`]
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
         C: Into<ChatId>,
         T: Into<String>;
 
-    // FIXME(waffle): add remaining 68 methods
+    type ForwardMessage: Request<Payload = ForwardMessage, Err = Self::Err>;
+
+    /// For telegram documentation see [`ForwardMessage`]
+    fn forward_message<C, F>(
+        &self,
+        chat_id: C,
+        from_chat_id: F,
+        message_id: i32,
+    ) -> Self::ForwardMessage
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>;
+
+    type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendPhoto`]
+    fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendAudio: Request<Payload = SendAudio, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendAudio`]
+    fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendDocument: Request<Payload = SendDocument, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendDocument`]
+    fn send_document<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        document: InputFile,
+        caption: Ca,
+    ) -> Self::SendDocument
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendVideo: Request<Payload = SendVideo, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendVideo`]
+    fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendAnimation: Request<Payload = SendAnimation, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendAnimation`]
+    fn send_animation<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        animation: InputFile,
+        caption: Ca,
+    ) -> Self::SendAnimation
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendVoice: Request<Payload = SendVoice, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendVoice`]
+    fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type SendVideoNote: Request<Payload = SendVideoNote, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendVideoNote`]
+    fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote
+    where
+        C: Into<ChatId>;
+
+    type SendMediaGroup: Request<Payload = SendMediaGroup, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendMediaGroup`]
+    fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup
+    where
+        C: Into<ChatId>,
+        M: IntoIterator<Item = InputMedia>;
+
+    type SendLocation: Request<Payload = SendLocation, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendLocation`]
+    fn send_location<C>(
+        &self,
+        chat_id: C,
+        latitude: f64,
+        longitude: f64,
+        live_period: u32,
+    ) -> Self::SendLocation
+    where
+        C: Into<ChatId>;
+
+    type EditMessageLiveLocation: Request<Payload = EditMessageLiveLocation, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageLiveLocation`]
+    fn edit_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::EditMessageLiveLocation
+    where
+        C: Into<ChatId>;
+
+    type EditMessageLiveLocationInline: Request<
+        Payload = EditMessageLiveLocationInline,
+        Err = Self::Err,
+    >;
+
+    /// For telegram documentation see [`EditMessageLiveLocationInline`]
+    fn edit_message_live_location_inline<I>(
+        &self,
+        inline_message_id: I,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::EditMessageLiveLocationInline
+    where
+        I: Into<String>;
+
+    type StopMessageLiveLocation: Request<Payload = StopMessageLiveLocation, Err = Self::Err>;
+
+    /// For telegram documentation see [`StopMessageLiveLocation`]
+    fn stop_message_live_location<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::StopMessageLiveLocation
+    where
+        C: Into<ChatId>;
+
+    type StopMessageLiveLocationInline: Request<
+        Payload = StopMessageLiveLocationInline,
+        Err = Self::Err,
+    >;
+
+    /// For telegram documentation see [`StopMessageLiveLocationInline`]
+    fn stop_message_live_location_inline<I>(
+        &self,
+        inline_message_id: I,
+        latitude: f64,
+        longitude: f64,
+    ) -> Self::StopMessageLiveLocationInline
+    where
+        I: Into<String>;
+
+    type SendVenue: Request<Payload = SendVenue, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendVenue`]
+    fn send_venue<C, T, A>(
+        &self,
+        chat_id: C,
+        latitude: f64,
+        longitude: f64,
+        title: T,
+        address: A,
+    ) -> Self::SendVenue
+    where
+        C: Into<ChatId>,
+        T: Into<String>,
+        A: Into<String>;
+
+    type SendContact: Request<Payload = SendContact, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendContact`]
+    fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact
+    where
+        C: Into<ChatId>;
+
+    type SendPoll: Request<Payload = SendPoll, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendPoll`]
+    fn send_poll<C, Q, O>(
+        &self,
+        chat_id: C,
+        question: Q,
+        options: O,
+        type_: PollType,
+    ) -> Self::SendPoll
+    where
+        C: Into<ChatId>,
+        Q: Into<String>,
+        O: IntoIterator<Item = String>;
+
+    type SendDice: Request<Payload = SendDice, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendDice`]
+    fn send_dice<C>(&self, chat_id: C, emoji: DiceEmoji) -> Self::SendDice
+    where
+        C: Into<ChatId>;
+
+    type SendChatAction: Request<Payload = SendChatAction, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendChatAction`]
+    fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction
+    where
+        C: Into<ChatId>;
+
+    type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetUserProfilePhotos`]
+    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos where;
+
+    type GetFile: Request<Payload = GetFile, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetFile`]
+    fn get_file<F>(&self, file_id: F) -> Self::GetFile
+    where
+        F: Into<String>;
+
+    type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
+
+    /// For telegram documentation see [`KickChatMember`]
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember
+    where
+        C: Into<ChatId>;
+
+    type UnbanChatMember: Request<Payload = UnbanChatMember, Err = Self::Err>;
+
+    /// For telegram documentation see [`UnbanChatMember`]
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember
+    where
+        C: Into<ChatId>;
+
+    type RestrictChatMember: Request<Payload = RestrictChatMember, Err = Self::Err>;
+
+    /// For telegram documentation see [`RestrictChatMember`]
+    fn restrict_chat_member<C>(
+        &self,
+        chat_id: C,
+        user_id: i32,
+        permissions: ChatPermissions,
+    ) -> Self::RestrictChatMember
+    where
+        C: Into<ChatId>;
+
+    type PromoteChatMember: Request<Payload = PromoteChatMember, Err = Self::Err>;
+
+    /// For telegram documentation see [`PromoteChatMember`]
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember
+    where
+        C: Into<ChatId>;
+
+    type SetChatAdministratorCustomTitle: Request<
+        Payload = SetChatAdministratorCustomTitle,
+        Err = Self::Err,
+    >;
+
+    /// For telegram documentation see [`SetChatAdministratorCustomTitle`]
+    fn set_chat_administrator_custom_title<Ch, Cu>(
+        &self,
+        chat_id: Ch,
+        user_id: i32,
+        custom_title: Cu,
+    ) -> Self::SetChatAdministratorCustomTitle
+    where
+        Ch: Into<ChatId>,
+        Cu: Into<String>;
+
+    type SetChatPermissions: Request<Payload = SetChatPermissions, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetChatPermissions`]
+    fn set_chat_permissions<C>(
+        &self,
+        chat_id: C,
+        permissions: ChatPermissions,
+    ) -> Self::SetChatPermissions
+    where
+        C: Into<ChatId>;
+
+    type ExportChatInviteLink: Request<Payload = ExportChatInviteLink, Err = Self::Err>;
+
+    /// For telegram documentation see [`ExportChatInviteLink`]
+    fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink
+    where
+        C: Into<ChatId>;
+
+    type SetChatPhoto: Request<Payload = SetChatPhoto, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetChatPhoto`]
+    fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
+    where
+        C: Into<ChatId>;
+
+    type DeleteChatPhoto: Request<Payload = DeleteChatPhoto, Err = Self::Err>;
+
+    /// For telegram documentation see [`DeleteChatPhoto`]
+    fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto
+    where
+        C: Into<ChatId>;
+
+    type SetChatTitle: Request<Payload = SetChatTitle, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetChatTitle`]
+    fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle
+    where
+        C: Into<ChatId>,
+        T: Into<String>;
+
+    type SetChatDescription: Request<Payload = SetChatDescription, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetChatDescription`]
+    fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription
+    where
+        C: Into<ChatId>;
+
+    type PinChatMessage: Request<Payload = PinChatMessage, Err = Self::Err>;
+
+    /// For telegram documentation see [`PinChatMessage`]
+    fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
+    where
+        C: Into<ChatId>;
+
+    type UnpinChatMessage: Request<Payload = UnpinChatMessage, Err = Self::Err>;
+
+    /// For telegram documentation see [`UnpinChatMessage`]
+    fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage
+    where
+        C: Into<ChatId>;
+
+    type LeaveChat: Request<Payload = LeaveChat, Err = Self::Err>;
+
+    /// For telegram documentation see [`LeaveChat`]
+    fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat
+    where
+        C: Into<ChatId>;
+
+    type GetChat: Request<Payload = GetChat, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetChat`]
+    fn get_chat<C>(&self, chat_id: C) -> Self::GetChat
+    where
+        C: Into<ChatId>;
+
+    type GetChatAdministrators: Request<Payload = GetChatAdministrators, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetChatAdministrators`]
+    fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators
+    where
+        C: Into<ChatId>;
+
+    type GetChatMembersCount: Request<Payload = GetChatMembersCount, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetChatMembersCount`]
+    fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount
+    where
+        C: Into<ChatId>;
+
+    type GetChatMember: Request<Payload = GetChatMember, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetChatMember`]
+    fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember
+    where
+        C: Into<ChatId>;
+
+    type SetChatStickerSet: Request<Payload = SetChatStickerSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetChatStickerSet`]
+    fn set_chat_sticker_set<C, S>(
+        &self,
+        chat_id: C,
+        sticker_set_name: S,
+    ) -> Self::SetChatStickerSet
+    where
+        C: Into<ChatId>,
+        S: Into<String>;
+
+    type DeleteChatStickerSet: Request<Payload = DeleteChatStickerSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`DeleteChatStickerSet`]
+    fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet
+    where
+        C: Into<ChatId>;
+
+    type AnswerCallbackQuery: Request<Payload = AnswerCallbackQuery, Err = Self::Err>;
+
+    /// For telegram documentation see [`AnswerCallbackQuery`]
+    fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery
+    where
+        C: Into<String>;
+
+    type SetMyCommands: Request<Payload = SetMyCommands, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetMyCommands`]
+    fn set_my_commands<C>(&self, commands: C) -> Self::SetMyCommands
+    where
+        C: IntoIterator<Item = BotCommand>;
+
+    type GetMyCommands: Request<Payload = GetMyCommands, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetMyCommands`]
+    fn get_my_commands(&self) -> Self::GetMyCommands where;
+
+    type AnswerInlineQuery: Request<Payload = AnswerInlineQuery, Err = Self::Err>;
+
+    /// For telegram documentation see [`AnswerInlineQuery`]
+    fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> Self::AnswerInlineQuery
+    where
+        I: Into<String>,
+        R: IntoIterator<Item = InlineQueryResult>;
+
+    type EditMessageText: Request<Payload = EditMessageText, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageText`]
+    fn edit_message_text<C, T>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        text: T,
+    ) -> Self::EditMessageText
+    where
+        C: Into<ChatId>,
+        T: Into<String>;
+
+    type EditMessageTextInline: Request<Payload = EditMessageTextInline, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageTextInline`]
+    fn edit_message_text_inline<I, T>(
+        &self,
+        inline_message_id: I,
+        text: T,
+    ) -> Self::EditMessageTextInline
+    where
+        I: Into<String>,
+        T: Into<String>;
+
+    type EditMessageCaption: Request<Payload = EditMessageCaption, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageCaption`]
+    fn edit_message_caption<Ch, Ca>(
+        &self,
+        chat_id: Ch,
+        message_id: i32,
+        caption: Ca,
+    ) -> Self::EditMessageCaption
+    where
+        Ch: Into<ChatId>,
+        Ca: Into<String>;
+
+    type EditMessageCaptionInline: Request<Payload = EditMessageCaptionInline, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageCaptionInline`]
+    fn edit_message_caption_inline<I, C>(
+        &self,
+        inline_message_id: I,
+        caption: C,
+    ) -> Self::EditMessageCaptionInline
+    where
+        I: Into<String>,
+        C: Into<String>;
+
+    type EditMessageMedia: Request<Payload = EditMessageMedia, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageMedia`]
+    fn edit_message_media<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+        media: InputMedia,
+    ) -> Self::EditMessageMedia
+    where
+        C: Into<ChatId>;
+
+    type EditMessageMediaInline: Request<Payload = EditMessageMediaInline, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageMediaInline`]
+    fn edit_message_media_inline<I>(
+        &self,
+        inline_message_id: I,
+        media: InputMedia,
+    ) -> Self::EditMessageMediaInline
+    where
+        I: Into<String>;
+
+    type EditMessageReplyMarkup: Request<Payload = EditMessageReplyMarkup, Err = Self::Err>;
+
+    /// For telegram documentation see [`EditMessageReplyMarkup`]
+    fn edit_message_reply_markup<C>(
+        &self,
+        chat_id: C,
+        message_id: i32,
+    ) -> Self::EditMessageReplyMarkup
+    where
+        C: Into<ChatId>;
+
+    type EditMessageReplyMarkupInline: Request<
+        Payload = EditMessageReplyMarkupInline,
+        Err = Self::Err,
+    >;
+
+    /// For telegram documentation see [`EditMessageReplyMarkupInline`]
+    fn edit_message_reply_markup_inline<I>(
+        &self,
+        inline_message_id: I,
+    ) -> Self::EditMessageReplyMarkupInline
+    where
+        I: Into<String>;
+
+    type StopPoll: Request<Payload = StopPoll, Err = Self::Err>;
+
+    /// For telegram documentation see [`StopPoll`]
+    fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
+    where
+        C: Into<ChatId>;
+
+    type DeleteMessage: Request<Payload = DeleteMessage, Err = Self::Err>;
+
+    /// For telegram documentation see [`DeleteMessage`]
+    fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
+    where
+        C: Into<ChatId>;
+
+    type SendSticker: Request<Payload = SendSticker, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendSticker`]
+    fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker
+    where
+        C: Into<ChatId>;
+
+    type GetStickerSet: Request<Payload = GetStickerSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetStickerSet`]
+    fn get_sticker_set<N>(&self, name: N) -> Self::GetStickerSet
+    where
+        N: Into<String>;
+
+    type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
+
+    /// For telegram documentation see [`UploadStickerFile`]
+    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where;
+
+    type CreateNewStickerSet: Request<Payload = CreateNewStickerSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`CreateNewStickerSet`]
+    fn create_new_sticker_set<N, T, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        title: T,
+        emojis: E,
+    ) -> Self::CreateNewStickerSet
+    where
+        N: Into<String>,
+        T: Into<String>,
+        E: Into<String>;
+
+    type AddStickerToSet: Request<Payload = AddStickerToSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`AddStickerToSet`]
+    fn add_sticker_to_set<N, E>(
+        &self,
+        user_id: i32,
+        name: N,
+        sticker: InputSticker,
+        emojis: E,
+    ) -> Self::AddStickerToSet
+    where
+        N: Into<String>,
+        E: Into<String>;
+
+    type SetStickerPositionInSet: Request<Payload = SetStickerPositionInSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetStickerPositionInSet`]
+    fn set_sticker_position_in_set<S>(
+        &self,
+        sticker: S,
+        position: u32,
+    ) -> Self::SetStickerPositionInSet
+    where
+        S: Into<String>;
+
+    type DeleteStickerFromSet: Request<Payload = DeleteStickerFromSet, Err = Self::Err>;
+
+    /// For telegram documentation see [`DeleteStickerFromSet`]
+    fn delete_sticker_from_set<S>(&self, sticker: S) -> Self::DeleteStickerFromSet
+    where
+        S: Into<String>;
+
+    type SetStickerSetThumb: Request<Payload = SetStickerSetThumb, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetStickerSetThumb`]
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb
+    where
+        N: Into<String>;
+
+    type SendInvoice: Request<Payload = SendInvoice, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendInvoice`]
+    #[allow(clippy::too_many_arguments)]
+    fn send_invoice<T, D, Pa, P, S, C, Pri>(
+        &self,
+        chat_id: i32,
+        title: T,
+        description: D,
+        payload: Pa,
+        provider_token: P,
+        start_parameter: S,
+        currency: C,
+        prices: Pri,
+    ) -> Self::SendInvoice
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        S: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice>;
+
+    type AnswerShippingQuery: Request<Payload = AnswerShippingQuery, Err = Self::Err>;
+
+    /// For telegram documentation see [`AnswerShippingQuery`]
+    fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> Self::AnswerShippingQuery
+    where
+        S: Into<String>;
+
+    type AnswerPreCheckoutQuery: Request<Payload = AnswerPreCheckoutQuery, Err = Self::Err>;
+
+    /// For telegram documentation see [`AnswerPreCheckoutQuery`]
+    fn answer_pre_checkout_query<P>(
+        &self,
+        pre_checkout_query_id: P,
+        ok: bool,
+    ) -> Self::AnswerPreCheckoutQuery
+    where
+        P: Into<String>;
+
+    type SetPassportDataErrors: Request<Payload = SetPassportDataErrors, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetPassportDataErrors`]
+    fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
+    where
+        E: IntoIterator<Item = PassportElementError>;
 }

From 7c9c871b83af854ab0c90ca9474ccf7978dacd83 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 Nov 2020 20:30:45 +0300
Subject: [PATCH 155/755] Remove empty generics lists, `where`s and ', ' after
 `self`

---
 src/bot/api.rs            | 12 ++++++------
 src/local_macros.rs       | 21 ++++++++++++---------
 src/requests/requester.rs | 16 ++++++++--------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 8427ddba..fa7c5d2d 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1709,7 +1709,7 @@ impl Requester for Bot {
 
     type GetUpdates = JsonRequest<payloads::GetUpdates>;
 
-    fn get_updates(&self) -> Self::GetUpdates where {
+    fn get_updates(&self) -> Self::GetUpdates {
         Self::GetUpdates::new(self.clone(), payloads::GetUpdates::new())
     }
 
@@ -1725,19 +1725,19 @@ impl Requester for Bot {
 
     type DeleteWebhook = JsonRequest<payloads::DeleteWebhook>;
 
-    fn delete_webhook(&self) -> Self::DeleteWebhook where {
+    fn delete_webhook(&self) -> Self::DeleteWebhook {
         Self::DeleteWebhook::new(self.clone(), payloads::DeleteWebhook::new())
     }
 
     type GetWebhookInfo = JsonRequest<payloads::GetWebhookInfo>;
 
-    fn get_webhook_info(&self) -> Self::GetWebhookInfo where {
+    fn get_webhook_info(&self) -> Self::GetWebhookInfo {
         Self::GetWebhookInfo::new(self.clone(), payloads::GetWebhookInfo::new())
     }
 
     type GetMe = JsonRequest<payloads::GetMe>;
 
-    fn get_me(&self) -> Self::GetMe where {
+    fn get_me(&self) -> Self::GetMe {
         Self::GetMe::new(self.clone(), payloads::GetMe::new())
     }
 
@@ -2029,7 +2029,7 @@ impl Requester for Bot {
 
     type GetUserProfilePhotos = JsonRequest<payloads::GetUserProfilePhotos>;
 
-    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos where {
+    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos {
         Self::GetUserProfilePhotos::new(self.clone(), payloads::GetUserProfilePhotos::new(user_id))
     }
 
@@ -2280,7 +2280,7 @@ impl Requester for Bot {
 
     type GetMyCommands = JsonRequest<payloads::GetMyCommands>;
 
-    fn get_my_commands(&self) -> Self::GetMyCommands where {
+    fn get_my_commands(&self) -> Self::GetMyCommands {
         Self::GetMyCommands::new(self.clone(), payloads::GetMyCommands::new())
     }
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index fc522950..83bf0f57 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -367,7 +367,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (fea4d31).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (a8fa55a).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -377,10 +377,12 @@ macro_rules! requester_forward {
             requester_forward!(@method $rest $body $ty);
         )*
     };
+
+
     (@method get_updates $body:ident $ty:ident) => {
         type GetUpdates = $ty![GetUpdates];
 
-        fn get_updates<>(&self, ) -> Self::GetUpdates where  {
+        fn get_updates(&self) -> Self::GetUpdates {
             let this = self;
             $body!(get_updates this ())
         }
@@ -397,7 +399,7 @@ macro_rules! requester_forward {
     (@method delete_webhook $body:ident $ty:ident) => {
         type DeleteWebhook = $ty![DeleteWebhook];
 
-        fn delete_webhook<>(&self, ) -> Self::DeleteWebhook where  {
+        fn delete_webhook(&self) -> Self::DeleteWebhook {
             let this = self;
             $body!(delete_webhook this ())
         }
@@ -405,7 +407,7 @@ macro_rules! requester_forward {
     (@method get_webhook_info $body:ident $ty:ident) => {
         type GetWebhookInfo = $ty![GetWebhookInfo];
 
-        fn get_webhook_info<>(&self, ) -> Self::GetWebhookInfo where  {
+        fn get_webhook_info(&self) -> Self::GetWebhookInfo {
             let this = self;
             $body!(get_webhook_info this ())
         }
@@ -413,7 +415,7 @@ macro_rules! requester_forward {
     (@method get_me $body:ident $ty:ident) => {
         type GetMe = $ty![GetMe];
 
-        fn get_me<>(&self, ) -> Self::GetMe where  {
+        fn get_me(&self) -> Self::GetMe {
             let this = self;
             $body!(get_me this ())
         }
@@ -594,7 +596,7 @@ macro_rules! requester_forward {
     (@method get_user_profile_photos $body:ident $ty:ident) => {
         type GetUserProfilePhotos = $ty![GetUserProfilePhotos];
 
-        fn get_user_profile_photos<>(&self, user_id: i32) -> Self::GetUserProfilePhotos where  {
+        fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos {
             let this = self;
             $body!(get_user_profile_photos this (user_id: i32))
         }
@@ -789,7 +791,7 @@ macro_rules! requester_forward {
     (@method get_my_commands $body:ident $ty:ident) => {
         type GetMyCommands = $ty![GetMyCommands];
 
-        fn get_my_commands<>(&self, ) -> Self::GetMyCommands where  {
+        fn get_my_commands(&self) -> Self::GetMyCommands {
             let this = self;
             $body!(get_my_commands this ())
         }
@@ -906,7 +908,7 @@ macro_rules! requester_forward {
     (@method upload_sticker_file $body:ident $ty:ident) => {
         type UploadStickerFile = $ty![UploadStickerFile];
 
-        fn upload_sticker_file<>(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where  {
+        fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile {
             let this = self;
             $body!(upload_sticker_file this (user_id: i32, png_sticker: InputFile))
         }
@@ -937,7 +939,8 @@ macro_rules! requester_forward {
             let this = self;
             $body!(set_sticker_position_in_set this (sticker: S, position: u32))
         }
-    };(@method delete_sticker_from_set $body:ident $ty:ident) => {
+    };
+    (@method delete_sticker_from_set $body:ident $ty:ident) => {
         type DeleteStickerFromSet = $ty![DeleteStickerFromSet];
 
         fn delete_sticker_from_set<S>(&self, sticker: S) -> Self::DeleteStickerFromSet where S: Into<String> {
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 573ab79f..5352ab35 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -16,14 +16,14 @@ use crate::{
 pub trait Requester {
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (fea4d31).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (a8fa55a).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 
     /// For telegram documentation see [`GetUpdates`]
-    fn get_updates(&self) -> Self::GetUpdates where;
+    fn get_updates(&self) -> Self::GetUpdates;
 
     type SetWebhook: Request<Payload = SetWebhook, Err = Self::Err>;
 
@@ -36,17 +36,17 @@ pub trait Requester {
     type DeleteWebhook: Request<Payload = DeleteWebhook, Err = Self::Err>;
 
     /// For telegram documentation see [`DeleteWebhook`]
-    fn delete_webhook(&self) -> Self::DeleteWebhook where;
+    fn delete_webhook(&self) -> Self::DeleteWebhook;
 
     type GetWebhookInfo: Request<Payload = GetWebhookInfo, Err = Self::Err>;
 
     /// For telegram documentation see [`GetWebhookInfo`]
-    fn get_webhook_info(&self) -> Self::GetWebhookInfo where;
+    fn get_webhook_info(&self) -> Self::GetWebhookInfo;
 
     type GetMe: Request<Payload = GetMe, Err = Self::Err>;
 
     /// For telegram documentation see [`GetMe`]
-    fn get_me(&self) -> Self::GetMe where;
+    fn get_me(&self) -> Self::GetMe;
 
     type SendMessage: Request<Payload = SendMessage, Err = Self::Err>;
 
@@ -266,7 +266,7 @@ pub trait Requester {
     type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
 
     /// For telegram documentation see [`GetUserProfilePhotos`]
-    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos where;
+    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos;
 
     type GetFile: Request<Payload = GetFile, Err = Self::Err>;
 
@@ -456,7 +456,7 @@ pub trait Requester {
     type GetMyCommands: Request<Payload = GetMyCommands, Err = Self::Err>;
 
     /// For telegram documentation see [`GetMyCommands`]
-    fn get_my_commands(&self) -> Self::GetMyCommands where;
+    fn get_my_commands(&self) -> Self::GetMyCommands;
 
     type AnswerInlineQuery: Request<Payload = AnswerInlineQuery, Err = Self::Err>;
 
@@ -594,7 +594,7 @@ pub trait Requester {
     type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
 
     /// For telegram documentation see [`UploadStickerFile`]
-    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where;
+    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile;
 
     type CreateNewStickerSet: Request<Payload = CreateNewStickerSet, Err = Self::Err>;
 

From 45cf62ce8e0fd1e7892587512b8a9b25c8341f9d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 27 Nov 2020 01:18:57 +0300
Subject: [PATCH 156/755] Refactor Bot for a bit

- Move default parse mode to an adaptor
- Remove bot builder (it's not usefull anymore, since parse_mode is moved away)
    - Undeprecate bot constructors
---
 src/adaptors.rs               |   4 +
 src/adaptors/parse_mode.rs    | 108 ++++++++++++++++++
 src/bot/api.rs                |  79 +++----------
 src/bot/mod.rs                | 205 ++++++++--------------------------
 src/lib.rs                    |   6 +-
 src/requests/requester_ext.rs |  34 +++++-
 6 files changed, 207 insertions(+), 229 deletions(-)
 create mode 100644 src/adaptors/parse_mode.rs

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 09c4fec8..40982784 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -19,6 +19,8 @@ pub mod cache_me;
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
 pub mod throttle;
 
+mod parse_mode;
+
 #[cfg(feature = "auto_send")]
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
 pub use auto_send::AutoSend;
@@ -29,4 +31,6 @@ pub use cache_me::CacheMe;
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
 pub use throttle::Throttle;
 
+pub use parse_mode::DefaultParseMode;
+
 // FIXME: move default `parse_mode` to adaptor
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
new file mode 100644
index 00000000..e191e73d
--- /dev/null
+++ b/src/adaptors/parse_mode.rs
@@ -0,0 +1,108 @@
+use crate::{
+    prelude::Requester,
+    requests::HasPayload,
+    types::{ChatId, InputFile, ParseMode, *},
+};
+
+/// Default parse mode adaptor, see
+/// [`RequesterExt::parse_mode`](crate::requests::RequesterExt::parse_mode)
+pub struct DefaultParseMode<B> {
+    bot: B,
+    mode: ParseMode,
+}
+
+impl<B> DefaultParseMode<B> {
+    /// Creates new [`DefaultParseMode`]
+    ///
+    /// Note: it's recommended to use [`RequesterExt::parse_mode`] instead.
+    ///
+    /// [`RequesterExt::parse_mode`]: crate::requests::RequesterExt::parse_mode
+    pub fn new(bot: B, parse_mode: ParseMode) -> Self {
+        Self { bot, mode: parse_mode }
+    }
+
+    /// Allows to access inner bot
+    pub fn inner(&self) -> &B {
+        &self.bot
+    }
+
+    /// Unwraps inner bot
+    pub fn into_inner(self) -> B {
+        self.bot
+    }
+}
+
+macro_rules! f {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        {
+            let mut req = $this.inner().$m($($arg),*);
+            req.payload_mut().parse_mode = Some($this.mode);
+            req
+        }
+    };
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        B::$T
+    };
+}
+
+macro_rules! fid {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        $this.inner().$m($($arg),*)
+    };
+}
+
+impl<B: Requester> Requester for DefaultParseMode<B> {
+    type Err = B::Err;
+
+    requester_forward! {
+        send_message,
+        send_photo,
+        send_video,
+        send_audio,
+        send_document,
+        send_animation,
+        send_voice,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline => f, fty
+    }
+
+    type SendPoll = B::SendPoll;
+
+    fn send_poll<C, Q, O>(
+        &self,
+        chat_id: C,
+        question: Q,
+        options: O,
+        type_: PollType,
+    ) -> Self::SendPoll
+    where
+        C: Into<ChatId>,
+        Q: Into<String>,
+        O: IntoIterator<Item = String>,
+    {
+        let mut req = self.inner().send_poll(chat_id, question, options, type_);
+        req.payload_mut().explanation_parse_mode = Some(self.mode);
+        req
+    }
+
+    requester_forward! {
+        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
+        stop_message_live_location_inline, send_venue, send_contact, send_dice,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
+        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
+        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
+        get_my_commands, answer_inline_query, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
+        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => fid, fty
+    }
+}
diff --git a/src/bot/api.rs b/src/bot/api.rs
index fa7c5d2d..9bebc7bb 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -21,7 +21,7 @@ use crate::{
     },
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, ParseMode, TargetMessage,
+        InputSticker, LabeledPrice, TargetMessage,
     },
     Bot,
 };
@@ -130,10 +130,7 @@ impl Bot {
         C: Into<ChatId>,
         T: Into<String>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendMessage::new(self.clone(), chat_id, text),
-            SendMessage::parse_mode,
-        )
+        SendMessage::new(self.clone(), chat_id, text)
     }
 
     /// Use this method to forward messages of any kind.
@@ -192,10 +189,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendPhoto::new(self.clone(), chat_id, photo),
-            SendPhoto::parse_mode,
-        )
+        SendPhoto::new(self.clone(), chat_id, photo)
     }
 
     ///
@@ -213,10 +207,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendAudio::new(self.clone(), chat_id, audio),
-            SendAudio::parse_mode,
-        )
+        SendAudio::new(self.clone(), chat_id, audio)
     }
 
     /// Use this method to send general files.
@@ -247,10 +238,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendDocument::new(self.clone(), chat_id, document),
-            SendDocument::parse_mode,
-        )
+        SendDocument::new(self.clone(), chat_id, document)
     }
 
     /// Use this method to send video files, Telegram clients support mp4 videos
@@ -284,10 +272,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendVideo::new(self.clone(), chat_id, video),
-            SendVideo::parse_mode,
-        )
+        SendVideo::new(self.clone(), chat_id, video)
     }
 
     /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video
@@ -312,10 +297,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendAnimation::new(self.clone(), chat_id, animation),
-            SendAnimation::parse_mode,
-        )
+        SendAnimation::new(self.clone(), chat_id, animation)
     }
 
     /// Use this method to send audio files, if you want Telegram clients to
@@ -355,10 +337,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendVoice::new(self.clone(), chat_id, voice),
-            SendVoice::parse_mode,
-        )
+        SendVoice::new(self.clone(), chat_id, voice)
     }
 
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up
@@ -583,10 +562,7 @@ impl Bot {
         Q: Into<String>,
         O: Into<Vec<String>>,
     {
-        self.with_default_parse_mode_if_specified(
-            SendPoll::new(self.clone(), chat_id, question, options),
-            SendPoll::explanation_parse_mode,
-        )
+        SendPoll::new(self.clone(), chat_id, question, options)
     }
 
     /// Use this method when you need to tell the user that something is
@@ -1069,12 +1045,7 @@ impl Bot {
         C: Into<ChatId>,
         T: Into<String>,
     {
-        match self.parse_mode {
-            None => EditMessageText::new(self.clone(), chat_id, message_id, text),
-            Some(parse_mode) => {
-                EditMessageText::new(self.clone(), chat_id, message_id, text).parse_mode(parse_mode)
-            }
-        }
+        EditMessageText::new(self.clone(), chat_id, message_id, text)
     }
 
     /// Use this method to edit text and game messages sent via the bot.
@@ -1105,11 +1076,7 @@ impl Bot {
         I: Into<String>,
         T: Into<String>,
     {
-        match self.parse_mode {
-            None => EditInlineMessageText::new(self.clone(), inline_message_id, text),
-            Some(parse_mode) => EditInlineMessageText::new(self.clone(), inline_message_id, text)
-                .parse_mode(parse_mode),
-        }
+        EditInlineMessageText::new(self.clone(), inline_message_id, text)
     }
 
     /// Use this method to edit captions of messages sent via the bot.
@@ -1130,12 +1097,7 @@ impl Bot {
     where
         C: Into<ChatId>,
     {
-        match self.parse_mode {
-            None => EditMessageCaption::new(self.clone(), chat_id, message_id),
-            Some(parse_mode) => {
-                EditMessageCaption::new(self.clone(), chat_id, message_id).parse_mode(parse_mode)
-            }
-        }
+        EditMessageCaption::new(self.clone(), chat_id, message_id)
     }
 
     /// Use this method to edit captions of messages sent via the bot.
@@ -1155,11 +1117,7 @@ impl Bot {
     where
         I: Into<String>,
     {
-        match self.parse_mode {
-            None => EditInlineMessageCaption::new(self.clone(), inline_message_id),
-            Some(parse_mode) => EditInlineMessageCaption::new(self.clone(), inline_message_id)
-                .parse_mode(parse_mode),
-        }
+        EditInlineMessageCaption::new(self.clone(), inline_message_id)
     }
 
     /// Use this method to edit animation, audio, document, photo, or video
@@ -1691,17 +1649,6 @@ impl Bot {
     {
         SetStickerSetThumb::new(self.clone(), name, user_id)
     }
-
-    fn with_default_parse_mode_if_specified<Builder>(
-        &self,
-        builder: Builder,
-        f: fn(Builder, ParseMode) -> Builder,
-    ) -> Builder {
-        match self.parse_mode {
-            None => builder,
-            Some(parse_mode) => f(builder, parse_mode),
-        }
-    }
 }
 
 impl Requester for Bot {
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index bdba198b..6187cf41 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -11,7 +11,6 @@ use crate::{
     net,
     requests::{Payload, ResponseResult},
     serde_multipart,
-    types::ParseMode,
 };
 
 mod api;
@@ -31,56 +30,15 @@ pub struct Bot {
     token: Arc<str>,
     api_url: ApiUrl,
     client: Client,
-    parse_mode: Option<ParseMode>,
 }
 
 impl Bot {
-    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` & `TELOXIDE_PROXY`
-    /// environmental variables (a bot's token & a proxy) and the default
-    /// [`reqwest::Client`].
-    ///
-    /// This function passes the value of `TELOXIDE_PROXY` into
-    /// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
-    /// client.
-    ///
-    /// # Panics
-    ///  - If cannot get the `TELOXIDE_TOKEN`  environmental variable.
-    ///  - If it cannot create [`reqwest::Client`].
-    ///
-    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
-    /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
-    #[must_use]
-    pub fn from_env() -> Self {
-        BotBuilder::new().build()
-    }
-
-    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
-    /// bot's token) and your [`reqwest::Client`].
-    ///
-    /// # Panics
-    /// If cannot get the `TELOXIDE_TOKEN` environmental variable.
-    ///
-    /// # Caution
-    /// Your custom client might not be configured correctly to be able to work
-    /// in long time durations, see [issue 223].
-    ///
-    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
-    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
-    #[deprecated]
-    #[allow(deprecated)]
-    pub fn from_env_with_client(client: Client) -> Self {
-        Self::with_client(&get_env(TELOXIDE_TOKEN), client)
-    }
-
     /// Creates a new `Bot` with the specified token and the default
-    /// [`reqwest::Client`].
+    /// [http-client](reqwest::Client).
     ///
     /// # Panics
-    /// If it cannot create [`reqwest::Client`].
     ///
-    /// [`reqwest::Client`]: https://docs.rs/reqwest/latest/reqwest/struct.Client.html
-    #[deprecated]
-    #[allow(deprecated)]
+    /// If it cannot create [`reqwest::Client`].
     pub fn new<S>(token: S) -> Self
     where
         S: Into<String>,
@@ -97,8 +55,6 @@ impl Bot {
     ///
     /// [`reqwest::Client`]: https://docs.rs/reqwest/latest/reqwest/struct.Client.html
     /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
-    #[deprecated]
-    #[allow(deprecated)]
     pub fn with_client<S>(token: S, client: Client) -> Self
     where
         S: Into<String>,
@@ -107,9 +63,52 @@ impl Bot {
             token: Into::<Arc<str>>::into(Into::<String>::into(token)),
             api_url: ApiUrl::Default,
             client,
-            parse_mode: None,
         }
     }
+
+    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` & `TELOXIDE_PROXY`
+    /// environmental variables (a bot's token & a proxy) and the default
+    /// [`reqwest::Client`].
+    ///
+    /// This function passes the value of `TELOXIDE_PROXY` into
+    /// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
+    /// client.
+    ///
+    /// # Panics
+    ///  - If cannot get the `TELOXIDE_TOKEN`  environmental variable.
+    ///  - If it cannot create [`reqwest::Client`].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
+    /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
+    pub fn from_env() -> Self {
+        Self::from_env_with_client(crate::client_from_env())
+    }
+
+    /// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
+    /// bot's token) and your [`reqwest::Client`].
+    ///
+    /// # Panics
+    /// If cannot get the `TELOXIDE_TOKEN` environmental variable.
+    ///
+    /// # Caution
+    /// Your custom client might not be configured correctly to be able to work
+    /// in long time durations, see [issue 223].
+    ///
+    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
+    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+    pub fn from_env_with_client(client: Client) -> Self {
+        Self::with_client(&get_env(TELOXIDE_TOKEN), client)
+    }
+
+    /// Returns currently used token
+    pub fn token(&self) -> &str {
+        &self.token
+    }
+
+    /// Returns currently used http-client
+    pub fn client(&self) -> &Client {
+        &self.client
+    }
 }
 
 impl Bot {
@@ -182,115 +181,3 @@ pub(crate) fn build_sound_bot() -> Client {
 fn get_env(env: &'static str) -> String {
     std::env::var(env).unwrap_or_else(|_| panic!("Cannot get the {} env variable", env))
 }
-
-impl Bot {
-    pub fn token(&self) -> &str {
-        &self.token
-    }
-
-    pub fn client(&self) -> &Client {
-        &self.client
-    }
-}
-
-/// A builder of [`Bot`], supporting some extra settings.
-///
-/// [`Bot`] crate::Bot
-#[derive(Debug, Default)]
-pub struct BotBuilder {
-    token: Option<String>,
-    client: Option<Client>,
-    parse_mode: Option<ParseMode>,
-}
-
-impl BotBuilder {
-    #[must_use]
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Specifies a custom HTTPS client. Otherwise, the default will be used.
-    ///
-    /// # Caution
-    ///  - Your custom client might not be configured correctly to be able to
-    ///    work
-    /// in long time durations, see [issue 223].
-    ///
-    ///  - If this method is used, the `TELOXIDE_PROXY` environmental variable
-    ///    won't be extracted in [`BotBuilder::build`].
-    ///
-    /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
-    /// [`BotBuilder::build`]: crate::BotBuilder::build
-    #[must_use]
-    pub fn client(mut self, client: Client) -> Self {
-        self.client = Some(client);
-        self
-    }
-
-    /// Specified a custom token.
-    ///
-    /// Otherwise, a token will be extracted from the `TELOXIDE_TOKEN`
-    /// environmental variable.
-    #[must_use]
-    pub fn token<S>(mut self, token: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.token = Some(token.into());
-        self
-    }
-
-    /// Specifies [`ParseMode`], which will be used during all calls to:
-    ///
-    ///  - [`send_message`]
-    ///  - [`send_photo`]
-    ///  - [`send_video`]
-    ///  - [`send_audio`]
-    ///  - [`send_document`]
-    ///  - [`send_animation`]
-    ///  - [`send_voice`]
-    ///  - [`send_poll`]
-    ///  - [`edit_message_text`]
-    ///  - [`edit_message_caption`]
-    ///
-    /// [`send_message`]: crate::Bot::send_message
-    /// [`send_photo`]: crate::Bot::send_photo
-    /// [`send_video`]: crate::Bot::send_video
-    /// [`send_audio`]: crate::Bot::send_audio
-    /// [`send_document`]: crate::Bot::send_document
-    /// [`send_animation`]: crate::Bot::send_animation
-    /// [`send_voice`]: crate::Bot::send_voice
-    /// [`send_poll`]: crate::Bot::send_poll
-    /// [`edit_message_text`]: crate::Bot::edit_message_text
-    /// [`edit_message_caption`]: crate::Bot::edit_message_caption
-    #[must_use]
-    pub fn parse_mode(mut self, parse_mode: ParseMode) -> Self {
-        self.parse_mode = Some(parse_mode);
-        self
-    }
-
-    /// Builds [`Bot`].
-    ///
-    /// This method will attempt to build a new client with a proxy, specified
-    /// in the `TELOXIDE_PROXY` (passed into [`reqwest::Proxy::all`])
-    /// environmental variable, if a client haven't been specified. If
-    /// `TELOXIDE_PROXY` is unspecified, it'll use no proxy.
-    ///
-    /// # Panics
-    ///  - If cannot get the `TELOXIDE_TOKEN` environmental variable.
-    ///  - If it cannot create [`reqwest::Client`].
-    ///
-    /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
-    ///
-    /// [`Bot`]: crate::Bot
-    /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
-    #[must_use]
-    pub fn build(self) -> Bot {
-        Bot {
-            token: self.token.unwrap_or_else(|| get_env(TELOXIDE_TOKEN)).into(),
-            api_url: ApiUrl::Default,
-            client: self.client.unwrap_or_else(crate::client_from_env),
-            parse_mode: self.parse_mode,
-        }
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
index ef19a9c9..54d79c30 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,19 +7,19 @@
 // ```console
 // $ RUSTDOCFLAGS="--cfg docsrs" cargo doc --open --all-features
 // ```
+#![forbid(unsafe_code)]
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
-#![forbid(unsafe_code)]
 #![cfg_attr(feature = "full", deny(broken_intra_doc_links))]
 //#![deny(missing_docs)]
 
-#[macro_use]
 // The internal helper macros.
+#[macro_use]
 mod local_macros;
 
 // FIXME(waffle): rethink modules, find a place for wrappers.
 pub use self::{
-    bot::{Bot, BotBuilder},
+    bot::Bot,
     errors::{ApiError, DownloadError, RequestError},
 };
 
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 1b5530b2..f819b0f3 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,4 +1,4 @@
-use crate::requests::Requester;
+use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
 
 #[cfg(feature = "cache_me")]
 use crate::adaptors::CacheMe;
@@ -46,6 +46,38 @@ pub trait RequesterExt: Requester {
     {
         Throttle::new_spawn(self, limits)
     }
+
+    /// Specifies default [`ParseMode`], which will be used during all calls to:
+    ///
+    ///  - [`send_message`]
+    ///  - [`send_photo`]
+    ///  - [`send_video`]
+    ///  - [`send_audio`]
+    ///  - [`send_document`]
+    ///  - [`send_animation`]
+    ///  - [`send_voice`]
+    ///  - [`send_poll`]
+    ///  - [`edit_message_text`] (and [`edit_message_text_inline`])
+    ///  - [`edit_message_caption`] (and [`edit_message_caption_inline`])
+    ///
+    /// [`send_message`]: crate::Requester::send_message
+    /// [`send_photo`]: crate::Requester::send_photo
+    /// [`send_video`]: crate::Requester::send_video
+    /// [`send_audio`]: crate::Requester::send_audio
+    /// [`send_document`]: crate::Requester::send_document
+    /// [`send_animation`]: crate::Requester::send_animation
+    /// [`send_voice`]: crate::Requester::send_voice
+    /// [`send_poll`]: crate::Requester::send_poll
+    /// [`edit_message_text`]: crate::Requester::edit_message_text
+    /// [`edit_message_text`]: crate::Requester::edit_message_text_inline
+    /// [`edit_message_caption`]: crate::Requester::edit_message_caption
+    /// [`edit_message_caption`]: crate::Requester::edit_message_caption_inline
+    fn parse_mode(self, parse_mode: ParseMode) -> DefaultParseMode<Self>
+    where
+        Self: Sized,
+    {
+        DefaultParseMode::new(self, parse_mode)
+    }
 }
 
 impl<T> RequesterExt for T

From eb45ac7d884488e158a07e2bf0637d70dfbf31bc Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 27 Nov 2020 01:39:35 +0300
Subject: [PATCH 157/755] Fix doc links

---
 src/bot/api.rs                | 79 -----------------------------------
 src/requests/requester_ext.rs | 27 ++++++------
 2 files changed, 15 insertions(+), 91 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 9bebc7bb..9facaba9 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -119,12 +119,6 @@ impl Bot {
     ///   - `chat_id`: Unique identifier for the target chat or username of the
     ///     target supergroup or channel (in the format `@channelusername`).
     ///   - `text`: Text of the message to be sent.
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_message<C, T>(&self, chat_id: C, text: T) -> SendMessage
     where
         C: Into<ChatId>,
@@ -179,12 +173,6 @@ impl Bot {
     /// [`InputFile::FileId`]: crate::types::InputFile::FileId
     ///
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> SendPhoto
     where
         C: Into<ChatId>,
@@ -197,12 +185,6 @@ impl Bot {
     /// # Params
     ///   - `chat_id`: Unique identifier for the target chat or username of the
     ///     target supergroup or channel (in the format `@channelusername`).
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> SendAudio
     where
         C: Into<ChatId>,
@@ -228,12 +210,6 @@ impl Bot {
     /// `multipart/form-data`. [More info on Sending Files »].
     ///
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_document<C>(&self, chat_id: C, document: InputFile) -> SendDocument
     where
         C: Into<ChatId>,
@@ -262,12 +238,6 @@ impl Bot {
     /// [`InputFile::File`]: crate::types::InputFile::File
     /// [`InputFile::Url`]: crate::types::InputFile::Url
     /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_video<C>(&self, chat_id: C, video: InputFile) -> SendVideo
     where
         C: Into<ChatId>,
@@ -287,12 +257,6 @@ impl Bot {
     ///   - `chat_id`: Unique identifier for the target chat or username of the
     ///     target supergroup or channel (in the format `@channelusername`).
     ///   - `animation`: Animation to send.
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> SendAnimation
     where
         C: Into<ChatId>,
@@ -327,12 +291,6 @@ impl Bot {
     /// [`InputFile::Url`]: crate::types::InputFile::Url
     /// [`InputFile::FileId`]: crate::types::InputFile::FileId
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> SendVoice
     where
         C: Into<ChatId>,
@@ -546,16 +504,6 @@ impl Bot {
     ///   - `question`: Poll question, 1-255 characters.
     ///   - `options`: List of answer options, 2-10 strings 1-100 characters
     ///     each.
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] ([`SendPoll::explanation_parse_mode`]) if
-    /// specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
-    /// [`SendPoll::explanation_parse_mode`]:
-    /// [`SendPoll::explanation_parse_mode`]:
-    /// crate::types::SendPoll::explanation_parse_mode
     pub fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> SendPoll
     where
         C: Into<ChatId>,
@@ -1033,13 +981,6 @@ impl Bot {
     ///    target channel (in the format `@channelusername`).
     ///  - `message_id`: Identifier of the message to edit.
     ///  - `text`: New text of the message.
-    ///
-    /// # Notes
-    ///
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> EditMessageText
     where
         C: Into<ChatId>,
@@ -1060,13 +1001,6 @@ impl Bot {
     ///
     ///  - `inline_message_id`: Identifier of the inline message.
     ///  - `text`: New text of the message.
-    ///
-    /// # Notes
-    ///
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn edit_inline_message_text<I, T>(
         &self,
         inline_message_id: I,
@@ -1086,13 +1020,6 @@ impl Bot {
     /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
     ///
     /// [`True`]: crate::types::True
-    ///
-    /// # Notes
-    ///
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> EditMessageCaption
     where
         C: Into<ChatId>,
@@ -1107,12 +1034,6 @@ impl Bot {
     /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
     ///
     /// [`True`]: crate::types::True
-    ///
-    /// # Notes
-    /// Uses [a default parse mode] if specified in [`BotBuilder`].
-    ///
-    /// [a default parse mode]: crate::BotBuilder::parse_mode
-    /// [`BotBuilder`]: crate::BotBuilder
     pub fn edit_inline_message_caption<I>(&self, inline_message_id: I) -> EditInlineMessageCaption
     where
         I: Into<String>,
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index f819b0f3..57ef9a52 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -60,18 +60,21 @@ pub trait RequesterExt: Requester {
     ///  - [`edit_message_text`] (and [`edit_message_text_inline`])
     ///  - [`edit_message_caption`] (and [`edit_message_caption_inline`])
     ///
-    /// [`send_message`]: crate::Requester::send_message
-    /// [`send_photo`]: crate::Requester::send_photo
-    /// [`send_video`]: crate::Requester::send_video
-    /// [`send_audio`]: crate::Requester::send_audio
-    /// [`send_document`]: crate::Requester::send_document
-    /// [`send_animation`]: crate::Requester::send_animation
-    /// [`send_voice`]: crate::Requester::send_voice
-    /// [`send_poll`]: crate::Requester::send_poll
-    /// [`edit_message_text`]: crate::Requester::edit_message_text
-    /// [`edit_message_text`]: crate::Requester::edit_message_text_inline
-    /// [`edit_message_caption`]: crate::Requester::edit_message_caption
-    /// [`edit_message_caption`]: crate::Requester::edit_message_caption_inline
+    /// [`send_message`]: crate::requests::Requester::send_message
+    /// [`send_photo`]: crate::requests::Requester::send_photo
+    /// [`send_video`]: crate::requests::Requester::send_video
+    /// [`send_audio`]: crate::requests::Requester::send_audio
+    /// [`send_document`]: crate::requests::Requester::send_document
+    /// [`send_animation`]: crate::requests::Requester::send_animation
+    /// [`send_voice`]: crate::requests::Requester::send_voice
+    /// [`send_poll`]: crate::requests::Requester::send_poll
+    /// [`edit_message_text`]: crate::requests::Requester::edit_message_text
+    /// [`edit_message_text_inline`]:
+    /// crate::requests::Requester::edit_message_text_inline
+    /// [`edit_message_caption`]:
+    /// crate::requests::Requester::edit_message_caption
+    /// [`edit_message_caption_inline`]:
+    /// crate::requests::Requester::edit_message_caption_inline
     fn parse_mode(self, parse_mode: ParseMode) -> DefaultParseMode<Self>
     where
         Self: Sized,

From 84ac0212e819fbdccdff4b5323d14d40ea742632 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 26 Nov 2020 12:28:52 +0300
Subject: [PATCH 158/755] Remove legacy code

---
 src/bot/api.rs                                | 1569 +----------------
 src/bot/mod.rs                                |    4 +-
 src/net/mod.rs                                |    2 +-
 src/net/request.rs                            |   75 +-
 src/requests/all/add_sticker_to_set.rs        |   96 -
 src/requests/all/answer_callback_query.rs     |  101 --
 src/requests/all/answer_inline_query.rs       |  146 --
 src/requests/all/answer_pre_checkout_query.rs |   82 -
 src/requests/all/answer_shipping_query.rs     |   86 -
 src/requests/all/create_new_sticker_set.rs    |  120 --
 src/requests/all/delete_chat_photo.rs         |   50 -
 src/requests/all/delete_chat_sticker_set.rs   |   55 -
 src/requests/all/delete_message.rs            |   67 -
 src/requests/all/delete_sticker_from_set.rs   |   47 -
 src/requests/all/delete_webhook.rs            |   37 -
 .../all/edit_inline_message_caption.rs        |   83 -
 .../all/edit_inline_message_live_location.rs  |   77 -
 src/requests/all/edit_inline_message_media.rs |   72 -
 .../all/edit_inline_message_reply_markup.rs   |   62 -
 src/requests/all/edit_inline_message_text.rs  |   98 -
 src/requests/all/edit_message_caption.rs      |   91 -
 .../all/edit_message_live_location.rs         |   91 -
 src/requests/all/edit_message_media.rs        |   78 -
 src/requests/all/edit_message_reply_markup.rs |   69 -
 src/requests/all/edit_message_text.rs         |  107 --
 src/requests/all/export_chat_invite_link.rs   |   65 -
 src/requests/all/forward_message.rs           |   81 -
 src/requests/all/get_chat.rs                  |   50 -
 src/requests/all/get_chat_administrators.rs   |   53 -
 src/requests/all/get_chat_member.rs           |   55 -
 src/requests/all/get_chat_members_count.rs    |   48 -
 src/requests/all/get_file.rs                  |   62 -
 src/requests/all/get_game_high_scores.rs      |   63 -
 src/requests/all/get_me.rs                    |   33 -
 src/requests/all/get_my_commands.rs           |   33 -
 src/requests/all/get_sticker_set.rs           |   47 -
 src/requests/all/get_updates.rs               |  106 --
 src/requests/all/get_updates_non_strict.rs    |   97 -
 src/requests/all/get_user_profile_photos.rs   |   58 -
 src/requests/all/get_webhook_info.rs          |   38 -
 src/requests/all/kick_chat_member.rs          |   72 -
 src/requests/all/leave_chat.rs                |   48 -
 src/requests/all/mod.rs                       |  154 --
 src/requests/all/pin_chat_message.rs          |   69 -
 src/requests/all/promote_chat_member.rs       |  134 --
 src/requests/all/restrict_chat_member.rs      |   76 -
 src/requests/all/send_animation.rs            |  158 --
 src/requests/all/send_audio.rs                |  183 --
 src/requests/all/send_chat_action.rs          |  105 --
 src/requests/all/send_contact.rs              |  129 --
 src/requests/all/send_dice.rs                 |   93 -
 src/requests/all/send_document.rs             |  140 --
 src/requests/all/send_game.rs                 |   92 -
 src/requests/all/send_invoice.rs              |  299 ----
 src/requests/all/send_location.rs             |  110 --
 src/requests/all/send_media_group.rs          |   78 -
 src/requests/all/send_message.rs              |  121 --
 src/requests/all/send_photo.rs                |  127 --
 src/requests/all/send_poll.rs                 |  217 ---
 src/requests/all/send_sticker.rs              |  104 --
 src/requests/all/send_venue.rs                |  159 --
 src/requests/all/send_video.rs                |  182 --
 src/requests/all/send_video_note.rs           |  138 --
 src/requests/all/send_voice.rs                |  144 --
 .../set_chat_administrator_custom_title.rs    |   75 -
 src/requests/all/set_chat_description.rs      |   62 -
 src/requests/all/set_chat_permissions.rs      |   58 -
 src/requests/all/set_chat_photo.rs            |   58 -
 src/requests/all/set_chat_sticker_set.rs      |   64 -
 src/requests/all/set_chat_title.rs            |   63 -
 src/requests/all/set_game_score.rs            |   89 -
 src/requests/all/set_my_commands.rs           |   49 -
 .../all/set_sticker_position_in_set.rs        |   56 -
 src/requests/all/set_sticker_set_thumb.rs     |   73 -
 src/requests/all/set_webhook.rs               |  114 --
 .../all/stop_inline_message_live_location.rs  |   62 -
 .../all/stop_message_live_location.rs         |   70 -
 src/requests/all/stop_poll.rs                 |   66 -
 src/requests/all/unban_chat_member.rs         |   58 -
 src/requests/all/unpin_chat_message.rs        |   52 -
 src/requests/all/upload_sticker_file.rs       |   55 -
 src/requests/mod.rs                           |   39 +-
 82 files changed, 22 insertions(+), 8527 deletions(-)
 delete mode 100644 src/requests/all/add_sticker_to_set.rs
 delete mode 100644 src/requests/all/answer_callback_query.rs
 delete mode 100644 src/requests/all/answer_inline_query.rs
 delete mode 100644 src/requests/all/answer_pre_checkout_query.rs
 delete mode 100644 src/requests/all/answer_shipping_query.rs
 delete mode 100644 src/requests/all/create_new_sticker_set.rs
 delete mode 100644 src/requests/all/delete_chat_photo.rs
 delete mode 100644 src/requests/all/delete_chat_sticker_set.rs
 delete mode 100644 src/requests/all/delete_message.rs
 delete mode 100644 src/requests/all/delete_sticker_from_set.rs
 delete mode 100644 src/requests/all/delete_webhook.rs
 delete mode 100644 src/requests/all/edit_inline_message_caption.rs
 delete mode 100644 src/requests/all/edit_inline_message_live_location.rs
 delete mode 100644 src/requests/all/edit_inline_message_media.rs
 delete mode 100644 src/requests/all/edit_inline_message_reply_markup.rs
 delete mode 100644 src/requests/all/edit_inline_message_text.rs
 delete mode 100644 src/requests/all/edit_message_caption.rs
 delete mode 100644 src/requests/all/edit_message_live_location.rs
 delete mode 100644 src/requests/all/edit_message_media.rs
 delete mode 100644 src/requests/all/edit_message_reply_markup.rs
 delete mode 100644 src/requests/all/edit_message_text.rs
 delete mode 100644 src/requests/all/export_chat_invite_link.rs
 delete mode 100644 src/requests/all/forward_message.rs
 delete mode 100644 src/requests/all/get_chat.rs
 delete mode 100644 src/requests/all/get_chat_administrators.rs
 delete mode 100644 src/requests/all/get_chat_member.rs
 delete mode 100644 src/requests/all/get_chat_members_count.rs
 delete mode 100644 src/requests/all/get_file.rs
 delete mode 100644 src/requests/all/get_game_high_scores.rs
 delete mode 100644 src/requests/all/get_me.rs
 delete mode 100644 src/requests/all/get_my_commands.rs
 delete mode 100644 src/requests/all/get_sticker_set.rs
 delete mode 100644 src/requests/all/get_updates.rs
 delete mode 100644 src/requests/all/get_updates_non_strict.rs
 delete mode 100644 src/requests/all/get_user_profile_photos.rs
 delete mode 100644 src/requests/all/get_webhook_info.rs
 delete mode 100644 src/requests/all/kick_chat_member.rs
 delete mode 100644 src/requests/all/leave_chat.rs
 delete mode 100644 src/requests/all/mod.rs
 delete mode 100644 src/requests/all/pin_chat_message.rs
 delete mode 100644 src/requests/all/promote_chat_member.rs
 delete mode 100644 src/requests/all/restrict_chat_member.rs
 delete mode 100644 src/requests/all/send_animation.rs
 delete mode 100644 src/requests/all/send_audio.rs
 delete mode 100644 src/requests/all/send_chat_action.rs
 delete mode 100644 src/requests/all/send_contact.rs
 delete mode 100644 src/requests/all/send_dice.rs
 delete mode 100644 src/requests/all/send_document.rs
 delete mode 100644 src/requests/all/send_game.rs
 delete mode 100644 src/requests/all/send_invoice.rs
 delete mode 100644 src/requests/all/send_location.rs
 delete mode 100644 src/requests/all/send_media_group.rs
 delete mode 100644 src/requests/all/send_message.rs
 delete mode 100644 src/requests/all/send_photo.rs
 delete mode 100644 src/requests/all/send_poll.rs
 delete mode 100644 src/requests/all/send_sticker.rs
 delete mode 100644 src/requests/all/send_venue.rs
 delete mode 100644 src/requests/all/send_video.rs
 delete mode 100644 src/requests/all/send_video_note.rs
 delete mode 100644 src/requests/all/send_voice.rs
 delete mode 100644 src/requests/all/set_chat_administrator_custom_title.rs
 delete mode 100644 src/requests/all/set_chat_description.rs
 delete mode 100644 src/requests/all/set_chat_permissions.rs
 delete mode 100644 src/requests/all/set_chat_photo.rs
 delete mode 100644 src/requests/all/set_chat_sticker_set.rs
 delete mode 100644 src/requests/all/set_chat_title.rs
 delete mode 100644 src/requests/all/set_game_score.rs
 delete mode 100644 src/requests/all/set_my_commands.rs
 delete mode 100644 src/requests/all/set_sticker_position_in_set.rs
 delete mode 100644 src/requests/all/set_sticker_set_thumb.rs
 delete mode 100644 src/requests/all/set_webhook.rs
 delete mode 100644 src/requests/all/stop_inline_message_live_location.rs
 delete mode 100644 src/requests/all/stop_message_live_location.rs
 delete mode 100644 src/requests/all/stop_poll.rs
 delete mode 100644 src/requests/all/unban_chat_member.rs
 delete mode 100644 src/requests/all/unpin_chat_message.rs
 delete mode 100644 src/requests/all/upload_sticker_file.rs

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 9facaba9..560efd01 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1,1577 +1,14 @@
 use crate::{
     payloads,
-    requests::{
-        AddStickerToSet, AnswerCallbackQuery, AnswerInlineQuery, AnswerPreCheckoutQuery,
-        AnswerShippingQuery, CreateNewStickerSet, DeleteChatPhoto, DeleteChatStickerSet,
-        DeleteMessage, DeleteStickerFromSet, DeleteWebhook, EditInlineMessageCaption,
-        EditInlineMessageLiveLocation, EditInlineMessageMedia, EditInlineMessageReplyMarkup,
-        EditInlineMessageText, EditMessageCaption, EditMessageLiveLocation, EditMessageMedia,
-        EditMessageReplyMarkup, EditMessageText, ExportChatInviteLink, ForwardMessage, GetChat,
-        GetChatAdministrators, GetChatMember, GetChatMembersCount, GetFile, GetGameHighScores,
-        GetMe, GetMyCommands, GetStickerSet, GetUpdates, GetUpdatesNonStrict, GetUserProfilePhotos,
-        GetWebhookInfo, JsonRequest, KickChatMember, LeaveChat, MultipartRequest, PinChatMessage,
-        PromoteChatMember, Requester, RestrictChatMember, SendAnimation, SendAudio, SendChatAction,
-        SendChatActionKind, SendContact, SendDice, SendDocument, SendGame, SendInvoice,
-        SendLocation, SendMediaGroup, SendMessage, SendPhoto, SendPoll, SendSticker, SendVenue,
-        SendVideo, SendVideoNote, SendVoice, SetChatAdministratorCustomTitle, SetChatDescription,
-        SetChatPermissions, SetChatPhoto, SetChatStickerSet, SetChatTitle, SetGameScore,
-        SetMyCommands, SetStickerPositionInSet, SetStickerSetThumb, SetWebhook,
-        StopInlineMessageLiveLocation, StopMessageLiveLocation, StopPoll, UnbanChatMember,
-        UnpinChatMessage, UploadStickerFile,
-    },
+    prelude::Requester,
+    requests::{JsonRequest, MultipartRequest},
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, TargetMessage,
+        InputSticker, LabeledPrice,
     },
     Bot,
 };
 
-impl Bot {
-    /// Use this method to receive incoming updates using long polling ([wiki]).
-    ///
-    /// **Notes:**
-    /// 1. This method will not work if an outgoing webhook is set up.
-    /// 2. In order to avoid getting duplicate updates,
-    ///    recalculate offset after each server response.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getupdates).
-    ///
-    /// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
-    pub fn get_updates(&self) -> GetUpdates {
-        GetUpdates::new(self.clone())
-    }
-
-    /// This is non strict version of [`get_updates`], this means that if it
-    /// will fail to deserialize some updates, it won't fail entirely, but
-    /// will just return some errors.
-    ///
-    /// Note: this is not a 'real' telegram method, this is simply
-    /// [`get_updates`] with changed return type.
-    ///
-    /// [`get_updates`]: crate::Bot::get_updates
-    pub fn get_updates_non_strict(&self) -> GetUpdatesNonStrict {
-        GetUpdatesNonStrict::new(self.clone())
-    }
-
-    /// Use this method to specify a url and receive incoming updates via an
-    /// outgoing webhook.
-    ///
-    /// Whenever there is an update for the bot, we will send an
-    /// HTTPS POST request to the specified url, containing a JSON-serialized
-    /// [`Update`]. In case of an unsuccessful request, we will give up after a
-    /// reasonable amount of attempts.
-    ///
-    /// If you'd like to make sure that the Webhook request comes from Telegram,
-    /// we recommend using a secret path in the URL, e.g.
-    /// `https://www.example.com/<token>`. Since nobody else knows your bot‘s
-    /// token, you can be pretty sure it’s us.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setwebhook).
-    ///
-    /// # Params
-    ///   - `url`: HTTPS url to send updates to.
-    ///
-    /// Use an empty string to remove webhook integration.
-    ///
-    /// [`Update`]: crate::types::Update
-    pub fn set_webhook<U>(&self, url: U) -> SetWebhook
-    where
-        U: Into<String>,
-    {
-        SetWebhook::new(self.clone(), url)
-    }
-
-    /// Use this method to remove webhook integration if you decide to switch
-    /// back to [Bot::get_updates].
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#deletewebhook).
-    ///
-    /// [Bot::get_updates]: crate::Bot::get_updates
-    pub fn delete_webhook(&self) -> DeleteWebhook {
-        DeleteWebhook::new(self.clone())
-    }
-
-    /// Use this method to get current webhook status.
-    ///
-    /// If the bot is using [`Bot::get_updates`], will return an object with the
-    /// url field empty.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getwebhookinfo).
-    ///
-    /// [`Bot::get_updates`]: crate::Bot::get_updates
-    pub fn get_webhook_info(&self) -> GetWebhookInfo {
-        GetWebhookInfo::new(self.clone())
-    }
-
-    /// A simple method for testing your bot's auth token. Requires no
-    /// parameters.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getme).
-    pub fn get_me(&self) -> GetMe {
-        GetMe::new(self.clone())
-    }
-
-    /// Use this method to send text messages.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendmessage).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `text`: Text of the message to be sent.
-    pub fn send_message<C, T>(&self, chat_id: C, text: T) -> SendMessage
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        SendMessage::new(self.clone(), chat_id, text)
-    }
-
-    /// Use this method to forward messages of any kind.
-    ///
-    /// [`The official docs`](https://core.telegram.org/bots/api#forwardmessage).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `from_chat_id`: Unique identifier for the chat where the original
-    ///     message was sent (or channel username in the format
-    ///     `@channelusername`).
-    ///   - `message_id`: Message identifier in the chat specified in
-    ///     [`from_chat_id`].
-    ///
-    /// [`from_chat_id`]: ForwardMessage::from_chat_id
-    pub fn forward_message<C, F>(
-        &self,
-        chat_id: C,
-        from_chat_id: F,
-        message_id: i32,
-    ) -> ForwardMessage
-    where
-        C: Into<ChatId>,
-        F: Into<ChatId>,
-    {
-        ForwardMessage::new(self.clone(), chat_id, from_chat_id, message_id)
-    }
-
-    /// Use this method to send photos.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendphoto).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `photo`: Photo to send.
-    ///
-    /// Pass [`InputFile::File`] to send a photo that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> SendPhoto
-    where
-        C: Into<ChatId>,
-    {
-        SendPhoto::new(self.clone(), chat_id, photo)
-    }
-
-    ///
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> SendAudio
-    where
-        C: Into<ChatId>,
-    {
-        SendAudio::new(self.clone(), chat_id, audio)
-    }
-
-    /// Use this method to send general files.
-    ///
-    /// Bots can currently send files of any type of up to 50 MB in size, this
-    /// limit may be changed in the future.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#senddocument).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `document`: File to send.
-    ///
-    /// Pass a file_id as String to send a file that exists on the
-    /// Telegram servers (recommended), pass an HTTP URL as a String for
-    /// Telegram to get a file from the Internet, or upload a new one using
-    /// `multipart/form-data`. [More info on Sending Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn send_document<C>(&self, chat_id: C, document: InputFile) -> SendDocument
-    where
-        C: Into<ChatId>,
-    {
-        SendDocument::new(self.clone(), chat_id, document)
-    }
-
-    /// Use this method to send video files, Telegram clients support mp4 videos
-    /// (other formats may be sent as Document).
-    ///
-    /// Bots can currently send video files of up to 50 MB in size, this
-    /// limit may be changed in the future.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendvideo).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `video`: Video to sent.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    pub fn send_video<C>(&self, chat_id: C, video: InputFile) -> SendVideo
-    where
-        C: Into<ChatId>,
-    {
-        SendVideo::new(self.clone(), chat_id, video)
-    }
-
-    /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video
-    /// without sound).
-    ///
-    /// Bots can currently send animation files of up to 50 MB in size, this
-    /// limit may be changed in the future.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendanimation).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `animation`: Animation to send.
-    pub fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> SendAnimation
-    where
-        C: Into<ChatId>,
-    {
-        SendAnimation::new(self.clone(), chat_id, animation)
-    }
-
-    /// Use this method to send audio files, if you want Telegram clients to
-    /// display the file as a playable voice message.
-    ///
-    /// For this to work, your audio must be in an .ogg file encoded with OPUS
-    /// (other formats may be sent as [`Audio`] or [`Document`]). Bots can
-    /// currently send voice messages of up to 50 MB in size, this limit may
-    /// be changed in the future.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendvoice).
-    ///
-    /// [`Audio`]: crate::types::Audio
-    /// [`Document`]: crate::types::Document
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `voice`: Audio file to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> SendVoice
-    where
-        C: Into<ChatId>,
-    {
-        SendVoice::new(self.clone(), chat_id, voice)
-    }
-
-    /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up
-    /// to 1 minute long. Use this method to send video messages.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendvideonote).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `video_note`: Video note to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on the Telegram
-    /// servers (recommended), pass an [`InputFile::Url`] for Telegram to get a
-    /// .webp file from the Internet, or upload a new one using
-    /// [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [v.4.0]: https://telegram.org/blog/video-messages-and-telescope
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-
-    pub fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> SendVideoNote
-    where
-        C: Into<ChatId>,
-    {
-        SendVideoNote::new(self.clone(), chat_id, video_note)
-    }
-
-    /// Use this method to send a group of photos or videos as an album.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendmediagroup).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `media`: A JSON-serialized array describing photos and videos to be
-    ///     sent, must include 2–10 items.
-    pub fn send_media_group<C, M>(&self, chat_id: C, media: M) -> SendMediaGroup
-    where
-        C: Into<ChatId>,
-        M: Into<Vec<InputMedia>>,
-    {
-        SendMediaGroup::new(self.clone(), chat_id, media)
-    }
-
-    /// Use this method to send point on the map.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendlocation).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `latitude`: Latitude of the location.
-    ///   - `longitude`: Latitude of the location.
-    pub fn send_location<C>(&self, chat_id: C, latitude: f32, longitude: f32) -> SendLocation
-    where
-        C: Into<ChatId>,
-    {
-        SendLocation::new(self.clone(), chat_id, latitude, longitude)
-    }
-
-    /// Use this method to edit live location messages.
-    ///
-    /// A location can be edited until its live_period expires or editing is
-    /// explicitly disabled by a call to stopMessageLiveLocation. On success,
-    /// the edited [`Message`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
-    ///
-    /// [`Message`]: crate::types::Message
-    ///
-    /// # Params
-    ///   - `latitude`: Latitude of new location.
-    ///   - `longitude`: Longitude of new location.
-    pub fn edit_message_live_location<C>(
-        &self,
-        chat_id: C,
-        message_id: i32,
-        latitude: f32,
-        longitude: f32,
-    ) -> EditMessageLiveLocation
-    where
-        C: Into<ChatId>,
-    {
-        EditMessageLiveLocation::new(self.clone(), chat_id, message_id, latitude, longitude)
-    }
-
-    /// Use this method to edit live location messages sent via the bot.
-    ///
-    /// A location can be edited until its live_period expires or editing is
-    /// explicitly disabled by a call to stopMessageLiveLocation. On success,
-    /// [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
-    ///
-    /// [`True`]: crate::types::True
-    ///
-    /// # Params
-    ///   - `latitude`: Latitude of new location.
-    ///   - `longitude`: Longitude of new location.
-    pub fn edit_inline_message_live_location<I>(
-        &self,
-        inline_message_id: I,
-        latitude: f32,
-        longitude: f32,
-    ) -> EditInlineMessageLiveLocation
-    where
-        I: Into<String>,
-    {
-        EditInlineMessageLiveLocation::new(self.clone(), inline_message_id, latitude, longitude)
-    }
-
-    /// Use this method to stop updating a live location message before
-    /// `live_period` expires.
-    ///
-    /// On success, the sent [`Message`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
-    ///
-    /// [`Message`]: crate::types::Message
-    pub fn stop_message_live_location<C>(
-        &self,
-        chat_id: C,
-        message_id: i32,
-    ) -> StopMessageLiveLocation
-    where
-        C: Into<ChatId>,
-    {
-        StopMessageLiveLocation::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to stop updating a live location message (sent via the
-    /// bot) before `live_period` expires.
-    ///
-    /// On success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
-    ///
-    /// [`True`]: crate::types::True
-    pub fn stop_inline_message_live_location<I>(
-        &self,
-        inline_message_id: I,
-    ) -> StopInlineMessageLiveLocation
-    where
-        I: Into<String>,
-    {
-        StopInlineMessageLiveLocation::new(self.clone(), inline_message_id)
-    }
-
-    /// Use this method to send information about a venue.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendvenue).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///  - `latitude`: Latitude of the venue.
-    ///  - `longitude`: Longitude of the venue.
-    ///  - `title`: Name of the venue.
-    ///  - `address`: Address of the venue.
-    pub fn send_venue<C, T, A>(
-        &self,
-        chat_id: C,
-        latitude: f32,
-        longitude: f32,
-        title: T,
-        address: A,
-    ) -> SendVenue
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-        A: Into<String>,
-    {
-        SendVenue::new(self.clone(), chat_id, latitude, longitude, title, address)
-    }
-
-    /// Use this method to send phone contacts.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendcontact).
-    ///
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `phone_number`: Contact's phone number.
-    ///   - `first_name`: Contact's first name.
-    pub fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> SendContact
-    where
-        C: Into<ChatId>,
-        P: Into<String>,
-        F: Into<String>,
-    {
-        SendContact::new(self.clone(), chat_id, phone_number, first_name)
-    }
-
-    /// Use this method to send a native poll. A native poll can't be sent to a
-    /// private chat.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendpoll).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `question`: Poll question, 1-255 characters.
-    ///   - `options`: List of answer options, 2-10 strings 1-100 characters
-    ///     each.
-    pub fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> SendPoll
-    where
-        C: Into<ChatId>,
-        Q: Into<String>,
-        O: Into<Vec<String>>,
-    {
-        SendPoll::new(self.clone(), chat_id, question, options)
-    }
-
-    /// Use this method when you need to tell the user that something is
-    /// happening on the bot's side.
-    ///
-    /// The status is set for 5 seconds or less (when a message arrives from
-    /// your bot, Telegram clients clear its typing status).
-    ///
-    /// ## Note
-    /// Example: The [ImageBot] needs some time to process a request and upload
-    /// the image. Instead of sending a text message along the lines of
-    /// “Retrieving image, please wait…”, the bot may use
-    /// [`Bot::send_chat_action`] with `action = upload_photo`. The user
-    /// will see a `sending photo` status for the bot.
-    ///
-    /// We only recommend using this method when a response from the bot will
-    /// take a **noticeable** amount of time to arrive.
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///
-    /// [ImageBot]: https://t.me/imagebot
-    /// [`Bot::send_chat_action`]: crate::Bot::send_chat_action
-    pub fn send_chat_action<C>(&self, chat_id: C, action: SendChatActionKind) -> SendChatAction
-    where
-        C: Into<ChatId>,
-    {
-        SendChatAction::new(self.clone(), chat_id, action)
-    }
-
-    /// Use this method to get a list of profile pictures for a user.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getuserprofilephotos).
-    ///
-    /// # Params
-    ///   - `user_id`: Unique identifier of the target user.
-    pub fn get_user_profile_photos(&self, user_id: i32) -> GetUserProfilePhotos {
-        GetUserProfilePhotos::new(self.clone(), user_id)
-    }
-
-    /// Use this method to get basic info about a file and prepare it for
-    /// downloading.
-    ///
-    /// For the moment, bots can download files of up to `20MB` in size.
-    ///
-    /// The file can then be downloaded via the link
-    /// `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>`
-    /// is taken from the response. It is guaranteed that the link will be valid
-    /// for at least `1` hour. When the link expires, a new one can be requested
-    /// by calling [`GetFile`] again.
-    ///
-    /// **Note**: This function may not preserve the original file name and MIME
-    /// type. You should save the file's MIME type and name (if available) when
-    /// the [`File`] object is received.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getfile).
-    ///
-    /// # Params
-    ///   - `file_id`: File identifier to get info about.
-    ///
-    /// [`File`]: crate::types::File
-    /// [`GetFile`]: self::GetFile
-    pub fn get_file<F>(&self, file_id: F) -> GetFile
-    where
-        F: Into<String>,
-    {
-        GetFile::new(self.clone(), file_id)
-    }
-
-    /// Use this method to kick a user from a group, a supergroup or a channel.
-    ///
-    /// In the case of supergroups and channels, the user will not be able to
-    /// return to the group on their own using invite links, etc., unless
-    /// [unbanned] first. The bot must be an administrator in the chat for
-    /// this to work and must have the appropriate admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#kickchatmember).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    ///
-    /// [unbanned]: crate::Bot::unban_chat_member
-    pub fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> KickChatMember
-    where
-        C: Into<ChatId>,
-    {
-        KickChatMember::new(self.clone(), chat_id, user_id)
-    }
-
-    /// Use this method to unban a previously kicked user in a supergroup or
-    /// channel. The user will **not** return to the group or channel
-    /// automatically, but will be able to join via link, etc. The bot must
-    /// be an administrator for this to work.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#unbanchatmember).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    pub fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> UnbanChatMember
-    where
-        C: Into<ChatId>,
-    {
-        UnbanChatMember::new(self.clone(), chat_id, user_id)
-    }
-
-    /// Use this method to restrict a user in a supergroup.
-    ///
-    /// The bot must be an administrator in the supergroup for this to work and
-    /// must have the appropriate admin rights. Pass `true` for all
-    /// permissions to lift restrictions from a user.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#restrictchatmember).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    ///   - `permissions`: New user permissions.
-    pub fn restrict_chat_member<C>(
-        &self,
-        chat_id: C,
-        user_id: i32,
-        permissions: ChatPermissions,
-    ) -> RestrictChatMember
-    where
-        C: Into<ChatId>,
-    {
-        RestrictChatMember::new(self.clone(), chat_id, user_id, permissions)
-    }
-
-    /// Use this method to promote or demote a user in a supergroup or a
-    /// channel.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the appropriate admin rights. Pass False for all boolean
-    /// parameters to demote a user.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#promotechatmember).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    pub fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> PromoteChatMember
-    where
-        C: Into<ChatId>,
-    {
-        PromoteChatMember::new(self.clone(), chat_id, user_id)
-    }
-
-    /// Use this method to set default chat permissions for all members.
-    ///
-    /// The bot must be an administrator in the group or a supergroup for this
-    /// to work and must have the can_restrict_members admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchatpermissions).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `permissions`: New default chat permissions.
-    pub fn set_chat_permissions<C>(
-        &self,
-        chat_id: C,
-        permissions: ChatPermissions,
-    ) -> SetChatPermissions
-    where
-        C: Into<ChatId>,
-    {
-        SetChatPermissions::new(self.clone(), chat_id, permissions)
-    }
-
-    /// Use this method to generate a new invite link for a chat; any previously
-    /// generated link is revoked.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the appropriate admin rights.
-    ///
-    /// # Note
-    /// Each administrator in a chat generates their own invite links. Bots
-    /// can't use invite links generated by other administrators. If you
-    /// want your bot to work with invite links, it will need to generate
-    /// its own link using [`Bot::export_chat_invite_link`] – after this the
-    /// link will become available to the bot via the [`Bot::get_chat`]
-    /// method. If your bot needs to generate a new invite link replacing
-    /// its previous one, use [`Bot::export_chat_invite_link`] again.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#exportchatinvitelink).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///
-    /// [`Bot::export_chat_invite_link`]: crate::Bot::export_chat_invite_link
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
-    pub fn export_chat_invite_link<C>(&self, chat_id: C) -> ExportChatInviteLink
-    where
-        C: Into<ChatId>,
-    {
-        ExportChatInviteLink::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to set a new profile photo for the chat.
-    ///
-    /// Photos can't be changed for private chats. The bot must be an
-    /// administrator in the chat for this to work and must have the
-    /// appropriate admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchatphoto).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `photo`: New chat photo, uploaded using `multipart/form-data`.
-    pub fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> SetChatPhoto
-    where
-        C: Into<ChatId>,
-    {
-        SetChatPhoto::new(self.clone(), chat_id, photo)
-    }
-
-    /// Use this method to delete a chat photo. Photos can't be changed for
-    /// private chats. The bot must be an administrator in the chat for this
-    /// to work and must have the appropriate admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#deletechatphoto).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn delete_chat_photo<C>(&self, chat_id: C) -> DeleteChatPhoto
-    where
-        C: Into<ChatId>,
-    {
-        DeleteChatPhoto::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to change the title of a chat.
-    ///
-    /// Titles can't be changed for private chats. The bot must be an
-    /// administrator in the chat for this to work and must have the
-    /// appropriate admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchattitle).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `title`: New chat title, 1-255 characters.
-    pub fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> SetChatTitle
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        SetChatTitle::new(self.clone(), chat_id, title)
-    }
-
-    /// Use this method to change the description of a group, a supergroup or a
-    /// channel.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the appropriate admin rights.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchatdescription).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn set_chat_description<C>(&self, chat_id: C) -> SetChatDescription
-    where
-        C: Into<ChatId>,
-    {
-        SetChatDescription::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to pin a message in a group, a supergroup, or a channel.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the `can_pin_messages` admin right in the supergroup or
-    /// `can_edit_messages` admin right in the channel.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#pinchatmessage).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `message_id`: Identifier of a message to pin.
-    pub fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> PinChatMessage
-    where
-        C: Into<ChatId>,
-    {
-        PinChatMessage::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to unpin a message in a group, a supergroup, or a
-    /// channel.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the `can_pin_messages` admin right in the supergroup or
-    /// `can_edit_messages` admin right in the channel.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#unpinchatmessage).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn unpin_chat_message<C>(&self, chat_id: C) -> UnpinChatMessage
-    where
-        C: Into<ChatId>,
-    {
-        UnpinChatMessage::new(self.clone(), chat_id)
-    }
-
-    /// Use this method for your bot to leave a group, supergroup or channel.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#leavechat).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn leave_chat<C>(&self, chat_id: C) -> LeaveChat
-    where
-        C: Into<ChatId>,
-    {
-        LeaveChat::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to get up to date information about the chat (current
-    /// name of the user for one-on-one conversations, current username of a
-    /// user, group or channel, etc.).
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getchat).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn get_chat<C>(&self, chat_id: C) -> GetChat
-    where
-        C: Into<ChatId>,
-    {
-        GetChat::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to get a list of administrators in a chat.
-    ///
-    /// If the chat is a group or a supergroup and no administrators were
-    /// appointed, only the creator will be returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getchatadministrators).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn get_chat_administrators<C>(&self, chat_id: C) -> GetChatAdministrators
-    where
-        C: Into<ChatId>,
-    {
-        GetChatAdministrators::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to get the number of members in a chat.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getchatmemberscount).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    pub fn get_chat_members_count<C>(&self, chat_id: C) -> GetChatMembersCount
-    where
-        C: Into<ChatId>,
-    {
-        GetChatMembersCount::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to get information about a member of a chat.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getchatmember).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup or channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    pub fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> GetChatMember
-    where
-        C: Into<ChatId>,
-    {
-        GetChatMember::new(self.clone(), chat_id, user_id)
-    }
-
-    /// Use this method to set a new group sticker set for a supergroup.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the appropriate admin rights. Use the field can_set_sticker_set
-    /// optionally returned in getChat requests to check if the bot can use
-    /// this method.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchatstickerset).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup (in the format `@supergroupusername`).
-    ///   - `sticker_set_name`: Name of the sticker set to be set as the group
-    ///     sticker set.
-    pub fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> SetChatStickerSet
-    where
-        C: Into<ChatId>,
-        S: Into<String>,
-    {
-        SetChatStickerSet::new(self.clone(), chat_id, sticker_set_name)
-    }
-
-    /// Use this method to delete a group sticker set from a supergroup.
-    ///
-    /// The bot must be an administrator in the chat for this to work and must
-    /// have the appropriate admin rights. Use the field
-    /// `can_set_sticker_set` optionally returned in [`Bot::get_chat`]
-    /// requests to check if the bot can use this method.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#deletechatstickerset).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target supergroup (in the format `@supergroupusername`).
-    ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
-    pub fn delete_chat_sticker_set<C>(&self, chat_id: C) -> DeleteChatStickerSet
-    where
-        C: Into<ChatId>,
-    {
-        DeleteChatStickerSet::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to send answers to callback queries sent from [inline
-    /// keyboards].
-    ///
-    /// The answer will be displayed to the user as a notification at
-    /// the top of the chat screen or as an alert.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#answercallbackquery).
-    ///
-    /// # Params
-    ///   - `callback_query_id`: Unique identifier for the query to be answered.
-    ///
-    /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn answer_callback_query<C>(&self, callback_query_id: C) -> AnswerCallbackQuery
-    where
-        C: Into<String>,
-    {
-        AnswerCallbackQuery::new(self.clone(), callback_query_id)
-    }
-
-    /// Use this method to edit text and game messages.
-    ///
-    /// On success, the edited [`Message`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
-    ///
-    /// [`Message`]: crate::types::Message
-    ///
-    /// # Params
-    ///
-    ///  - `chat_id`: Unique identifier for the target chat or username of the
-    ///    target channel (in the format `@channelusername`).
-    ///  - `message_id`: Identifier of the message to edit.
-    ///  - `text`: New text of the message.
-    pub fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> EditMessageText
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        EditMessageText::new(self.clone(), chat_id, message_id, text)
-    }
-
-    /// Use this method to edit text and game messages sent via the bot.
-    ///
-    /// On success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
-    ///
-    /// [`True`]: crate::types::True
-    ///
-    /// # Params
-    ///
-    ///  - `inline_message_id`: Identifier of the inline message.
-    ///  - `text`: New text of the message.
-    pub fn edit_inline_message_text<I, T>(
-        &self,
-        inline_message_id: I,
-        text: T,
-    ) -> EditInlineMessageText
-    where
-        I: Into<String>,
-        T: Into<String>,
-    {
-        EditInlineMessageText::new(self.clone(), inline_message_id, text)
-    }
-
-    /// Use this method to edit captions of messages sent via the bot.
-    ///
-    /// On success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
-    ///
-    /// [`True`]: crate::types::True
-    pub fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> EditMessageCaption
-    where
-        C: Into<ChatId>,
-    {
-        EditMessageCaption::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to edit captions of messages sent via the bot.
-    ///
-    /// On success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
-    ///
-    /// [`True`]: crate::types::True
-    pub fn edit_inline_message_caption<I>(&self, inline_message_id: I) -> EditInlineMessageCaption
-    where
-        I: Into<String>,
-    {
-        EditInlineMessageCaption::new(self.clone(), inline_message_id)
-    }
-
-    /// Use this method to edit animation, audio, document, photo, or video
-    /// messages.
-    ///
-    /// If a message is a part of a message album, then it can be edited only to
-    /// a photo or a video. Otherwise, message type can be changed
-    /// arbitrarily. On success, the edited [`Message`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
-    ///
-    /// [`Message`]: crate::types::Message
-    pub fn edit_message_media<C>(
-        &self,
-        chat_id: C,
-        message_id: i32,
-        media: InputMedia,
-    ) -> EditMessageMedia
-    where
-        C: Into<ChatId>,
-    {
-        EditMessageMedia::new(self.clone(), chat_id, message_id, media)
-    }
-
-    /// Use this method to edit animation, audio, document, photo, or video
-    /// messages sent via the bot.
-    ///
-    /// If a message is a part of a message album, then it can be edited only to
-    /// a photo or a video. Otherwise, message type can be changed
-    /// arbitrarily. When this method is used, new file can't be uploaded.
-    /// Use previously uploaded file via its `file_id` or specify a URL. On
-    /// success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
-    ///
-    /// [`True`]: crate::types::True
-    pub fn edit_inline_message_media<I>(
-        &self,
-        inline_message_id: I,
-        media: InputMedia,
-    ) -> EditInlineMessageMedia
-    where
-        I: Into<String>,
-    {
-        EditInlineMessageMedia::new(self.clone(), inline_message_id, media)
-    }
-
-    /// Use this method to edit only the reply markup of messages.
-    ///
-    /// On success, the edited [`Message`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
-    ///
-    /// [`Message`]: crate::types::Message
-    pub fn edit_message_reply_markup<C>(
-        &self,
-        chat_id: C,
-        message_id: i32,
-    ) -> EditMessageReplyMarkup
-    where
-        C: Into<ChatId>,
-    {
-        EditMessageReplyMarkup::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to edit only the reply markup of messages sent via the
-    /// bot.
-    ///
-    /// On success, [`True`] is returned.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
-    ///
-    /// [`Message`]: crate::types::Message
-    /// [`True`]: crate::types::True
-    pub fn edit_inline_message_reply_markup<I>(
-        &self,
-        inline_message_id: I,
-    ) -> EditInlineMessageReplyMarkup
-    where
-        I: Into<String>,
-    {
-        EditInlineMessageReplyMarkup::new(self.clone(), inline_message_id)
-    }
-
-    /// Use this method to stop a poll which was sent by the bot.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#stoppoll).
-    ///
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target channel (in the format `@channelusername`).
-    ///   - `message_id`: Identifier of the original message with the poll.
-    pub fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> StopPoll
-    where
-        C: Into<ChatId>,
-    {
-        StopPoll::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to delete a message, including service messages.
-    ///
-    /// The limitations are:
-    ///  - A message can only be deleted if it was sent less than 48 hours ago.
-    ///  - Bots can delete outgoing messages in private chats, groups, and
-    ///    supergroups.
-    ///  - Bots can delete incoming messages in private chats.
-    ///  - Bots granted can_post_messages permissions can delete outgoing
-    ///    messages in channels.
-    ///  - If the bot is an administrator of a group, it can delete any message
-    ///    there.
-    ///  - If the bot has can_delete_messages permission in a supergroup or a
-    ///    channel, it can delete any message there.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#deletemessage).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target channel (in the format `@channelusername`).
-    ///   - `message_id`: Identifier of the message to delete.
-    pub fn delete_message<C>(&self, chat_id: C, message_id: i32) -> DeleteMessage
-    where
-        C: Into<ChatId>,
-    {
-        DeleteMessage::new(self.clone(), chat_id, message_id)
-    }
-
-    /// Use this method to send static .WEBP or [animated] .TGS stickers.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendsticker).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target channel (in the format `@channelusername`).
-    ///   - `sticker`: Sticker to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on the Telegram
-    /// servers (recommended), pass an [`InputFile::Url`] for Telegram to get a
-    /// .webp file from the Internet, or upload a new one using
-    /// [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [animated]: https://telegram.org/blog/animated-stickers
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> SendSticker
-    where
-        C: Into<ChatId>,
-    {
-        SendSticker::new(self.clone(), chat_id, sticker)
-    }
-
-    /// Use this method to get a sticker set.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getstickerset).
-    ///
-    /// # Params
-    ///   - `name`: Name of the sticker set.
-    pub fn get_sticker_set<N>(&self, name: N) -> GetStickerSet
-    where
-        N: Into<String>,
-    {
-        GetStickerSet::new(self.clone(), name)
-    }
-
-    /// Use this method to upload a .png file with a sticker for later use in
-    /// [`Bot::create_new_sticker_set`] and [`Bot::add_sticker_to_set`] methods
-    /// (can be used multiple times).
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#uploadstickerfile).
-    ///
-    /// # Params
-    ///   - `user_id`: User identifier of sticker file owner.
-    ///   - `png_sticker`: **Png** image with the sticker, must be up to 512
-    ///     kilobytes in size, dimensions must not exceed 512px, and either
-    ///     width or height must be exactly 512px. [More info on Sending Files
-    ///     »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    /// [`Bot::create_new_sticker_set`]: crate::Bot::create_new_sticker_set
-    /// [`Bot::add_sticker_to_set`]: crate::Bot::add_sticker_to_set
-    pub fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> UploadStickerFile {
-        UploadStickerFile::new(self.clone(), user_id, png_sticker)
-    }
-
-    /// Use this method to create new sticker set owned by a user. The bot will
-    /// be able to edit the created sticker set.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#createnewstickerset).
-    ///
-    /// # Params
-    ///   - `user_id`: User identifier of created sticker set owner.
-    ///   - `name`: Short name of sticker set, to be used in `t.me/addstickers/`
-    ///     URLs (e.g., animals). Can contain only english letters, digits and
-    ///     underscores.
-    ///
-    /// Must begin with a letter, can't contain consecutive underscores and must
-    /// end in `_by_<bot username>`. `<bot_username>` is case insensitive. 1-64
-    /// characters.
-    ///   - `title`: Sticker set title, 1-64 characters.
-    pub fn create_new_sticker_set<N, T, E>(
-        &self,
-        user_id: i32,
-        name: N,
-        title: T,
-        sticker_type: InputSticker,
-        emojis: E,
-    ) -> CreateNewStickerSet
-    where
-        N: Into<String>,
-        T: Into<String>,
-        E: Into<String>,
-    {
-        CreateNewStickerSet::new(self.clone(), user_id, name, title, sticker_type, emojis)
-    }
-
-    /// Use this method to add a new sticker to a set created by the bot.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#addstickertoset).
-    ///
-    /// # Params
-    ///   - `user_id`: User identifier of sticker set owner.
-    ///   - `name`: Sticker set name.
-    ///   - `emojis`: One or more emoji corresponding to the sticker.
-    pub fn add_sticker_to_set<N, E>(
-        &self,
-        user_id: i32,
-        name: N,
-        sticker_type: InputSticker,
-        emojis: E,
-    ) -> AddStickerToSet
-    where
-        N: Into<String>,
-        E: Into<String>,
-    {
-        AddStickerToSet::new(self.clone(), user_id, name, sticker_type, emojis)
-    }
-
-    /// Use this method to move a sticker in a set created by the bot to a
-    /// specific position.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setstickerpositioninset).
-    ///
-    /// # Params
-    ///   - `sticker`: File identifier of the sticker.
-    ///   - `position`: New sticker position in the set, zero-based.
-    pub fn set_sticker_position_in_set<S>(
-        &self,
-        sticker: S,
-        position: i32,
-    ) -> SetStickerPositionInSet
-    where
-        S: Into<String>,
-    {
-        SetStickerPositionInSet::new(self.clone(), sticker, position)
-    }
-
-    /// Use this method to delete a sticker from a set created by the bot.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#deletestickerfromset).
-    ///
-    /// # Params
-    ///   - `sticker`: File identifier of the sticker.
-    pub fn delete_sticker_from_set<S>(&self, sticker: S) -> DeleteStickerFromSet
-    where
-        S: Into<String>,
-    {
-        DeleteStickerFromSet::new(self.clone(), sticker)
-    }
-
-    /// Use this method to send answers to an inline query.
-    ///
-    /// No more than **50** results per query are allowed.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#answerinlinequery).
-    ///
-    /// # Params
-    ///   - `inline_query_id`: Unique identifier for the answered query.
-    ///   - `results`: A JSON-serialized array of results for the inline query.
-    pub fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> AnswerInlineQuery
-    where
-        I: Into<String>,
-        R: Into<Vec<InlineQueryResult>>,
-    {
-        AnswerInlineQuery::new(self.clone(), inline_query_id, results)
-    }
-
-    /// Use this method to send invoices.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendinvoice).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target private chat.
-    ///   - `title`: Product name, 1-32 characters.
-    ///   - `description`: Product description, 1-255 characters.
-    ///   - `payload`: Bot-defined invoice payload, 1-128 bytes. This will not
-    ///     be displayed to the user, use for your internal processes.
-    ///   - `provider_token`: Payments provider token, obtained via
-    ///     [@Botfather].
-    ///   - `start_parameter`: Unique deep-linking parameter that can be used to
-    ///     generate this invoice when used as a start parameter.
-    ///   - `currency`: Three-letter ISO 4217 currency code, see [more on
-    ///     currencies].
-    ///   - `prices`: Price breakdown, a list of components (e.g. product price,
-    ///     tax, discount, delivery cost, delivery tax, bonus, etc.).
-    ///
-    /// [more on currencies]: https://core.telegram.org/bots/payments#supported-currencies
-    /// [@Botfather]: https://t.me/botfather
-    #[allow(clippy::too_many_arguments)]
-    pub fn send_invoice<T, D, Pl, Pt, S, C, Pr>(
-        &self,
-        chat_id: i32,
-        title: T,
-        description: D,
-        payload: Pl,
-        provider_token: Pt,
-        start_parameter: S,
-        currency: C,
-        prices: Pr,
-    ) -> SendInvoice
-    where
-        T: Into<String>,
-        D: Into<String>,
-        Pl: Into<String>,
-        Pt: Into<String>,
-        S: Into<String>,
-        C: Into<String>,
-        Pr: Into<Vec<LabeledPrice>>,
-    {
-        SendInvoice::new(
-            self.clone(),
-            chat_id,
-            title,
-            description,
-            payload,
-            provider_token,
-            start_parameter,
-            currency,
-            prices,
-        )
-    }
-
-    /// Once the user has confirmed their payment and shipping details, the Bot
-    /// API sends the final confirmation in the form of an [`Update`] with
-    /// the field `pre_checkout_query`. Use this method to respond to such
-    /// pre-checkout queries. Note: The Bot API must receive an answer
-    /// within 10 seconds after the pre-checkout query was sent.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
-    ///
-    /// # Params
-    ///   - `shipping_query_id`: Unique identifier for the query to be answered.
-    ///   - `ok`: Specify `true` if delivery to the specified address is
-    ///     possible and `false` if there are any problems (for example, if
-    ///     delivery to the specified address is not possible).
-    ///
-    /// [`Update`]: crate::types::Update
-    pub fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> AnswerShippingQuery
-    where
-        S: Into<String>,
-    {
-        AnswerShippingQuery::new(self.clone(), shipping_query_id, ok)
-    }
-
-    /// Once the user has confirmed their payment and shipping details, the Bot
-    /// API sends the final confirmation in the form of an [`Update`] with
-    /// the field `pre_checkout_query`. Use this method to respond to such
-    /// pre-checkout queries. Note: The Bot API must receive an answer
-    /// within 10 seconds after the pre-checkout query was sent.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
-    ///
-    /// # Params
-    ///   - `pre_checkout_query_id`: Unique identifier for the query to be
-    ///     answered.
-    ///   - `ok`: Specify `true` if everything is alright (goods are available,
-    ///     etc.) and the bot is ready to proceed with the order. Use False if
-    ///     there are any problems.
-    ///
-    /// [`Update`]: crate::types::Update
-    pub fn answer_pre_checkout_query<P>(
-        &self,
-        pre_checkout_query_id: P,
-        ok: bool,
-    ) -> AnswerPreCheckoutQuery
-    where
-        P: Into<String>,
-    {
-        AnswerPreCheckoutQuery::new(self.clone(), pre_checkout_query_id, ok)
-    }
-
-    /// Use this method to send a game.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#sendgame).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat.
-    ///   - `game_short_name`: Short name of the game, serves as the unique
-    ///     identifier for the game. Set up your games via [@Botfather].
-    ///
-    /// [@Botfather]: https://t.me/botfather
-    pub fn send_game<G>(&self, chat_id: i32, game_short_name: G) -> SendGame
-    where
-        G: Into<String>,
-    {
-        SendGame::new(self.clone(), chat_id, game_short_name)
-    }
-
-    /// Use this method to set the score of the specified user in a game.
-    ///
-    /// On success, if the message was sent by the bot, returns the edited
-    /// [`Message`], otherwise returns [`True`]. Returns an error, if the new
-    /// score is not greater than the user's current score in the chat and
-    /// force is `false`.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setgamescore).
-    ///
-    /// # Params
-    ///   - `target`: Target message, either chat id and message id or inline
-    ///     message id.
-    ///   - `user_id`: User identifier.
-    ///   - `score`: New score, must be non-negative.
-    ///
-    /// [`Message`]: crate::types::Message
-    /// [`True`]: crate::types::True
-    pub fn set_game_score<T>(&self, target: T, user_id: i32, score: i32) -> SetGameScore
-    where
-        T: Into<TargetMessage>,
-    {
-        SetGameScore::new(self.clone(), target, user_id, score)
-    }
-
-    /// Use this method to get data for high score tables.
-    ///
-    /// Will return the score of the specified user and several of his neighbors
-    /// in a game.
-    ///
-    /// # Note
-    /// This method will currently return scores for the target user, plus two
-    /// of his closest neighbors on each side. Will also return the top
-    /// three users if the user and his neighbors are not among them. Please
-    /// note that this behavior is subject to change.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getgamehighscores).
-    ///
-    /// # Params
-    ///   - `target`: Target message, either chat id and message id or inline
-    ///     message id.
-    ///   - `user_id`: Target user id.
-    pub fn get_game_high_scores<T>(&self, target: T, user_id: i32) -> GetGameHighScores
-    where
-        T: Into<TargetMessage>,
-    {
-        GetGameHighScores::new(self.clone(), target, user_id)
-    }
-
-    /// Use this method to set a custom title for an administrator in a
-    /// supergroup promoted by the bot.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setchatadministratorcustomtitle).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target channel (in the format `@channelusername`).
-    ///   - `user_id`: Unique identifier of the target user.
-    ///   - `custom_title`: New custom title for the administrator; 0-16
-    ///     characters, emoji are not allowed.
-    pub fn set_chat_administrator_custom_title<C, CT>(
-        &self,
-        chat_id: C,
-        user_id: i32,
-        custom_title: CT,
-    ) -> SetChatAdministratorCustomTitle
-    where
-        C: Into<ChatId>,
-        CT: Into<String>,
-    {
-        SetChatAdministratorCustomTitle::new(self.clone(), chat_id, user_id, custom_title)
-    }
-
-    /// Use this method to send an animated emoji that will display a random
-    /// value.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#senddice).
-    ///
-    /// # Params
-    ///   - `chat_id`: Unique identifier for the target chat or username of the
-    ///     target channel  (in the format `@channelusername`).
-    pub fn send_dice<C>(&self, chat_id: C) -> SendDice
-    where
-        C: Into<ChatId>,
-    {
-        SendDice::new(self.clone(), chat_id)
-    }
-
-    /// Use this method to get the current list of the bot's commands.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#getmycommands).
-    pub fn get_my_commands(&self) -> GetMyCommands {
-        GetMyCommands::new(self.clone())
-    }
-
-    /// Use this method to change the list of the bot's commands.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setmycommands).
-    ///
-    /// # Params
-    ///    - `commands`: A JSON-serialized list of bot commands to be set as the
-    ///      list of the bot's commands. At most 100 commands can be specified.
-    pub fn set_my_commands<C>(&self, commands: C) -> SetMyCommands
-    where
-        C: Into<Vec<BotCommand>>,
-    {
-        SetMyCommands::new(self.clone(), commands)
-    }
-
-    /// Use this method to set the thumbnail of a sticker set. Animated
-    /// thumbnails can be set for animated sticker sets only.
-    ///
-    /// [The official docs](https://core.telegram.org/bots/api#setstickersetthumb).
-    ///
-    /// # Params
-    ///    - `name`: Sticker set name.
-    ///    - `user_id`: User identifier of the sticker set owner.
-    pub fn set_sticker_set_thumb<S>(&self, name: S, user_id: i32) -> SetStickerSetThumb
-    where
-        S: Into<String>,
-    {
-        SetStickerSetThumb::new(self.clone(), name, user_id)
-    }
-}
-
 impl Requester for Bot {
     type Err = crate::errors::RequestError;
 
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 6187cf41..8fb01095 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -129,7 +129,7 @@ impl Bot {
             .expect("serialization of request to be infallible");
 
         // async move to capture client&token&api_url&params
-        async move { net::request_json2(&client, token.as_ref(), api_url.get(), P::NAME, params).await }
+        async move { net::request_json(&client, token.as_ref(), api_url.get(), P::NAME, params).await }
     }
 
     pub(crate) fn execute_multipart<P>(
@@ -149,7 +149,7 @@ impl Bot {
         // async move to capture client&token&api_url&params
         async move {
             let params = params.await?;
-            net::request_multipart2(&client, token.as_ref(), api_url.get(), P::NAME, params).await
+            net::request_multipart(&client, token.as_ref(), api_url.get(), P::NAME, params).await
         }
     }
 }
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 88f857cb..a6699ca5 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -1,6 +1,6 @@
 pub(crate) use self::{
     download::{download_file, download_file_stream},
-    request::{request_json, request_json2, request_multipart, request_multipart2},
+    request::{request_json, request_multipart},
     telegram_response::TelegramResponse,
 };
 
diff --git a/src/net/request.rs b/src/net/request.rs
index 887199e5..15fb3d27 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -4,80 +4,13 @@ use reqwest::{
     header::{HeaderValue, CONTENT_TYPE},
     Client, Response,
 };
-use serde::{de::DeserializeOwned, Serialize};
+use serde::de::DeserializeOwned;
 
-use crate::{
-    net::{TelegramResponse, TELEGRAM_API_URL},
-    requests::ResponseResult,
-    serde_multipart::to_form,
-    RequestError,
-};
+use crate::{net::TelegramResponse, requests::ResponseResult, RequestError};
 
 const DELAY_ON_SERVER_ERROR: Duration = Duration::from_secs(10);
 
-pub async fn request_multipart<P, R>(
-    client: &Client,
-    token: &str,
-    method_name: &str,
-    params: &P, // I'll regret this
-) -> ResponseResult<R>
-where
-    P: Serialize,
-    R: DeserializeOwned,
-{
-    use crate::serde_multipart::Error;
-    let form = match to_form(params).await {
-        Ok(x) => x,
-        Err(Error::Io(ioerr)) => return Err(RequestError::Io(ioerr)),
-        Err(_) => unreachable!(
-            "we don't create requests those fail to serialize (if you see this, open an issue :|)"
-        ),
-    };
-
-    let response = client
-        .post(crate::net::method_url(
-            reqwest::Url::parse(TELEGRAM_API_URL).expect("failed to parse default url"),
-            token,
-            method_name,
-        ))
-        .multipart(form)
-        .send()
-        .await
-        .map_err(RequestError::NetworkError)?;
-
-    process_response(response).await
-}
-
-pub async fn request_json<P, R>(
-    client: &Client,
-    token: &str,
-    method_name: &str,
-    params: &P,
-) -> ResponseResult<R>
-where
-    P: Serialize,
-    R: DeserializeOwned,
-{
-    let response = client
-        .post(crate::net::method_url(
-            reqwest::Url::parse(TELEGRAM_API_URL).expect("failed to parse default url"),
-            token,
-            method_name,
-        ))
-        .json(params)
-        .send()
-        .await
-        .map_err(RequestError::NetworkError)?;
-
-    process_response(response).await
-}
-
-// FIXME(waffle):
-//   request_{json,mutipart} are currently used in old code, so we keep them
-//   for now when they will not be used anymore, we should remove them
-//   and rename request_{json,mutipart}2 => request_{json,mutipart}
-
-pub async fn request_multipart2<T>(
+pub async fn request_multipart<T>(
     client: &Client,
     token: &str,
     api_url: reqwest::Url,
@@ -97,7 +30,7 @@ where
     process_response(response).await
 }
 
-pub async fn request_json2<T>(
+pub async fn request_json<T>(
     client: &Client,
     token: &str,
     api_url: reqwest::Url,
diff --git a/src/requests/all/add_sticker_to_set.rs b/src/requests/all/add_sticker_to_set.rs
deleted file mode 100644
index a881e17e..00000000
--- a/src/requests/all/add_sticker_to_set.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    types::{MaskPosition, True},
-    Bot,
-};
-
-use crate::{
-    requests::{RequestOld, ResponseResult},
-    types::InputSticker,
-};
-
-/// Use this method to add a new sticker to a set created by the bot.
-///
-/// [The official docs](https://core.telegram.org/bots/api#addstickertoset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct AddStickerToSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub user_id: i32,
-    pub name: String,
-    #[serde(flatten)]
-    pub sticker_type: InputSticker,
-    pub emojis: String,
-    pub mask_position: Option<MaskPosition>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for AddStickerToSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "addStickerToSet", self).await
-    }
-}
-
-impl AddStickerToSet {
-    pub(crate) fn new<N, E>(
-        bot: Bot,
-        user_id: i32,
-        name: N,
-        sticker_type: InputSticker,
-        emojis: E,
-    ) -> Self
-    where
-        N: Into<String>,
-        E: Into<String>,
-    {
-        Self {
-            bot,
-            user_id,
-            name: name.into(),
-            sticker_type,
-            emojis: emojis.into(),
-            mask_position: None,
-        }
-    }
-
-    /// User identifier of sticker set owner.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// Sticker set name.
-    pub fn name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-
-    pub fn sticker_type(mut self, val: InputSticker) -> Self {
-        self.sticker_type = val;
-        self
-    }
-
-    /// One or more emoji corresponding to the sticker.
-    pub fn emojis<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.emojis = val.into();
-        self
-    }
-
-    /// A JSON-serialized object for position where the mask should be placed on
-    /// faces.
-    pub fn mask_position(mut self, val: MaskPosition) -> Self {
-        self.mask_position = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/answer_callback_query.rs b/src/requests/all/answer_callback_query.rs
deleted file mode 100644
index 34aef9ba..00000000
--- a/src/requests/all/answer_callback_query.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::True,
-    Bot,
-};
-
-/// Use this method to send answers to callback queries sent from [inline
-/// keyboards].
-///
-/// The answer will be displayed to the user as a notification at
-/// the top of the chat screen or as an alert.
-///
-/// [The official docs](https://core.telegram.org/bots/api#answercallbackquery).
-///
-/// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct AnswerCallbackQuery {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub callback_query_id: String,
-    pub text: Option<String>,
-    pub show_alert: Option<bool>,
-    pub url: Option<String>,
-    pub cache_time: Option<i32>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for AnswerCallbackQuery {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "answerCallbackQuery", &self).await
-    }
-}
-
-impl AnswerCallbackQuery {
-    pub(crate) fn new<C>(bot: Bot, callback_query_id: C) -> Self
-    where
-        C: Into<String>,
-    {
-        let callback_query_id = callback_query_id.into();
-        Self { bot, callback_query_id, text: None, show_alert: None, url: None, cache_time: None }
-    }
-
-    /// Unique identifier for the query to be answered.
-    pub fn callback_query_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.callback_query_id = val.into();
-        self
-    }
-
-    /// Text of the notification. If not specified, nothing will be shown to the
-    /// user, 0-200 characters.
-    pub fn text<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.text = Some(val.into());
-        self
-    }
-
-    /// If `true`, an alert will be shown by the client instead of a
-    /// notification at the top of the chat screen. Defaults to `false`.
-    pub fn show_alert(mut self, val: bool) -> Self {
-        self.show_alert = Some(val);
-        self
-    }
-
-    /// URL that will be opened by the user's client. If you have created a
-    /// [`Game`] and accepted the conditions via [@Botfather], specify the
-    /// URL that opens your game – note that this will only work if the
-    /// query comes from a [`callback_game`] button.
-    ///
-    /// Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open
-    /// your bot with a parameter.
-    ///
-    /// [@Botfather]: https://t.me/botfather
-    /// [`callback_game`]: crate::types::InlineKeyboardButton
-    /// [`Game`]: crate::types::Game
-    pub fn url<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.url = Some(val.into());
-        self
-    }
-
-    /// The maximum amount of time in seconds that the result of the callback
-    /// query may be cached client-side. Telegram apps will support caching
-    /// starting in version 3.14. Defaults to 0.
-    pub fn cache_time(mut self, val: i32) -> Self {
-        self.cache_time = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/answer_inline_query.rs b/src/requests/all/answer_inline_query.rs
deleted file mode 100644
index 1030d38f..00000000
--- a/src/requests/all/answer_inline_query.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineQueryResult, True},
-    Bot,
-};
-
-/// Use this method to send answers to an inline query.
-///
-/// No more than **50** results per query are allowed.
-///
-/// [The official docs](https://core.telegram.org/bots/api#answerinlinequery).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct AnswerInlineQuery {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_query_id: String,
-    pub results: Vec<InlineQueryResult>,
-    pub cache_time: Option<i32>,
-    pub is_personal: Option<bool>,
-    pub next_offset: Option<String>,
-    pub switch_pm_text: Option<String>,
-    pub switch_pm_parameter: Option<String>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for AnswerInlineQuery {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "answerInlineQuery", &self).await
-    }
-}
-
-impl AnswerInlineQuery {
-    pub(crate) fn new<I, R>(bot: Bot, inline_query_id: I, results: R) -> Self
-    where
-        I: Into<String>,
-        R: Into<Vec<InlineQueryResult>>,
-    {
-        let inline_query_id = inline_query_id.into();
-        let results = results.into();
-        Self {
-            bot,
-            inline_query_id,
-            results,
-            cache_time: None,
-            is_personal: None,
-            next_offset: None,
-            switch_pm_text: None,
-            switch_pm_parameter: None,
-        }
-    }
-
-    /// Unique identifier for the answered query.
-    pub fn inline_query_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_query_id = val.into();
-        self
-    }
-
-    /// A JSON-serialized array of results for the inline query.
-    pub fn results<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<InlineQueryResult>>,
-    {
-        self.results = val.into();
-        self
-    }
-
-    /// The maximum amount of time in seconds that the result of the inline
-    /// query may be cached on the server.
-    ///
-    /// Defaults to 300.
-    pub fn cache_time(mut self, val: i32) -> Self {
-        self.cache_time = Some(val);
-        self
-    }
-
-    /// Pass `true`, if results may be cached on the server side only for the
-    /// user that sent the query.
-    ///
-    /// By default, results may be returned to any user who sends the same
-    /// query.
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_personal(mut self, val: bool) -> Self {
-        self.is_personal = Some(val);
-        self
-    }
-
-    /// Pass the offset that a client should send in the next query with the
-    /// same text to receive more results.
-    ///
-    /// Pass an empty string if there are no more results or if you don‘t
-    /// support pagination. Offset length can’t exceed 64 bytes.
-    pub fn next_offset<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.next_offset = Some(val.into());
-        self
-    }
-
-    /// If passed, clients will display a button with specified text that
-    /// switches the user to a private chat with the bot and sends the bot a
-    /// start message with the parameter [`switch_pm_parameter`].
-    ///
-    /// [`switch_pm_parameter`]:
-    /// crate::requests::AnswerInlineQuery::switch_pm_parameter
-    pub fn switch_pm_text<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.switch_pm_text = Some(val.into());
-        self
-    }
-
-    /// [Deep-linking] parameter for the /start message sent to the bot when
-    /// user presses the switch button. 1-64 characters, only `A-Z`, `a-z`,
-    /// `0-9`, `_` and `-` are allowed.
-    ///
-    /// Example: An inline bot that sends YouTube videos can ask the user to
-    /// connect the bot to their YouTube account to adapt search results
-    /// accordingly. To do this, it displays a ‘Connect your YouTube account’
-    /// button above the results, or even before showing any. The user presses
-    /// the button, switches to a private chat with the bot and, in doing so,
-    /// passes a start parameter that instructs the bot to return an oauth link.
-    /// Once done, the bot can offer a [`switch_inline`] button so that the user
-    /// can easily return to the chat where they wanted to use the bot's
-    /// inline capabilities.
-    ///
-    /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
-    /// [`switch_inline`]: crate::types::InlineKeyboardMarkup
-    pub fn switch_pm_parameter<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.switch_pm_parameter = Some(val.into());
-        self
-    }
-}
diff --git a/src/requests/all/answer_pre_checkout_query.rs b/src/requests/all/answer_pre_checkout_query.rs
deleted file mode 100644
index c00c5c11..00000000
--- a/src/requests/all/answer_pre_checkout_query.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::True,
-    Bot,
-};
-
-/// Once the user has confirmed their payment and shipping details, the Bot API
-/// sends the final confirmation in the form of an [`Update`] with the field
-/// `pre_checkout_query`. Use this method to respond to such pre-checkout
-/// queries.
-///
-/// # Note
-/// The Bot API must receive an answer within 10 seconds after the pre-checkout
-/// query was sent.
-///
-/// [The official docs](https://core.telegram.org/bots/api#answerprecheckoutquery).
-///
-/// [`Update`]: crate::types::Update
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct AnswerPreCheckoutQuery {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub pre_checkout_query_id: String,
-    pub ok: bool,
-    pub error_message: Option<String>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for AnswerPreCheckoutQuery {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "answerPreCheckoutQuery", &self)
-            .await
-    }
-}
-
-impl AnswerPreCheckoutQuery {
-    pub(crate) fn new<P>(bot: Bot, pre_checkout_query_id: P, ok: bool) -> Self
-    where
-        P: Into<String>,
-    {
-        let pre_checkout_query_id = pre_checkout_query_id.into();
-        Self { bot, pre_checkout_query_id, ok, error_message: None }
-    }
-
-    /// Unique identifier for the query to be answered.
-    pub fn pre_checkout_query_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.pre_checkout_query_id = val.into();
-        self
-    }
-
-    /// Specify `true` if everything is alright (goods are available, etc.) and
-    /// the bot is ready to proceed with the order. Use False if there are any
-    /// problems.
-    pub fn ok(mut self, val: bool) -> Self {
-        self.ok = val;
-        self
-    }
-
-    /// Required if ok is `false`. Error message in human readable form that
-    /// explains the reason for failure to proceed with the checkout (e.g.
-    /// "Sorry, somebody just bought the last of our amazing black T-shirts
-    /// while you were busy filling out your payment details. Please choose a
-    /// different color or garment!").
-    ///
-    /// Telegram will display this message to the user.
-    pub fn error_message<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.error_message = Some(val.into());
-        self
-    }
-}
diff --git a/src/requests/all/answer_shipping_query.rs b/src/requests/all/answer_shipping_query.rs
deleted file mode 100644
index bb66facf..00000000
--- a/src/requests/all/answer_shipping_query.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ShippingOption, True},
-    Bot,
-};
-
-/// If you sent an invoice requesting a shipping address and the parameter
-/// `is_flexible` was specified, the Bot API will send an [`Update`] with a
-/// shipping_query field to the bot. Use this method to reply to shipping
-/// queries.
-///
-/// [The official docs](https://core.telegram.org/bots/api#answershippingquery).
-///
-/// [`Update`]: crate::types::Update
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct AnswerShippingQuery {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub shipping_query_id: String,
-    pub ok: bool,
-    pub shipping_options: Option<Vec<ShippingOption>>,
-    pub error_message: Option<String>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for AnswerShippingQuery {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "answerShippingQuery", &self).await
-    }
-}
-
-impl AnswerShippingQuery {
-    pub(crate) fn new<S>(bot: Bot, shipping_query_id: S, ok: bool) -> Self
-    where
-        S: Into<String>,
-    {
-        let shipping_query_id = shipping_query_id.into();
-        Self { bot, shipping_query_id, ok, shipping_options: None, error_message: None }
-    }
-
-    /// Unique identifier for the query to be answered.
-    pub fn shipping_query_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.shipping_query_id = val.into();
-        self
-    }
-
-    /// Specify `true` if delivery to the specified address is possible and
-    /// `false` if there are any problems (for example, if delivery to the
-    /// specified address is not possible).
-    pub fn ok(mut self, val: bool) -> Self {
-        self.ok = val;
-        self
-    }
-
-    /// Required if ok is `true`. A JSON-serialized array of available shipping
-    /// options.
-    pub fn shipping_options<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<ShippingOption>>,
-    {
-        self.shipping_options = Some(val.into());
-        self
-    }
-
-    /// Required if ok is `false`. Error message in human readable form that
-    /// explains why it is impossible to complete the order (e.g. "Sorry,
-    /// delivery to your desired address is unavailable').
-    ///
-    /// Telegram will display this message to the user.
-    pub fn error_message<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.error_message = Some(val.into());
-        self
-    }
-}
diff --git a/src/requests/all/create_new_sticker_set.rs b/src/requests/all/create_new_sticker_set.rs
deleted file mode 100644
index 4d781bee..00000000
--- a/src/requests/all/create_new_sticker_set.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InputSticker, MaskPosition, True},
-    Bot,
-};
-
-/// Use this method to create new sticker set owned by a user. The bot will be
-/// able to edit the created sticker set.
-///
-/// [The official docs](https://core.telegram.org/bots/api#createnewstickerset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct CreateNewStickerSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub user_id: i32,
-    pub name: String,
-    pub title: String,
-    #[serde(flatten)]
-    pub sticker: InputSticker,
-    pub emojis: String,
-    pub contains_masks: Option<bool>,
-    pub mask_position: Option<MaskPosition>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for CreateNewStickerSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "createNewStickerSet", self)
-            .await
-    }
-}
-
-impl CreateNewStickerSet {
-    pub(crate) fn new<N, T, E>(
-        bot: Bot,
-        user_id: i32,
-        name: N,
-        title: T,
-        sticker_type: InputSticker,
-        emojis: E,
-    ) -> Self
-    where
-        N: Into<String>,
-        T: Into<String>,
-        E: Into<String>,
-    {
-        Self {
-            bot,
-            user_id,
-            name: name.into(),
-            title: title.into(),
-            sticker: sticker_type,
-            emojis: emojis.into(),
-            contains_masks: None,
-            mask_position: None,
-        }
-    }
-
-    /// User identifier of created sticker set owner.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g.,
-    /// animals). Can contain only english letters, digits and underscores.
-    ///
-    /// Must begin with a letter, can't contain consecutive underscores and must
-    /// end in `_by_<bot username>`. `<bot_username>` is case insensitive.
-    /// 1-64 characters.
-    pub fn name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-
-    /// Sticker set title, 1-64 characters.
-    pub fn title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    pub fn sticker_type(mut self, val: InputSticker) -> Self {
-        self.sticker = val;
-        self
-    }
-
-    /// One or more emoji corresponding to the sticker.
-    pub fn emojis<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.emojis = val.into();
-        self
-    }
-
-    /// Pass `true`, if a set of mask stickers should be created.
-    pub fn contains_masks(mut self, val: bool) -> Self {
-        self.contains_masks = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for position where the mask should be placed on
-    /// faces.
-    pub fn mask_position(mut self, val: MaskPosition) -> Self {
-        self.mask_position = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/delete_chat_photo.rs b/src/requests/all/delete_chat_photo.rs
deleted file mode 100644
index f915b879..00000000
--- a/src/requests/all/delete_chat_photo.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to delete a chat photo. Photos can't be changed for private
-/// chats. The bot must be an administrator in the chat for this to work and
-/// must have the appropriate admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#deletechatphoto).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct DeleteChatPhoto {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for DeleteChatPhoto {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "deleteChatPhoto", &self).await
-    }
-}
-
-impl DeleteChatPhoto {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/delete_chat_sticker_set.rs b/src/requests/all/delete_chat_sticker_set.rs
deleted file mode 100644
index b0ee8542..00000000
--- a/src/requests/all/delete_chat_sticker_set.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to delete a group sticker set from a supergroup.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights. Use the field `can_set_sticker_set` optionally
-/// returned in [`Bot::get_chat`] requests to check if the bot can use this
-/// method.
-///
-/// [The official docs](https://core.telegram.org/bots/api#deletechatstickerset).
-///
-/// [`Bot::get_chat`]: crate::Bot::get_chat
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct DeleteChatStickerSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for DeleteChatStickerSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "deleteChatStickerSet", &self).await
-    }
-}
-
-impl DeleteChatStickerSet {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup (in the format `@supergroupusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/delete_message.rs b/src/requests/all/delete_message.rs
deleted file mode 100644
index c47d9380..00000000
--- a/src/requests/all/delete_message.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to delete a message, including service messages.
-///
-/// The limitations are:
-///  - A message can only be deleted if it was sent less than 48 hours ago.
-///  - Bots can delete outgoing messages in private chats, groups, and
-///    supergroups.
-///  - Bots can delete incoming messages in private chats.
-///  - Bots granted can_post_messages permissions can delete outgoing messages
-///    in channels.
-///  - If the bot is an administrator of a group, it can delete any message
-///    there.
-///  - If the bot has can_delete_messages permission in a supergroup or a
-///    channel, it can delete any message there.
-///
-/// [The official docs](https://core.telegram.org/bots/api#deletemessage).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct DeleteMessage {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for DeleteMessage {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "deleteMessage", &self).await
-    }
-}
-
-impl DeleteMessage {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to delete.
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-}
diff --git a/src/requests/all/delete_sticker_from_set.rs b/src/requests/all/delete_sticker_from_set.rs
deleted file mode 100644
index e17a1cf1..00000000
--- a/src/requests/all/delete_sticker_from_set.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::True,
-    Bot,
-};
-
-/// Use this method to delete a sticker from a set created by the bot.
-///
-/// [The official docs](https://core.telegram.org/bots/api#deletestickerfromset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct DeleteStickerFromSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub sticker: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for DeleteStickerFromSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "deleteStickerFromSet", &self).await
-    }
-}
-
-impl DeleteStickerFromSet {
-    pub(crate) fn new<S>(bot: Bot, sticker: S) -> Self
-    where
-        S: Into<String>,
-    {
-        let sticker = sticker.into();
-        Self { bot, sticker }
-    }
-
-    /// File identifier of the sticker.
-    pub fn sticker<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.sticker = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/delete_webhook.rs b/src/requests/all/delete_webhook.rs
deleted file mode 100644
index 110cbe38..00000000
--- a/src/requests/all/delete_webhook.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::True,
-    Bot,
-};
-
-/// Use this method to remove webhook integration if you decide to switch back
-/// to [Bot::get_updates].
-///
-/// [The official docs](https://core.telegram.org/bots/api#deletewebhook).
-///
-/// [Bot::get_updates]: crate::Bot::get_updates
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct DeleteWebhook {
-    #[serde(skip_serializing)]
-    bot: Bot,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for DeleteWebhook {
-    type Output = True;
-
-    #[allow(clippy::trivially_copy_pass_by_ref)]
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "deleteWebhook", &self).await
-    }
-}
-
-impl DeleteWebhook {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self { bot }
-    }
-}
diff --git a/src/requests/all/edit_inline_message_caption.rs b/src/requests/all/edit_inline_message_caption.rs
deleted file mode 100644
index c7d54c15..00000000
--- a/src/requests/all/edit_inline_message_caption.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, ParseMode, True},
-    Bot,
-};
-
-/// Use this method to edit captions of messages sent via the bot.
-///
-/// On success, [`True`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
-///
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditInlineMessageCaption {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditInlineMessageCaption {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageCaption", &self).await
-    }
-}
-
-impl EditInlineMessageCaption {
-    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
-    where
-        I: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        Self { bot, inline_message_id, caption: None, parse_mode: None, reply_markup: None }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// New caption of the message.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_inline_message_live_location.rs b/src/requests/all/edit_inline_message_live_location.rs
deleted file mode 100644
index a57407c1..00000000
--- a/src/requests/all/edit_inline_message_live_location.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, True},
-    Bot,
-};
-
-/// Use this method to edit live location messages sent via the bot.
-///
-/// A location can be edited until its live_period expires or editing is
-/// explicitly disabled by a call to stopMessageLiveLocation. On success,
-/// [`True`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
-///
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditInlineMessageLiveLocation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub latitude: f32,
-    pub longitude: f32,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditInlineMessageLiveLocation {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageLiveLocation", &self)
-            .await
-    }
-}
-
-impl EditInlineMessageLiveLocation {
-    pub(crate) fn new<I>(bot: Bot, inline_message_id: I, latitude: f32, longitude: f32) -> Self
-    where
-        I: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        Self { bot, inline_message_id, latitude, longitude, reply_markup: None }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// Latitude of new location.
-    pub fn latitude(mut self, val: f32) -> Self {
-        self.latitude = val;
-        self
-    }
-
-    /// Longitude of new location.
-    pub fn longitude(mut self, val: f32) -> Self {
-        self.longitude = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_inline_message_media.rs b/src/requests/all/edit_inline_message_media.rs
deleted file mode 100644
index c61cc994..00000000
--- a/src/requests/all/edit_inline_message_media.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, InputMedia, True},
-    Bot,
-};
-
-/// Use this method to edit animation, audio, document, photo, or video
-/// messages sent via the bot.
-///
-/// If a message is a part of a message album, then it can be edited only to a
-/// photo or a video. Otherwise, message type can be changed arbitrarily. When
-/// this method is used, new file can't be uploaded. Use previously
-/// uploaded file via its `file_id` or specify a URL. On success, [`True`] is
-/// returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
-///
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditInlineMessageMedia {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub media: InputMedia,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditInlineMessageMedia {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "editMessageMedia", self).await
-    }
-}
-
-impl EditInlineMessageMedia {
-    pub(crate) fn new<I>(bot: Bot, inline_message_id: I, media: InputMedia) -> Self
-    where
-        I: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        Self { bot, inline_message_id, media, reply_markup: None }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// A JSON-serialized object for a new media content of the message.
-    pub fn media(mut self, val: InputMedia) -> Self {
-        self.media = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_inline_message_reply_markup.rs b/src/requests/all/edit_inline_message_reply_markup.rs
deleted file mode 100644
index a51f4c96..00000000
--- a/src/requests/all/edit_inline_message_reply_markup.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, True},
-    Bot,
-};
-
-/// Use this method to edit only the reply markup of messages sent via the bot.
-///
-/// On success, [`True`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
-///
-/// [`Message`]: crate::types::Message
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditInlineMessageReplyMarkup {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditInlineMessageReplyMarkup {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageReplyMarkup", &self)
-            .await
-    }
-}
-
-impl EditInlineMessageReplyMarkup {
-    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
-    where
-        I: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        Self { bot, inline_message_id, reply_markup: None }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_inline_message_text.rs b/src/requests/all/edit_inline_message_text.rs
deleted file mode 100644
index d3186efd..00000000
--- a/src/requests/all/edit_inline_message_text.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, Message, ParseMode},
-    Bot,
-};
-
-/// Use this method to edit text and game messages sent via the bot.
-///
-/// On success, [`True`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
-///
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditInlineMessageText {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub text: String,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_web_page_preview: Option<bool>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditInlineMessageText {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageText", &self).await
-    }
-}
-
-impl EditInlineMessageText {
-    pub(crate) fn new<I, T>(bot: Bot, inline_message_id: I, text: T) -> Self
-    where
-        I: Into<String>,
-        T: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        let text = text.into();
-        Self {
-            bot,
-            inline_message_id,
-            text,
-            parse_mode: None,
-            disable_web_page_preview: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// New text of the message.
-    pub fn text<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.text = val.into();
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
-    /// italic, fixed-width text or inline URLs] in your bot's message.
-    ///
-    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
-    /// [HTML]: https://core.telegram.org/bots/api#html-style
-    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Disables link previews for links in this message.
-    pub fn disable_web_page_preview(mut self, val: bool) -> Self {
-        self.disable_web_page_preview = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_message_caption.rs b/src/requests/all/edit_message_caption.rs
deleted file mode 100644
index 5db3946b..00000000
--- a/src/requests/all/edit_message_caption.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
-    Bot,
-};
-
-/// Use this method to edit captions of messages sent by the bot.
-///
-/// On success, the edited [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagecaption).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditMessageCaption {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditMessageCaption {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageCaption", &self).await
-    }
-}
-
-impl EditMessageCaption {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, caption: None, parse_mode: None, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// New caption of the message.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_message_live_location.rs b/src/requests/all/edit_message_live_location.rs
deleted file mode 100644
index cd1d0c17..00000000
--- a/src/requests/all/edit_message_live_location.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Message},
-    Bot,
-};
-
-/// Use this method to edit live location messages.
-///
-/// A location can be edited until its live_period expires or editing is
-/// explicitly disabled by a call to stopMessageLiveLocation. On success, the
-/// edited [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagelivelocation).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditMessageLiveLocation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub latitude: f32,
-    pub longitude: f32,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditMessageLiveLocation {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageLiveLocation", &self)
-            .await
-    }
-}
-
-impl EditMessageLiveLocation {
-    pub(crate) fn new<C>(
-        bot: Bot,
-        chat_id: C,
-        message_id: i32,
-        latitude: f32,
-        longitude: f32,
-    ) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, latitude, longitude, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// Latitude of new location.
-    pub fn latitude(mut self, val: f32) -> Self {
-        self.latitude = val;
-        self
-    }
-
-    /// Longitude of new location.
-    pub fn longitude(mut self, val: f32) -> Self {
-        self.longitude = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_message_media.rs b/src/requests/all/edit_message_media.rs
deleted file mode 100644
index 2dea170a..00000000
--- a/src/requests/all/edit_message_media.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, InputMedia, Message},
-    Bot,
-};
-
-/// Use this method to edit animation, audio, document, photo, or video
-/// messages.
-///
-/// If a message is a part of a message album, then it can be edited only to a
-/// photo or a video. Otherwise, message type can be changed arbitrarily. On
-/// success, the edited [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagemedia).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditMessageMedia {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub media: InputMedia,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditMessageMedia {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "editMessageMedia", self).await
-    }
-}
-
-impl EditMessageMedia {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32, media: InputMedia) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, media, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new media content of the message.
-    pub fn media(mut self, val: InputMedia) -> Self {
-        self.media = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_message_reply_markup.rs b/src/requests/all/edit_message_reply_markup.rs
deleted file mode 100644
index 5022fd5f..00000000
--- a/src/requests/all/edit_message_reply_markup.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Message},
-    Bot,
-};
-
-/// Use this method to edit only the reply markup of messages.
-///
-/// On success, the edited [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagereplymarkup).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditMessageReplyMarkup {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditMessageReplyMarkup {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageReplyMarkup", &self)
-            .await
-    }
-}
-
-impl EditMessageReplyMarkup {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/edit_message_text.rs b/src/requests/all/edit_message_text.rs
deleted file mode 100644
index f6669411..00000000
--- a/src/requests/all/edit_message_text.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Message, ParseMode},
-    Bot,
-};
-
-/// Use this method to edit text and game messages.
-///
-/// On success, the edited [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#editmessagetext).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct EditMessageText {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub text: String,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_web_page_preview: Option<bool>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for EditMessageText {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "editMessageText", &self).await
-    }
-}
-
-impl EditMessageText {
-    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, message_id: i32, text: T) -> Self
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let text = text.into();
-        Self {
-            bot,
-            chat_id,
-            message_id,
-            text,
-            parse_mode: None,
-            disable_web_page_preview: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// New text of the message.
-    pub fn text<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.text = val.into();
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show [bold,
-    /// italic, fixed-width text or inline URLs] in your bot's message.
-    ///
-    /// [Markdown]: https://core.telegram.org/bots/api#markdown-style
-    /// [HTML]: https://core.telegram.org/bots/api#html-style
-    /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Disables link previews for links in this message.
-    pub fn disable_web_page_preview(mut self, val: bool) -> Self {
-        self.disable_web_page_preview = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/export_chat_invite_link.rs b/src/requests/all/export_chat_invite_link.rs
deleted file mode 100644
index 82f58a50..00000000
--- a/src/requests/all/export_chat_invite_link.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::ChatId,
-    Bot,
-};
-
-/// Use this method to generate a new invite link for a chat; any previously
-/// generated link is revoked.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights.
-///
-/// ## Note
-/// Each administrator in a chat generates their own invite links. Bots can't
-/// use invite links generated by other administrators. If you want your bot to
-/// work with invite links, it will need to generate its own link using
-/// [`Bot::export_chat_invite_link`] – after this the link will become available
-/// to the bot via the [`Bot::get_chat`] method. If your bot needs to generate a
-/// new invite link replacing its previous one, use
-/// [`Bot::export_chat_invite_link`] again.
-///
-/// [The official docs](https://core.telegram.org/bots/api#exportchatinvitelink).
-///
-/// [`Bot::export_chat_invite_link`]: crate::Bot::export_chat_invite_link
-/// [`Bot::get_chat`]: crate::Bot::get_chat
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct ExportChatInviteLink {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for ExportChatInviteLink {
-    type Output = String;
-
-    /// Returns the new invite link as `String` on success.
-    async fn send(&self) -> ResponseResult<String> {
-        net::request_json(self.bot.client(), self.bot.token(), "exportChatInviteLink", &self).await
-    }
-}
-
-impl ExportChatInviteLink {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/forward_message.rs b/src/requests/all/forward_message.rs
deleted file mode 100644
index 6df3ad43..00000000
--- a/src/requests/all/forward_message.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message},
-    Bot,
-};
-
-/// Use this method to forward messages of any kind.
-///
-/// [`The official docs`](https://core.telegram.org/bots/api#forwardmessage).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct ForwardMessage {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub from_chat_id: ChatId,
-    pub disable_notification: Option<bool>,
-    pub message_id: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for ForwardMessage {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "forwardMessage", &self).await
-    }
-}
-
-impl ForwardMessage {
-    pub(crate) fn new<C, F>(bot: Bot, chat_id: C, from_chat_id: F, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-        F: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        let from_chat_id = from_chat_id.into();
-        Self { bot, chat_id, from_chat_id, message_id, disable_notification: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier for the chat where the original message was sent (or
-    /// channel username in the format `@channelusername`).
-    #[allow(clippy::wrong_self_convention)]
-    pub fn from_chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.from_chat_id = val.into();
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// Message identifier in the chat specified in [`from_chat_id`].
-    ///
-    /// [`from_chat_id`]: ForwardMessage::from_chat_id
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-}
diff --git a/src/requests/all/get_chat.rs b/src/requests/all/get_chat.rs
deleted file mode 100644
index 6ac5eb17..00000000
--- a/src/requests/all/get_chat.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{Chat, ChatId},
-    Bot,
-};
-
-/// Use this method to get up to date information about the chat (current name
-/// of the user for one-on-one conversations, current username of a user, group
-/// or channel, etc.).
-///
-/// [The official docs](https://core.telegram.org/bots/api#getchat).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetChat {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetChat {
-    type Output = Chat;
-
-    async fn send(&self) -> ResponseResult<Chat> {
-        net::request_json(self.bot.client(), self.bot.token(), "getChat", &self).await
-    }
-}
-
-impl GetChat {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/get_chat_administrators.rs b/src/requests/all/get_chat_administrators.rs
deleted file mode 100644
index e82e1162..00000000
--- a/src/requests/all/get_chat_administrators.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, ChatMember},
-    Bot,
-};
-
-/// Use this method to get a list of administrators in a chat.
-///
-/// If the chat is a group or a supergroup and no administrators were appointed,
-/// only the creator will be returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getchatadministrators).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetChatAdministrators {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetChatAdministrators {
-    type Output = Vec<ChatMember>;
-
-    /// On success, returns an array that contains information about all chat
-    /// administrators except other bots.
-    async fn send(&self) -> ResponseResult<Vec<ChatMember>> {
-        net::request_json(self.bot.client(), self.bot.token(), "getChatAdministrators", &self).await
-    }
-}
-
-impl GetChatAdministrators {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/get_chat_member.rs b/src/requests/all/get_chat_member.rs
deleted file mode 100644
index 9f5cc5bd..00000000
--- a/src/requests/all/get_chat_member.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, ChatMember},
-    Bot,
-};
-
-/// Use this method to get information about a member of a chat.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getchatmember).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetChatMember {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetChatMember {
-    type Output = ChatMember;
-
-    async fn send(&self) -> ResponseResult<ChatMember> {
-        net::request_json(self.bot.client(), self.bot.token(), "getChatMember", &self).await
-    }
-}
-
-impl GetChatMember {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, user_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-}
diff --git a/src/requests/all/get_chat_members_count.rs b/src/requests/all/get_chat_members_count.rs
deleted file mode 100644
index 7cb0ec4b..00000000
--- a/src/requests/all/get_chat_members_count.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::ChatId,
-    Bot,
-};
-
-/// Use this method to get the number of members in a chat.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getchatmemberscount).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetChatMembersCount {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetChatMembersCount {
-    type Output = i32;
-
-    async fn send(&self) -> ResponseResult<i32> {
-        net::request_json(self.bot.client(), self.bot.token(), "getChatMembersCount", &self).await
-    }
-}
-
-impl GetChatMembersCount {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/get_file.rs b/src/requests/all/get_file.rs
deleted file mode 100644
index bf41038e..00000000
--- a/src/requests/all/get_file.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::File,
-    Bot,
-};
-
-/// Use this method to get basic info about a file and prepare it for
-/// downloading.
-///
-/// For the moment, bots can download files of up to `20MB` in size.
-///
-/// The file can then be downloaded via the link
-/// `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>`
-/// is taken from the response. It is guaranteed that the link will be valid
-/// for at least `1` hour. When the link expires, a new one can be requested by
-/// calling [`GetFile`] again.
-///
-/// **Note**: This function may not preserve the original file name and MIME
-/// type. You should save the file's MIME type and name (if available) when the
-/// [`File`] object is received.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getfile).
-///
-/// [`File`]: crate::types::File
-/// [`GetFile`]: self::GetFile
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetFile {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub file_id: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetFile {
-    type Output = File;
-
-    async fn send(&self) -> ResponseResult<File> {
-        net::request_json(self.bot.client(), self.bot.token(), "getFile", &self).await
-    }
-}
-
-impl GetFile {
-    pub(crate) fn new<F>(bot: Bot, file_id: F) -> Self
-    where
-        F: Into<String>,
-    {
-        Self { bot, file_id: file_id.into() }
-    }
-
-    /// File identifier to get info about.
-    pub fn file_id<F>(mut self, value: F) -> Self
-    where
-        F: Into<String>,
-    {
-        self.file_id = value.into();
-        self
-    }
-}
diff --git a/src/requests/all/get_game_high_scores.rs b/src/requests/all/get_game_high_scores.rs
deleted file mode 100644
index 3a16114e..00000000
--- a/src/requests/all/get_game_high_scores.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{GameHighScore, TargetMessage},
-    Bot,
-};
-
-/// Use this method to get data for high score tables.
-///
-/// Will return the score of the specified user and several of his neighbors in
-/// a game.
-///
-/// ## Note
-/// This method will currently return scores for the target user, plus two of
-/// his closest neighbors on each side. Will also return the top three users if
-/// the user and his neighbors are not among them. Please note that this
-/// behavior is subject to change.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getgamehighscores)
-#[derive(Debug, Clone, Serialize)]
-pub struct GetGameHighScores {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    #[serde(flatten)]
-    pub target: TargetMessage,
-    pub user_id: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetGameHighScores {
-    type Output = Vec<GameHighScore>;
-
-    async fn send(&self) -> ResponseResult<Vec<GameHighScore>> {
-        net::request_json(self.bot.client(), self.bot.token(), "getGameHighScores", &self).await
-    }
-}
-
-impl GetGameHighScores {
-    pub(crate) fn new<T>(bot: Bot, target: T, user_id: i32) -> Self
-    where
-        T: Into<TargetMessage>,
-    {
-        let target = target.into();
-        Self { bot, target, user_id }
-    }
-
-    /// Target message, either chat id and message id or inline message id.
-    pub fn target<T>(mut self, val: T) -> Self
-    where
-        T: Into<TargetMessage>,
-    {
-        self.target = val.into();
-        self
-    }
-
-    /// Target user id.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-}
diff --git a/src/requests/all/get_me.rs b/src/requests/all/get_me.rs
deleted file mode 100644
index 6ebbae5a..00000000
--- a/src/requests/all/get_me.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::Me,
-    Bot,
-};
-use serde::Serialize;
-
-/// A simple method for testing your bot's auth token. Requires no parameters.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getme).
-#[derive(Debug, Clone, Serialize)]
-pub struct GetMe {
-    #[serde(skip_serializing)]
-    bot: Bot,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetMe {
-    type Output = Me;
-
-    /// Returns basic information about the bot.
-    #[allow(clippy::trivially_copy_pass_by_ref)]
-    async fn send(&self) -> ResponseResult<Me> {
-        net::request_json(self.bot.client(), self.bot.token(), "getMe", &self).await
-    }
-}
-
-impl GetMe {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self { bot }
-    }
-}
diff --git a/src/requests/all/get_my_commands.rs b/src/requests/all/get_my_commands.rs
deleted file mode 100644
index aa8ae4a1..00000000
--- a/src/requests/all/get_my_commands.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::BotCommand,
-    Bot,
-};
-
-/// Use this method to get the current list of the bot's commands.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getmycommands).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetMyCommands {
-    #[serde(skip_serializing)]
-    bot: Bot,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetMyCommands {
-    type Output = Vec<BotCommand>;
-
-    async fn send(&self) -> ResponseResult<Self::Output> {
-        net::request_json(self.bot.client(), self.bot.token(), "getMyCommands", &self).await
-    }
-}
-
-impl GetMyCommands {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self { bot }
-    }
-}
diff --git a/src/requests/all/get_sticker_set.rs b/src/requests/all/get_sticker_set.rs
deleted file mode 100644
index 5d05e1d2..00000000
--- a/src/requests/all/get_sticker_set.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::StickerSet,
-    Bot,
-};
-
-/// Use this method to get a sticker set.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getstickerset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetStickerSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub name: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetStickerSet {
-    type Output = StickerSet;
-
-    async fn send(&self) -> ResponseResult<StickerSet> {
-        net::request_json(self.bot.client(), self.bot.token(), "getStickerSet", &self).await
-    }
-}
-
-impl GetStickerSet {
-    pub(crate) fn new<N>(bot: Bot, name: N) -> Self
-    where
-        N: Into<String>,
-    {
-        let name = name.into();
-        Self { bot, name }
-    }
-
-    /// Name of the sticker set.
-    pub fn name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/get_updates.rs b/src/requests/all/get_updates.rs
deleted file mode 100644
index fa635f73..00000000
--- a/src/requests/all/get_updates.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{AllowedUpdate, Update},
-    Bot,
-};
-
-/// Use this method to receive incoming updates using long polling ([wiki]).
-///
-/// **Notes:**
-/// 1. This method will not work if an outgoing webhook is set up.
-/// 2. In order to avoid getting duplicate updates,
-///    recalculate offset after each server response.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getupdates).
-///
-/// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetUpdates {
-    #[serde(skip_serializing)]
-    pub(crate) bot: Bot,
-    pub offset: Option<i32>,
-    pub limit: Option<u8>,
-    pub timeout: Option<u32>,
-    pub allowed_updates: Option<Vec<AllowedUpdate>>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetUpdates {
-    type Output = Vec<Update>;
-
-    async fn send(&self) -> ResponseResult<Self::Output> {
-        net::request_json(self.bot.client(), self.bot.token(), "getUpdates", &self).await
-    }
-}
-
-impl GetUpdates {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self { bot, offset: None, limit: None, timeout: None, allowed_updates: None }
-    }
-
-    /// Identifier of the first update to be returned.
-    ///
-    /// Must be greater by one than the highest among the identifiers of
-    /// previously received updates. By default, updates starting with the
-    /// earliest unconfirmed update are returned. An update is considered
-    /// confirmed as soon as [`GetUpdates`] is called with an [`offset`]
-    /// higher than its [`id`]. The negative offset can be specified to
-    /// retrieve updates starting from `-offset` update from the end of the
-    /// updates queue. All previous updates will forgotten.
-    ///
-    /// [`GetUpdates`]: self::GetUpdates
-    /// [`offset`]: self::GetUpdates::offset
-    /// [`id`]: crate::types::Update::id
-    pub fn offset(mut self, value: i32) -> Self {
-        self.offset = Some(value);
-        self
-    }
-
-    /// Limits the number of updates to be retrieved.
-    ///
-    /// Values between `1`—`100` are accepted. Defaults to `100`.
-    pub fn limit(mut self, value: u8) -> Self {
-        self.limit = Some(value);
-        self
-    }
-
-    /// Timeout in seconds for long polling.
-    ///
-    /// Defaults to `0`, i.e. usual short polling. Should be positive, short
-    /// polling should be used for testing purposes only.
-    pub fn timeout(mut self, value: u32) -> Self {
-        self.timeout = Some(value);
-        self
-    }
-
-    /// List the types of updates you want your bot to receive.
-    ///
-    /// For example, specify [[`Message`], [`EditedChannelPost`],
-    /// [`CallbackQuery`]] to only receive updates of these types.
-    /// See [`AllowedUpdate`] for a complete list of available update types.
-    ///
-    /// Specify an empty list to receive all updates regardless of type
-    /// (default). If not specified, the previous setting will be used.
-    ///
-    /// **Note:**
-    /// This parameter doesn't affect updates created before the call to the
-    /// [`Bot::get_updates`], so unwanted updates may be received for a short
-    /// period of time.
-    ///
-    /// [`Message`]: self::AllowedUpdate::Message
-    /// [`EditedChannelPost`]: self::AllowedUpdate::EditedChannelPost
-    /// [`CallbackQuery`]: self::AllowedUpdate::CallbackQuery
-    /// [`AllowedUpdate`]: self::AllowedUpdate
-    /// [`Bot::get_updates`]: crate::Bot::get_updates
-    pub fn allowed_updates<T>(mut self, value: T) -> Self
-    where
-        T: Into<Vec<AllowedUpdate>>,
-    {
-        self.allowed_updates = Some(value.into());
-        self
-    }
-}
diff --git a/src/requests/all/get_updates_non_strict.rs b/src/requests/all/get_updates_non_strict.rs
deleted file mode 100644
index 77b7db44..00000000
--- a/src/requests/all/get_updates_non_strict.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{GetUpdates, RequestOld, ResponseResult},
-    types::{AllowedUpdate, NonStrictVec, Update},
-    Bot,
-};
-
-/// This is non strict version of [`GetUpdates`], this means that if it will
-/// fail to deserialize some updates, it won't fail entirely, but will just
-/// return some errors.
-///
-/// Note: this is not a 'real' telegram method, this is simply [`GetUpdates`]
-/// with changed return type.
-///
-/// [`GetUpdates`]: crate::requests::GetUpdates
-#[derive(Debug, Clone, Serialize)]
-#[serde(transparent)]
-pub struct GetUpdatesNonStrict(pub GetUpdates);
-
-#[async_trait::async_trait]
-impl RequestOld for GetUpdatesNonStrict {
-    type Output = NonStrictVec<Update>;
-
-    async fn send(&self) -> ResponseResult<Self::Output> {
-        net::request_json(self.0.bot.client(), self.0.bot.token(), "getUpdates", &self).await
-    }
-}
-
-impl GetUpdatesNonStrict {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self(GetUpdates::new(bot))
-    }
-
-    /// Identifier of the first update to be returned.
-    ///
-    /// Must be greater by one than the highest among the identifiers of
-    /// previously received updates. By default, updates starting with the
-    /// earliest unconfirmed update are returned. An update is considered
-    /// confirmed as soon as [`GetUpdates`] is called with an [`offset`]
-    /// higher than its [`id`]. The negative offset can be specified to
-    /// retrieve updates starting from `-offset` update from the end of the
-    /// updates queue. All previous updates will forgotten.
-    ///
-    /// [`GetUpdates`]: self::GetUpdates
-    /// [`offset`]: self::GetUpdates::offset
-    /// [`id`]: crate::types::Update::id
-    pub fn offset(mut self, value: i32) -> Self {
-        self.0.offset = Some(value);
-        self
-    }
-
-    /// Limits the number of updates to be retrieved.
-    ///
-    /// Values between `1`—`100` are accepted. Defaults to `100`.
-    pub fn limit(mut self, value: u8) -> Self {
-        self.0.limit = Some(value);
-        self
-    }
-
-    /// Timeout in seconds for long polling.
-    ///
-    /// Defaults to `0`, i.e. usual short polling. Should be positive, short
-    /// polling should be used for testing purposes only.
-    pub fn timeout(mut self, value: u32) -> Self {
-        self.0.timeout = Some(value);
-        self
-    }
-
-    /// List the types of updates you want your bot to receive.
-    ///
-    /// For example, specify [[`Message`], [`EditedChannelPost`],
-    /// [`CallbackQuery`]] to only receive updates of these types.
-    /// See [`AllowedUpdate`] for a complete list of available update types.
-    ///
-    /// Specify an empty list to receive all updates regardless of type
-    /// (default). If not specified, the previous setting will be used.
-    ///
-    /// **Note:**
-    /// This parameter doesn't affect updates created before the call to the
-    /// [`Bot::get_updates`], so unwanted updates may be received for a short
-    /// period of time.
-    ///
-    /// [`Message`]: self::AllowedUpdate::Message
-    /// [`EditedChannelPost`]: self::AllowedUpdate::EditedChannelPost
-    /// [`CallbackQuery`]: self::AllowedUpdate::CallbackQuery
-    /// [`AllowedUpdate`]: self::AllowedUpdate
-    /// [`Bot::get_updates`]: crate::Bot::get_updates
-    pub fn allowed_updates<T>(mut self, value: T) -> Self
-    where
-        T: Into<Vec<AllowedUpdate>>,
-    {
-        self.0.allowed_updates = Some(value.into());
-        self
-    }
-}
diff --git a/src/requests/all/get_user_profile_photos.rs b/src/requests/all/get_user_profile_photos.rs
deleted file mode 100644
index b391ca51..00000000
--- a/src/requests/all/get_user_profile_photos.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::UserProfilePhotos,
-    Bot,
-};
-
-/// Use this method to get a list of profile pictures for a user.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getuserprofilephotos).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct GetUserProfilePhotos {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub user_id: i32,
-    pub offset: Option<i32>,
-    pub limit: Option<i32>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetUserProfilePhotos {
-    type Output = UserProfilePhotos;
-
-    async fn send(&self) -> ResponseResult<UserProfilePhotos> {
-        net::request_json(self.bot.client(), self.bot.token(), "getUserProfilePhotos", &self).await
-    }
-}
-
-impl GetUserProfilePhotos {
-    pub(crate) fn new(bot: Bot, user_id: i32) -> Self {
-        Self { bot, user_id, offset: None, limit: None }
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// Sequential number of the first photo to be returned. By default, all
-    /// photos are returned.
-    pub fn offset(mut self, val: i32) -> Self {
-        self.offset = Some(val);
-        self
-    }
-
-    /// Limits the number of photos to be retrieved. Values between 1—100 are
-    /// accepted.
-    ///
-    /// Defaults to 100.
-    pub fn limit(mut self, val: i32) -> Self {
-        self.limit = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/get_webhook_info.rs b/src/requests/all/get_webhook_info.rs
deleted file mode 100644
index 086b7464..00000000
--- a/src/requests/all/get_webhook_info.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::WebhookInfo,
-    Bot,
-};
-
-/// Use this method to get current webhook status.
-///
-/// If the bot is using [`Bot::get_updates`], will return an object with the url
-/// field empty.
-///
-/// [The official docs](https://core.telegram.org/bots/api#getwebhookinfo).
-///
-/// [`Bot::get_updates`]: crate::Bot::get_updates
-#[derive(Debug, Clone, Serialize)]
-pub struct GetWebhookInfo {
-    #[serde(skip_serializing)]
-    bot: Bot,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for GetWebhookInfo {
-    type Output = WebhookInfo;
-
-    #[allow(clippy::trivially_copy_pass_by_ref)]
-    async fn send(&self) -> ResponseResult<WebhookInfo> {
-        net::request_json(self.bot.client(), self.bot.token(), "getWebhookInfo", &self).await
-    }
-}
-
-impl GetWebhookInfo {
-    pub(crate) fn new(bot: Bot) -> Self {
-        Self { bot }
-    }
-}
diff --git a/src/requests/all/kick_chat_member.rs b/src/requests/all/kick_chat_member.rs
deleted file mode 100644
index 455f160c..00000000
--- a/src/requests/all/kick_chat_member.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to kick a user from a group, a supergroup or a channel.
-///
-/// In the case of supergroups and channels, the user will not be able to return
-/// to the group on their own using invite links, etc., unless [unbanned] first.
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#kickchatmember).
-///
-/// [unbanned]: crate::Bot::unban_chat_member
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct KickChatMember {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-    pub until_date: Option<i32>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for KickChatMember {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "kickChatMember", &self).await
-    }
-}
-
-impl KickChatMember {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, user_id, until_date: None }
-    }
-
-    /// Unique identifier for the target group or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// Date when the user will be unbanned, unix time.
-    ///
-    /// If user is banned for more than 366 days or less than 30 seconds from
-    /// the current time they are considered to be banned forever.
-    pub fn until_date(mut self, val: i32) -> Self {
-        self.until_date = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/leave_chat.rs b/src/requests/all/leave_chat.rs
deleted file mode 100644
index 6b96f621..00000000
--- a/src/requests/all/leave_chat.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method for your bot to leave a group, supergroup or channel.
-///
-/// [The official docs](https://core.telegram.org/bots/api#leavechat).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct LeaveChat {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for LeaveChat {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "leaveChat", &self).await
-    }
-}
-
-impl LeaveChat {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup or channel (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/mod.rs b/src/requests/all/mod.rs
deleted file mode 100644
index d173f210..00000000
--- a/src/requests/all/mod.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-mod add_sticker_to_set;
-mod answer_callback_query;
-mod answer_inline_query;
-mod answer_pre_checkout_query;
-mod answer_shipping_query;
-mod create_new_sticker_set;
-mod delete_chat_photo;
-mod delete_chat_sticker_set;
-mod delete_message;
-mod delete_sticker_from_set;
-mod delete_webhook;
-mod edit_inline_message_caption;
-mod edit_inline_message_live_location;
-mod edit_inline_message_media;
-mod edit_inline_message_reply_markup;
-mod edit_inline_message_text;
-mod edit_message_caption;
-mod edit_message_live_location;
-mod edit_message_media;
-mod edit_message_reply_markup;
-mod edit_message_text;
-mod export_chat_invite_link;
-mod forward_message;
-mod get_chat;
-mod get_chat_administrators;
-mod get_chat_member;
-mod get_chat_members_count;
-mod get_file;
-mod get_game_high_scores;
-mod get_me;
-mod get_my_commands;
-mod get_sticker_set;
-mod get_updates;
-mod get_updates_non_strict;
-mod get_user_profile_photos;
-mod get_webhook_info;
-mod kick_chat_member;
-mod leave_chat;
-mod pin_chat_message;
-mod promote_chat_member;
-mod restrict_chat_member;
-mod send_animation;
-mod send_audio;
-mod send_chat_action;
-mod send_contact;
-mod send_dice;
-mod send_document;
-mod send_game;
-mod send_invoice;
-mod send_location;
-mod send_media_group;
-mod send_message;
-mod send_photo;
-mod send_poll;
-mod send_sticker;
-mod send_venue;
-mod send_video;
-mod send_video_note;
-mod send_voice;
-mod set_chat_administrator_custom_title;
-mod set_chat_description;
-mod set_chat_permissions;
-mod set_chat_photo;
-mod set_chat_sticker_set;
-mod set_chat_title;
-mod set_game_score;
-mod set_my_commands;
-mod set_sticker_position_in_set;
-mod set_sticker_set_thumb;
-mod set_webhook;
-mod stop_inline_message_live_location;
-mod stop_message_live_location;
-mod stop_poll;
-mod unban_chat_member;
-mod unpin_chat_message;
-mod upload_sticker_file;
-
-pub use add_sticker_to_set::*;
-pub use answer_callback_query::*;
-pub use answer_inline_query::*;
-pub use answer_pre_checkout_query::*;
-pub use answer_shipping_query::*;
-pub use create_new_sticker_set::*;
-pub use delete_chat_photo::*;
-pub use delete_chat_sticker_set::*;
-pub use delete_message::*;
-pub use delete_sticker_from_set::*;
-pub use delete_webhook::*;
-pub use edit_inline_message_caption::*;
-pub use edit_inline_message_live_location::*;
-pub use edit_inline_message_media::*;
-pub use edit_inline_message_reply_markup::*;
-pub use edit_inline_message_text::*;
-pub use edit_message_caption::*;
-pub use edit_message_live_location::*;
-pub use edit_message_media::*;
-pub use edit_message_reply_markup::*;
-pub use edit_message_text::*;
-pub use export_chat_invite_link::*;
-pub use forward_message::*;
-pub use get_chat::*;
-pub use get_chat_administrators::*;
-pub use get_chat_member::*;
-pub use get_chat_members_count::*;
-pub use get_file::*;
-pub use get_game_high_scores::*;
-pub use get_me::*;
-pub use get_my_commands::*;
-pub use get_sticker_set::*;
-pub use get_updates::*;
-pub use get_updates_non_strict::*;
-pub use get_user_profile_photos::*;
-pub use get_webhook_info::*;
-pub use kick_chat_member::*;
-pub use leave_chat::*;
-pub use pin_chat_message::*;
-pub use promote_chat_member::*;
-pub use restrict_chat_member::*;
-pub use send_animation::*;
-pub use send_audio::*;
-pub use send_chat_action::*;
-pub use send_contact::*;
-pub use send_dice::*;
-pub use send_document::*;
-pub use send_game::*;
-pub use send_invoice::*;
-pub use send_location::*;
-pub use send_media_group::*;
-pub use send_message::*;
-pub use send_photo::*;
-pub use send_poll::*;
-pub use send_sticker::*;
-pub use send_venue::*;
-pub use send_video::*;
-pub use send_video_note::*;
-pub use send_voice::*;
-pub use set_chat_administrator_custom_title::*;
-pub use set_chat_description::*;
-pub use set_chat_permissions::*;
-pub use set_chat_photo::*;
-pub use set_chat_sticker_set::*;
-pub use set_chat_title::*;
-pub use set_game_score::*;
-pub use set_my_commands::*;
-pub use set_sticker_position_in_set::*;
-pub use set_sticker_set_thumb::*;
-pub use set_webhook::*;
-pub use std::pin::Pin;
-pub use stop_inline_message_live_location::*;
-pub use stop_message_live_location::*;
-pub use stop_poll::*;
-pub use unban_chat_member::*;
-pub use unpin_chat_message::*;
-pub use upload_sticker_file::*;
diff --git a/src/requests/all/pin_chat_message.rs b/src/requests/all/pin_chat_message.rs
deleted file mode 100644
index d7aa8586..00000000
--- a/src/requests/all/pin_chat_message.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to pin a message in a group, a supergroup, or a channel.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the `can_pin_messages` admin right in the supergroup or `can_edit_messages`
-/// admin right in the channel.
-///
-/// [The official docs](https://core.telegram.org/bots/api#pinchatmessage).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct PinChatMessage {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub disable_notification: Option<bool>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for PinChatMessage {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "pinChatMessage", &self).await
-    }
-}
-
-impl PinChatMessage {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, disable_notification: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of a message to pin.
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// Pass `true`, if it is not necessary to send a notification to all chat
-    /// members about the new pinned message.
-    ///
-    /// Notifications are always disabled in channels.
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/promote_chat_member.rs b/src/requests/all/promote_chat_member.rs
deleted file mode 100644
index 2f558dc9..00000000
--- a/src/requests/all/promote_chat_member.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to promote or demote a user in a supergroup or a channel.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights. Pass False for all boolean parameters to
-/// demote a user.
-///
-/// [The official docs](https://core.telegram.org/bots/api#promotechatmember).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct PromoteChatMember {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-    pub can_change_info: Option<bool>,
-    pub can_post_messages: Option<bool>,
-    pub can_edit_messages: Option<bool>,
-    pub can_delete_messages: Option<bool>,
-    pub can_invite_users: Option<bool>,
-    pub can_restrict_members: Option<bool>,
-    pub can_pin_messages: Option<bool>,
-    pub can_promote_members: Option<bool>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for PromoteChatMember {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "promoteChatMember", &self).await
-    }
-}
-
-impl PromoteChatMember {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self {
-            bot,
-            chat_id,
-            user_id,
-            can_change_info: None,
-            can_post_messages: None,
-            can_edit_messages: None,
-            can_delete_messages: None,
-            can_invite_users: None,
-            can_restrict_members: None,
-            can_pin_messages: None,
-            can_promote_members: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// Pass `true`, if the administrator can change chat title, photo and other
-    /// settings.
-    pub fn can_change_info(mut self, val: bool) -> Self {
-        self.can_change_info = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can create channel posts, channels
-    /// only.
-    pub fn can_post_messages(mut self, val: bool) -> Self {
-        self.can_post_messages = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can edit messages of other users and
-    /// can pin messages, channels only.
-    pub fn can_edit_messages(mut self, val: bool) -> Self {
-        self.can_edit_messages = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can delete messages of other users.
-    pub fn can_delete_messages(mut self, val: bool) -> Self {
-        self.can_delete_messages = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can invite new users to the chat.
-    pub fn can_invite_users(mut self, val: bool) -> Self {
-        self.can_invite_users = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can restrict, ban or unban chat
-    /// members.
-    pub fn can_restrict_members(mut self, val: bool) -> Self {
-        self.can_restrict_members = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can pin messages, supergroups only.
-    pub fn can_pin_messages(mut self, val: bool) -> Self {
-        self.can_pin_messages = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the administrator can add new administrators with a
-    /// subset of his own privileges or demote administrators that he has
-    /// promoted, directly or indirectly (promoted by administrators that were
-    /// appointed by him).
-    pub fn can_promote_members(mut self, val: bool) -> Self {
-        self.can_promote_members = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/restrict_chat_member.rs b/src/requests/all/restrict_chat_member.rs
deleted file mode 100644
index 84caa542..00000000
--- a/src/requests/all/restrict_chat_member.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, ChatPermissions, True},
-    Bot,
-};
-
-/// Use this method to restrict a user in a supergroup.
-///
-/// The bot must be an administrator in the supergroup for this to work and must
-/// have the appropriate admin rights. Pass `true` for all permissions to lift
-/// restrictions from a user.
-///
-/// [The official docs](https://core.telegram.org/bots/api#restrictchatmember).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct RestrictChatMember {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-    pub permissions: ChatPermissions,
-    pub until_date: Option<i32>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for RestrictChatMember {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "restrictChatMember", &self).await
-    }
-}
-
-impl RestrictChatMember {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32, permissions: ChatPermissions) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, user_id, permissions, until_date: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup (in the format `@supergroupusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// New user permissions.
-    pub fn permissions(mut self, val: ChatPermissions) -> Self {
-        self.permissions = val;
-        self
-    }
-
-    /// Date when restrictions will be lifted for the user, unix time.
-    ///
-    /// If user is restricted for more than 366 days or less than 30 seconds
-    /// from the current time, they are considered to be restricted forever.
-    pub fn until_date(mut self, val: i32) -> Self {
-        self.until_date = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_animation.rs b/src/requests/all/send_animation.rs
deleted file mode 100644
index f8ef0b80..00000000
--- a/src/requests/all/send_animation.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video
-/// without sound).
-///
-/// Bots can currently send animation files of up to 50 MB in size, this limit
-/// may be changed in the future.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendanimation).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendAnimation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub animation: InputFile,
-    pub duration: Option<u32>,
-    pub width: Option<u32>,
-    pub height: Option<u32>,
-    pub thumb: Option<InputFile>,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendAnimation {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendAnimation", self).await
-    }
-}
-
-impl SendAnimation {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, animation: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            animation,
-            duration: None,
-            width: None,
-            height: None,
-            thumb: None,
-            caption: None,
-            parse_mode: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, value: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = value.into();
-        self
-    }
-
-    /// Animation to send.
-    pub fn animation(mut self, val: InputFile) -> Self {
-        self.animation = val;
-        self
-    }
-
-    /// Duration of sent animation in seconds.
-    pub fn duration(mut self, value: u32) -> Self {
-        self.duration = Some(value);
-        self
-    }
-
-    /// Animation width.
-    pub fn width(mut self, value: u32) -> Self {
-        self.width = Some(value);
-        self
-    }
-
-    /// Animation height.
-    pub fn height(mut self, value: u32) -> Self {
-        self.height = Some(value);
-        self
-    }
-
-    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
-    /// the file is supported server-side.
-    ///
-    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
-    /// thumbnail‘s width and height should not exceed 320. Ignored if the
-    /// file is not uploaded using [`InputFile::File`]. Thumbnails can’t be
-    /// reused and can be only uploaded as a new file, with
-    /// [`InputFile::File`].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    pub fn thumb(mut self, value: InputFile) -> Self {
-        self.thumb = Some(value);
-        self
-    }
-
-    /// Animation caption, `0`-`1024` characters.
-    pub fn caption<T>(mut self, value: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(value.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, value: ParseMode) -> Self {
-        self.parse_mode = Some(value);
-        self
-    }
-
-    /// Sends the message silently. Users will receive a notification with no
-    /// sound.
-    pub fn disable_notification(mut self, value: bool) -> Self {
-        self.disable_notification = Some(value);
-        self
-    }
-
-    /// If the message is a reply, [id] of the original message.
-    ///
-    /// [id]: crate::types::Message::id
-    pub fn reply_to_message_id(mut self, value: i32) -> Self {
-        self.reply_to_message_id = Some(value);
-        self
-    }
-
-    /// Additional interface options.
-    pub fn reply_markup<T>(mut self, value: T) -> Self
-    where
-        T: Into<ReplyMarkup>,
-    {
-        self.reply_markup = Some(value.into());
-        self
-    }
-}
diff --git a/src/requests/all/send_audio.rs b/src/requests/all/send_audio.rs
deleted file mode 100644
index ba7ac093..00000000
--- a/src/requests/all/send_audio.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send audio files, if you want Telegram clients to display
-/// them in the music player.
-///
-/// Your audio must be in the .MP3 or .M4A format. Bots can currently send audio
-/// files of up to 50 MB in size, this limit may be changed in the future.
-///
-/// For sending voice messages, use the [`Bot::send_voice`] method instead.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendaudio).
-///
-/// [`Bot::send_voice`]: crate::Bot::send_voice
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendAudio {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub audio: InputFile,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub duration: Option<i32>,
-    pub performer: Option<String>,
-    pub title: Option<String>,
-    pub thumb: Option<InputFile>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendAudio {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendAudio", self).await
-    }
-}
-
-impl SendAudio {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, audio: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            audio,
-            caption: None,
-            parse_mode: None,
-            duration: None,
-            performer: None,
-            title: None,
-            thumb: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Audio file to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn audio(mut self, val: InputFile) -> Self {
-        self.audio = val;
-        self
-    }
-
-    /// Audio caption, 0-1024 characters.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Duration of the audio in seconds.
-    pub fn duration(mut self, val: i32) -> Self {
-        self.duration = Some(val);
-        self
-    }
-
-    /// Performer.
-    pub fn performer<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.performer = Some(val.into());
-        self
-    }
-
-    /// Track name.
-    pub fn title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.title = Some(val.into());
-        self
-    }
-
-    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
-    /// the file is supported server-side.
-    ///
-    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
-    /// thumbnail‘s width and height should not exceed 320. Ignored if the
-    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
-    /// be reused and can be only uploaded as a new file, so you can pass
-    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
-    /// `multipart/form-data` under `<file_attach_name>`. [More info on
-    /// Sending Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn thumb(mut self, val: InputFile) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options. A JSON-serialized object for an [inline
-    /// keyboard], [custom reply keyboard], instructions to remove reply
-    /// keyboard or to force a reply from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_chat_action.rs b/src/requests/all/send_chat_action.rs
deleted file mode 100644
index e83df54d..00000000
--- a/src/requests/all/send_chat_action.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method when you need to tell the user that something is happening
-/// on the bot's side.
-///
-/// The status is set for 5 seconds or less (when a message arrives from your
-/// bot, Telegram clients clear its typing status).
-///
-/// ## Note
-/// Example: The [ImageBot] needs some time to process a request and upload the
-/// image. Instead of sending a text message along the lines of “Retrieving
-/// image, please wait…”, the bot may use [`Bot::send_chat_action`] with `action
-/// = upload_photo`. The user will see a `sending photo` status for the bot.
-///
-/// We only recommend using this method when a response from the bot will take a
-/// **noticeable** amount of time to arrive.
-///
-/// [ImageBot]: https://t.me/imagebot
-/// [`Bot::send_chat_action`]: crate::Bot::send_chat_action
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendChatAction {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub action: SendChatActionKind,
-}
-
-/// A type of action used in [`SendChatAction`].
-///
-/// [`SendChatAction`]: crate::requests::SendChatAction
-#[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum SendChatActionKind {
-    /// For [text messages](crate::Bot::send_message).
-    Typing,
-
-    /// For [photos](crate::Bot::send_photo).
-    UploadPhoto,
-
-    /// For [videos](crate::Bot::send_video).
-    RecordVideo,
-
-    /// For [videos](crate::Bot::send_video).
-    UploadVideo,
-
-    /// For [audio files](crate::Bot::send_audio).
-    RecordAudio,
-
-    /// For [audio files](crate::Bot::send_audio).
-    UploadAudio,
-
-    /// For [general files](crate::Bot::send_document).
-    UploadDocument,
-
-    /// For [location data](crate::Bot::send_location).
-    FindLocation,
-
-    /// For [video notes](crate::Bot::send_video_note).
-    RecordVideoNote,
-
-    /// For [video notes](crate::Bot::send_video_note).
-    UploadVideoNote,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendChatAction {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendChatAction", &self).await
-    }
-}
-
-impl SendChatAction {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, action: SendChatActionKind) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self { bot, chat_id: chat_id.into(), action }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Type of action to broadcast.
-    pub fn action(mut self, val: SendChatActionKind) -> Self {
-        self.action = val;
-        self
-    }
-}
diff --git a/src/requests/all/send_contact.rs b/src/requests/all/send_contact.rs
deleted file mode 100644
index 5eb27e95..00000000
--- a/src/requests/all/send_contact.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send phone contacts.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendcontact).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendContact {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub phone_number: String,
-    pub first_name: String,
-    pub last_name: Option<String>,
-    pub vcard: Option<String>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendContact {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendContact", &self).await
-    }
-}
-
-impl SendContact {
-    pub(crate) fn new<C, P, F>(bot: Bot, chat_id: C, phone_number: P, first_name: F) -> Self
-    where
-        C: Into<ChatId>,
-        P: Into<String>,
-        F: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let phone_number = phone_number.into();
-        let first_name = first_name.into();
-        Self {
-            bot,
-            chat_id,
-            phone_number,
-            first_name,
-            last_name: None,
-            vcard: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Contact's phone number.
-    pub fn phone_number<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.phone_number = val.into();
-        self
-    }
-
-    /// Contact's first name.
-    pub fn first_name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.first_name = val.into();
-        self
-    }
-
-    /// Contact's last name.
-    pub fn last_name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.last_name = Some(val.into());
-        self
-    }
-
-    /// Additional data about the contact in the form of a [vCard], 0-2048
-    /// bytes.
-    ///
-    /// [vCard]: https://en.wikipedia.org/wiki/VCard
-    pub fn vcard<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.vcard = Some(val.into());
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_dice.rs b/src/requests/all/send_dice.rs
deleted file mode 100644
index 3a650d7f..00000000
--- a/src/requests/all/send_dice.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, DiceEmoji, Message, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send an animated emoji that will display a random value.
-///
-/// [The official docs](https://core.telegram.org/bots/api#senddice).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendDice {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    #[serde(flatten)]
-    pub emoji: Option<DiceEmoji>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendDice {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendDice", &self).await
-    }
-}
-
-impl SendDice {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            emoji: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, value: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = value.into();
-        self
-    }
-
-    /// Emoji on which the dice throw animation is based.
-    pub fn emoji(mut self, val: DiceEmoji) -> Self {
-        self.emoji = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, value: bool) -> Self {
-        self.disable_notification = Some(value);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, value: i32) -> Self {
-        self.reply_to_message_id = Some(value);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_document.rs b/src/requests/all/send_document.rs
deleted file mode 100644
index 0e766ac8..00000000
--- a/src/requests/all/send_document.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send general files.
-///
-/// Bots can currently send files of any type of up to 50 MB in size, this limit
-/// may be changed in the future.
-///
-/// [The official docs](https://core.telegram.org/bots/api#senddocument).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendDocument {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub document: InputFile,
-    pub thumb: Option<InputFile>,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendDocument {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendDocument", self).await
-    }
-}
-
-impl SendDocument {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, document: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            document,
-            thumb: None,
-            caption: None,
-            parse_mode: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// File to send.
-    ///
-    /// Pass a file_id as String to send a file that exists on the
-    /// Telegram servers (recommended), pass an HTTP URL as a String for
-    /// Telegram to get a file from the Internet, or upload a new one using
-    /// `multipart/form-data`. [More info on Sending Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn document(mut self, val: InputFile) -> Self {
-        self.document = val;
-        self
-    }
-
-    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
-    /// the file is supported server-side.
-    ///
-    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
-    /// thumbnail‘s width and height should not exceed 320. Ignored if the
-    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
-    /// be reused and can be only uploaded as a new file, so you can pass
-    /// “attach://<file_attach_name>” if the thumbnail was uploaded using
-    /// `multipart/form-data` under `<file_attach_name>`. [More info on
-    /// Sending Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn thumb(mut self, val: InputFile) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    /// Document caption (may also be used when resending documents by
-    /// `file_id`), 0-1024 characters.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_game.rs b/src/requests/all/send_game.rs
deleted file mode 100644
index bde1bd1c..00000000
--- a/src/requests/all/send_game.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, Message},
-    Bot,
-};
-
-/// Use this method to send a game.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendgame).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendGame {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: i32,
-    pub game_short_name: String,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendGame {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendGame", &self).await
-    }
-}
-
-impl SendGame {
-    pub(crate) fn new<G>(bot: Bot, chat_id: i32, game_short_name: G) -> Self
-    where
-        G: Into<String>,
-    {
-        let game_short_name = game_short_name.into();
-        Self {
-            bot,
-            chat_id,
-            game_short_name,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat.
-    pub fn chat_id(mut self, val: i32) -> Self {
-        self.chat_id = val;
-        self
-    }
-
-    /// Short name of the game, serves as the unique identifier for the game.
-    /// Set up your games via [@Botfather].
-    ///
-    /// [@Botfather]: https://t.me/botfather
-    pub fn game_short_name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.game_short_name = val.into();
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard]. If empty, one `Play
-    /// game_title` button will be shown. If not empty, the first button must
-    /// launch the game.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_invoice.rs b/src/requests/all/send_invoice.rs
deleted file mode 100644
index bce7aa5d..00000000
--- a/src/requests/all/send_invoice.rs
+++ /dev/null
@@ -1,299 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, LabeledPrice, Message},
-    Bot,
-};
-
-/// Use this method to send invoices.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendinvoice).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendInvoice {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: i32,
-    pub title: String,
-    pub description: String,
-    pub payload: String,
-    pub provider_token: String,
-    pub start_parameter: String,
-    pub currency: String,
-    pub prices: Vec<LabeledPrice>,
-    pub provider_data: Option<String>,
-    pub photo_url: Option<String>,
-    pub photo_size: Option<i32>,
-    pub photo_width: Option<i32>,
-    pub photo_height: Option<i32>,
-    pub need_name: Option<bool>,
-    pub need_phone_number: Option<bool>,
-    pub need_email: Option<bool>,
-    pub need_shipping_address: Option<bool>,
-    pub send_phone_number_to_provider: Option<bool>,
-    pub send_email_to_provider: Option<bool>,
-    pub is_flexible: Option<bool>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendInvoice {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendInvoice", &self).await
-    }
-}
-
-impl SendInvoice {
-    #[allow(clippy::too_many_arguments)]
-    pub(crate) fn new<T, D, Pl, Pt, S, C, Pr>(
-        bot: Bot,
-        chat_id: i32,
-        title: T,
-        description: D,
-        payload: Pl,
-        provider_token: Pt,
-        start_parameter: S,
-        currency: C,
-        prices: Pr,
-    ) -> Self
-    where
-        T: Into<String>,
-        D: Into<String>,
-        Pl: Into<String>,
-        Pt: Into<String>,
-        S: Into<String>,
-        C: Into<String>,
-        Pr: Into<Vec<LabeledPrice>>,
-    {
-        let title = title.into();
-        let description = description.into();
-        let payload = payload.into();
-        let provider_token = provider_token.into();
-        let start_parameter = start_parameter.into();
-        let currency = currency.into();
-        let prices = prices.into();
-        Self {
-            bot,
-            chat_id,
-            title,
-            description,
-            payload,
-            provider_token,
-            start_parameter,
-            currency,
-            prices,
-            provider_data: None,
-            photo_url: None,
-            photo_size: None,
-            photo_width: None,
-            photo_height: None,
-            need_name: None,
-            need_phone_number: None,
-            need_email: None,
-            need_shipping_address: None,
-            send_phone_number_to_provider: None,
-            send_email_to_provider: None,
-            is_flexible: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target private chat.
-    pub fn chat_id(mut self, val: i32) -> Self {
-        self.chat_id = val;
-        self
-    }
-
-    /// Product name, 1-32 characters.
-    pub fn title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    /// Product description, 1-255 characters.
-    pub fn description<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.description = val.into();
-        self
-    }
-
-    /// Bot-defined invoice payload, 1-128 bytes. This will not be displayed to
-    /// the user, use for your internal processes.
-    pub fn payload<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.payload = val.into();
-        self
-    }
-
-    /// Payments provider token, obtained via [@Botfather].
-    ///
-    /// [@Botfather]: https://t.me/botfather
-    pub fn provider_token<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.provider_token = val.into();
-        self
-    }
-
-    /// Unique deep-linking parameter that can be used to generate this invoice
-    /// when used as a start parameter.
-    pub fn start_parameter<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.start_parameter = val.into();
-        self
-    }
-
-    /// Three-letter ISO 4217 currency code, see [more on currencies].
-    ///
-    /// [more on currencies]: https://core.telegram.org/bots/payments#supported-currencies
-    pub fn currency<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.currency = val.into();
-        self
-    }
-
-    /// Price breakdown, a list of components (e.g. product price, tax,
-    /// discount, delivery cost, delivery tax, bonus, etc.).
-    pub fn prices<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<LabeledPrice>>,
-    {
-        self.prices = val.into();
-        self
-    }
-
-    /// JSON-encoded data about the invoice, which will be shared with the
-    /// payment provider.
-    ///
-    /// A detailed description of required fields should be provided by the
-    /// payment provider.
-    pub fn provider_data<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.provider_data = Some(val.into());
-        self
-    }
-
-    /// URL of the product photo for the invoice.
-    ///
-    /// Can be a photo of the goods or a marketing image for a service. People
-    /// like it better when they see what they are paying for.
-    pub fn photo_url<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.photo_url = Some(val.into());
-        self
-    }
-
-    /// Photo size.
-    pub fn photo_size(mut self, val: i32) -> Self {
-        self.photo_size = Some(val);
-        self
-    }
-
-    /// Photo width.
-    pub fn photo_width(mut self, val: i32) -> Self {
-        self.photo_width = Some(val);
-        self
-    }
-
-    /// Photo height.
-    pub fn photo_height(mut self, val: i32) -> Self {
-        self.photo_height = Some(val);
-        self
-    }
-
-    /// Pass `true`, if you require the user's full name to complete the order.
-    pub fn need_name(mut self, val: bool) -> Self {
-        self.need_name = Some(val);
-        self
-    }
-
-    /// Pass `true`, if you require the user's phone number to complete the
-    /// order.
-    pub fn need_phone_number(mut self, val: bool) -> Self {
-        self.need_phone_number = Some(val);
-        self
-    }
-
-    /// Pass `true`, if you require the user's email address to complete the
-    /// order.
-    pub fn need_email(mut self, val: bool) -> Self {
-        self.need_email = Some(val);
-        self
-    }
-
-    /// Pass `true`, if you require the user's shipping address to complete the
-    /// order.
-    pub fn need_shipping_address(mut self, val: bool) -> Self {
-        self.need_shipping_address = Some(val);
-        self
-    }
-
-    /// Pass `true`, if user's phone number should be sent to provider.
-    pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
-        self.send_phone_number_to_provider = Some(val);
-        self
-    }
-
-    /// Pass `true`, if user's email address should be sent to provider.
-    pub fn send_email_to_provider(mut self, val: bool) -> Self {
-        self.send_email_to_provider = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the final price depends on the shipping method.
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_flexible(mut self, val: bool) -> Self {
-        self.is_flexible = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// If empty, one 'Pay `total price`' button will be shown. If not empty,
-    /// the first button must be a Pay button.
-    ///
-    /// [inlint keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_location.rs b/src/requests/all/send_location.rs
deleted file mode 100644
index 691d9b9e..00000000
--- a/src/requests/all/send_location.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send point on the map.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendlocation).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendLocation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub latitude: f32,
-    pub longitude: f32,
-    pub live_period: Option<i64>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendLocation {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendLocation", &self).await
-    }
-}
-
-impl SendLocation {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, latitude: f32, longitude: f32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self {
-            bot,
-            chat_id,
-            latitude,
-            longitude,
-            live_period: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Latitude of the location.
-    pub fn latitude(mut self, val: f32) -> Self {
-        self.latitude = val;
-        self
-    }
-
-    /// Longitude of the location.
-    pub fn longitude(mut self, val: f32) -> Self {
-        self.longitude = val;
-        self
-    }
-
-    /// Period in seconds for which the location will be updated (see [Live
-    /// Locations], should be between 60 and 86400).
-    ///
-    /// [Live Locations]: https://telegram.org/blog/live-locations
-    pub fn live_period(mut self, val: i64) -> Self {
-        self.live_period = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// A JSON-serialized object for an [inline keyboard].
-    ///
-    /// If empty, one 'Pay `total price`' button will be shown. If not empty,
-    /// the first button must be a Pay button.
-    ///
-    /// [inlint keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_media_group.rs b/src/requests/all/send_media_group.rs
deleted file mode 100644
index c9cfdb34..00000000
--- a/src/requests/all/send_media_group.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputMedia, Message},
-    Bot,
-};
-
-/// Use this method to send a group of photos or videos as an album.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendmediagroup).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendMediaGroup {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub media: Vec<InputMedia>, // TODO: InputMediaPhoto and InputMediaVideo
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendMediaGroup {
-    type Output = Vec<Message>;
-
-    async fn send(&self) -> ResponseResult<Vec<Message>> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendMediaGroup", self).await
-    }
-}
-
-impl SendMediaGroup {
-    pub(crate) fn new<C, M>(bot: Bot, chat_id: C, media: M) -> Self
-    where
-        C: Into<ChatId>,
-        M: Into<Vec<InputMedia>>,
-    {
-        let chat_id = chat_id.into();
-        let media = media.into();
-        Self { bot, chat_id, media, disable_notification: None, reply_to_message_id: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// A JSON-serialized array describing photos and videos to be sent, must
-    /// include 2–10 items.
-    pub fn media<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<InputMedia>>,
-    {
-        self.media = val.into();
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the messages are a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_message.rs b/src/requests/all/send_message.rs
deleted file mode 100644
index a1c9b3b0..00000000
--- a/src/requests/all/send_message.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send text messages.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendmessage).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendMessage {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub text: String,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_web_page_preview: Option<bool>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendMessage {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendMessage", &self).await
-    }
-}
-
-impl SendMessage {
-    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, text: T) -> Self
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            text: text.into(),
-            parse_mode: None,
-            disable_web_page_preview: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, value: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = value.into();
-        self
-    }
-
-    /// Text of the message to be sent.
-    pub fn text<T>(mut self, value: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.text = value.into();
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, value: ParseMode) -> Self {
-        self.parse_mode = Some(value);
-        self
-    }
-
-    /// Disables link previews for links in this message.
-    pub fn disable_web_page_preview(mut self, value: bool) -> Self {
-        self.disable_web_page_preview = Some(value);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, value: bool) -> Self {
-        self.disable_notification = Some(value);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, value: i32) -> Self {
-        self.reply_to_message_id = Some(value);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup<T>(mut self, value: T) -> Self
-    where
-        T: Into<ReplyMarkup>,
-    {
-        self.reply_markup = Some(value.into());
-        self
-    }
-}
diff --git a/src/requests/all/send_photo.rs b/src/requests/all/send_photo.rs
deleted file mode 100644
index 7ae7c46d..00000000
--- a/src/requests/all/send_photo.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send photos.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendphoto).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendPhoto {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub photo: InputFile,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendPhoto {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendPhoto", self).await
-    }
-}
-
-impl SendPhoto {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, photo: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            photo,
-            caption: None,
-            parse_mode: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Photo to send.
-    ///
-    /// Pass [`InputFile::File`] to send a photo that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn photo(mut self, val: InputFile) -> Self {
-        self.photo = val;
-        self
-    }
-
-    ///Photo caption (may also be used when resending photos by file_id),
-    /// 0-1024 characters.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options. A JSON-serialized object for an [inline
-    /// keyboard], [custom reply keyboard], instructions to remove reply
-    /// keyboard or to force a reply from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_poll.rs b/src/requests/all/send_poll.rs
deleted file mode 100644
index d5a538c4..00000000
--- a/src/requests/all/send_poll.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message, ParseMode, PollType, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send a native poll.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendpoll).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendPoll {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub question: String,
-    pub options: Vec<String>,
-    pub is_anonymous: Option<bool>,
-    pub poll_type: Option<PollType>,
-    pub allows_multiple_answers: Option<bool>,
-    pub correct_option_id: Option<i32>,
-    pub explanation: Option<String>,
-    pub explanation_parse_mode: Option<ParseMode>,
-    pub open_period: Option<i32>,
-    pub close_date: Option<i32>,
-    pub is_closed: Option<bool>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendPoll {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendPoll", &self).await
-    }
-}
-
-impl SendPoll {
-    pub(crate) fn new<C, Q, O>(bot: Bot, chat_id: C, question: Q, options: O) -> Self
-    where
-        C: Into<ChatId>,
-        Q: Into<String>,
-        O: Into<Vec<String>>,
-    {
-        let chat_id = chat_id.into();
-        let question = question.into();
-        let options = options.into();
-        Self {
-            bot,
-            chat_id,
-            question,
-            options,
-            is_anonymous: None,
-            poll_type: None,
-            allows_multiple_answers: None,
-            correct_option_id: None,
-            explanation: None,
-            explanation_parse_mode: None,
-            is_closed: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-            close_date: None,
-            open_period: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    ///
-    /// A native poll can't be sent to a private chat.
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Poll question, 1-255 characters.
-    pub fn question<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.question = val.into();
-        self
-    }
-
-    /// List of answer options, 2-10 strings 1-100 characters each.
-    pub fn options<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<String>>,
-    {
-        self.options = val.into();
-        self
-    }
-
-    /// `true`, if the poll needs to be anonymous, defaults to `true`.
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_anonymous<T>(mut self, val: T) -> Self
-    where
-        T: Into<bool>,
-    {
-        self.is_anonymous = Some(val.into());
-        self
-    }
-
-    /// Poll type, `quiz` or `regular`, defaults to `regular`.
-    pub fn poll_type(mut self, val: PollType) -> Self {
-        self.poll_type = Some(val);
-        self
-    }
-
-    /// `true`, if the poll allows multiple answers, ignored for polls in quiz
-    /// mode.
-    ///
-    /// Defaults to `false`.
-    pub fn allows_multiple_answers<T>(mut self, val: T) -> Self
-    where
-        T: Into<bool>,
-    {
-        self.allows_multiple_answers = Some(val.into());
-        self
-    }
-
-    /// 0-based identifier of the correct answer option, required for polls in
-    /// quiz mode.
-    pub fn correct_option_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<i32>,
-    {
-        self.correct_option_id = Some(val.into());
-        self
-    }
-
-    /// Text that is shown when a user chooses an incorrect answer or taps on
-    /// the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line
-    /// feeds after entities parsing.
-    pub fn explanation<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.explanation = Some(val.into());
-        self
-    }
-
-    /// Mode for parsing entities in the explanation. See [formatting options]
-    /// for more details.
-    ///
-    /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
-    pub fn explanation_parse_mode(mut self, val: ParseMode) -> Self {
-        self.explanation_parse_mode = Some(val);
-        self
-    }
-
-    /// Amount of time in seconds the poll will be active after creation, 5-600.
-    /// Can't be used together with `close_date`.
-    pub fn open_period(mut self, val: i32) -> Self {
-        self.open_period = Some(val);
-        self
-    }
-
-    /// Point in time (Unix timestamp) when the poll will be automatically
-    /// closed. Must be at least 5 and no more than 600 seconds in the future.
-    /// Can't be used together with `open_period`.
-    pub fn close_date(mut self, val: i32) -> Self {
-        self.close_date = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the poll needs to be immediately closed.
-    ///
-    /// This can be useful for poll preview.
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_closed<T>(mut self, val: T) -> Self
-    where
-        T: Into<bool>,
-    {
-        self.is_closed = Some(val.into());
-        self
-    }
-
-    /// Sends the message [silently].
-    ///
-    /// Users will receive a notification with no sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_sticker.rs b/src/requests/all/send_sticker.rs
deleted file mode 100644
index 13bc7f0e..00000000
--- a/src/requests/all/send_sticker.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send static .WEBP or [animated] .TGS stickers.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendsticker).
-///
-/// [animated]: https://telegram.org/blog/animated-stickers
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendSticker {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub sticker: InputFile,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendSticker {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendSticker", self).await
-    }
-}
-
-impl SendSticker {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, sticker: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            sticker,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Sticker to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn sticker(mut self, val: InputFile) -> Self {
-        self.sticker = val;
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_venue.rs b/src/requests/all/send_venue.rs
deleted file mode 100644
index c2aab592..00000000
--- a/src/requests/all/send_venue.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, Message, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send information about a venue.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendvenue).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendVenue {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub latitude: f32,
-    pub longitude: f32,
-    pub title: String,
-    pub address: String,
-    pub foursquare_id: Option<String>,
-    pub foursquare_type: Option<String>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendVenue {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendVenue", &self).await
-    }
-}
-
-impl SendVenue {
-    pub(crate) fn new<C, T, A>(
-        bot: Bot,
-        chat_id: C,
-        latitude: f32,
-        longitude: f32,
-        title: T,
-        address: A,
-    ) -> Self
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-        A: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let title = title.into();
-        let address = address.into();
-        Self {
-            bot,
-            chat_id,
-            latitude,
-            longitude,
-            title,
-            address,
-            foursquare_id: None,
-            foursquare_type: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Latitude of the venue.
-    pub fn latitude(mut self, val: f32) -> Self {
-        self.latitude = val;
-        self
-    }
-
-    /// Longitude of the venue.
-    pub fn longitude(mut self, val: f32) -> Self {
-        self.longitude = val;
-        self
-    }
-
-    /// Name of the venue.
-    pub fn title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    /// Address of the venue.
-    pub fn address<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.address = val.into();
-        self
-    }
-
-    /// Foursquare identifier of the venue.
-    pub fn foursquare_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.foursquare_id = Some(val.into());
-        self
-    }
-
-    /// Foursquare type of the venue, if known.
-    ///
-    /// For example, `arts_entertainment/default`, `arts_entertainment/aquarium`
-    /// or `food/icecream`.
-    pub fn foursquare_type<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.foursquare_type = Some(val.into());
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_video.rs b/src/requests/all/send_video.rs
deleted file mode 100644
index 9ee14b3f..00000000
--- a/src/requests/all/send_video.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send video files, Telegram clients support mp4 videos
-/// (other formats may be sent as Document).
-///
-/// Bots can currently send video files of up to 50 MB in size, this
-/// limit may be changed in the future.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendvideo).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendVideo {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub video: InputFile,
-    pub duration: Option<i32>,
-    pub width: Option<i32>,
-    pub height: Option<i32>,
-    pub thumb: Option<InputFile>,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub supports_streaming: Option<bool>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendVideo {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendVideo", self).await
-    }
-}
-
-impl SendVideo {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, video: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            video,
-            duration: None,
-            width: None,
-            height: None,
-            thumb: None,
-            caption: None,
-            parse_mode: None,
-            supports_streaming: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Video to sent.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    pub fn video(mut self, val: InputFile) -> Self {
-        self.video = val;
-        self
-    }
-
-    /// Duration of sent video in seconds.
-    pub fn duration(mut self, val: i32) -> Self {
-        self.duration = Some(val);
-        self
-    }
-
-    /// Video width.
-    pub fn width(mut self, val: i32) -> Self {
-        self.width = Some(val);
-        self
-    }
-
-    /// Video height.
-    pub fn height(mut self, val: i32) -> Self {
-        self.height = Some(val);
-        self
-    }
-
-    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
-    /// the file is supported server-side.
-    ///
-    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
-    /// thumbnail‘s width and height should not exceed 320. Ignored if the
-    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t be
-    /// reused and can be only uploaded as a new file, so you can pass
-    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
-    /// `multipart/form-data` under `<file_attach_name>`. [More info on Sending
-    /// Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn thumb(mut self, val: InputFile) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    /// Video caption (may also be used when resending videos by file_id),
-    /// 0-1024 characters.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Pass `true`, if the uploaded video is suitable for streaming.
-    pub fn supports_streaming(mut self, val: bool) -> Self {
-        self.supports_streaming = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_video_note.rs b/src/requests/all/send_video_note.rs
deleted file mode 100644
index d0ff8485..00000000
--- a/src/requests/all/send_video_note.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ReplyMarkup},
-    Bot,
-};
-
-/// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1
-/// minute long. Use this method to send video messages.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendvideonote).
-///
-/// [v.4.0]: https://telegram.org/blog/video-messages-and-telescope
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendVideoNote {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub video_note: InputFile,
-    pub duration: Option<i32>,
-    pub length: Option<i32>,
-    pub thumb: Option<InputFile>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendVideoNote {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendVideoNote", self).await
-    }
-}
-
-impl SendVideoNote {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, video_note: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            video_note,
-            duration: None,
-            length: None,
-            thumb: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Video note to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn video_note(mut self, val: InputFile) -> Self {
-        self.video_note = val;
-        self
-    }
-
-    /// Duration of sent video in seconds.
-    pub fn duration(mut self, val: i32) -> Self {
-        self.duration = Some(val);
-        self
-    }
-
-    /// Video width and height, i.e. diameter of the video message.
-    pub fn length(mut self, val: i32) -> Self {
-        self.length = Some(val);
-        self
-    }
-
-    /// Thumbnail of the file sent; can be ignored if thumbnail generation for
-    /// the file is supported server-side.
-    ///
-    /// The thumbnail should be in JPEG format and less than 200 kB in size. A
-    /// thumbnail‘s width and height should not exceed 320. Ignored if the
-    /// file is not uploaded using `multipart/form-data`. Thumbnails can’t
-    /// be reused and can be only uploaded as a new file, so you can pass
-    /// `attach://<file_attach_name>` if the thumbnail was uploaded using
-    /// `multipart/form-data` under `<file_attach_name>`. [More info on
-    /// Sending Files »].
-    pub fn thumb(mut self, val: InputFile) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/send_voice.rs b/src/requests/all/send_voice.rs
deleted file mode 100644
index bb59c36c..00000000
--- a/src/requests/all/send_voice.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup},
-    Bot,
-};
-
-/// Use this method to send audio files, if you want Telegram clients to display
-/// the file as a playable voice message.
-///
-/// For this to work, your audio must be in an .ogg file encoded with OPUS
-/// (other formats may be sent as [`Audio`] or [`Document`]). Bots can currently
-/// send voice messages of up to 50 MB in size, this limit may be changed in the
-/// future.
-///
-/// [The official docs](https://core.telegram.org/bots/api#sendvoice).
-///
-/// [`Audio`]: crate::types::Audio
-/// [`Document`]: crate::types::Document
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SendVoice {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub voice: InputFile,
-    pub caption: Option<String>,
-    pub parse_mode: Option<ParseMode>,
-    pub duration: Option<i32>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<ReplyMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SendVoice {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_multipart(self.bot.client(), self.bot.token(), "sendVoice", self).await
-    }
-}
-
-impl SendVoice {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, voice: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        Self {
-            bot,
-            chat_id: chat_id.into(),
-            voice,
-            caption: None,
-            parse_mode: None,
-            duration: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Audio file to send.
-    ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
-    /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
-    ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn voice(mut self, val: InputFile) -> Self {
-        self.voice = val;
-        self
-    }
-
-    /// Voice message caption, 0-1024 characters.
-    pub fn caption<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    /// Send [Markdown] or [HTML], if you want Telegram apps to show
-    /// [bold, italic, fixed-width text or inline URLs] in the media caption.
-    ///
-    /// [Markdown]: crate::types::ParseMode::Markdown
-    /// [HTML]: crate::types::ParseMode::HTML
-    /// [bold, italic, fixed-width text or inline URLs]:
-    /// crate::types::ParseMode
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
-        self.parse_mode = Some(val);
-        self
-    }
-
-    /// Duration of the voice message in seconds.
-    pub fn duration(mut self, val: i32) -> Self {
-        self.duration = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    /// If the message is a reply, ID of the original message.
-    pub fn reply_to_message_id(mut self, val: i32) -> Self {
-        self.reply_to_message_id = Some(val);
-        self
-    }
-
-    /// Additional interface options.
-    ///
-    /// A JSON-serialized object for an [inline keyboard], [custom reply
-    /// keyboard], instructions to remove reply keyboard or to force a reply
-    /// from the user.
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
-    pub fn reply_markup(mut self, val: ReplyMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_administrator_custom_title.rs b/src/requests/all/set_chat_administrator_custom_title.rs
deleted file mode 100644
index 95fbbe9a..00000000
--- a/src/requests/all/set_chat_administrator_custom_title.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to set a custom title for an administrator in a supergroup
-/// promoted by the bot.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchatadministratorcustomtitle).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatAdministratorCustomTitle {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-    pub custom_title: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatAdministratorCustomTitle {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(
-            self.bot.client(),
-            self.bot.token(),
-            "setChatAdministratorCustomTitle",
-            &self,
-        )
-        .await
-    }
-}
-
-impl SetChatAdministratorCustomTitle {
-    pub(crate) fn new<C, CT>(bot: Bot, chat_id: C, user_id: i32, custom_title: CT) -> Self
-    where
-        C: Into<ChatId>,
-        CT: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let custom_title = custom_title.into();
-        Self { bot, chat_id, user_id, custom_title }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// New custom title for the administrator; 0-16 characters, emoji are not
-    /// allowed.
-    pub fn custom_title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.custom_title = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_description.rs b/src/requests/all/set_chat_description.rs
deleted file mode 100644
index a36e06e4..00000000
--- a/src/requests/all/set_chat_description.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to change the description of a group, a supergroup or a
-/// channel.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchatdescription).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatDescription {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub description: Option<String>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatDescription {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setChatDescription", &self).await
-    }
-}
-
-impl SetChatDescription {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, description: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// New chat description, 0-255 characters.
-    pub fn description<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.description = Some(val.into());
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_permissions.rs b/src/requests/all/set_chat_permissions.rs
deleted file mode 100644
index 2d14f6c7..00000000
--- a/src/requests/all/set_chat_permissions.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, ChatPermissions, True},
-    Bot,
-};
-
-/// Use this method to set default chat permissions for all members.
-///
-/// The bot must be an administrator in the group or a supergroup for this to
-/// work and must have the can_restrict_members admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchatpermissions).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatPermissions {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub permissions: ChatPermissions,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatPermissions {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "sendChatPermissions", &self).await
-    }
-}
-
-impl SetChatPermissions {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, permissions: ChatPermissions) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, permissions }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup (in the format `@supergroupusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// New default chat permissions.
-    pub fn permissions(mut self, val: ChatPermissions) -> Self {
-        self.permissions = val;
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_photo.rs b/src/requests/all/set_chat_photo.rs
deleted file mode 100644
index 1df5c413..00000000
--- a/src/requests/all/set_chat_photo.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InputFile, True},
-    Bot,
-};
-
-/// Use this method to set a new profile photo for the chat.
-///
-/// Photos can't be changed for private chats. The bot must be an administrator
-/// in the chat for this to work and must have the appropriate admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchatphoto).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatPhoto {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub photo: InputFile,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatPhoto {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setChatPhoto", &self).await
-    }
-}
-
-impl SetChatPhoto {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, photo: InputFile) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, photo }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// New chat photo, uploaded using `multipart/form-data`.
-    pub fn photo(mut self, val: InputFile) -> Self {
-        self.photo = val;
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_sticker_set.rs b/src/requests/all/set_chat_sticker_set.rs
deleted file mode 100644
index 2e24bac2..00000000
--- a/src/requests/all/set_chat_sticker_set.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to set a new group sticker set for a supergroup.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the appropriate admin rights. Use the field can_set_sticker_set optionally
-/// returned in getChat requests to check if the bot can use this method.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchatstickerset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatStickerSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub sticker_set_name: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatStickerSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setChatStickerSet", &self).await
-    }
-}
-
-impl SetChatStickerSet {
-    pub(crate) fn new<C, S>(bot: Bot, chat_id: C, sticker_set_name: S) -> Self
-    where
-        C: Into<ChatId>,
-        S: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let sticker_set_name = sticker_set_name.into();
-        Self { bot, chat_id, sticker_set_name }
-    }
-
-    /// Unique identifier for the target chat or username of the target
-    /// supergroup (in the format `@supergroupusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Name of the sticker set to be set as the group sticker set.
-    pub fn sticker_set_name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.sticker_set_name = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/set_chat_title.rs b/src/requests/all/set_chat_title.rs
deleted file mode 100644
index d0566a7e..00000000
--- a/src/requests/all/set_chat_title.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to change the title of a chat.
-///
-/// Titles can't be changed for private chats. The bot must be an administrator
-/// in the chat for this to work and must have the appropriate admin rights.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setchattitle).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetChatTitle {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub title: String,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetChatTitle {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setChatTitle", &self).await
-    }
-}
-
-impl SetChatTitle {
-    pub(crate) fn new<C, T>(bot: Bot, chat_id: C, title: T) -> Self
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        let chat_id = chat_id.into();
-        let title = title.into();
-        Self { bot, chat_id, title }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// New chat title, 1-255 characters.
-    pub fn title<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/set_game_score.rs b/src/requests/all/set_game_score.rs
deleted file mode 100644
index 43ecc9d6..00000000
--- a/src/requests/all/set_game_score.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{Message, TargetMessage},
-    Bot,
-};
-
-/// Use this method to set the score of the specified user in a game.
-///
-/// On success, if the message was sent by the bot, returns the edited
-/// [`Message`], otherwise returns [`True`]. Returns an error, if the new score
-/// is not greater than the user's current score in the chat and force is
-/// `false`.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setgamescore).
-///
-/// [`Message`]: crate::types::Message
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetGameScore {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    #[serde(flatten)]
-    pub target: TargetMessage,
-    pub user_id: i32,
-    pub score: i32,
-    pub force: Option<bool>,
-    pub disable_edit_message: Option<bool>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetGameScore {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "setGameScore", &self).await
-    }
-}
-
-impl SetGameScore {
-    pub(crate) fn new<T>(bot: Bot, target: T, user_id: i32, score: i32) -> Self
-    where
-        T: Into<TargetMessage>,
-    {
-        let target = target.into();
-        Self { bot, target, user_id, score, force: None, disable_edit_message: None }
-    }
-
-    /// Target message, either chat id and message id or inline message id.
-    pub fn target<T>(mut self, val: T) -> Self
-    where
-        T: Into<TargetMessage>,
-    {
-        self.target = val.into();
-        self
-    }
-
-    /// User identifier.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// New score, must be non-negative.
-    pub fn score(mut self, val: i32) -> Self {
-        self.score = val;
-        self
-    }
-
-    /// Pass `true`, if the high score is allowed to decrease.
-    ///
-    /// This can be useful when fixing mistakes or banning cheaters.
-    pub fn force(mut self, val: bool) -> Self {
-        self.force = Some(val);
-        self
-    }
-
-    /// Sends the message [silently]. Users will receive a notification with no
-    /// sound.
-    ///
-    /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
-    pub fn disable_edit_message(mut self, val: bool) -> Self {
-        self.disable_edit_message = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/set_my_commands.rs b/src/requests/all/set_my_commands.rs
deleted file mode 100644
index 3e06920f..00000000
--- a/src/requests/all/set_my_commands.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{BotCommand, True},
-    Bot,
-};
-
-/// Use this method to change the list of the bot's commands.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setmycommands).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetMyCommands {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub commands: Vec<BotCommand>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetMyCommands {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<Self::Output> {
-        net::request_json(self.bot.client(), self.bot.token(), "setMyCommands", &self).await
-    }
-}
-
-impl SetMyCommands {
-    pub(crate) fn new<C>(bot: Bot, commands: C) -> Self
-    where
-        C: Into<Vec<BotCommand>>,
-    {
-        Self { bot, commands: commands.into() }
-    }
-
-    /// A JSON-serialized list of bot commands to be set as the list of the
-    /// bot's commands.
-    ///
-    /// At most 100 commands can be specified.
-    pub fn commands<C>(mut self, commands: C) -> Self
-    where
-        C: Into<Vec<BotCommand>>,
-    {
-        self.commands = commands.into();
-        self
-    }
-}
diff --git a/src/requests/all/set_sticker_position_in_set.rs b/src/requests/all/set_sticker_position_in_set.rs
deleted file mode 100644
index bb752b1f..00000000
--- a/src/requests/all/set_sticker_position_in_set.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::True,
-    Bot,
-};
-
-/// Use this method to move a sticker in a set created by the bot to a specific
-/// position.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setstickerpositioninset).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetStickerPositionInSet {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub sticker: String,
-    pub position: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetStickerPositionInSet {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setStickerPositionInSet", &self)
-            .await
-    }
-}
-
-impl SetStickerPositionInSet {
-    pub(crate) fn new<S>(bot: Bot, sticker: S, position: i32) -> Self
-    where
-        S: Into<String>,
-    {
-        let sticker = sticker.into();
-        Self { bot, sticker, position }
-    }
-
-    /// File identifier of the sticker.
-    pub fn sticker<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.sticker = val.into();
-        self
-    }
-
-    /// New sticker position in the set, zero-based.
-    pub fn position(mut self, val: i32) -> Self {
-        self.position = val;
-        self
-    }
-}
diff --git a/src/requests/all/set_sticker_set_thumb.rs b/src/requests/all/set_sticker_set_thumb.rs
deleted file mode 100644
index 745805d6..00000000
--- a/src/requests/all/set_sticker_set_thumb.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InputFile, True},
-    Bot,
-};
-
-/// Use this method to set the thumbnail of a sticker set. Animated thumbnails
-/// can be set for animated sticker sets only.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setstickersetthumb).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetStickerSetThumb {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub name: String,
-    pub user_id: i32,
-    pub thumb: Option<InputFile>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetStickerSetThumb {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<Self::Output> {
-        net::request_json(self.bot.client(), self.bot.token(), "setStickerSetThumb", &self).await
-    }
-}
-
-impl SetStickerSetThumb {
-    pub(crate) fn new<S>(bot: Bot, name: S, user_id: i32) -> Self
-    where
-        S: Into<String>,
-    {
-        Self { bot, name: name.into(), user_id, thumb: None }
-    }
-
-    /// Sticker set name.
-    pub fn name<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-
-    /// User identifier of the sticker set owner.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// A PNG image with the thumbnail, must be up to 128 kilobytes in size and
-    /// have width and height exactly 100px, or a TGS animation with the
-    /// thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements
-    /// for animated sticker technical requirements.
-    ///
-    /// Pass [`InputFile::FileId`] as a String to send a file that already
-    /// exists on the Telegram servers, pass [`InputFile::Url`] for Telegram
-    /// to get a file from the Internet, or upload a new one using
-    /// multipart/form-data. More info on Sending Files ». Animated sticker
-    /// set thumbnail can't be uploaded via HTTP URL.
-    ///
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
-    /// [`InputFile::Url]: crate::types::InputFile::Url
-    pub fn thumb(mut self, val: InputFile) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/set_webhook.rs b/src/requests/all/set_webhook.rs
deleted file mode 100644
index f8d45282..00000000
--- a/src/requests/all/set_webhook.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{AllowedUpdate, InputFile, True},
-    Bot,
-};
-
-/// Use this method to specify a url and receive incoming updates via an
-/// outgoing webhook.
-///
-/// Whenever there is an update for the bot, we will send an
-/// HTTPS POST request to the specified url, containing a JSON-serialized
-/// [`Update`]. In case of an unsuccessful request, we will give up after a
-/// reasonable amount of attempts.
-///
-/// If you'd like to make sure that the Webhook request comes from Telegram,
-/// we recommend using a secret path in the URL, e.g.
-/// `https://www.example.com/<token>`. Since nobody else knows your bot‘s
-/// token, you can be pretty sure it’s us.
-///
-/// [The official docs](https://core.telegram.org/bots/api#setwebhook).
-///
-/// [`Update`]: crate::types::Update
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct SetWebhook {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub url: String,
-    pub certificate: Option<InputFile>,
-    pub max_connections: Option<i32>,
-    pub allowed_updates: Option<Vec<AllowedUpdate>>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for SetWebhook {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "setWebhook", &self).await
-    }
-}
-
-impl SetWebhook {
-    pub(crate) fn new<U>(bot: Bot, url: U) -> Self
-    where
-        U: Into<String>,
-    {
-        let url = url.into();
-        Self { bot, url, certificate: None, max_connections: None, allowed_updates: None }
-    }
-
-    /// HTTPS url to send updates to.
-    ///
-    /// Use an empty string to remove webhook integration.
-    pub fn url<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.url = val.into();
-        self
-    }
-
-    /// Upload your public key certificate so that the root certificate in use
-    /// can be checked.
-    ///
-    /// See our [self-signed guide] for details.
-    ///
-    /// [self-signed guide]: https://core.telegram.org/bots/self-signed
-    pub fn certificate(mut self, val: InputFile) -> Self {
-        self.certificate = Some(val);
-        self
-    }
-
-    /// Maximum allowed number of simultaneous HTTPS connections to the webhook
-    /// for update delivery, 1-100.
-    ///
-    /// Defaults to 40. Use lower values to limit the load on your bot‘s server,
-    /// and higher values to increase your bot’s throughput.
-    pub fn max_connections(mut self, val: i32) -> Self {
-        self.max_connections = Some(val);
-        self
-    }
-
-    /// List the types of updates you want your bot to receive.
-    ///
-    /// For example, specify [`AllowedUpdate::Message`],
-    /// [`AllowedUpdate::EditedChannelPost`], [`AllowedUpdate::CallbackQuery`]
-    /// to only receive updates of these types. Specify an empty list to receive
-    /// all updates regardless of type (default). If not specified, the
-    /// previous setting will be used. See [`AllowedUpdate`] for a complete list
-    /// of available update types.
-    ///
-    /// Please note that this parameter doesn't affect updates created before
-    /// the call to the [`Bot::set_webhook`], so unwanted updates may be
-    /// received for a short period of time.
-    ///
-    /// [`Bot::set_webhook`]: crate::Bot::set_webhook
-    /// [`AllowedUpdate::Message`]: crate::types::AllowedUpdate::Message
-    /// [`AllowedUpdate::EditedChannelPost`]:
-    /// crate::types::AllowedUpdate::EditedChannelPost
-    /// [`AllowedUpdate::CallbackQuery`]:
-    /// crate::types::AllowedUpdate::CallbackQuery
-    /// [`AllowedUpdate`]: crate::types::AllowedUpdate
-    pub fn allowed_updates<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<AllowedUpdate>>,
-    {
-        self.allowed_updates = Some(val.into());
-        self
-    }
-}
diff --git a/src/requests/all/stop_inline_message_live_location.rs b/src/requests/all/stop_inline_message_live_location.rs
deleted file mode 100644
index 38669a63..00000000
--- a/src/requests/all/stop_inline_message_live_location.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{InlineKeyboardMarkup, Message},
-    Bot,
-};
-
-/// Use this method to stop updating a live location message (sent via the bot)
-/// before `live_period` expires.
-///
-/// On success, [`True`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
-///
-/// [`True`]: crate::types::True
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct StopInlineMessageLiveLocation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub inline_message_id: String,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for StopInlineMessageLiveLocation {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "stopMessageLiveLocation", &self)
-            .await
-    }
-}
-
-impl StopInlineMessageLiveLocation {
-    pub(crate) fn new<I>(bot: Bot, inline_message_id: I) -> Self
-    where
-        I: Into<String>,
-    {
-        let inline_message_id = inline_message_id.into();
-        Self { bot, inline_message_id, reply_markup: None }
-    }
-
-    /// Identifier of the inline message.
-    pub fn inline_message_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<String>,
-    {
-        self.inline_message_id = val.into();
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/stop_message_live_location.rs b/src/requests/all/stop_message_live_location.rs
deleted file mode 100644
index 71400dc2..00000000
--- a/src/requests/all/stop_message_live_location.rs
+++ /dev/null
@@ -1,70 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Message},
-    Bot,
-};
-
-/// Use this method to stop updating a live location message before
-/// `live_period` expires.
-///
-/// On success, the sent [`Message`] is returned.
-///
-/// [The official docs](https://core.telegram.org/bots/api#stopmessagelivelocation).
-///
-/// [`Message`]: crate::types::Message
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct StopMessageLiveLocation {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for StopMessageLiveLocation {
-    type Output = Message;
-
-    async fn send(&self) -> ResponseResult<Message> {
-        net::request_json(self.bot.client(), self.bot.token(), "stopMessageLiveLocation", &self)
-            .await
-    }
-}
-
-impl StopMessageLiveLocation {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`)
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the message to edit
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/stop_poll.rs b/src/requests/all/stop_poll.rs
deleted file mode 100644
index 14252739..00000000
--- a/src/requests/all/stop_poll.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, InlineKeyboardMarkup, Poll},
-    Bot,
-};
-
-/// Use this method to stop a poll which was sent by the bot.
-///
-/// [The official docs](https://core.telegram.org/bots/api#stoppoll).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct StopPoll {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub message_id: i32,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for StopPoll {
-    type Output = Poll;
-
-    /// On success, the stopped [`Poll`] with the final results is returned.
-    ///
-    /// [`Poll`]: crate::types::Poll
-    async fn send(&self) -> ResponseResult<Poll> {
-        net::request_json(self.bot.client(), self.bot.token(), "stopPoll", &self).await
-    }
-}
-impl StopPoll {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, message_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, message_id, reply_markup: None }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Identifier of the original message with the poll.
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    /// A JSON-serialized object for a new [inline keyboard].
-    ///
-    /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
diff --git a/src/requests/all/unban_chat_member.rs b/src/requests/all/unban_chat_member.rs
deleted file mode 100644
index f0bfbe3f..00000000
--- a/src/requests/all/unban_chat_member.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to unban a previously kicked user in a supergroup or
-/// channel. The user will **not** return to the group or channel automatically,
-/// but will be able to join via link, etc. The bot must be an administrator for
-/// this to work.
-///
-/// [The official docs](https://core.telegram.org/bots/api#unbanchatmember).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct UnbanChatMember {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-    pub user_id: i32,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for UnbanChatMember {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "unbanChatMember", &self).await
-    }
-}
-
-impl UnbanChatMember {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C, user_id: i32) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id, user_id }
-    }
-
-    /// Unique identifier for the target group or username of the target
-    /// supergroup or channel (in the format `@username`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    /// Unique identifier of the target user.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-}
diff --git a/src/requests/all/unpin_chat_message.rs b/src/requests/all/unpin_chat_message.rs
deleted file mode 100644
index eab4dd8a..00000000
--- a/src/requests/all/unpin_chat_message.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{ChatId, True},
-    Bot,
-};
-
-/// Use this method to unpin a message in a group, a supergroup, or a channel.
-///
-/// The bot must be an administrator in the chat for this to work and must have
-/// the `can_pin_messages` admin right in the supergroup or `can_edit_messages`
-/// admin right in the channel.
-///
-/// [The official docs](https://core.telegram.org/bots/api#unpinchatmessage).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct UnpinChatMessage {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub chat_id: ChatId,
-}
-
-#[async_trait::async_trait]
-impl RequestOld for UnpinChatMessage {
-    type Output = True;
-
-    async fn send(&self) -> ResponseResult<True> {
-        net::request_json(self.bot.client(), self.bot.token(), "unpinChatMessage", &self).await
-    }
-}
-
-impl UnpinChatMessage {
-    pub(crate) fn new<C>(bot: Bot, chat_id: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        let chat_id = chat_id.into();
-        Self { bot, chat_id }
-    }
-
-    /// Unique identifier for the target chat or username of the target channel
-    /// (in the format `@channelusername`).
-    pub fn chat_id<T>(mut self, val: T) -> Self
-    where
-        T: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-}
diff --git a/src/requests/all/upload_sticker_file.rs b/src/requests/all/upload_sticker_file.rs
deleted file mode 100644
index 73ff5f87..00000000
--- a/src/requests/all/upload_sticker_file.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    net,
-    requests::{RequestOld, ResponseResult},
-    types::{File, InputFile},
-    Bot,
-};
-
-/// Use this method to upload a .png file with a sticker for later use in
-/// [`Bot::create_new_sticker_set`] and [`Bot::add_sticker_to_set`] methods (can
-/// be used multiple times).
-///
-/// [The official docs](https://core.telegram.org/bots/api#uploadstickerfile).
-///
-/// [`Bot::create_new_sticker_set`]: crate::Bot::create_new_sticker_set
-/// [`Bot::add_sticker_to_set`]: crate::Bot::add_sticker_to_set
-#[serde_with_macros::skip_serializing_none]
-#[derive(Debug, Clone, Serialize)]
-pub struct UploadStickerFile {
-    #[serde(skip_serializing)]
-    bot: Bot,
-    pub user_id: i32,
-    pub png_sticker: InputFile,
-}
-#[async_trait::async_trait]
-impl RequestOld for UploadStickerFile {
-    type Output = File;
-
-    async fn send(&self) -> ResponseResult<File> {
-        net::request_json(self.bot.client(), self.bot.token(), "uploadStickerFile", &self).await
-    }
-}
-
-impl UploadStickerFile {
-    pub(crate) fn new(bot: Bot, user_id: i32, png_sticker: InputFile) -> Self {
-        Self { bot, user_id, png_sticker }
-    }
-
-    /// User identifier of sticker file owner.
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = val;
-        self
-    }
-
-    /// **Png** image with the sticker, must be up to 512 kilobytes in size,
-    /// dimensions must not exceed 512px, and either width or height must be
-    /// exactly 512px. [More info on Sending Files »].
-    ///
-    /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    pub fn png_sticker(mut self, val: InputFile) -> Self {
-        self.png_sticker = val;
-        self
-    }
-}
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index cc134a48..3433c81e 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -1,23 +1,9 @@
 //! Telegram API requests.
 
-mod has_payload;
-mod payload;
-mod request;
-
-pub use self::{has_payload::HasPayload, payload::Payload, request::Request};
-
-mod all;
-mod json;
-mod multipart;
-mod requester;
-mod requester_ext;
-mod utils;
-
-pub use all::*;
-pub use json::JsonRequest;
-pub use multipart::MultipartRequest;
-pub use requester::Requester;
-pub use requester_ext::RequesterExt;
+pub use self::{
+    has_payload::HasPayload, json::JsonRequest, multipart::MultipartRequest, payload::Payload,
+    request::Request, requester::Requester, requester_ext::RequesterExt,
+};
 
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
@@ -26,12 +12,11 @@ pub type ResponseResult<T> = Result<T, crate::RequestError>;
 /// `<<T as HasPayload>::Payload as Payload>::Output`.
 pub type Output<T> = <<T as HasPayload>::Payload as Payload>::Output;
 
-/// Designates an API request.
-#[async_trait::async_trait]
-pub trait RequestOld {
-    /// A data structure returned if success.
-    type Output;
-
-    /// Asynchronously sends this request to Telegram and returns the result.
-    async fn send(&self) -> ResponseResult<Self::Output>;
-}
+mod has_payload;
+mod json;
+mod multipart;
+mod payload;
+mod request;
+mod requester;
+mod requester_ext;
+mod utils;

From 1882ff0bc44f7ef033ad40bc6823563a26847fe3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 27 Nov 2020 01:27:51 +0300
Subject: [PATCH 159/755] Fix doc test

---
 src/bot/download.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bot/download.rs b/src/bot/download.rs
index eed32b1c..aff200c2 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -17,16 +17,18 @@ impl Bot {
     /// ## Examples
     ///
     /// ```no_run
-    /// use teloxide_core::types::File as TgFile;
+    /// use teloxide_core::{
+    ///     requests::{Request, Requester},
+    ///     types::File as TgFile,
+    ///     Bot,
+    /// };
     /// use tokio::fs::File;
-    /// # use teloxide_core::RequestError;
-    /// use teloxide_core::{requests::RequestOld, Bot};
     ///
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
-    /// let mut file = File::create("/home/waffle/Pictures/test.png").await?;
     ///
     /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
+    /// let mut file = File::create("/home/waffle/Pictures/test.png").await?;
     /// bot.download_file(&file_path, &mut file).await?;
     /// # Ok(()) }
     /// ```

From 3491a668b2d24e8dcde9d376e9fa25b74654187a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 27 Nov 2020 02:13:50 +0300
Subject: [PATCH 160/755] Fix doc links...

---
 src/bot/download.rs |  8 ++--
 src/errors.rs       | 96 ++++++++++++++++++++++-----------------------
 src/types/chat.rs   | 42 ++++++++++----------
 src/types/file.rs   |  4 +-
 src/types/game.rs   | 11 +++---
 src/types/me.rs     |  4 +-
 src/types/update.rs |  4 +-
 7 files changed, 84 insertions(+), 85 deletions(-)

diff --git a/src/bot/download.rs b/src/bot/download.rs
index aff200c2..bc859df7 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -10,7 +10,7 @@ use crate::{
 impl Bot {
     /// Download a file from Telegram into `destination`.
     ///
-    /// `path` can be obtained from [`Bot::get_file`].
+    /// `path` can be obtained from [`GetFile`].
     ///
     /// To download as a stream of chunks, see [`Bot::download_file_stream`].
     ///
@@ -33,7 +33,7 @@ impl Bot {
     /// # Ok(()) }
     /// ```
     ///
-    /// [`Bot::get_file`]: crate::Bot::get_file
+    /// [`GetFile`]: crate::payloads::GetFile
     /// [`Bot::download_file_stream`]: crate::Bot::download_file_stream
     pub async fn download_file<D>(
         &self,
@@ -48,12 +48,12 @@ impl Bot {
 
     /// Download a file from Telegram.
     ///
-    /// `path` can be obtained from the [`Bot::get_file`].
+    /// `path` can be obtained from the [`GetFile`].
     ///
     /// To download into [`AsyncWrite`] (e.g. [`tokio::fs::File`]), see
     /// [`Bot::download_file`].
     ///
-    /// [`Bot::get_file`]: crate::bot::Bot::get_file
+    /// [`GetFile`]: crate::payloads::GetFile
     /// [`AsyncWrite`]: tokio::io::AsyncWrite
     /// [`tokio::fs::File`]: tokio::fs::File
     /// [`Bot::download_file`]: crate::Bot::download_file
diff --git a/src/errors.rs b/src/errors.rs
index d12296ae..1164398a 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -70,7 +70,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`EditMessageText`]
     ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
+    /// [`EditMessageText`]: crate::payloads::EditMessageText
     #[serde(rename = "Bad Request: message is not modified: specified new message content and \
                       reply markup are exactly the same as a current content and reply markup \
                       of the message")]
@@ -82,8 +82,8 @@ pub enum ApiError {
     /// 1. [`ForwardMessage`]
     /// 2. [`DeleteMessage`]
     ///
-    /// [`ForwardMessage`]: crate::requests::ForwardMessage
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    /// [`ForwardMessage`]: crate::payloads::ForwardMessage
+    /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
     MessageIdInvalid,
 
@@ -92,7 +92,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`ForwardMessage`]
     ///
-    /// [`ForwardMessage`]: crate::requests::ForwardMessage
+    /// [`ForwardMessage`]: crate::payloads::ForwardMessage
     #[serde(rename = "Bad Request: message to forward not found")]
     MessageToForwardNotFound,
 
@@ -101,7 +101,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`DeleteMessage`]
     ///
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: message to delete not found")]
     MessageToDeleteNotFound,
 
@@ -110,7 +110,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: message text is empty")]
     MessageTextIsEmpty,
 
@@ -119,7 +119,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`EditMessageText`]
     ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
+    /// [`EditMessageText`]: crate::payloads::EditMessageText
     #[serde(rename = "Bad Request: message can't be edited")]
     MessageCantBeEdited,
 
@@ -129,7 +129,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`DeleteMessage`]
     ///
-    /// [`DeleteMessage`]: crate::requests::DeleteMessage
+    /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: message can't be deleted")]
     MessageCantBeDeleted,
 
@@ -138,7 +138,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`EditMessageText`]
     ///
-    /// [`EditMessageText`]: crate::requests::EditMessageText
+    /// [`EditMessageText`]: crate::payloads::EditMessageText
     #[serde(rename = "Bad Request: message to edit not found")]
     MessageToEditNotFound,
 
@@ -147,7 +147,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: reply message not found")]
     MessageToReplyNotFound,
 
@@ -161,7 +161,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: message is too long")]
     MessageIsTooLong,
 
@@ -170,7 +170,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMediaGroup`]
     ///
-    /// [`SendMediaGroup`]: crate::requests::SendMediaGroup
+    /// [`SendMediaGroup`]: crate::payloads::SendMediaGroup
     #[serde(rename = "Bad Request: Too much messages to send as an album")]
     ToMuchMessages,
 
@@ -179,7 +179,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll has already been closed")]
     PollHasAlreadyClosed,
 
@@ -188,7 +188,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll must have at least 2 option")]
     PollMustHaveMoreOptions,
 
@@ -197,7 +197,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll can't have more than 10 options")]
     PollCantHaveMoreOptions,
 
@@ -206,7 +206,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll options must be non-empty")]
     PollOptionsMustBeNonEmpty,
 
@@ -215,7 +215,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll question must be non-empty")]
     PollQuestionMustBeNonEmpty,
 
@@ -225,7 +225,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll options length must not exceed 100")]
     PollOptionsLengthTooLong,
 
@@ -235,7 +235,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendPoll`]
     ///
-    /// [`SendPoll`]: crate::requests::SendPoll
+    /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll question length must not exceed 255")]
     PollQuestionLengthTooLong,
 
@@ -244,7 +244,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`StopPoll`]
     ///
-    /// [`StopPoll`]: crate::requests::StopPoll
+    /// [`StopPoll`]: crate::payloads::StopPoll
     #[serde(rename = "Bad Request: message with poll to stop not found")]
     MessageWithPollNotFound,
 
@@ -253,7 +253,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`StopPoll`]
     ///
-    /// [`StopPoll`]: crate::requests::StopPoll
+    /// [`StopPoll`]: crate::payloads::StopPoll
     #[serde(rename = "Bad Request: message is not a poll")]
     MessageIsNotAPoll,
 
@@ -263,7 +263,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: chat not found")]
     ChatNotFound,
 
@@ -273,7 +273,7 @@ pub enum ApiError {
     /// 1. [`getUserProfilePhotos`]
     ///
     /// [`getUserProfilePhotos`]:
-    /// crate::requests::GetUserProfilePhotos
+    /// crate::payloads::GetUserProfilePhotos
     #[serde(rename = "Bad Request: user not found")]
     UserNotFound,
 
@@ -283,7 +283,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetChatDescription`]
     ///
-    /// [`SetChatDescription`]: crate::requests::SetChatDescription
+    /// [`SetChatDescription`]: crate::payloads::SetChatDescription
     #[serde(rename = "Bad Request: chat description is not modified")]
     ChatDescriptionIsNotModified,
 
@@ -292,7 +292,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`AnswerCallbackQuery`]
     ///
-    /// [`AnswerCallbackQuery`]: crate::requests::AnswerCallbackQuery
+    /// [`AnswerCallbackQuery`]: crate::payloads::AnswerCallbackQuery
     #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
                       invalid")]
     InvalidQueryID,
@@ -303,7 +303,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
     ButtonURLInvalid,
 
@@ -312,7 +312,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
     ButtonDataInvalid,
 
@@ -321,7 +321,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
                       unallowed in the inline keyboard")]
     TextButtonsAreUnallowed,
@@ -331,7 +331,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`GetFile`]
     ///
-    /// [`GetFile`]: crate::requests::GetFile
+    /// [`GetFile`]: crate::payloads::GetFile
     #[serde(rename = "Bad Request: wrong file id")]
     WrongFileID,
 
@@ -344,7 +344,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetChatPhoto`]
     ///
-    /// [`SetChatPhoto`]: crate::requests::SetChatPhoto
+    /// [`SetChatPhoto`]: crate::payloads::SetChatPhoto
     #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
     PhotoAsInputFileRequired,
 
@@ -353,7 +353,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`AddStickerToSet`]
     ///
-    /// [`AddStickerToSet`]: crate::requests::AddStickerToSet
+    /// [`AddStickerToSet`]: crate::payloads::AddStickerToSet
     #[serde(rename = "Bad Request: STICKERSET_INVALID")]
     InvalidStickersSet,
 
@@ -363,7 +363,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`PinChatMessage`]
     ///
-    /// [`PinChatMessage`]: crate::requests::PinChatMessage
+    /// [`PinChatMessage`]: crate::payloads::PinChatMessage
     #[serde(rename = "Bad Request: not enough rights to pin a message")]
     NotEnoughRightsToPinMessage,
 
@@ -377,7 +377,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`PromoteChatMember`]
     ///
-    /// [`PromoteChatMember`]: crate::requests::PromoteChatMember
+    /// [`PromoteChatMember`]: crate::payloads::PromoteChatMember
     #[serde(rename = "Bad Request: can't demote chat creator")]
     CantDemoteChatCreator,
 
@@ -386,7 +386,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`RestrictChatMember`]
     ///
-    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    /// [`RestrictChatMember`]: crate::payloads::RestrictChatMember
     #[serde(rename = "Bad Request: can't restrict self")]
     CantRestrictSelf,
 
@@ -396,7 +396,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`RestrictChatMember`]
     ///
-    /// [`RestrictChatMember`]: crate::requests::RestrictChatMember
+    /// [`RestrictChatMember`]: crate::payloads::RestrictChatMember
     #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
     NotEnoughRightsToRestrict,
 
@@ -405,7 +405,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetWebhook`]
     ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
+    /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
     WebhookRequireHTTPS,
 
@@ -415,7 +415,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetWebhook`]
     ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
+    /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
                       or 8443")]
     BadWebhookPort,
@@ -425,7 +425,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetWebhook`]
     ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
+    /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
     UnknownHost,
 
@@ -434,7 +434,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SetWebhook`]
     ///
-    /// [`SetWebhook`]: crate::requests::SetWebhook
+    /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: can't parse URL")]
     CantParseUrl,
 
@@ -443,7 +443,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: can't parse entities")]
     CantParseEntities,
 
@@ -452,7 +452,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`GetUpdates`]
     ///
-    /// [`GetUpdates`]: crate::requests::GetUpdates
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
     #[serde(rename = "can't use getUpdates method while webhook is active")]
     CantGetUpdates,
 
@@ -461,7 +461,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot was kicked from a chat")]
     BotKicked,
 
@@ -470,7 +470,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: user is deactivated")]
     UserDeactivated,
 
@@ -479,7 +479,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
     CantInitiateConversation,
 
@@ -488,7 +488,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot can't send messages to bots")]
     CantTalkWithBots,
 
@@ -497,7 +497,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
-    /// [`SendMessage`]: crate::requests::SendMessage
+    /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: wrong HTTP URL")]
     WrongHTTPurl,
 
@@ -507,7 +507,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`GetUpdates`]
     ///
-    /// [`GetUpdates`]: crate::requests::GetUpdates
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
     #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
                       bot instance is running")]
     TerminatedByOtherGetUpdates,
@@ -517,7 +517,7 @@ pub enum ApiError {
     /// May happen in methods:
     /// 1. [`GetFile`]
     ///
-    /// [`GetFile`]: crate::requests::GetFile
+    /// [`GetFile`]: crate::payloads::GetFile
     #[serde(rename = "Bad Request: invalid file id")]
     FileIdInvalid,
 
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 2623614a..3a9e7dfe 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -18,9 +18,9 @@ pub struct Chat {
     #[serde(flatten)]
     pub kind: ChatKind,
 
-    /// A chat photo. Returned only in [`Bot::get_chat`].
+    /// A chat photo. Returned only in [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub photo: Option<ChatPhoto>,
 }
 
@@ -63,27 +63,27 @@ pub struct ChatPublic {
     pub kind: PublicChatKind,
 
     /// A description, for groups, supergroups and channel chats. Returned
-    /// only in [`Bot::get_chat`].
+    /// only in [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub description: Option<String>,
 
     /// A chat invite link, for groups, supergroups and channel chats. Each
     /// administrator in a chat generates their own invite links, so the
     /// bot must first generate the link using
-    /// [`Bot::export_chat_invite_link`]. Returned only in
-    /// [`Bot::get_chat`].
+    /// [`ExportChatInviteLink`]. Returned only in
+    /// [`GetChat`].
     ///
-    /// [`Bot::export_chat_invite_link`]:
-    /// crate::Bot::export_chat_invite_link
+    /// [`ExportChatInviteLink`]:
+    /// crate::payloads::ExportChatInviteLink
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub invite_link: Option<String>,
 
     /// Pinned message, for groups, supergroups and channels. Returned only
-    /// in [`Bot::get_chat`].
+    /// in [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub pinned_message: Option<Box<Message>>,
 }
 
@@ -199,9 +199,9 @@ impl PublicChatChannel {
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatGroup {
     /// A default chat member permissions, for groups and supergroups. Returned
-    /// only from [`Bot::get_chat`].
+    /// only from [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub permissions: Option<ChatPermissions>,
 }
 
@@ -219,27 +219,27 @@ pub struct PublicChatSupergroup {
     pub username: Option<String>,
 
     /// For supergroups, name of group sticker set. Returned only from
-    /// [`Bot::get_chat`].
+    /// [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub sticker_set_name: Option<String>,
 
     /// `true`, if the bot can change the group sticker set. Returned only
-    /// from [`Bot::get_chat`].
+    /// from [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub can_set_sticker_set: Option<bool>,
 
     /// A default chat member permissions, for groups and supergroups.
-    /// Returned only from [`Bot::get_chat`].
+    /// Returned only from [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub permissions: Option<ChatPermissions>,
 
     /// The minimum allowed delay between consecutive messages sent by each
-    /// unpriviledged user. Returned only from [`Bot::get_chat`].
+    /// unpriviledged user. Returned only from [`GetChat`].
     ///
-    /// [`Bot::get_chat`]: crate::Bot::get_chat
+    /// [`GetChat`]: crate::payloads::GetChat
     pub slow_mode_delay: Option<i32>,
 }
 
diff --git a/src/types/file.rs b/src/types/file.rs
index 43734b6d..86908109 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -4,11 +4,11 @@ use serde::{Deserialize, Serialize};
 ///
 /// The file can be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`.
 /// It is guaranteed that the link will be valid for at least 1 hour. When the
-/// link expires, a new one can be requested by calling [`Bot::get_file`].
+/// link expires, a new one can be requested by calling [`GetFile`].
 ///
 /// [The official docs](https://core.telegram.org/bots/api#file).
 ///
-/// [`Bot::get_file`]: crate::Bot::get_file
+/// [`GetFile`]: crate::payloads::GetFile
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct File {
     /// Identifier for this file.
diff --git a/src/types/game.rs b/src/types/game.rs
index 56f4ef69..477f7988 100644
--- a/src/types/game.rs
+++ b/src/types/game.rs
@@ -20,14 +20,15 @@ pub struct Game {
     /// Photo that will be displayed in the game message in chats.
     pub photo: Vec<PhotoSize>,
 
+    // FIXME(waffle): SetGameScore method is missing for some reason O_o
+    #[allow(broken_intra_doc_links)]
     /// Brief description of the game or high scores included in the game
     /// message. Can be automatically edited to include current high scores
-    /// for the game when the bot calls [`Bot::set_game_score`], or manually
-    /// edited using [`Bot::edit_message_text`]. 0-4096 characters.
+    /// for the game when the bot calls [`SetGameScore`], or manually
+    /// edited using [`EditMessageText`]. 0-4096 characters.
     ///
-    /// [`Bot::set_game_score`]: crate::Bot::set_game_score
-    ///
-    /// [`Bot::edit_message_text`]: crate::Bot::edit_message_text
+    /// [`SetGameScore`]: crate::payloads::SetGameScore
+    /// [`EditMessageText`]: crate::payloads::EditMessageText
     pub text: Option<String>,
 
     /// Special entities that appear in text, such as usernames, URLs, bot
diff --git a/src/types/me.rs b/src/types/me.rs
index a9f33848..bf07b50f 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -1,9 +1,9 @@
 use crate::types::User;
 use serde::{Deserialize, Serialize};
 
-/// Returned only in [`Bot::get_me`].
+/// Returned only in [`GetMe`].
 ///
-/// [`Bot::get_me`]: crate::Bot::get_me
+/// [`GetMe`]: crate::payloads::GetMe
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Me {
     #[serde(flatten)]
diff --git a/src/types/update.rs b/src/types/update.rs
index e77656c1..8aa3992f 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -16,13 +16,11 @@ use crate::types::{
 pub struct Update {
     /// The update‘s unique identifier. Update identifiers start from a certain
     /// positive number and increase sequentially. This ID becomes especially
-    /// handy if you’re using [Webhooks], since it allows you to ignore
+    /// handy if you’re using webhooks, since it allows you to ignore
     /// repeated updates or to restore the correct update sequence, should
     /// they get out of order. If there are no new updates for at least a
     /// week, then identifier of the next update will be chosen randomly
     /// instead of sequentially.
-    ///
-    /// [Webhooks]: crate::Bot::set_webhook
     #[serde(rename = "update_id")]
     pub id: i32,
 

From 445c42b585e386d314c81047c1db8a49a72e54b1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 12 Dec 2020 15:52:47 +0300
Subject: [PATCH 161/755] Refactor file downloading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Make `net` module public
- Move `Bot::download_file{,_stream}` methods to a new `Download` trait
  - Add `download_forward` macro to forward `Download` impls (priv)
  - Impl `Download` for all bot adaptors & the `Bot` itself
- Change return type of `download_file_stream` — return `Stream<Result<Bytes>>``,
  instead of `Future<Result<Stream<Result<Bytes>>>>``
- Add `api_url` param to standalone versions of `download_file{,_stream}`
- Make `net::{TELEGRAM_API_URL, download_file{,_stream}}` pub
- Small documentation changes
---
 src/adaptors/auto_send.rs  |   7 ++
 src/adaptors/cache_me.rs   |   7 ++
 src/adaptors/parse_mode.rs |   7 ++
 src/adaptors/throttle.rs   |   7 ++
 src/bot/download.rs        |  73 +++++------------
 src/lib.rs                 |   2 +-
 src/local_macros.rs        |  31 ++++++++
 src/net/download.rs        | 157 +++++++++++++++++++++++++++----------
 src/net/mod.rs             |  12 ++-
 src/requests/multipart.rs  |   2 +-
 src/types/file.rs          |  15 ++--
 11 files changed, 217 insertions(+), 103 deletions(-)

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index f5c71e61..54a85d87 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -96,6 +96,13 @@ impl<B: Requester> Requester for AutoSend<B> {
     }
 }
 
+download_forward! {
+    'w
+    B
+    AutoSend<B>
+    { this => this.inner() }
+}
+
 #[pin_project::pin_project]
 pub struct AutoRequest<R: Request>(#[pin] Inner<R>);
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 3f8000fe..8f54a2ee 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -113,6 +113,13 @@ where
     }
 }
 
+download_forward! {
+    'w
+    B
+    CacheMe<B>
+    { this => this.inner() }
+}
+
 pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
 
 enum Inner<R: Request<Payload = GetMe>> {
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index e191e73d..ce4814d9 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -106,3 +106,10 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => fid, fty
     }
 }
+
+download_forward! {
+    'w
+    B
+    DefaultParseMode<B>
+    { this => this.inner() }
+}
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 2401e04c..e7e2250c 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -457,6 +457,13 @@ where
     }
 }
 
+download_forward! {
+    'w
+    B
+    Throttle<B>
+    { this => this.inner() }
+}
+
 /// Id used in worker.
 ///
 /// It is used instead of `ChatId` to make copying cheap even in case of
diff --git a/src/bot/download.rs b/src/bot/download.rs
index bc859df7..dad76b31 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -1,66 +1,33 @@
 use bytes::Bytes;
-use tokio::{io::AsyncWrite, stream::Stream};
+use futures::{future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
+use tokio::io::AsyncWrite;
 
 use crate::{
     bot::Bot,
-    net::{download_file, download_file_stream},
+    net::{self, Download},
     DownloadError,
 };
 
-impl Bot {
-    /// Download a file from Telegram into `destination`.
-    ///
-    /// `path` can be obtained from [`GetFile`].
-    ///
-    /// To download as a stream of chunks, see [`Bot::download_file_stream`].
-    ///
-    /// ## Examples
-    ///
-    /// ```no_run
-    /// use teloxide_core::{
-    ///     requests::{Request, Requester},
-    ///     types::File as TgFile,
-    ///     Bot,
-    /// };
-    /// use tokio::fs::File;
-    ///
-    /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
-    /// let bot = Bot::new("TOKEN");
-    ///
-    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
-    /// let mut file = File::create("/home/waffle/Pictures/test.png").await?;
-    /// bot.download_file(&file_path, &mut file).await?;
-    /// # Ok(()) }
-    /// ```
-    ///
-    /// [`GetFile`]: crate::payloads::GetFile
-    /// [`Bot::download_file_stream`]: crate::Bot::download_file_stream
-    pub async fn download_file<D>(
+impl<'w> Download<'w> for Bot {
+    type Err = DownloadError;
+
+    // I would like to unbox this, but my coworkers will kill me if they'll see yet
+    // another hand written `Future`. (waffle)
+    type Fut = BoxFuture<'w, Result<(), Self::Err>>;
+
+    fn download_file(
         &self,
         path: &str,
-        destination: &mut D,
-    ) -> Result<(), DownloadError>
-    where
-        D: AsyncWrite + Unpin,
-    {
-        download_file(&self.client, &self.token, path, destination).await
+        destination: &'w mut (dyn AsyncWrite + Unpin + Send),
+    ) -> Self::Fut {
+        net::download_file(&self.client, self.api_url.get(), &self.token, path, destination).boxed()
     }
 
-    /// Download a file from Telegram.
-    ///
-    /// `path` can be obtained from the [`GetFile`].
-    ///
-    /// To download into [`AsyncWrite`] (e.g. [`tokio::fs::File`]), see
-    /// [`Bot::download_file`].
-    ///
-    /// [`GetFile`]: crate::payloads::GetFile
-    /// [`AsyncWrite`]: tokio::io::AsyncWrite
-    /// [`tokio::fs::File`]: tokio::fs::File
-    /// [`Bot::download_file`]: crate::Bot::download_file
-    pub async fn download_file_stream(
-        &self,
-        path: &str,
-    ) -> Result<impl Stream<Item = Result<Bytes, reqwest::Error>>, reqwest::Error> {
-        download_file_stream(&self.client, &self.token, path).await
+    type StreamErr = reqwest::Error;
+
+    type Stream = BoxStream<'static, Result<Bytes, Self::StreamErr>>;
+
+    fn download_file_stream(&self, path: &str) -> Self::Stream {
+        net::download_file_stream(&self.client, self.api_url.get(), &self.token, path).boxed()
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 54d79c30..7b33b931 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,6 +24,7 @@ pub use self::{
 };
 
 pub mod adaptors;
+pub mod net;
 pub mod payloads;
 pub mod prelude;
 pub mod requests;
@@ -34,7 +35,6 @@ mod bot;
 mod errors;
 
 // implementation details
-mod net;
 mod serde_multipart;
 
 /// Constructs a client from the `TELOXIDE_PROXY` environmental variable.
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 83bf0f57..51be0d62 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -995,3 +995,34 @@ macro_rules! requester_forward {
         }
     };
 }
+
+#[macro_use]
+macro_rules! download_forward {
+    ($l:lifetime $T:ident $S:ty {$this:ident => $inner:expr}) => {
+        impl<$l, $T: crate::net::Download<$l>> crate::net::Download<$l> for $S {
+            type Err = <$T as crate::net::Download<$l>>::Err;
+
+            type Fut = <$T as crate::net::Download<$l>>::Fut;
+
+            fn download_file(
+                &self,
+                path: &str,
+                destination: &'w mut (dyn tokio::io::AsyncWrite
+                             + core::marker::Unpin
+                             + core::marker::Send),
+            ) -> Self::Fut {
+                let $this = self;
+                ($inner).download_file(path, destination)
+            }
+
+            type StreamErr = <$T as crate::net::Download<$l>>::StreamErr;
+
+            type Stream = <$T as crate::net::Download<$l>>::Stream;
+
+            fn download_file_stream(&self, path: &str) -> Self::Stream {
+                let $this = self;
+                ($inner).download_file_stream(path)
+            }
+        }
+    };
+}
diff --git a/src/net/download.rs b/src/net/download.rs
index 3a507ad2..d19de588 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -1,54 +1,131 @@
-use reqwest::Client;
+use std::future::Future;
+
+use bytes::Bytes;
+use futures::{
+    future::{ready, Either},
+    stream::{once, unfold},
+    FutureExt, Stream, StreamExt,
+};
+use reqwest::{Client, Response, Url};
 use tokio::io::{AsyncWrite, AsyncWriteExt};
 
-use crate::errors::DownloadError;
+use crate::{errors::DownloadError, net::file_url};
 
-pub async fn download_file<D>(
-    client: &Client,
-    token: &str,
-    path: &str,
-    destination: &mut D,
-) -> Result<(), DownloadError>
-where
-    D: AsyncWrite + Unpin,
+/// Download client.
+///
+/// This trait allows you to download files from telegram.
+pub trait Download<'w>
+/* FIXME(waffle): ideally, this lifetime ('w) shouldn't be here, but we can't help it without
+ * GATs */
 {
-    let mut res = client
-        .get(crate::net::file_url(
-            reqwest::Url::parse(crate::net::TELEGRAM_API_URL).expect("failed to parse default url"),
-            token,
-            path,
-        ))
-        .send()
-        .await?
-        .error_for_status()?;
+    /// Error returned by [`download_file`](Self::download_file)
+    type Err;
 
-    while let Some(chunk) = res.chunk().await? {
-        destination.write_all(&chunk).await?;
-    }
+    /// Future returned from [`download_file`](Self::download_file)
+    type Fut: Future<Output = Result<(), Self::Err>> + Send;
 
-    Ok(())
+    /// Download a file from Telegram into `destination`.
+    ///
+    /// `path` can be obtained from [`GetFile`].
+    ///
+    /// To download as a stream of chunks, see [`download_file_stream`].
+    ///
+    /// ## Examples
+    ///
+    /// ```no_run
+    /// use teloxide_core::{
+    ///     requests::{Download, Request, Requester},
+    ///     types::File as TgFile,
+    ///     Bot,
+    /// };
+    /// use tokio::fs::File;
+    ///
+    /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
+    /// let bot = Bot::new("TOKEN");
+    ///
+    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
+    /// let mut file = File::create("/tmp/test.png").await?;
+    /// bot.download_file(&file_path, &mut file).await?;
+    /// # Ok(()) }
+    /// ```
+    ///
+    /// [`GetFile`]: crate::payloads::GetFile
+    /// [`download_file_stream`]: Self::download_file_stream
+    fn download_file(
+        &self,
+        path: &str,
+        destination: &'w mut (dyn AsyncWrite + Unpin + Send),
+    ) -> Self::Fut;
+
+    /// Error returned by [`download_file_stream`](Self::download_file_stream)
+    type StreamErr;
+
+    /// Stream returned from [`download_file_stream`]
+    ///
+    ///[`download_file_stream`]: (Self::download_file_stream)
+    type Stream: Stream<Item = Result<Bytes, Self::StreamErr>> + Send;
+
+    /// Download a file from Telegram as a [`Stream`].
+    ///
+    /// `path` can be obtained from the [`GetFile`].
+    ///
+    /// To download into an [`AsyncWrite`] (e.g. [`tokio::fs::File`]), see
+    /// [`download_file`].
+    ///
+    /// [`GetFile`]: crate::payloads::GetFile
+    /// [`AsyncWrite`]: tokio::io::AsyncWrite
+    /// [`tokio::fs::File`]: tokio::fs::File
+    /// [`download_file`]: Self::download_file
+    fn download_file_stream(&self, path: &str) -> Self::Stream;
 }
 
-pub async fn download_file_stream(
+/// Download a file from Telegram into `dst`.
+///
+/// Note: if you don't need to use a different (from you're bot) client and
+/// don't need to get *all* performance (and you don't, c'mon it's very io-bound
+/// job), then it's recommended to use [`Download::download_file`]
+pub fn download_file<'o, D>(
     client: &Client,
+    api_url: Url,
     token: &str,
     path: &str,
-) -> Result<impl futures::Stream<Item = reqwest::Result<bytes::Bytes>>, reqwest::Error> {
-    let res = client
-        .get(crate::net::file_url(
-            reqwest::Url::parse(crate::net::TELEGRAM_API_URL).expect("failed to parse default url"),
-            token,
-            path,
-        ))
-        .send()
-        .await?
-        .error_for_status()?;
+    dst: &'o mut D,
+) -> impl Future<Output = Result<(), DownloadError>> + 'o
+where
+    D: ?Sized + AsyncWrite + Unpin,
+{
+    client.get(file_url(api_url, token, path)).send().then(move |r| async move {
+        let mut res = r?.error_for_status()?;
 
-    Ok(futures::stream::unfold(res, |mut res| async {
-        match res.chunk().await {
-            Err(err) => Some((Err(err), res)),
-            Ok(Some(c)) => Some((Ok(c), res)),
-            Ok(None) => None,
+        while let Some(chunk) = res.chunk().await? {
+            dst.write_all(&chunk).await?;
         }
-    }))
+
+        Ok(())
+    })
+}
+
+/// Download a file from Telegram as a [`Stream`].
+///
+/// Note: if you don't need to use a different (from you're bot) client and
+/// don't need to get *all* performance (and you don't, c'mon it's very io-bound
+/// job), then it's recommended to use [`Download::download_file_stream`]
+pub fn download_file_stream(
+    client: &Client,
+    api_url: Url,
+    token: &str,
+    path: &str,
+) -> impl Stream<Item = reqwest::Result<Bytes>> + 'static {
+    client.get(file_url(api_url, token, path)).send().into_stream().flat_map(|res| {
+        match res.and_then(Response::error_for_status) {
+            Ok(res) => Either::Left(unfold(res, |mut res| async {
+                match res.chunk().await {
+                    Err(err) => Some((Err(err), res)),
+                    Ok(Some(c)) => Some((Ok(c), res)),
+                    Ok(None) => None,
+                }
+            })),
+            Err(err) => Either::Right(once(ready(Err(err)))),
+        }
+    })
 }
diff --git a/src/net/mod.rs b/src/net/mod.rs
index a6699ca5..cac0f366 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -1,5 +1,12 @@
+//! Network specific items.
+//!
+//! Currently this module contains only the file download stuff and the default
+//! api url.
+// ... and some internal stuff :P
+
+pub use self::download::{download_file, download_file_stream, Download};
+
 pub(crate) use self::{
-    download::{download_file, download_file_stream},
     request::{request_json, request_multipart},
     telegram_response::TelegramResponse,
 };
@@ -8,7 +15,8 @@ mod download;
 mod request;
 mod telegram_response;
 
-pub(crate) const TELEGRAM_API_URL: &str = "https://api.telegram.org";
+/// Default telegram api url
+pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].
 ///
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 009271bd..41339055 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -18,7 +18,7 @@ pub struct MultipartRequest<P> {
 }
 
 impl<P> MultipartRequest<P> {
-    pub fn new(bot: Bot, payload: P) -> Self {
+    pub const fn new(bot: Bot, payload: P) -> Self {
         Self { bot, payload }
     }
 }
diff --git a/src/types/file.rs b/src/types/file.rs
index 86908109..a1eeeb75 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -2,13 +2,15 @@ use serde::{Deserialize, Serialize};
 
 /// This object represents a file ready to be downloaded.
 ///
-/// The file can be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`.
-/// It is guaranteed that the link will be valid for at least 1 hour. When the
-/// link expires, a new one can be requested by calling [`GetFile`].
+/// The file can be downloaded via the [`Bot::download_file(file_path, dst)`]
+/// method. It is guaranteed that the path from [`GetFile`] will be valid for at
+/// least 1 hour. When the path expires, a new one can be requested by calling
+/// [`GetFile`].
 ///
 /// [The official docs](https://core.telegram.org/bots/api#file).
 ///
 /// [`GetFile`]: crate::payloads::GetFile
+/// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct File {
     /// Identifier for this file.
@@ -22,9 +24,10 @@ pub struct File {
     /// File size, if known.
     pub file_size: u32,
 
-    // TODO: chacge "Use ..." to use bot.download...
-    /// File path. Use `https://api.telegram.org/file/bot<token>/<file_path>`
-    /// to get the file.
+    /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
+    ///
+    /// [`Bot::download_file(file_path, dst)`]:
+    /// crate::net::Download::download_file
     pub file_path: String,
 }
 

From 290258cd1fa64ea6123fbf128961dccd87d0d177 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 12 Dec 2020 17:59:45 +0300
Subject: [PATCH 162/755] Small fixes: fmt & import in test

---
 src/net/download.rs          | 3 ++-
 src/net/telegram_response.rs | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/net/download.rs b/src/net/download.rs
index d19de588..16694821 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -34,7 +34,8 @@ pub trait Download<'w>
     ///
     /// ```no_run
     /// use teloxide_core::{
-    ///     requests::{Download, Request, Requester},
+    ///     net::Download,
+    ///     requests::{Request, Requester},
     ///     types::File as TgFile,
     ///     Bot,
     /// };
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index fd3dbc9e..04f8f4c1 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -62,9 +62,10 @@ mod tests {
         let s = r#"{"ok":false,"error_code":409,"description":"Conflict: terminated by other getUpdates request; make sure that only one bot instance is running"}"#;
         let val = serde_json::from_str::<TelegramResponse<Update>>(s).unwrap();
 
-        assert!(
-            matches!(val, TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. })
-        );
+        assert!(matches!(
+            val,
+            TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. }
+        ));
     }
 
     #[test]

From 08cefc379b2f0136183c98274879dccd18ad76ea Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 12 Dec 2020 19:27:54 +0300
Subject: [PATCH 163/755] Fix netlify docs build

---
 netlify.toml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index ecb9c8fb..be511e64 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,12 +1,8 @@
-[build]
-# Directory (relative to root of your repo) that contains the deploy-ready
-# HTML files and assets generated by the build. If a base directory has
-# been specified, include it in the publish directory path.
-publish = "target/doc"
-
-# Default build command.
-command = 'curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly --profile minimal && source $HOME/.cargo/env && RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --no-deps --all-features'
+[build] 
+command = "rustup install nightly --profile minimal && cargo +nightly doc --all-features --no-deps && cp -r target/doc _netlify_out"
+environment = { RUSTDOCFLAGS= "--cfg docsrs" } 
+publish = "_netlify_out" 
 
 [[redirects]]
-  from = "/*"
-  to = "/teloxide_core"
+from = "/" 
+to = "/teloxide_core"

From f5d9cb1a73c0a66120f7b444549e831f7f320fde Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 22:24:31 +0600
Subject: [PATCH 164/755] Documentation gardening

---
 src/adaptors.rs               |  11 ++-
 src/adaptors/parse_mode.rs    |   8 +-
 src/errors.rs                 |  15 ++--
 src/net/download.rs           |  21 +++--
 src/net/mod.rs                |   8 +-
 src/payloads/mod.rs           |   9 +-
 src/prelude.rs                |   2 +-
 src/requests/has_payload.rs   |  15 ++--
 src/requests/json.rs          |   6 +-
 src/requests/mod.rs           |   3 +-
 src/requests/multipart.rs     |   7 +-
 src/requests/payload.rs       |  24 +++---
 src/requests/request.rs       |  23 +++---
 src/requests/requester.rs     | 151 +++++++++++++++++-----------------
 src/requests/requester_ext.rs |   1 +
 15 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 40982784..fc4c6583 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -1,11 +1,10 @@
-//! ## Bot adaptors
+//! Wrappers altering functionality of a bot.
 //!
-//! Bot adaptors are very similar to [`Iterator`] adaptors —
-//! they are bots (implement [`Requester`]) which wrap other bots
-//! adding new functionality.
+//! Bot adaptors are very similar to the [`Iterator`] adaptors: they are bots
+//! wrapping other bots to alter existing or add new functionality.
 //!
-//! E.g. [`AutoSend`] allows `await`ing requests directly,
-//! without need to use `.send()`.
+//! E.g. [`AutoSend`] allows `await`ing requests directly, no need to to use
+//! `.send()`.
 //!
 //! [`Requester`]: crate::requests::Requester
 
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index ce4814d9..5057a5f1 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -5,14 +5,14 @@ use crate::{
 };
 
 /// Default parse mode adaptor, see
-/// [`RequesterExt::parse_mode`](crate::requests::RequesterExt::parse_mode)
+/// [`RequesterExt::parse_mode`](crate::requests::RequesterExt::parse_mode).
 pub struct DefaultParseMode<B> {
     bot: B,
     mode: ParseMode,
 }
 
 impl<B> DefaultParseMode<B> {
-    /// Creates new [`DefaultParseMode`]
+    /// Creates new [`DefaultParseMode`].
     ///
     /// Note: it's recommended to use [`RequesterExt::parse_mode`] instead.
     ///
@@ -21,12 +21,12 @@ impl<B> DefaultParseMode<B> {
         Self { bot, mode: parse_mode }
     }
 
-    /// Allows to access inner bot
+    /// Allows to access the inner bot.
     pub fn inner(&self) -> &B {
         &self.bot
     }
 
-    /// Unwraps inner bot
+    /// Unwraps the inner bot.
     pub fn into_inner(self) -> B {
         self.bot
     }
diff --git a/src/errors.rs b/src/errors.rs
index 1164398a..1b183180 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -8,11 +8,11 @@ use thiserror::Error;
 /// An error caused by downloading a file.
 #[derive(Debug, Error, From)]
 pub enum DownloadError {
-    /// Network error while downloading file from telegram.
+    /// Network error while downloading a file from Telegram.
     #[error("A network error: {0}")]
     NetworkError(#[source] reqwest::Error),
 
-    /// I/O error while writing file to destination.
+    /// An I/O error while writing a file to destination.
     #[error("An I/O error: {0}")]
     Io(#[source] std::io::Error),
 }
@@ -20,12 +20,13 @@ pub enum DownloadError {
 /// An error caused by sending a request to Telegram.
 #[derive(Debug, Error)]
 pub enum RequestError {
-    /// Telegram API error
+    /// Telegram API error.
     #[error("A Telegram's error #{status_code}: {kind:?}")]
     ApiError {
-        /// Kind of api error
+        /// Kind of an API error.
         kind: ApiError,
-        /// HTTP code returned by telegram, not very usefull in practice.
+
+        /// An HTTP code returned by Telegram, not very useful in practice.
         status_code: StatusCode,
     },
 
@@ -39,11 +40,11 @@ pub enum RequestError {
     #[error("Retry after {0} seconds")]
     RetryAfter(i32),
 
-    /// Network error while sending request to telegram.
+    /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
     NetworkError(#[source] reqwest::Error),
 
-    /// Error while parsing response from telegram.
+    /// Error while parsing a response from Telegram.
     ///
     /// If you've received this error, please, [open an issue] with the
     /// description of the error.
diff --git a/src/net/download.rs b/src/net/download.rs
index 16694821..5c123cb7 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -11,17 +11,15 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
 
 use crate::{errors::DownloadError, net::file_url};
 
-/// Download client.
-///
-/// This trait allows you to download files from telegram.
+/// A trait for downloading files from Telegram.
 pub trait Download<'w>
 /* FIXME(waffle): ideally, this lifetime ('w) shouldn't be here, but we can't help it without
  * GATs */
 {
-    /// Error returned by [`download_file`](Self::download_file)
+    /// An error returned from [`download_file`](Self::download_file).
     type Err;
 
-    /// Future returned from [`download_file`](Self::download_file)
+    /// A future returned from [`download_file`](Self::download_file).
     type Fut: Future<Output = Result<(), Self::Err>> + Send;
 
     /// Download a file from Telegram into `destination`.
@@ -58,15 +56,16 @@ pub trait Download<'w>
         destination: &'w mut (dyn AsyncWrite + Unpin + Send),
     ) -> Self::Fut;
 
-    /// Error returned by [`download_file_stream`](Self::download_file_stream)
+    /// An error returned from
+    /// [`download_file_stream`](Self::download_file_stream).
     type StreamErr;
 
-    /// Stream returned from [`download_file_stream`]
+    /// A stream returned from [`download_file_stream`].
     ///
     ///[`download_file_stream`]: (Self::download_file_stream)
     type Stream: Stream<Item = Result<Bytes, Self::StreamErr>> + Send;
 
-    /// Download a file from Telegram as a [`Stream`].
+    /// Download a file from Telegram as [`Stream`].
     ///
     /// `path` can be obtained from the [`GetFile`].
     ///
@@ -84,7 +83,7 @@ pub trait Download<'w>
 ///
 /// Note: if you don't need to use a different (from you're bot) client and
 /// don't need to get *all* performance (and you don't, c'mon it's very io-bound
-/// job), then it's recommended to use [`Download::download_file`]
+/// job), then it's recommended to use [`Download::download_file`].
 pub fn download_file<'o, D>(
     client: &Client,
     api_url: Url,
@@ -106,11 +105,11 @@ where
     })
 }
 
-/// Download a file from Telegram as a [`Stream`].
+/// Download a file from Telegram as [`Stream`].
 ///
 /// Note: if you don't need to use a different (from you're bot) client and
 /// don't need to get *all* performance (and you don't, c'mon it's very io-bound
-/// job), then it's recommended to use [`Download::download_file_stream`]
+/// job), then it's recommended to use [`Download::download_file_stream`].
 pub fn download_file_stream(
     client: &Client,
     api_url: Url,
diff --git a/src/net/mod.rs b/src/net/mod.rs
index cac0f366..119213aa 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -1,8 +1,4 @@
-//! Network specific items.
-//!
-//! Currently this module contains only the file download stuff and the default
-//! api url.
-// ... and some internal stuff :P
+//! Network-specific API.
 
 pub use self::download::{download_file, download_file_stream, Download};
 
@@ -15,7 +11,7 @@ mod download;
 mod request;
 mod telegram_response;
 
-/// Default telegram api url
+/// The default Telegram API URL.
 pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 171588be..42b90fe7 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,11 +1,14 @@
-//! Payloads - data types sended to relegram
+//! Request data sent to Telegram.
 
-/// This module reexports all setters traits as `_`. When used with a glob
+/// This module re-exports all the setters traits as `_`. When used with a glob
 /// import:
+///
 /// ```
 /// use teloxide_core::payloads::setters::*;
 /// ```
-/// It allows you to use all payloads setters, without polluting your namespace.
+///
+/// It allows you to use all the payloads setters, without polluting your
+/// namespace.
 pub mod setters;
 
 // This block is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).
diff --git a/src/prelude.rs b/src/prelude.rs
index 886b201a..3ea2b60c 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,3 +1,3 @@
-//! Crate prelude
+//! Commonly used items.
 
 pub use crate::requests::Requester;
diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index facca0cc..6c0c1abf 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -1,15 +1,14 @@
 use crate::requests::Payload;
 
-/// Represent types that have payload inside it. E.g.: the payload itself or a
-/// `Request`.
+/// Represents types having payload inside.
 ///
 /// This trait is something between [`DerefMut`] and [`BorrowMut`] — it allows
-/// only one implementation per type (the [output] is associated type, not a
-/// generic), have implementations for all types `P` such `P: `[`Payload`], but
-/// have no magic compiler support like [`DerefMut`] does nor does it require
+/// only one implementation per type (the [output type] is associated, not
+/// generic), has implementations for all types `P` such `P: `[`Payload`], but
+/// has no magic compiler support like [`DerefMut`] does nor does it require
 /// any laws about `Eq`, `Ord` and `Hash` as [`BorrowMut`] does.
 ///
-/// Also [output] type is bounded by [`Payload`] trait.
+/// Also the [output type] is bounded by the [`Payload`] trait.
 ///
 /// This trait is mostly used to implement payload setters (on both payloads &
 /// requests), so you probably won't find yourself using it directly.
@@ -17,13 +16,13 @@ use crate::requests::Payload;
 /// [`DerefMut`]: std::ops::DerefMut
 /// [`BorrowMut`]: std::borrow::BorrowMut
 /// [`Payload`]: crate::requests::Payload
-/// [output]: HasPayload::Payload
+/// [output type]: HasPayload::Payload
 pub trait HasPayload
 // FIXME(waffle):
 //   we wanted to use As{Mut,Ref} here, but they doesn't work
 //   because of https://github.com/rust-lang/rust/issues/77010
 {
-    /// Type of the payload contained.
+    /// A type of the payload contained.
     type Payload: Payload;
 
     /// Gain mutable access to the underlying payload.
diff --git a/src/requests/json.rs b/src/requests/json.rs
index 51cf906a..bda409e5 100644
--- a/src/requests/json.rs
+++ b/src/requests/json.rs
@@ -6,11 +6,9 @@ use crate::{
     RequestError,
 };
 
-/// Ready-to-send telegram request.
+/// A ready-to-send Telegram request whose payload is sent using [JSON].
 ///
-/// Note: payload will be sent to telegram using [`json`]
-///
-/// [`json`]: https://core.telegram.org/bots/api#making-requests
+/// [JSON]: https://core.telegram.org/bots/api#making-requests
 #[must_use = "requests do nothing until sent"]
 pub struct JsonRequest<P> {
     bot: Bot,
diff --git a/src/requests/mod.rs b/src/requests/mod.rs
index 3433c81e..84e933e6 100644
--- a/src/requests/mod.rs
+++ b/src/requests/mod.rs
@@ -8,8 +8,7 @@ pub use self::{
 /// A type that is returned after making a request to Telegram.
 pub type ResponseResult<T> = Result<T, crate::RequestError>;
 
-/// Output of a [`Payload`] in [`HasPayload`]. Alias to
-/// `<<T as HasPayload>::Payload as Payload>::Output`.
+/// An output type of [`Payload`] in [`HasPayload`].
 pub type Output<T> = <<T as HasPayload>::Payload as Payload>::Output;
 
 mod has_payload;
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 41339055..5b2ea867 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -6,11 +6,10 @@ use crate::{
     RequestError,
 };
 
-/// Ready-to-send telegram request.
+/// A ready-to-send Telegram request whose payload is sent using
+/// [multipart/form-data].
 ///
-/// Note: payload will be sent to telegram using [`multipart/form-data`]
-///
-/// [`multipart/form-data`]: https://core.telegram.org/bots/api#making-requests
+/// [multipart/form-data]: https://core.telegram.org/bots/api#making-requests
 #[must_use = "requests do nothing until sent"]
 pub struct MultipartRequest<P> {
     bot: Bot,
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 0e02531d..8b885e96 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -1,20 +1,24 @@
 /// Payload of a request.
 ///
-/// Simply speaking structs implementing this trait represent arguments of
-/// a telegram bot API method.
+/// Simply speaking, structures implementing this trait represent arguments of
+/// a Telegram bot API method.
 ///
-/// This trait provides some additional information needed for sending request
-/// to the telegram.
+/// Also, this trait provides some additional information needed for sending a
+/// request to Telegram.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Payload {
-    /// Return type of the telegram method.
+    /// A return type of a Telegram method.
     ///
-    /// Note: that should not include result wrappers (e.g. it should be simply
-    /// `Message`, `True` or something else)
+    /// Note: it should not include `Result` wrappers (e.g. it should be simply
+    /// [`Message`], [`True`] or something else).
+    ///
+    /// [`Message`]: crate::types::Message
+    /// [`True`]: crate::types::True
     type Output;
 
-    /// Name of the telegram method. Case insensitive, though must not include
-    /// underscores. (e.g.: `GetMe`, `GETME`, `getme`, `getMe` are ok, but
-    /// `get_me` is not ok)
+    /// Name of a Telegram method.
+    ///
+    /// It is case insensitive, though must not include underscores. (e.g.
+    /// `GetMe`, `GETME`, `getme`, `getMe` are ok, but `get_me` is not ok).
     const NAME: &'static str;
 }
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 0d6692d9..b3f674f3 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -2,7 +2,7 @@ use std::future::Future;
 
 use crate::requests::{HasPayload, Output};
 
-/// A ready-to-send telegram request.
+/// A ready-to-send Telegram request.
 // FIXME(waffle): Write better doc for the trait
 ///
 /// ## Implementation notes
@@ -23,19 +23,20 @@ pub trait Request: HasPayload {
      * use it before it's integrated in async/await
      */
 
-    /// Type of error that may happen during sending the request to telegram.
+    /// A type of an error that may happen while sending a request to Telegram.
     type Err: std::error::Error + Send;
 
-    /// Type of future returned by [`send`](Request::send) method.
+    /// A type of the future returned by the [`send`](Request::send) method.
     type Send: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
-    /// Type of future returned by [`send_ref`](Request::send_ref) method.
+    /// A type of the future returned by the [`send_ref`](Request::send_ref)
+    /// method.
     ///
-    /// NOTE: it intentionally forbids borrowing from self
-    // though anyway we couldn't allow borrowing without GATs :sob:
+    /// Note: it intentionally forbids borrowing from `self` though anyway we
+    /// couldn't allow borrowing without GATs.
     type SendRef: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
-    /// Send the request.
+    /// Send this request.
     ///
     /// ## Examples
     // FIXME(waffle): ignored until full request redesign lands
@@ -51,15 +52,15 @@ pub trait Request: HasPayload {
     /// ```
     fn send(self) -> Self::Send;
 
-    /// Send the request.
+    /// Send this request by reference.
     ///
     /// This method is analogous to [`send`](Request::send), but it doesn't take
     /// the ownership of `self`. This allows to send the same (or slightly
     /// different) requests over and over.
     ///
-    /// _Also_ it is expected that calling this method is better than just
-    /// `clone`ing the requests. (because instead of copying all the data
-    /// and then serializing it, this method should just serialize the data)
+    /// Also, it is expected that calling this method is better than just
+    /// cloning requests. (Because instead of copying all the data
+    /// and then serializing it, this method should just serialize the data.)
     ///
     /// ## Examples
     // FIXME(waffle): ignored until full request redesign lands
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 5352ab35..87a78331 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -8,8 +8,9 @@ use crate::{
     },
 };
 
-/// The trait implemented by all bots & bot adaptors.
-/// Essentially a request builder factory (?).
+/// Methods for building requests.
+///
+/// This trait is implemented by all bots & bot adaptors.
 ///
 /// _This trait is included in the crate's [`prelude`](crate::prelude)_.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
@@ -22,12 +23,12 @@ pub trait Requester {
 
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetUpdates`]
+    /// For Telegram documentation see [`GetUpdates`].
     fn get_updates(&self) -> Self::GetUpdates;
 
     type SetWebhook: Request<Payload = SetWebhook, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetWebhook`]
+    /// For Telegram documentation see [`SetWebhook`].
     fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook
     where
         U: Into<String>,
@@ -35,22 +36,22 @@ pub trait Requester {
 
     type DeleteWebhook: Request<Payload = DeleteWebhook, Err = Self::Err>;
 
-    /// For telegram documentation see [`DeleteWebhook`]
+    /// For Telegram documentation see [`DeleteWebhook`].
     fn delete_webhook(&self) -> Self::DeleteWebhook;
 
     type GetWebhookInfo: Request<Payload = GetWebhookInfo, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetWebhookInfo`]
+    /// For Telegram documentation see [`GetWebhookInfo`].
     fn get_webhook_info(&self) -> Self::GetWebhookInfo;
 
     type GetMe: Request<Payload = GetMe, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetMe`]
+    /// For Telegram documentation see [`GetMe`].
     fn get_me(&self) -> Self::GetMe;
 
     type SendMessage: Request<Payload = SendMessage, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendMessage`]
+    /// For Telegram documentation see [`SendMessage`].
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
         C: Into<ChatId>,
@@ -58,7 +59,7 @@ pub trait Requester {
 
     type ForwardMessage: Request<Payload = ForwardMessage, Err = Self::Err>;
 
-    /// For telegram documentation see [`ForwardMessage`]
+    /// For Telegram documentation see [`ForwardMessage`].
     fn forward_message<C, F>(
         &self,
         chat_id: C,
@@ -71,7 +72,7 @@ pub trait Requester {
 
     type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendPhoto`]
+    /// For Telegram documentation see [`SendPhoto`].
     fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto
     where
         Ch: Into<ChatId>,
@@ -79,7 +80,7 @@ pub trait Requester {
 
     type SendAudio: Request<Payload = SendAudio, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendAudio`]
+    /// For Telegram documentation see [`SendAudio`].
     fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio
     where
         Ch: Into<ChatId>,
@@ -87,7 +88,7 @@ pub trait Requester {
 
     type SendDocument: Request<Payload = SendDocument, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendDocument`]
+    /// For Telegram documentation see [`SendDocument`].
     fn send_document<Ch, Ca>(
         &self,
         chat_id: Ch,
@@ -100,7 +101,7 @@ pub trait Requester {
 
     type SendVideo: Request<Payload = SendVideo, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVideo`]
+    /// For Telegram documentation see [`SendVideo`].
     fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo
     where
         Ch: Into<ChatId>,
@@ -108,7 +109,7 @@ pub trait Requester {
 
     type SendAnimation: Request<Payload = SendAnimation, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendAnimation`]
+    /// For Telegram documentation see [`SendAnimation`].
     fn send_animation<Ch, Ca>(
         &self,
         chat_id: Ch,
@@ -121,7 +122,7 @@ pub trait Requester {
 
     type SendVoice: Request<Payload = SendVoice, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVoice`]
+    /// For Telegram documentation see [`SendVoice`].
     fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice
     where
         Ch: Into<ChatId>,
@@ -129,14 +130,14 @@ pub trait Requester {
 
     type SendVideoNote: Request<Payload = SendVideoNote, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVideoNote`]
+    /// For Telegram documentation see [`SendVideoNote`].
     fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote
     where
         C: Into<ChatId>;
 
     type SendMediaGroup: Request<Payload = SendMediaGroup, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendMediaGroup`]
+    /// For Telegram documentation see [`SendMediaGroup`].
     fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup
     where
         C: Into<ChatId>,
@@ -144,7 +145,7 @@ pub trait Requester {
 
     type SendLocation: Request<Payload = SendLocation, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendLocation`]
+    /// For Telegram documentation see [`SendLocation`].
     fn send_location<C>(
         &self,
         chat_id: C,
@@ -157,7 +158,7 @@ pub trait Requester {
 
     type EditMessageLiveLocation: Request<Payload = EditMessageLiveLocation, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageLiveLocation`]
+    /// For Telegram documentation see [`EditMessageLiveLocation`].
     fn edit_message_live_location<C>(
         &self,
         chat_id: C,
@@ -173,7 +174,7 @@ pub trait Requester {
         Err = Self::Err,
     >;
 
-    /// For telegram documentation see [`EditMessageLiveLocationInline`]
+    /// For Telegram documentation see [`EditMessageLiveLocationInline`].
     fn edit_message_live_location_inline<I>(
         &self,
         inline_message_id: I,
@@ -185,7 +186,7 @@ pub trait Requester {
 
     type StopMessageLiveLocation: Request<Payload = StopMessageLiveLocation, Err = Self::Err>;
 
-    /// For telegram documentation see [`StopMessageLiveLocation`]
+    /// For Telegram documentation see [`StopMessageLiveLocation`].
     fn stop_message_live_location<C>(
         &self,
         chat_id: C,
@@ -201,7 +202,7 @@ pub trait Requester {
         Err = Self::Err,
     >;
 
-    /// For telegram documentation see [`StopMessageLiveLocationInline`]
+    /// For Telegram documentation see [`StopMessageLiveLocationInline`].
     fn stop_message_live_location_inline<I>(
         &self,
         inline_message_id: I,
@@ -213,7 +214,7 @@ pub trait Requester {
 
     type SendVenue: Request<Payload = SendVenue, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVenue`]
+    /// For Telegram documentation see [`SendVenue`].
     fn send_venue<C, T, A>(
         &self,
         chat_id: C,
@@ -229,14 +230,14 @@ pub trait Requester {
 
     type SendContact: Request<Payload = SendContact, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendContact`]
+    /// For Telegram documentation see [`SendContact`].
     fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact
     where
         C: Into<ChatId>;
 
     type SendPoll: Request<Payload = SendPoll, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendPoll`]
+    /// For Telegram documentation see [`SendPoll`].
     fn send_poll<C, Q, O>(
         &self,
         chat_id: C,
@@ -251,47 +252,47 @@ pub trait Requester {
 
     type SendDice: Request<Payload = SendDice, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendDice`]
+    /// For Telegram documentation see [`SendDice`].
     fn send_dice<C>(&self, chat_id: C, emoji: DiceEmoji) -> Self::SendDice
     where
         C: Into<ChatId>;
 
     type SendChatAction: Request<Payload = SendChatAction, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendChatAction`]
+    /// For Telegram documentation see [`SendChatAction`].
     fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction
     where
         C: Into<ChatId>;
 
     type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetUserProfilePhotos`]
+    /// For Telegram documentation see [`GetUserProfilePhotos`].
     fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos;
 
     type GetFile: Request<Payload = GetFile, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetFile`]
+    /// For Telegram documentation see [`GetFile`].
     fn get_file<F>(&self, file_id: F) -> Self::GetFile
     where
         F: Into<String>;
 
     type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
 
-    /// For telegram documentation see [`KickChatMember`]
+    /// For Telegram documentation see [`KickChatMember`].
     fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember
     where
         C: Into<ChatId>;
 
     type UnbanChatMember: Request<Payload = UnbanChatMember, Err = Self::Err>;
 
-    /// For telegram documentation see [`UnbanChatMember`]
+    /// For Telegram documentation see [`UnbanChatMember`].
     fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember
     where
         C: Into<ChatId>;
 
     type RestrictChatMember: Request<Payload = RestrictChatMember, Err = Self::Err>;
 
-    /// For telegram documentation see [`RestrictChatMember`]
+    /// For Telegram documentation see [`RestrictChatMember`].
     fn restrict_chat_member<C>(
         &self,
         chat_id: C,
@@ -303,7 +304,7 @@ pub trait Requester {
 
     type PromoteChatMember: Request<Payload = PromoteChatMember, Err = Self::Err>;
 
-    /// For telegram documentation see [`PromoteChatMember`]
+    /// For Telegram documentation see [`PromoteChatMember`].
     fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember
     where
         C: Into<ChatId>;
@@ -313,7 +314,7 @@ pub trait Requester {
         Err = Self::Err,
     >;
 
-    /// For telegram documentation see [`SetChatAdministratorCustomTitle`]
+    /// For Telegram documentation see [`SetChatAdministratorCustomTitle`].
     fn set_chat_administrator_custom_title<Ch, Cu>(
         &self,
         chat_id: Ch,
@@ -326,7 +327,7 @@ pub trait Requester {
 
     type SetChatPermissions: Request<Payload = SetChatPermissions, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetChatPermissions`]
+    /// For Telegram documentation see [`SetChatPermissions`].
     fn set_chat_permissions<C>(
         &self,
         chat_id: C,
@@ -337,28 +338,28 @@ pub trait Requester {
 
     type ExportChatInviteLink: Request<Payload = ExportChatInviteLink, Err = Self::Err>;
 
-    /// For telegram documentation see [`ExportChatInviteLink`]
+    /// For Telegram documentation see [`ExportChatInviteLink`].
     fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink
     where
         C: Into<ChatId>;
 
     type SetChatPhoto: Request<Payload = SetChatPhoto, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetChatPhoto`]
+    /// For Telegram documentation see [`SetChatPhoto`].
     fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
     where
         C: Into<ChatId>;
 
     type DeleteChatPhoto: Request<Payload = DeleteChatPhoto, Err = Self::Err>;
 
-    /// For telegram documentation see [`DeleteChatPhoto`]
+    /// For Telegram documentation see [`DeleteChatPhoto`].
     fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto
     where
         C: Into<ChatId>;
 
     type SetChatTitle: Request<Payload = SetChatTitle, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetChatTitle`]
+    /// For Telegram documentation see [`SetChatTitle`].
     fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle
     where
         C: Into<ChatId>,
@@ -366,63 +367,63 @@ pub trait Requester {
 
     type SetChatDescription: Request<Payload = SetChatDescription, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetChatDescription`]
+    /// For Telegram documentation see [`SetChatDescription`].
     fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription
     where
         C: Into<ChatId>;
 
     type PinChatMessage: Request<Payload = PinChatMessage, Err = Self::Err>;
 
-    /// For telegram documentation see [`PinChatMessage`]
+    /// For Telegram documentation see [`PinChatMessage`].
     fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
     where
         C: Into<ChatId>;
 
     type UnpinChatMessage: Request<Payload = UnpinChatMessage, Err = Self::Err>;
 
-    /// For telegram documentation see [`UnpinChatMessage`]
+    /// For Telegram documentation see [`UnpinChatMessage`].
     fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage
     where
         C: Into<ChatId>;
 
     type LeaveChat: Request<Payload = LeaveChat, Err = Self::Err>;
 
-    /// For telegram documentation see [`LeaveChat`]
+    /// For Telegram documentation see [`LeaveChat`].
     fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat
     where
         C: Into<ChatId>;
 
     type GetChat: Request<Payload = GetChat, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetChat`]
+    /// For Telegram documentation see [`GetChat`].
     fn get_chat<C>(&self, chat_id: C) -> Self::GetChat
     where
         C: Into<ChatId>;
 
     type GetChatAdministrators: Request<Payload = GetChatAdministrators, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetChatAdministrators`]
+    /// For Telegram documentation see [`GetChatAdministrators`].
     fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators
     where
         C: Into<ChatId>;
 
     type GetChatMembersCount: Request<Payload = GetChatMembersCount, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetChatMembersCount`]
+    /// For Telegram documentation see [`GetChatMembersCount`].
     fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount
     where
         C: Into<ChatId>;
 
     type GetChatMember: Request<Payload = GetChatMember, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetChatMember`]
+    /// For Telegram documentation see [`GetChatMember`].
     fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember
     where
         C: Into<ChatId>;
 
     type SetChatStickerSet: Request<Payload = SetChatStickerSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetChatStickerSet`]
+    /// For Telegram documentation see [`SetChatStickerSet`].
     fn set_chat_sticker_set<C, S>(
         &self,
         chat_id: C,
@@ -434,33 +435,33 @@ pub trait Requester {
 
     type DeleteChatStickerSet: Request<Payload = DeleteChatStickerSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`DeleteChatStickerSet`]
+    /// For Telegram documentation see [`DeleteChatStickerSet`].
     fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet
     where
         C: Into<ChatId>;
 
     type AnswerCallbackQuery: Request<Payload = AnswerCallbackQuery, Err = Self::Err>;
 
-    /// For telegram documentation see [`AnswerCallbackQuery`]
+    /// For Telegram documentation see [`AnswerCallbackQuery`].
     fn answer_callback_query<C>(&self, callback_query_id: C) -> Self::AnswerCallbackQuery
     where
         C: Into<String>;
 
     type SetMyCommands: Request<Payload = SetMyCommands, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetMyCommands`]
+    /// For Telegram documentation see [`SetMyCommands`].
     fn set_my_commands<C>(&self, commands: C) -> Self::SetMyCommands
     where
         C: IntoIterator<Item = BotCommand>;
 
     type GetMyCommands: Request<Payload = GetMyCommands, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetMyCommands`]
+    /// For Telegram documentation see [`GetMyCommands`].
     fn get_my_commands(&self) -> Self::GetMyCommands;
 
     type AnswerInlineQuery: Request<Payload = AnswerInlineQuery, Err = Self::Err>;
 
-    /// For telegram documentation see [`AnswerInlineQuery`]
+    /// For Telegram documentation see [`AnswerInlineQuery`].
     fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> Self::AnswerInlineQuery
     where
         I: Into<String>,
@@ -468,7 +469,7 @@ pub trait Requester {
 
     type EditMessageText: Request<Payload = EditMessageText, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageText`]
+    /// For Telegram documentation see [`EditMessageText`].
     fn edit_message_text<C, T>(
         &self,
         chat_id: C,
@@ -481,7 +482,7 @@ pub trait Requester {
 
     type EditMessageTextInline: Request<Payload = EditMessageTextInline, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageTextInline`]
+    /// For Telegram documentation see [`EditMessageTextInline`].
     fn edit_message_text_inline<I, T>(
         &self,
         inline_message_id: I,
@@ -493,7 +494,7 @@ pub trait Requester {
 
     type EditMessageCaption: Request<Payload = EditMessageCaption, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageCaption`]
+    /// For Telegram documentation see [`EditMessageCaption`].
     fn edit_message_caption<Ch, Ca>(
         &self,
         chat_id: Ch,
@@ -506,7 +507,7 @@ pub trait Requester {
 
     type EditMessageCaptionInline: Request<Payload = EditMessageCaptionInline, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageCaptionInline`]
+    /// For Telegram documentation see [`EditMessageCaptionInline`].
     fn edit_message_caption_inline<I, C>(
         &self,
         inline_message_id: I,
@@ -518,7 +519,7 @@ pub trait Requester {
 
     type EditMessageMedia: Request<Payload = EditMessageMedia, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageMedia`]
+    /// For Telegram documentation see [`EditMessageMedia`].
     fn edit_message_media<C>(
         &self,
         chat_id: C,
@@ -530,7 +531,7 @@ pub trait Requester {
 
     type EditMessageMediaInline: Request<Payload = EditMessageMediaInline, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageMediaInline`]
+    /// For Telegram documentation see [`EditMessageMediaInline`].
     fn edit_message_media_inline<I>(
         &self,
         inline_message_id: I,
@@ -541,7 +542,7 @@ pub trait Requester {
 
     type EditMessageReplyMarkup: Request<Payload = EditMessageReplyMarkup, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageReplyMarkup`]
+    /// For Telegram documentation see [`EditMessageReplyMarkup`].
     fn edit_message_reply_markup<C>(
         &self,
         chat_id: C,
@@ -555,7 +556,7 @@ pub trait Requester {
         Err = Self::Err,
     >;
 
-    /// For telegram documentation see [`EditMessageReplyMarkupInline`]
+    /// For Telegram documentation see [`EditMessageReplyMarkupInline`].
     fn edit_message_reply_markup_inline<I>(
         &self,
         inline_message_id: I,
@@ -565,40 +566,40 @@ pub trait Requester {
 
     type StopPoll: Request<Payload = StopPoll, Err = Self::Err>;
 
-    /// For telegram documentation see [`StopPoll`]
+    /// For Telegram documentation see [`StopPoll`].
     fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
     where
         C: Into<ChatId>;
 
     type DeleteMessage: Request<Payload = DeleteMessage, Err = Self::Err>;
 
-    /// For telegram documentation see [`DeleteMessage`]
+    /// For Telegram documentation see [`DeleteMessage`].
     fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
     where
         C: Into<ChatId>;
 
     type SendSticker: Request<Payload = SendSticker, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendSticker`]
+    /// For Telegram documentation see [`SendSticker`].
     fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker
     where
         C: Into<ChatId>;
 
     type GetStickerSet: Request<Payload = GetStickerSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetStickerSet`]
+    /// For Telegram documentation see [`GetStickerSet`].
     fn get_sticker_set<N>(&self, name: N) -> Self::GetStickerSet
     where
         N: Into<String>;
 
     type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
 
-    /// For telegram documentation see [`UploadStickerFile`]
+    /// For Telegram documentation see [`UploadStickerFile`].
     fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile;
 
     type CreateNewStickerSet: Request<Payload = CreateNewStickerSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`CreateNewStickerSet`]
+    /// For Telegram documentation see [`CreateNewStickerSet`].
     fn create_new_sticker_set<N, T, E>(
         &self,
         user_id: i32,
@@ -613,7 +614,7 @@ pub trait Requester {
 
     type AddStickerToSet: Request<Payload = AddStickerToSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`AddStickerToSet`]
+    /// For Telegram documentation see [`AddStickerToSet`].
     fn add_sticker_to_set<N, E>(
         &self,
         user_id: i32,
@@ -627,7 +628,7 @@ pub trait Requester {
 
     type SetStickerPositionInSet: Request<Payload = SetStickerPositionInSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetStickerPositionInSet`]
+    /// For Telegram documentation see [`SetStickerPositionInSet`].
     fn set_sticker_position_in_set<S>(
         &self,
         sticker: S,
@@ -638,21 +639,21 @@ pub trait Requester {
 
     type DeleteStickerFromSet: Request<Payload = DeleteStickerFromSet, Err = Self::Err>;
 
-    /// For telegram documentation see [`DeleteStickerFromSet`]
+    /// For Telegram documentation see [`DeleteStickerFromSet`].
     fn delete_sticker_from_set<S>(&self, sticker: S) -> Self::DeleteStickerFromSet
     where
         S: Into<String>;
 
     type SetStickerSetThumb: Request<Payload = SetStickerSetThumb, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetStickerSetThumb`]
+    /// For Telegram documentation see [`SetStickerSetThumb`].
     fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb
     where
         N: Into<String>;
 
     type SendInvoice: Request<Payload = SendInvoice, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendInvoice`]
+    /// For Telegram documentation see [`SendInvoice`].
     #[allow(clippy::too_many_arguments)]
     fn send_invoice<T, D, Pa, P, S, C, Pri>(
         &self,
@@ -676,14 +677,14 @@ pub trait Requester {
 
     type AnswerShippingQuery: Request<Payload = AnswerShippingQuery, Err = Self::Err>;
 
-    /// For telegram documentation see [`AnswerShippingQuery`]
+    /// For Telegram documentation see [`AnswerShippingQuery`].
     fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> Self::AnswerShippingQuery
     where
         S: Into<String>;
 
     type AnswerPreCheckoutQuery: Request<Payload = AnswerPreCheckoutQuery, Err = Self::Err>;
 
-    /// For telegram documentation see [`AnswerPreCheckoutQuery`]
+    /// For Telegram documentation see [`AnswerPreCheckoutQuery`].
     fn answer_pre_checkout_query<P>(
         &self,
         pre_checkout_query_id: P,
@@ -694,7 +695,7 @@ pub trait Requester {
 
     type SetPassportDataErrors: Request<Payload = SetPassportDataErrors, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetPassportDataErrors`]
+    /// For Telegram documentation see [`SetPassportDataErrors`].
     fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = PassportElementError>;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 57ef9a52..5f4b9e20 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -9,6 +9,7 @@ use crate::adaptors::AutoSend;
 #[cfg(feature = "throttle")]
 use crate::adaptors::throttle::{Limits, Throttle};
 
+/// Extensions methods for [`Requester`].
 pub trait RequesterExt: Requester {
     /// Add `get_me` caching ability, see [`CacheMe`] for more.
     ///

From 914ddd40bb62325771f4d5c10a86b5c278bcff2b Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 22:46:31 +0600
Subject: [PATCH 165/755] Add #[allow(clippy::wrong_self_convention)]

---
 src/local_macros.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 51be0d62..146fedd3 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -243,6 +243,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: Into<$FTy>,
@@ -263,6 +264,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
@@ -283,6 +285,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field(mut self, value: $FTy) -> Self {
                 self.payload_mut().$field = Some(value);
                 self
@@ -300,6 +303,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: Into<$FTy>,
@@ -320,6 +324,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
@@ -340,6 +345,7 @@ macro_rules! impl_payload {
                 stringify!($field),
                 ") field."
             )]
+            #[allow(clippy::wrong_self_convention)]
             fn $field(mut self, value: $FTy) -> Self {
                 self.payload_mut().$field = value;
                 self

From dc7092fed56cb7c2566ec91e8cb4e9a23efa15c2 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:14:58 +0600
Subject: [PATCH 166/755] Update src/requests/has_payload.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/requests/has_payload.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index 6c0c1abf..3a1135de 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -22,7 +22,7 @@ pub trait HasPayload
 //   we wanted to use As{Mut,Ref} here, but they doesn't work
 //   because of https://github.com/rust-lang/rust/issues/77010
 {
-    /// A type of the payload contained.
+    /// The type of the payload contained.
     type Payload: Payload;
 
     /// Gain mutable access to the underlying payload.

From 18c34a7f70c094dafd0ed86303b914e7c9d38d6f Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:16:19 +0600
Subject: [PATCH 167/755] Update src/requests/payload.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/requests/payload.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 8b885e96..d9940767 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -3,7 +3,7 @@
 /// Simply speaking, structures implementing this trait represent arguments of
 /// a Telegram bot API method.
 ///
-/// Also, this trait provides some additional information needed for sending a
+/// Also, this trait provides some additional information needed to send a
 /// request to Telegram.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Payload {

From bb8148a3b30493fbbbfa2ce722ae025386fdf5ca Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:16:42 +0600
Subject: [PATCH 168/755] Update src/requests/request.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/requests/request.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requests/request.rs b/src/requests/request.rs
index b3f674f3..7e504803 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -23,7 +23,7 @@ pub trait Request: HasPayload {
      * use it before it's integrated in async/await
      */
 
-    /// A type of an error that may happen while sending a request to Telegram.
+    /// The type of an error that may happen while sending a request to Telegram.
     type Err: std::error::Error + Send;
 
     /// A type of the future returned by the [`send`](Request::send) method.

From f1e5f3f1b31d2c05010be4dba7023e4119ddb21f Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:16:49 +0600
Subject: [PATCH 169/755] Update src/requests/request.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/requests/request.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requests/request.rs b/src/requests/request.rs
index 7e504803..38ca6a61 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -26,7 +26,7 @@ pub trait Request: HasPayload {
     /// The type of an error that may happen while sending a request to Telegram.
     type Err: std::error::Error + Send;
 
-    /// A type of the future returned by the [`send`](Request::send) method.
+    /// The type of the future returned by the [`send`](Request::send) method.
     type Send: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
     /// A type of the future returned by the [`send_ref`](Request::send_ref)

From edc12d000848507261fbbfc7de0824bfe7b27b4f Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:18:20 +0600
Subject: [PATCH 170/755] Update src/requests/payload.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/requests/payload.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index d9940767..34fa3d4b 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -7,7 +7,7 @@
 /// request to Telegram.
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Payload {
-    /// A return type of a Telegram method.
+    /// The return type of a Telegram method.
     ///
     /// Note: it should not include `Result` wrappers (e.g. it should be simply
     /// [`Message`], [`True`] or something else).

From 1188da84e325283ea96e25e39fa0ad3808fef5b3 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:40:58 +0600
Subject: [PATCH 171/755] Small typo fixes

---
 src/adaptors.rs         | 2 +-
 src/errors.rs           | 6 +++---
 src/requests/request.rs | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index fc4c6583..51db702c 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -3,7 +3,7 @@
 //! Bot adaptors are very similar to the [`Iterator`] adaptors: they are bots
 //! wrapping other bots to alter existing or add new functionality.
 //!
-//! E.g. [`AutoSend`] allows `await`ing requests directly, no need to to use
+//! E.g. [`AutoSend`] allows `await`ing requests directly, no need to use
 //! `.send()`.
 //!
 //! [`Requester`]: crate::requests::Requester
diff --git a/src/errors.rs b/src/errors.rs
index 1b183180..9c65dd6d 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -8,7 +8,7 @@ use thiserror::Error;
 /// An error caused by downloading a file.
 #[derive(Debug, Error, From)]
 pub enum DownloadError {
-    /// Network error while downloading a file from Telegram.
+    /// A network error while downloading a file from Telegram.
     #[error("A network error: {0}")]
     NetworkError(#[source] reqwest::Error),
 
@@ -20,10 +20,10 @@ pub enum DownloadError {
 /// An error caused by sending a request to Telegram.
 #[derive(Debug, Error)]
 pub enum RequestError {
-    /// Telegram API error.
+    /// A Telegram API error.
     #[error("A Telegram's error #{status_code}: {kind:?}")]
     ApiError {
-        /// Kind of an API error.
+        /// A kind of an API error.
         kind: ApiError,
 
         /// An HTTP code returned by Telegram, not very useful in practice.
diff --git a/src/requests/request.rs b/src/requests/request.rs
index b3f674f3..36f97976 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -31,9 +31,8 @@ pub trait Request: HasPayload {
 
     /// A type of the future returned by the [`send_ref`](Request::send_ref)
     /// method.
-    ///
-    /// Note: it intentionally forbids borrowing from `self` though anyway we
-    /// couldn't allow borrowing without GATs.
+    // Note: it intentionally forbids borrowing from `self` though anyway we
+    // couldn't allow borrowing without GATs.
     type SendRef: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
     /// Send this request.

From 109a5d89ab07575f4b926887a9b06b04e72173cd Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Wed, 23 Dec 2020 23:45:56 +0600
Subject: [PATCH 172/755] Satisfy rustfmt

---
 src/requests/request.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/requests/request.rs b/src/requests/request.rs
index a1450837..abc48fa1 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -23,7 +23,8 @@ pub trait Request: HasPayload {
      * use it before it's integrated in async/await
      */
 
-    /// The type of an error that may happen while sending a request to Telegram.
+    /// The type of an error that may happen while sending a request to
+    /// Telegram.
     type Err: std::error::Error + Send;
 
     /// The type of the future returned by the [`send`](Request::send) method.

From 7cc79eda636482d1cd6afe7a1dcbe9c3909007d1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 14:30:18 +0300
Subject: [PATCH 173/755] Fix API typos

- Make `caption` args optional
- Add missing game methods
---
 src/adaptors/auto_send.rs                     |  36 +++--
 src/adaptors/cache_me.rs                      |  30 ++--
 src/adaptors/parse_mode.rs                    |  28 ++--
 src/adaptors/throttle.rs                      |  30 ++--
 src/bot/api.rs                                | 132 ++++++++++--------
 src/local_macros.rs                           |  74 ++++++----
 src/payloads/add_sticker_to_set.rs            |   2 +-
 src/payloads/answer_callback_query.rs         |   4 +-
 src/payloads/answer_inline_query.rs           |   4 +-
 src/payloads/answer_pre_checkout_query.rs     |   2 +-
 src/payloads/answer_shipping_query.rs         |   2 +-
 src/payloads/create_new_sticker_set.rs        |   2 +-
 src/payloads/delete_chat_photo.rs             |   2 +-
 src/payloads/delete_chat_sticker_set.rs       |   2 +-
 src/payloads/delete_message.rs                |   2 +-
 src/payloads/delete_sticker_from_set.rs       |   2 +-
 src/payloads/delete_webhook.rs                |   2 +-
 src/payloads/edit_message_caption.rs          |   6 +-
 src/payloads/edit_message_caption_inline.rs   |   6 +-
 src/payloads/edit_message_live_location.rs    |   2 +-
 .../edit_message_live_location_inline.rs      |   4 +-
 src/payloads/edit_message_media.rs            |   2 +-
 src/payloads/edit_message_media_inline.rs     |   2 +-
 src/payloads/edit_message_reply_markup.rs     |   2 +-
 .../edit_message_reply_markup_inline.rs       |   2 +-
 src/payloads/edit_message_text.rs             |   2 +-
 src/payloads/edit_message_text_inline.rs      |   2 +-
 src/payloads/export_chat_invite_link.rs       |   2 +-
 src/payloads/forward_message.rs               |   2 +-
 src/payloads/get_chat.rs                      |   2 +-
 src/payloads/get_chat_administrators.rs       |   2 +-
 src/payloads/get_chat_member.rs               |   2 +-
 src/payloads/get_chat_members_count.rs        |   2 +-
 src/payloads/get_file.rs                      |   2 +-
 src/payloads/get_game_high_scores.rs          |  24 ++++
 src/payloads/get_me.rs                        |   2 +-
 src/payloads/get_my_commands.rs               |   2 +-
 src/payloads/get_sticker_set.rs               |   2 +-
 src/payloads/get_updates.rs                   |   2 +-
 src/payloads/get_user_profile_photos.rs       |   2 +-
 src/payloads/get_webhook_info.rs              |   2 +-
 src/payloads/kick_chat_member.rs              |   2 +-
 src/payloads/leave_chat.rs                    |   2 +-
 src/payloads/mod.rs                           |  10 +-
 src/payloads/pin_chat_message.rs              |   2 +-
 src/payloads/promote_chat_member.rs           |   2 +-
 src/payloads/restrict_chat_member.rs          |   2 +-
 src/payloads/send_animation.rs                |   6 +-
 src/payloads/send_audio.rs                    |   6 +-
 src/payloads/send_chat_action.rs              |  10 +-
 src/payloads/send_contact.rs                  |   2 +-
 src/payloads/send_dice.rs                     |   4 +-
 src/payloads/send_document.rs                 |   8 +-
 src/payloads/send_game.rs                     |  21 +++
 src/payloads/send_invoice.rs                  |   2 +-
 src/payloads/send_location.rs                 |   4 +-
 src/payloads/send_media_group.rs              |   2 +-
 src/payloads/send_message.rs                  |   4 +-
 src/payloads/send_photo.rs                    |   8 +-
 src/payloads/send_poll.rs                     |   2 +-
 src/payloads/send_sticker.rs                  |   2 +-
 src/payloads/send_venue.rs                    |   2 +-
 src/payloads/send_video.rs                    |   6 +-
 src/payloads/send_video_note.rs               |   6 +-
 src/payloads/send_voice.rs                    |   8 +-
 .../set_chat_administrator_custom_title.rs    |   2 +-
 src/payloads/set_chat_description.rs          |   2 +-
 src/payloads/set_chat_permissions.rs          |   2 +-
 src/payloads/set_chat_photo.rs                |   2 +-
 src/payloads/set_chat_sticker_set.rs          |   2 +-
 src/payloads/set_chat_title.rs                |   2 +-
 src/payloads/set_game_score.rs                |  33 +++++
 src/payloads/set_game_score_inline.rs         |  29 ++++
 src/payloads/set_my_commands.rs               |   2 +-
 src/payloads/set_passport_data_errors.rs      |   2 +-
 src/payloads/set_sticker_position_in_set.rs   |   2 +-
 src/payloads/set_sticker_set_thumb.rs         |   2 +-
 src/payloads/set_webhook.rs                   |   2 +-
 src/payloads/setters.rs                       |  24 ++--
 src/payloads/stop_message_live_location.rs    |   4 +-
 .../stop_message_live_location_inline.rs      |   4 +-
 src/payloads/stop_poll.rs                     |   2 +-
 src/payloads/unban_chat_member.rs             |   2 +-
 src/payloads/unpin_chat_message.rs            |   2 +-
 src/payloads/upload_sticker_file.rs           |   2 +-
 src/requests/requester.rs                     | 119 +++++++++-------
 86 files changed, 502 insertions(+), 300 deletions(-)
 create mode 100644 src/payloads/get_game_high_scores.rs
 create mode 100644 src/payloads/send_game.rs
 create mode 100644 src/payloads/set_game_score.rs
 create mode 100644 src/payloads/set_game_score_inline.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 54a85d87..890979ac 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -78,21 +78,27 @@ impl<B: Requester> Requester for AutoSend<B> {
     type Err = B::Err;
 
     requester_forward! {
-        get_me, send_message, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, send_photo, send_audio, send_document, send_video,
-        send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
-        stop_message_live_location_inline, send_venue, send_contact, send_poll, send_dice,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
-        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
-        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
-        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
-        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
-        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => f, fty
+        get_me, send_message, get_updates, set_webhook, delete_webhook,
+        get_webhook_info, forward_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group,
+        send_location, edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
+        get_chat, get_chat_administrators, get_chat_members_count, get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores => f, fty
     }
 }
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 8f54a2ee..2a23a2ae 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -98,18 +98,24 @@ where
         get_updates, set_webhook, delete_webhook, get_webhook_info,
         forward_message, send_photo, send_audio, send_document, send_video,
         send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
-        stop_message_live_location_inline, send_venue, send_contact, send_poll, send_dice,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
-        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
-        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
-        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
-        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
-        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => f, fty
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
+        get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores => f, fty
     }
 }
 
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 5057a5f1..df7a612b 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -93,17 +93,23 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
     requester_forward! {
         get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
         forward_message, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
-        stop_message_live_location_inline, send_venue, send_contact, send_dice,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
-        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
-        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
-        get_my_commands, answer_inline_query, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker, get_sticker_set, upload_sticker_file,
-        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => fid, fty
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
+        get_chat, get_chat_administrators, get_chat_members_count, get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, answer_inline_query, edit_message_media,
+        edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message,
+        send_sticker, get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game, set_game_score,
+        set_game_score_inline, get_game_high_scores => fid, fty
     }
 }
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index e7e2250c..db26038f 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -443,17 +443,25 @@ where
     }
 
     requester_forward! {
-        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info, edit_message_live_location, edit_message_live_location_inline, stop_message_live_location,
-        stop_message_live_location_inline, send_chat_action, get_user_profile_photos, get_file, kick_chat_member, unban_chat_member,
-        restrict_chat_member, promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title, set_chat_description,
-        pin_chat_message, unpin_chat_message, leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query, set_my_commands,
-        get_my_commands, answer_inline_query, edit_message_text, edit_message_text_inline, edit_message_caption,
-        edit_message_caption_inline, edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, get_sticker_set, upload_sticker_file,
-        create_new_sticker_set, add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query, set_passport_data_errors => fid, ftyid
+        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member,
+        unban_chat_member, restrict_chat_member, promote_chat_member,
+        set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
+        get_chat, get_chat_administrators, get_chat_members_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
+        answer_callback_query, set_my_commands, get_my_commands, answer_inline_query,
+        edit_message_text, edit_message_text_inline, edit_message_caption,
+        edit_message_caption_inline, edit_message_media, edit_message_media_inline,
+        edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
+        delete_message, get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
+        set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
+        get_game_high_scores => fid, ftyid
     }
 }
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 560efd01..01463afa 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -76,78 +76,56 @@ impl Requester for Bot {
 
     type SendPhoto = MultipartRequest<payloads::SendPhoto>;
 
-    fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto
+    fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendPhoto::new(self.clone(), payloads::SendPhoto::new(chat_id, photo, caption))
+        Self::SendPhoto::new(self.clone(), payloads::SendPhoto::new(chat_id, photo))
     }
 
     type SendAudio = MultipartRequest<payloads::SendAudio>;
 
-    fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio
+    fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendAudio::new(self.clone(), payloads::SendAudio::new(chat_id, audio, caption))
+        Self::SendAudio::new(self.clone(), payloads::SendAudio::new(chat_id, audio))
     }
 
     type SendDocument = MultipartRequest<payloads::SendDocument>;
 
-    fn send_document<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        document: InputFile,
-        caption: Ca,
-    ) -> Self::SendDocument
+    fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendDocument::new(
-            self.clone(),
-            payloads::SendDocument::new(chat_id, document, caption),
-        )
+        Self::SendDocument::new(self.clone(), payloads::SendDocument::new(chat_id, document))
     }
 
     type SendVideo = MultipartRequest<payloads::SendVideo>;
 
-    fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo
+    fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendVideo::new(self.clone(), payloads::SendVideo::new(chat_id, video, caption))
+        Self::SendVideo::new(self.clone(), payloads::SendVideo::new(chat_id, video))
     }
 
     type SendAnimation = MultipartRequest<payloads::SendAnimation>;
 
-    fn send_animation<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        animation: InputFile,
-        caption: Ca,
-    ) -> Self::SendAnimation
+    fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendAnimation::new(
-            self.clone(),
-            payloads::SendAnimation::new(chat_id, animation, caption),
-        )
+        Self::SendAnimation::new(self.clone(), payloads::SendAnimation::new(chat_id, animation))
     }
 
     type SendVoice = MultipartRequest<payloads::SendVoice>;
 
-    fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice
+    fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
-        Self::SendVoice::new(self.clone(), payloads::SendVoice::new(chat_id, voice, caption))
+        Self::SendVoice::new(self.clone(), payloads::SendVoice::new(chat_id, voice))
     }
 
     type SendVideoNote = MultipartRequest<payloads::SendVideoNote>;
@@ -634,36 +612,25 @@ impl Requester for Bot {
 
     type EditMessageCaption = JsonRequest<payloads::EditMessageCaption>;
 
-    fn edit_message_caption<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        message_id: i32,
-        caption: Ca,
-    ) -> Self::EditMessageCaption
+    fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>,
+        C: Into<ChatId>,
     {
         Self::EditMessageCaption::new(
             self.clone(),
-            payloads::EditMessageCaption::new(chat_id, message_id, caption),
+            payloads::EditMessageCaption::new(chat_id, message_id),
         )
     }
 
     type EditMessageCaptionInline = JsonRequest<payloads::EditMessageCaptionInline>;
 
-    fn edit_message_caption_inline<I, C>(
-        &self,
-        inline_message_id: I,
-        caption: C,
-    ) -> Self::EditMessageCaptionInline
+    fn edit_message_caption_inline<I>(&self, inline_message_id: I) -> Self::EditMessageCaptionInline
     where
         I: Into<String>,
-        C: Into<String>,
     {
         Self::EditMessageCaptionInline::new(
             self.clone(),
-            payloads::EditMessageCaptionInline::new(inline_message_id, caption),
+            payloads::EditMessageCaptionInline::new(inline_message_id),
         )
     }
 
@@ -929,4 +896,57 @@ impl Requester for Bot {
             payloads::SetPassportDataErrors::new(user_id, errors),
         )
     }
+
+    type SendGame = JsonRequest<payloads::SendGame>;
+
+    fn send_game<G>(&self, chat_id: u32, game_short_name: G) -> Self::SendGame
+    where
+        G: Into<String>,
+    {
+        Self::SendGame::new(self.clone(), payloads::SendGame::new(chat_id, game_short_name))
+    }
+
+    type SetGameScore = JsonRequest<payloads::SetGameScore>;
+
+    fn set_game_score(
+        &self,
+        user_id: u32,
+        score: u64,
+        chat_id: u32,
+        message_id: i64,
+    ) -> Self::SetGameScore {
+        Self::SetGameScore::new(
+            self.clone(),
+            payloads::SetGameScore::new(user_id, score, chat_id, message_id),
+        )
+    }
+
+    type SetGameScoreInline = JsonRequest<payloads::SetGameScoreInline>;
+
+    fn set_game_score_inline<I>(
+        &self,
+        user_id: u32,
+        score: u64,
+        inline_message_id: I,
+    ) -> Self::SetGameScoreInline
+    where
+        I: Into<String>,
+    {
+        Self::SetGameScoreInline::new(
+            self.clone(),
+            payloads::SetGameScoreInline::new(user_id, score, inline_message_id),
+        )
+    }
+
+    type GetGameHighScores = JsonRequest<payloads::GetGameHighScores>;
+
+    fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
+    where
+        T: Into<crate::types::TargetMessage>,
+    {
+        Self::GetGameHighScores::new(
+            self.clone(),
+            payloads::GetGameHighScores::new(user_id, target),
+        )
+    }
 }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 146fedd3..25cffd7f 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -373,7 +373,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (a8fa55a).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -447,55 +447,49 @@ macro_rules! requester_forward {
     (@method send_photo $body:ident $ty:ident) => {
         type SendPhoto = $ty![SendPhoto];
 
-        fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto where C: Into<ChatId> {
             let this = self;
-            $body!(send_photo this (chat_id: Ch, photo: InputFile, caption: Ca))
+            $body!(send_photo this (chat_id: C, photo: InputFile))
         }
     };
     (@method send_audio $body:ident $ty:ident) => {
         type SendAudio = $ty![SendAudio];
 
-        fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio where C: Into<ChatId> {
             let this = self;
-            $body!(send_audio this (chat_id: Ch, audio: InputFile, caption: Ca))
+            $body!(send_audio this (chat_id: C, audio: InputFile))
         }
     };
     (@method send_document $body:ident $ty:ident) => {
         type SendDocument = $ty![SendDocument];
 
-        fn send_document<Ch, Ca>(&self, chat_id: Ch, document: InputFile, caption: Ca) -> Self::SendDocument where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument where C: Into<ChatId> {
             let this = self;
-            $body!(send_document this (chat_id: Ch, document: InputFile, caption: Ca))
+            $body!(send_document this (chat_id: C, document: InputFile))
         }
     };
     (@method send_video $body:ident $ty:ident) => {
         type SendVideo = $ty![SendVideo];
 
-        fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo where C: Into<ChatId> {
             let this = self;
-            $body!(send_video this (chat_id: Ch, video: InputFile, caption: Ca))
+            $body!(send_video this (chat_id: C, video: InputFile))
         }
     };
     (@method send_animation $body:ident $ty:ident) => {
         type SendAnimation = $ty![SendAnimation];
 
-        fn send_animation<Ch, Ca>(&self, chat_id: Ch, animation: InputFile, caption: Ca) -> Self::SendAnimation where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation where C: Into<ChatId> {
             let this = self;
-            $body!(send_animation this (chat_id: Ch, animation: InputFile, caption: Ca))
+            $body!(send_animation this (chat_id: C, animation: InputFile))
         }
     };
     (@method send_voice $body:ident $ty:ident) => {
         type SendVoice = $ty![SendVoice];
 
-        fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice where C: Into<ChatId> {
             let this = self;
-            $body!(send_voice this (chat_id: Ch, voice: InputFile, caption: Ca))
+            $body!(send_voice this (chat_id: C, voice: InputFile))
         }
     };
     (@method send_video_note $body:ident $ty:ident) => {
@@ -832,19 +826,17 @@ macro_rules! requester_forward {
     (@method edit_message_caption $body:ident $ty:ident) => {
         type EditMessageCaption = $ty![EditMessageCaption];
 
-        fn edit_message_caption<Ch, Ca>(&self, chat_id: Ch, message_id: i32, caption: Ca) -> Self::EditMessageCaption where Ch: Into<ChatId>,
-        Ca: Into<String> {
+        fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption where C: Into<ChatId> {
             let this = self;
-            $body!(edit_message_caption this (chat_id: Ch, message_id: i32, caption: Ca))
+            $body!(edit_message_caption this (chat_id: C, message_id: i32))
         }
     };
     (@method edit_message_caption_inline $body:ident $ty:ident) => {
         type EditMessageCaptionInline = $ty![EditMessageCaptionInline];
 
-        fn edit_message_caption_inline<I, C>(&self, inline_message_id: I, caption: C) -> Self::EditMessageCaptionInline where I: Into<String>,
-        C: Into<String> {
+        fn edit_message_caption_inline<I>(&self, inline_message_id: I) -> Self::EditMessageCaptionInline where I: Into<String> {
             let this = self;
-            $body!(edit_message_caption_inline this (inline_message_id: I, caption: C))
+            $body!(edit_message_caption_inline this (inline_message_id: I))
         }
     };
     (@method edit_message_media $body:ident $ty:ident) => {
@@ -1000,6 +992,38 @@ macro_rules! requester_forward {
             $body!(set_passport_data_errors this (user_id: i32, errors: E))
         }
     };
+    (@method send_game $body:ident $ty:ident) => {
+        type SendGame = $ty![SendGame];
+
+        fn send_game<G>(&self, chat_id: u32, game_short_name: G) -> Self::SendGame where G: Into<String> {
+            let this = self;
+            $body!(send_game this (chat_id: u32, game_short_name: G))
+        }
+    };
+    (@method set_game_score $body:ident $ty:ident) => {
+        type SetGameScore = $ty![SetGameScore];
+
+        fn set_game_score(&self, user_id: u32, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
+            let this = self;
+            $body!(set_game_score this (user_id: u32, score: u64, chat_id: u32, message_id: i64))
+        }
+    };
+    (@method set_game_score_inline $body:ident $ty:ident) => {
+        type SetGameScoreInline = $ty![SetGameScoreInline];
+
+        fn set_game_score_inline<I>(&self, user_id: u32, score: u64, inline_message_id: I) -> Self::SetGameScoreInline where I: Into<String> {
+            let this = self;
+            $body!(set_game_score_inline this (user_id: u32, score: u64, inline_message_id: I))
+        }
+    };
+    (@method get_game_high_scores $body:ident $ty:ident) => {
+        type GetGameHighScores = $ty![GetGameHighScores];
+
+        fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores where T: Into<TargetMessage> {
+            let this = self;
+            $body!(get_game_high_scores this (user_id: u32, target: T))
+        }
+    };
 }
 
 #[macro_use]
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 7836bd43..1a24bf81 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index fda34ae4..1ff7f262 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -27,8 +27,8 @@ impl_payload! {
             ///
             /// Otherwise, you may use links like `t.me/your\_bot?start=XXXX` that open your bot with a parameter.
             ///
-            /// [@Botfather]: https://t.me/botfather
             /// [`Game`]: crate::types::Game
+            /// [@Botfather]: https://t.me/botfather
             /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
             pub url: String [into],
             /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index 7032695b..7c970a97 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -28,8 +28,8 @@ impl_payload! {
             ///
             /// _Example_: An inline bot that sends YouTube videos can ask the user to connect the bot to their YouTube account to adapt search results accordingly. To do this, it displays a 'Connect your YouTube account' button above the results, or even before showing any. The user presses the button, switches to a private chat with the bot and, in doing so, passes a start parameter that instructs the bot to return an oauth link. Once done, the bot can offer a [switch_inline] button so that the user can easily return to the chat where they wanted to use the bot's inline capabilities.
             ///
-            /// [switch_inline]: https://core.telegram.org/bots/api#inlinekeyboardmarkup
             /// [Deep-linking]: https://core.telegram.org/bots#deep-linking
+            /// [switch_inline]: https://core.telegram.org/bots/api#inlinekeyboardmarkup
             pub switch_pm_parameter: String [into],
         }
     }
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index 821bb4ae..ec884ba9 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index a4fc80f7..b00b29c1 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 93f945c4..1b74097a 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index dc447a48..23165b38 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index fef2f48b..ba87b16a 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index cc94d937..cf31bf93 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index ec8ca0fb..b432c6ce 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index 3c6906af..ebdd2823 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index aafa4f69..3b626d28 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -16,10 +16,10 @@ impl_payload! {
             pub chat_id: ChatId [into],
             /// Identifier of the message to edit
             pub message_id: i32,
-            /// New caption of the message, 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
+            /// New caption of the message, 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the message text. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index fe94044f..565b7486 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -14,10 +14,10 @@ impl_payload! {
         required {
             /// Identifier of the inline message
             pub inline_message_id: String [into],
-            /// New caption of the message, 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
+            /// New caption of the message, 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the message text. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 727f46d4..c183cb0a 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 41bb41a8..79389c4a 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -24,8 +24,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 5e687339..f85aa27f 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index b5247819..1a3b5d28 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 4deafeb4..cc7b2777 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 0999db8a..a34db1a6 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index 00a8aa72..fe475bce 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index d498d71c..758de475 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index d1d8ce6d..44b5ec3d 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 336004e6..ce11ac85 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index ce6d6b87..c110722c 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 169987f2..10cf24e4 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index 22eb2aaf..f5e80f55 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index e353ff6d..0fd2c05e 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 3dfdcfac..47d9225c 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
new file mode 100644
index 00000000..2678043a
--- /dev/null
+++ b/src/payloads/get_game_high_scores.rs
@@ -0,0 +1,24 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{TargetMessage, True};
+
+impl_payload! {
+    /// Use this method to get data for high score tables. Will return the score of the specified user and several of their neighbors in a game. On success, returns an Array of [`GameHighScore`] objects.
+    ///
+    /// > This method will currently return scores for the target user, plus two of their closest neighbors on each side. Will also return the top three users if the user and his neighbors are not among them. Please note that this behavior is subject to change.
+    ///
+    /// [`GameHighScore`]: crate::types::GameHighScore
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetGameHighScores (GetGameHighScoresSetters) => True {
+        required {
+            /// User identifier
+            pub user_id: u32,
+            /// Target message
+            #[serde(flatten)]
+            pub target: TargetMessage [into],
+        }
+    }
+}
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 86cae760..76e97ab7 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 405b6847..bfa35ecb 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index 10ff4917..35466950 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 514002da..3dba9e34 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 590096e2..9ae52286 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index c342b2a0..846c907a 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 835f33d3..81f5014c 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 4c4ee3e2..27af51a1 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index 42b90fe7..abfebc1b 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -11,7 +11,7 @@
 /// namespace.
 pub mod setters;
 
-// This block is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).
+// This block is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS BLOCK**,
 // edit `cg` instead.
 mod add_sticker_to_set;
@@ -42,6 +42,7 @@ mod get_chat_administrators;
 mod get_chat_member;
 mod get_chat_members_count;
 mod get_file;
+mod get_game_high_scores;
 mod get_me;
 mod get_my_commands;
 mod get_sticker_set;
@@ -59,6 +60,7 @@ mod send_chat_action;
 mod send_contact;
 mod send_dice;
 mod send_document;
+mod send_game;
 mod send_invoice;
 mod send_location;
 mod send_media_group;
@@ -76,6 +78,8 @@ mod set_chat_permissions;
 mod set_chat_photo;
 mod set_chat_sticker_set;
 mod set_chat_title;
+mod set_game_score;
+mod set_game_score_inline;
 mod set_my_commands;
 mod set_passport_data_errors;
 mod set_sticker_position_in_set;
@@ -120,6 +124,7 @@ pub use get_chat_administrators::{GetChatAdministrators, GetChatAdministratorsSe
 pub use get_chat_member::{GetChatMember, GetChatMemberSetters};
 pub use get_chat_members_count::{GetChatMembersCount, GetChatMembersCountSetters};
 pub use get_file::{GetFile, GetFileSetters};
+pub use get_game_high_scores::{GetGameHighScores, GetGameHighScoresSetters};
 pub use get_me::{GetMe, GetMeSetters};
 pub use get_my_commands::{GetMyCommands, GetMyCommandsSetters};
 pub use get_sticker_set::{GetStickerSet, GetStickerSetSetters};
@@ -137,6 +142,7 @@ pub use send_chat_action::{SendChatAction, SendChatActionSetters};
 pub use send_contact::{SendContact, SendContactSetters};
 pub use send_dice::{SendDice, SendDiceSetters};
 pub use send_document::{SendDocument, SendDocumentSetters};
+pub use send_game::{SendGame, SendGameSetters};
 pub use send_invoice::{SendInvoice, SendInvoiceSetters};
 pub use send_location::{SendLocation, SendLocationSetters};
 pub use send_media_group::{SendMediaGroup, SendMediaGroupSetters};
@@ -156,6 +162,8 @@ pub use set_chat_permissions::{SetChatPermissions, SetChatPermissionsSetters};
 pub use set_chat_photo::{SetChatPhoto, SetChatPhotoSetters};
 pub use set_chat_sticker_set::{SetChatStickerSet, SetChatStickerSetSetters};
 pub use set_chat_title::{SetChatTitle, SetChatTitleSetters};
+pub use set_game_score::{SetGameScore, SetGameScoreSetters};
+pub use set_game_score_inline::{SetGameScoreInline, SetGameScoreInlineSetters};
 pub use set_my_commands::{SetMyCommands, SetMyCommandsSetters};
 pub use set_passport_data_errors::{SetPassportDataErrors, SetPassportDataErrorsSetters};
 pub use set_sticker_position_in_set::{SetStickerPositionInSet, SetStickerPositionInSetSetters};
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 73b03b5f..b3d31f1b 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 71c8cbeb..6d259b4a 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 81aa68ff..a168f493 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 168c5681..364f821e 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -18,8 +18,6 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub animation: InputFile,
-            /// Animation caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
             /// Duration of the animation in seconds
@@ -32,6 +30,8 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub thumb: InputFile,
+            /// Animation caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the animation caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 6c7e636c..87cb3de6 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -21,10 +21,10 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub audio: InputFile,
-            /// Audio caption, 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
+            /// Audio caption, 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the audio caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index d5a4a390..d4e4b859 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -20,13 +20,13 @@ impl_payload! {
             pub chat_id: ChatId [into],
             /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
-            /// [audio files]: crate::payloads::SendAudio
             /// [video notes]: crate::payloads::SendVideoNote
-            /// [videos]: crate::payloads::SendVideo
-            /// [text messages]: crate::payloads::SendMessage
-            /// [photos]: crate::payloads::SendPhoto
+            /// [audio files]: crate::payloads::SendAudio
             /// [general files]: crate::payloads::SendDocument
             /// [location data]: crate::payloads::SendLocation
+            /// [text messages]: crate::payloads::SendMessage
+            /// [photos]: crate::payloads::SendPhoto
+            /// [videos]: crate::payloads::SendVideo
             pub action: ChatAction,
         }
     }
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 6980c662..2f617848 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 755b2b2f..a7400d23 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -26,8 +26,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 2d66f28e..8b9e9fbd 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -18,14 +18,14 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub document: InputFile,
-            /// Document caption (may also be used when resending documents by _file\_id_), 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
             /// Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub thumb: InputFile,
+            /// Document caption (may also be used when resending documents by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the audio caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
@@ -38,8 +38,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
new file mode 100644
index 00000000..354573d9
--- /dev/null
+++ b/src/payloads/send_game.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::Message;
+
+impl_payload! {
+    /// Use this method to send a game. On success, the sent [`Message`] is returned.
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SendGame (SendGameSetters) => Message {
+        required {
+            /// Unique identifier for the target chat
+            pub chat_id: u32,
+            /// Short name of the game, serves as the unique identifier for the game. Set up your games via Botfather.
+            pub game_short_name: String [into],
+        }
+    }
+}
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 292cb81a..8941bf16 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index fbaef731..f9a213e1 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 3799557d..3cdf6a1d 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index a4f30955..9157d52f 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 10eeb698..4cc847bf 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -18,10 +18,10 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub photo: InputFile,
-            /// Photo caption (may also be used when resending photos by _file\_id_), 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
+            /// Photo caption (may also be used when resending photos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the photo caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
@@ -34,8 +34,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 59f96801..5a83b5cc 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index fddf0ddb..234b2951 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 355806d1..20ba4eb0 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index c4b40121..e009fd0c 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -19,8 +19,6 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub video: InputFile,
-            /// Video caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
             /// Duration of the video in seconds
@@ -33,6 +31,8 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub thumb: InputFile,
+            /// Video caption (may also be used when resending videos by _file\_id_), 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the video caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 47d5808a..8aecd4fb 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 impl_payload! {
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
     ///
-    /// [v.4.0]: https://core.telegram.org/bots/api#document
     /// [`Message`]: crate::types::Message
+    /// [v.4.0]: https://core.telegram.org/bots/api#document
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVideoNote (SendVideoNoteSetters) => Message {
         required {
@@ -37,8 +37,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index bcea5f38..d30e5b36 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -9,8 +9,8 @@ impl_payload! {
     /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Audio`]: crate::types::Audio
-    /// [`Message`]: crate::types::Message
     /// [`Document`]: crate::types::Document
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVoice (SendVoiceSetters) => Message {
         required {
@@ -20,10 +20,10 @@ impl_payload! {
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             pub voice: InputFile,
-            /// Voice message caption, 0-1024 characters after entities parsing
-            pub caption: String [into],
         }
         optional {
+            /// Voice message caption, 0-1024 characters after entities parsing
+            pub caption: String [into],
             /// Mode for parsing entities in the voice message caption. See [formatting options] for more details.
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 414ca72f..31b63c5e 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index 35b88b3f..8abbe59a 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 2c3a5cf9..196b320e 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index f72c682f..48b518cf 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 9c09328e..e28e569f 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 76b72b8d..1ccc4b9b 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
new file mode 100644
index 00000000..8334f64c
--- /dev/null
+++ b/src/payloads/set_game_score.rs
@@ -0,0 +1,33 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::Message;
+
+impl_payload! {
+    /// Use this method to set the score of the specified user in a game. On success, returns the edited [`Message`]. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.
+    ///
+    /// See also: [`SetGameScoreInline`](crate::payloads::SetGameScoreInline)
+    ///
+    /// [`Message`]: crate::types::Message
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetGameScore (SetGameScoreSetters) => Message {
+        required {
+            /// User identifier
+            pub user_id: u32,
+            /// New score
+            pub score: u64,
+            /// Unique identifier for the target chat
+            pub chat_id: u32,
+            /// Identifier of the message to edit
+            pub message_id: i64,
+        }
+        optional {
+            /// Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters
+            pub force: bool,
+            /// Pass True, if the game message should not be automatically edited to include the current scoreboard
+            pub disable_edit_message: bool,
+        }
+    }
+}
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
new file mode 100644
index 00000000..8b53accb
--- /dev/null
+++ b/src/payloads/set_game_score_inline.rs
@@ -0,0 +1,29 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::Message;
+
+impl_payload! {
+    /// Use this method to set the score of the specified user in a game. On success, returns _True_. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.
+    ///
+    /// See also: [`SetGameScore`](crate::payloads::SetGameScore)
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub SetGameScoreInline (SetGameScoreInlineSetters) => Message {
+        required {
+            /// User identifier
+            pub user_id: u32,
+            /// New score
+            pub score: u64,
+            /// Identifier of the inline message
+            pub inline_message_id: String [into],
+        }
+        optional {
+            /// Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters
+            pub force: bool,
+            /// Pass True, if the game message should not be automatically edited to include the current scoreboard
+            pub disable_edit_message: bool,
+        }
+    }
+}
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 4916fb6a..5cbc46cf 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 74ab729a..ebd3ad3a 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 80fad985..8b131b2a 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index b9301535..7b142106 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index b04b5bbc..c73b843f 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 98b55c80..2947bef2 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (878e847).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 
@@ -15,18 +15,20 @@ pub use crate::payloads::{
     EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
     ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberSetters as _, GetChatMembersCountSetters as _,
-    GetChatSetters as _, GetFileSetters as _, GetMeSetters as _, GetMyCommandsSetters as _,
-    GetStickerSetSetters as _, GetUpdatesSetters as _, GetUserProfilePhotosSetters as _,
-    GetWebhookInfoSetters as _, KickChatMemberSetters as _, LeaveChatSetters as _,
-    PinChatMessageSetters as _, PromoteChatMemberSetters as _, RestrictChatMemberSetters as _,
-    SendAnimationSetters as _, SendAudioSetters as _, SendChatActionSetters as _,
-    SendContactSetters as _, SendDiceSetters as _, SendDocumentSetters as _,
-    SendInvoiceSetters as _, SendLocationSetters as _, SendMediaGroupSetters as _,
-    SendMessageSetters as _, SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _,
-    SendVenueSetters as _, SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
+    GetChatSetters as _, GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
+    GetMyCommandsSetters as _, GetStickerSetSetters as _, GetUpdatesSetters as _,
+    GetUserProfilePhotosSetters as _, GetWebhookInfoSetters as _, KickChatMemberSetters as _,
+    LeaveChatSetters as _, PinChatMessageSetters as _, PromoteChatMemberSetters as _,
+    RestrictChatMemberSetters as _, SendAnimationSetters as _, SendAudioSetters as _,
+    SendChatActionSetters as _, SendContactSetters as _, SendDiceSetters as _,
+    SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
+    SendLocationSetters as _, SendMediaGroupSetters as _, SendMessageSetters as _,
+    SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _, SendVenueSetters as _,
+    SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
     SetChatAdministratorCustomTitleSetters as _, SetChatDescriptionSetters as _,
     SetChatPermissionsSetters as _, SetChatPhotoSetters as _, SetChatStickerSetSetters as _,
-    SetChatTitleSetters as _, SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
+    SetChatTitleSetters as _, SetGameScoreInlineSetters as _, SetGameScoreSetters as _,
+    SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
     SetStickerPositionInSetSetters as _, SetStickerSetThumbSetters as _, SetWebhookSetters as _,
     StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
     StopPollSetters as _, UnbanChatMemberSetters as _, UnpinChatMessageSetters as _,
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index 60c35d58..fdaa08e5 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -27,8 +27,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index 9b0813be..b9e18e98 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -24,8 +24,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index b0abacbb..d1cf267f 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index cd9e4fde..76d73e4e 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index dc78f594..bfc16094 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 908f50a3..82957d99 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (e634f65).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 87a78331..c940eb80 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1,10 +1,13 @@
+// We can't change Telegram API
+#![allow(clippy::too_many_arguments)]
+
 use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
     types::{
         AllowedUpdate, BotCommand, ChatAction, ChatId, ChatPermissions, DiceEmoji,
         InlineQueryResult, InputFile, InputMedia, InputSticker, LabeledPrice, PassportElementError,
-        PollType,
+        PollType, TargetMessage,
     },
 };
 
@@ -17,7 +20,7 @@ use crate::{
 pub trait Requester {
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (a8fa55a).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -72,61 +75,45 @@ pub trait Requester {
 
     type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendPhoto`].
-    fn send_photo<Ch, Ca>(&self, chat_id: Ch, photo: InputFile, caption: Ca) -> Self::SendPhoto
+    /// For telegram documentation see [`SendPhoto`]
+    fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendAudio: Request<Payload = SendAudio, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendAudio`].
-    fn send_audio<Ch, Ca>(&self, chat_id: Ch, audio: InputFile, caption: Ca) -> Self::SendAudio
+    /// For telegram documentation see [`SendAudio`]
+    fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendDocument: Request<Payload = SendDocument, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendDocument`].
-    fn send_document<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        document: InputFile,
-        caption: Ca,
-    ) -> Self::SendDocument
+    /// For telegram documentation see [`SendDocument`]
+    fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendVideo: Request<Payload = SendVideo, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendVideo`].
-    fn send_video<Ch, Ca>(&self, chat_id: Ch, video: InputFile, caption: Ca) -> Self::SendVideo
+    /// For telegram documentation see [`SendVideo`]
+    fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendAnimation: Request<Payload = SendAnimation, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendAnimation`].
-    fn send_animation<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        animation: InputFile,
-        caption: Ca,
-    ) -> Self::SendAnimation
+    /// For telegram documentation see [`SendAnimation`]
+    fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendVoice: Request<Payload = SendVoice, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendVoice`].
-    fn send_voice<Ch, Ca>(&self, chat_id: Ch, voice: InputFile, caption: Ca) -> Self::SendVoice
+    /// For telegram documentation see [`SendVoice`]
+    fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type SendVideoNote: Request<Payload = SendVideoNote, Err = Self::Err>;
 
@@ -494,28 +481,20 @@ pub trait Requester {
 
     type EditMessageCaption: Request<Payload = EditMessageCaption, Err = Self::Err>;
 
-    /// For Telegram documentation see [`EditMessageCaption`].
-    fn edit_message_caption<Ch, Ca>(
-        &self,
-        chat_id: Ch,
-        message_id: i32,
-        caption: Ca,
-    ) -> Self::EditMessageCaption
+    /// For telegram documentation see [`EditMessageCaption`]
+    fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
     where
-        Ch: Into<ChatId>,
-        Ca: Into<String>;
+        C: Into<ChatId>;
 
     type EditMessageCaptionInline: Request<Payload = EditMessageCaptionInline, Err = Self::Err>;
 
-    /// For Telegram documentation see [`EditMessageCaptionInline`].
-    fn edit_message_caption_inline<I, C>(
+    /// For telegram documentation see [`EditMessageCaptionInline`]
+    fn edit_message_caption_inline<I>(
         &self,
         inline_message_id: I,
-        caption: C,
     ) -> Self::EditMessageCaptionInline
     where
-        I: Into<String>,
-        C: Into<String>;
+        I: Into<String>;
 
     type EditMessageMedia: Request<Payload = EditMessageMedia, Err = Self::Err>;
 
@@ -653,8 +632,7 @@ pub trait Requester {
 
     type SendInvoice: Request<Payload = SendInvoice, Err = Self::Err>;
 
-    /// For Telegram documentation see [`SendInvoice`].
-    #[allow(clippy::too_many_arguments)]
+    /// For telegram documentation see [`SendInvoice`]
     fn send_invoice<T, D, Pa, P, S, C, Pri>(
         &self,
         chat_id: i32,
@@ -699,4 +677,41 @@ pub trait Requester {
     fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = PassportElementError>;
+
+    type SendGame: Request<Payload = SendGame, Err = Self::Err>;
+
+    /// For telegram documentation see [`SendGame`]
+    fn send_game<G>(&self, chat_id: u32, game_short_name: G) -> Self::SendGame
+    where
+        G: Into<String>;
+
+    type SetGameScore: Request<Payload = SetGameScore, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetGameScore`]
+    fn set_game_score(
+        &self,
+        user_id: u32,
+        score: u64,
+        chat_id: u32,
+        message_id: i64,
+    ) -> Self::SetGameScore;
+
+    type SetGameScoreInline: Request<Payload = SetGameScoreInline, Err = Self::Err>;
+
+    /// For telegram documentation see [`SetGameScoreInline`]
+    fn set_game_score_inline<I>(
+        &self,
+        user_id: u32,
+        score: u64,
+        inline_message_id: I,
+    ) -> Self::SetGameScoreInline
+    where
+        I: Into<String>;
+
+    type GetGameHighScores: Request<Payload = GetGameHighScores, Err = Self::Err>;
+
+    /// For telegram documentation see [`GetGameHighScores`]
+    fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
+    where
+        T: Into<TargetMessage>;
 }

From 93bc2e6fee27709e93edd7807c99e6180baff3d5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 14:46:49 +0300
Subject: [PATCH 174/755] Make requester methods doc nicer

---
 src/requests/requester.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index c940eb80..09ff0641 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -20,7 +20,7 @@ use crate::{
 pub trait Requester {
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (de3765b).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -75,42 +75,42 @@ pub trait Requester {
 
     type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendPhoto`]
+    /// For Telegram documentation see [`SendPhoto`].
     fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto
     where
         C: Into<ChatId>;
 
     type SendAudio: Request<Payload = SendAudio, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendAudio`]
+    /// For Telegram documentation see [`SendAudio`].
     fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio
     where
         C: Into<ChatId>;
 
     type SendDocument: Request<Payload = SendDocument, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendDocument`]
+    /// For Telegram documentation see [`SendDocument`].
     fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument
     where
         C: Into<ChatId>;
 
     type SendVideo: Request<Payload = SendVideo, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVideo`]
+    /// For Telegram documentation see [`SendVideo`].
     fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo
     where
         C: Into<ChatId>;
 
     type SendAnimation: Request<Payload = SendAnimation, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendAnimation`]
+    /// For Telegram documentation see [`SendAnimation`].
     fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation
     where
         C: Into<ChatId>;
 
     type SendVoice: Request<Payload = SendVoice, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendVoice`]
+    /// For Telegram documentation see [`SendVoice`].
     fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice
     where
         C: Into<ChatId>;
@@ -481,14 +481,14 @@ pub trait Requester {
 
     type EditMessageCaption: Request<Payload = EditMessageCaption, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageCaption`]
+    /// For Telegram documentation see [`EditMessageCaption`].
     fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
     where
         C: Into<ChatId>;
 
     type EditMessageCaptionInline: Request<Payload = EditMessageCaptionInline, Err = Self::Err>;
 
-    /// For telegram documentation see [`EditMessageCaptionInline`]
+    /// For Telegram documentation see [`EditMessageCaptionInline`].
     fn edit_message_caption_inline<I>(
         &self,
         inline_message_id: I,
@@ -632,7 +632,7 @@ pub trait Requester {
 
     type SendInvoice: Request<Payload = SendInvoice, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendInvoice`]
+    /// For Telegram documentation see [`SendInvoice`].
     fn send_invoice<T, D, Pa, P, S, C, Pri>(
         &self,
         chat_id: i32,
@@ -680,14 +680,14 @@ pub trait Requester {
 
     type SendGame: Request<Payload = SendGame, Err = Self::Err>;
 
-    /// For telegram documentation see [`SendGame`]
+    /// For Telegram documentation see [`SendGame`].
     fn send_game<G>(&self, chat_id: u32, game_short_name: G) -> Self::SendGame
     where
         G: Into<String>;
 
     type SetGameScore: Request<Payload = SetGameScore, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetGameScore`]
+    /// For Telegram documentation see [`SetGameScore`].
     fn set_game_score(
         &self,
         user_id: u32,
@@ -698,7 +698,7 @@ pub trait Requester {
 
     type SetGameScoreInline: Request<Payload = SetGameScoreInline, Err = Self::Err>;
 
-    /// For telegram documentation see [`SetGameScoreInline`]
+    /// For Telegram documentation see [`SetGameScoreInline`].
     fn set_game_score_inline<I>(
         &self,
         user_id: u32,
@@ -710,7 +710,7 @@ pub trait Requester {
 
     type GetGameHighScores: Request<Payload = GetGameHighScores, Err = Self::Err>;
 
-    /// For telegram documentation see [`GetGameHighScores`]
+    /// For Telegram documentation see [`GetGameHighScores`].
     fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;

From 9052d4dfbbe21fa21dfecc994327e21dd5f201ff Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 18:02:04 +0300
Subject: [PATCH 175/755] Remove already fixed FIXMEs

---
 src/adaptors.rs | 2 --
 src/lib.rs      | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 51db702c..1a308c57 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -31,5 +31,3 @@ pub use cache_me::CacheMe;
 pub use throttle::Throttle;
 
 pub use parse_mode::DefaultParseMode;
-
-// FIXME: move default `parse_mode` to adaptor
diff --git a/src/lib.rs b/src/lib.rs
index 7b33b931..67231953 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,7 +17,6 @@
 #[macro_use]
 mod local_macros;
 
-// FIXME(waffle): rethink modules, find a place for wrappers.
 pub use self::{
     bot::Bot,
     errors::{ApiError, DownloadError, RequestError},

From f4e3aa13eb98cacf805d4e91ea005d30599e192c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 18:45:45 +0300
Subject: [PATCH 176/755] Add `Bot::{set_,}api_url` methods

The methods allow to set and get the Telegram bot API url.
---
 rustfmt.toml       |  1 -
 src/bot/api_url.rs |  8 ++++----
 src/bot/mod.rs     | 37 +++++++++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index c61c5a92..60b85bac 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -2,5 +2,4 @@ format_code_in_doc_comments = true
 wrap_comments = true
 format_strings = true
 merge_imports = true
-use_small_heuristics = "Max"
 use_field_init_shorthand = true
diff --git a/src/bot/api_url.rs b/src/bot/api_url.rs
index ed10afc8..9db6a826 100644
--- a/src/bot/api_url.rs
+++ b/src/bot/api_url.rs
@@ -1,9 +1,9 @@
+use std::sync::Arc;
+
 #[derive(Debug, Clone)]
 pub(crate) enum ApiUrl {
     Default,
-    // FIXME: remove #[allow] when we use this variant
-    #[allow(dead_code)]
-    Custom(reqwest::Url),
+    Custom(Arc<reqwest::Url>),
 }
 
 impl ApiUrl {
@@ -12,7 +12,7 @@ impl ApiUrl {
             // FIXME(waffle): parse once
             ApiUrl::Default => reqwest::Url::parse(crate::net::TELEGRAM_API_URL)
                 .expect("failed to parse default url"),
-            ApiUrl::Custom(url) => url.clone(),
+            ApiUrl::Custom(url) => (&**url).clone(),
         }
     }
 }
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 8fb01095..5a7654a3 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -100,15 +100,48 @@ impl Bot {
         Self::with_client(&get_env(TELOXIDE_TOKEN), client)
     }
 
-    /// Returns currently used token
+    /// Sets custom api url.
+    ///
+    /// For example you can run your own [Telegram bot API server][tbas] and set
+    /// it's url using this method.
+    ///
+    /// [tbas]: https://github.com/tdlib/telegram-bot-api
+    ///
+    /// ## Examples
+    ///
+    /// ```
+    /// use teloxide_core::{
+    ///     requests::{Request, Requester},
+    ///     Bot,
+    /// };
+    ///
+    /// # async {
+    /// // Setup bot
+    /// let url = reqwest::Url::parse("https://localhost/tbas").unwrap();
+    /// let bot = Bot::new("TOKEN").set_api_url(url);
+    /// // All methods will use "https://localhost/tbas" as an api url
+    /// bot.get_me().send().await
+    /// # };
+    /// ```
+    pub fn set_api_url(mut self, url: reqwest::Url) -> Self {
+        self.api_url = ApiUrl::Custom(Arc::new(url));
+        self
+    }
+
+    /// Returns currently used token.
     pub fn token(&self) -> &str {
         &self.token
     }
 
-    /// Returns currently used http-client
+    /// Returns currently used http-client.
     pub fn client(&self) -> &Client {
         &self.client
     }
+
+    /// Returns currently used token API url.
+    pub fn api_url(&self) -> reqwest::Url {
+        self.api_url.get()
+    }
 }
 
 impl Bot {

From 50d3d67f931d55230ca848bcbf68dd2afddedb01 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 19:03:54 +0300
Subject: [PATCH 177/755] fmt

---
 src/adaptors/cache_me.rs                      |   5 +-
 src/adaptors/parse_mode.rs                    |   5 +-
 src/adaptors/throttle.rs                      |  65 ++++++--
 src/bot/api.rs                                |  40 ++++-
 src/bot/download.rs                           |   9 +-
 src/errors.rs                                 |  35 +++--
 src/net/download.rs                           |  27 ++--
 src/net/mod.rs                                |  16 +-
 src/net/telegram_response.rs                  |  12 +-
 src/requests/request.rs                       |  13 +-
 src/serde_multipart/serializers.rs            |  42 +++--
 src/serde_multipart/unserializers.rs          |  32 +++-
 .../unserializers/input_file.rs               |  15 +-
 src/types/bot_command.rs                      |   5 +-
 src/types/chat.rs                             |  40 ++++-
 src/types/chat_member.rs                      |  66 +++++---
 src/types/encrypted_credentials.rs            |   6 +-
 src/types/encrypted_passport_element.rs       |  68 ++++++--
 src/types/game.rs                             |   2 -
 src/types/game_high_score.rs                  |   6 +-
 src/types/inline_keyboard_button.rs           |  15 +-
 src/types/inline_keyboard_markup.rs           |  16 +-
 src/types/inline_query.rs                     |   8 +-
 src/types/inline_query_result_game.rs         |   6 +-
 src/types/input_file.rs                       |  16 +-
 src/types/input_media.rs                      |  13 +-
 src/types/input_message_content.rs            |  12 +-
 src/types/keyboard_button.rs                  |  76 ++++++---
 src/types/keyboard_button_poll_type.rs        |   4 +-
 src/types/label_price.rs                      |  10 +-
 src/types/location.rs                         |   5 +-
 src/types/mask_position.rs                    |   7 +-
 src/types/me.rs                               |   7 +-
 src/types/message.rs                          | 146 ++++++++++++++----
 src/types/message_entity.rs                   |  18 ++-
 .../non_telegram_types/non_strict_vec.rs      |   6 +-
 src/types/passport_data.rs                    |   5 +-
 src/types/passport_element_error.rs           |  51 ++++--
 src/types/poll.rs                             |   5 +-
 src/types/poll_answer.rs                      |   6 +-
 src/types/shipping_option.rs                  |  11 +-
 src/types/shipping_query.rs                   |   7 +-
 src/types/update.rs                           |   4 +-
 src/types/user_profile_photos.rs              |   5 +-
 44 files changed, 740 insertions(+), 228 deletions(-)

diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 2a23a2ae..539004bd 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -30,7 +30,10 @@ impl<B> CacheMe<B> {
     ///
     /// [`RequesterExt::cache_me`]: crate::requests::RequesterExt::cache_me
     pub fn new(bot: B) -> CacheMe<B> {
-        Self { bot, me: Arc::new(OnceCell::new()) }
+        Self {
+            bot,
+            me: Arc::new(OnceCell::new()),
+        }
     }
 
     /// Allows to access inner bot
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index df7a612b..f5802d2d 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -18,7 +18,10 @@ impl<B> DefaultParseMode<B> {
     ///
     /// [`RequesterExt::parse_mode`]: crate::requests::RequesterExt::parse_mode
     pub fn new(bot: B, parse_mode: ParseMode) -> Self {
-        Self { bot, mode: parse_mode }
+        Self {
+            bot,
+            mode: parse_mode,
+        }
     }
 
     /// Allows to access the inner bot.
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index db26038f..a71fafa5 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -99,7 +99,11 @@ pub struct Limits {
 /// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
 impl Default for Limits {
     fn default() -> Self {
-        Self { chat_s: 1, overall_s: 30, chat_m: 20 }
+        Self {
+            chat_s: 1,
+            overall_s: 30,
+            chat_m: 20,
+        }
     }
 }
 
@@ -244,7 +248,10 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
 
         // as truncates which is ok since in case of truncation it would always be >=
         // limits.overall_s
-        let used = history.iter().take_while(|(_, time)| time > &sec_back).count() as u32;
+        let used = history
+            .iter()
+            .take_while(|(_, time)| time > &sec_back)
+            .count() as u32;
         let mut allowed = limits.overall_s.saturating_sub(used);
 
         if allowed == 0 {
@@ -307,7 +314,10 @@ impl<B> Throttle<B> {
         let (queue_tx, queue_rx) = mpsc::channel(buffer as usize);
 
         let worker = worker(limits, queue_rx);
-        let this = Self { bot, queue: queue_tx };
+        let this = Self {
+            bot,
+            queue: queue_tx,
+        };
 
         (this, worker)
     }
@@ -526,7 +536,11 @@ where
         let (tx, rx) = channel();
         let id = self.2(self.payload_ref());
         let send = self.1.send_t((id, tx));
-        ThrottlingSend(ThrottlingSendInner::Registering { request: self.0, send, wait: rx })
+        ThrottlingSend(ThrottlingSendInner::Registering {
+            request: self.0,
+            send,
+            wait: rx,
+        })
     }
 
     fn send_ref(&self) -> Self::SendRef {
@@ -541,7 +555,11 @@ where
         // should **not** do any kind of work, so it's ok.
         let request = self.0.send_ref();
 
-        ThrottlingSendRef(ThrottlingSendRefInner::Registering { request, send, wait: rx })
+        ThrottlingSendRef(ThrottlingSendRefInner::Registering {
+            request,
+            send,
+            wait: rx,
+        })
     }
 }
 
@@ -575,11 +593,18 @@ impl<R: Request> Future for ThrottlingSend<R> {
         let mut this = self.as_mut().project().0;
 
         match this.as_mut().project() {
-            SendProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
+            SendProj::Registering {
+                request: _,
+                send,
+                wait: _,
+            } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(res) => {
-                    if let SendRepl::Registering { request, send: _, wait } =
-                        this.as_mut().project_replace(ThrottlingSendInner::Done)
+                    if let SendRepl::Registering {
+                        request,
+                        send: _,
+                        wait,
+                    } = this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
                         match res {
                             Ok(()) => this
@@ -588,9 +613,9 @@ impl<R: Request> Future for ThrottlingSend<R> {
                             // The worker is unlikely to drop queue before sending all requests,
                             // but just in case it has dropped the queue, we want to just send the
                             // request.
-                            Err(_) => this
-                                .as_mut()
-                                .project_replace(ThrottlingSendInner::Sent { fut: request.send() }),
+                            Err(_) => this.as_mut().project_replace(ThrottlingSendInner::Sent {
+                                fut: request.send(),
+                            }),
                         };
                     }
 
@@ -607,8 +632,9 @@ impl<R: Request> Future for ThrottlingSend<R> {
                     if let SendRepl::Pending { request, wait: _ } =
                         this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        this.as_mut()
-                            .project_replace(ThrottlingSendInner::Sent { fut: request.send() });
+                        this.as_mut().project_replace(ThrottlingSendInner::Sent {
+                            fut: request.send(),
+                        });
                     }
 
                     self.poll(cx)
@@ -654,11 +680,18 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
         let mut this = self.as_mut().project().0;
 
         match this.as_mut().project() {
-            SendRefProj::Registering { request: _, send, wait: _ } => match send.poll(cx) {
+            SendRefProj::Registering {
+                request: _,
+                send,
+                wait: _,
+            } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(res) => {
-                    if let SendRefRepl::Registering { request, send: _, wait } =
-                        this.as_mut().project_replace(ThrottlingSendRefInner::Done)
+                    if let SendRefRepl::Registering {
+                        request,
+                        send: _,
+                        wait,
+                    } = this.as_mut().project_replace(ThrottlingSendRefInner::Done)
                     {
                         match res {
                             Ok(()) => this
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 01463afa..f03e5cd9 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -25,7 +25,10 @@ impl Requester for Bot {
         U: Into<String>,
         A: IntoIterator<Item = crate::types::AllowedUpdate>,
     {
-        Self::SetWebhook::new(self.clone(), payloads::SetWebhook::new(url, allowed_updates))
+        Self::SetWebhook::new(
+            self.clone(),
+            payloads::SetWebhook::new(url, allowed_updates),
+        )
     }
 
     type DeleteWebhook = JsonRequest<payloads::DeleteWebhook>;
@@ -116,7 +119,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::SendAnimation::new(self.clone(), payloads::SendAnimation::new(chat_id, animation))
+        Self::SendAnimation::new(
+            self.clone(),
+            payloads::SendAnimation::new(chat_id, animation),
+        )
     }
 
     type SendVoice = MultipartRequest<payloads::SendVoice>;
@@ -134,7 +140,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::SendVideoNote::new(self.clone(), payloads::SendVideoNote::new(chat_id, video_note))
+        Self::SendVideoNote::new(
+            self.clone(),
+            payloads::SendVideoNote::new(chat_id, video_note),
+        )
     }
 
     type SendMediaGroup = MultipartRequest<payloads::SendMediaGroup>;
@@ -331,7 +340,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::KickChatMember::new(self.clone(), payloads::KickChatMember::new(chat_id, user_id))
+        Self::KickChatMember::new(
+            self.clone(),
+            payloads::KickChatMember::new(chat_id, user_id),
+        )
     }
 
     type UnbanChatMember = JsonRequest<payloads::UnbanChatMember>;
@@ -340,7 +352,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::UnbanChatMember::new(self.clone(), payloads::UnbanChatMember::new(chat_id, user_id))
+        Self::UnbanChatMember::new(
+            self.clone(),
+            payloads::UnbanChatMember::new(chat_id, user_id),
+        )
     }
 
     type RestrictChatMember = JsonRequest<payloads::RestrictChatMember>;
@@ -458,7 +473,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::PinChatMessage::new(self.clone(), payloads::PinChatMessage::new(chat_id, message_id))
+        Self::PinChatMessage::new(
+            self.clone(),
+            payloads::PinChatMessage::new(chat_id, message_id),
+        )
     }
 
     type UnpinChatMessage = JsonRequest<payloads::UnpinChatMessage>;
@@ -713,7 +731,10 @@ impl Requester for Bot {
     where
         C: Into<ChatId>,
     {
-        Self::DeleteMessage::new(self.clone(), payloads::DeleteMessage::new(chat_id, message_id))
+        Self::DeleteMessage::new(
+            self.clone(),
+            payloads::DeleteMessage::new(chat_id, message_id),
+        )
     }
 
     type SendSticker = MultipartRequest<payloads::SendSticker>;
@@ -903,7 +924,10 @@ impl Requester for Bot {
     where
         G: Into<String>,
     {
-        Self::SendGame::new(self.clone(), payloads::SendGame::new(chat_id, game_short_name))
+        Self::SendGame::new(
+            self.clone(),
+            payloads::SendGame::new(chat_id, game_short_name),
+        )
     }
 
     type SetGameScore = JsonRequest<payloads::SetGameScore>;
diff --git a/src/bot/download.rs b/src/bot/download.rs
index dad76b31..32b19d6e 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -20,7 +20,14 @@ impl<'w> Download<'w> for Bot {
         path: &str,
         destination: &'w mut (dyn AsyncWrite + Unpin + Send),
     ) -> Self::Fut {
-        net::download_file(&self.client, self.api_url.get(), &self.token, path, destination).boxed()
+        net::download_file(
+            &self.client,
+            self.api_url.get(),
+            &self.token,
+            path,
+            destination,
+        )
+        .boxed()
     }
 
     type StreamErr = reqwest::Error;
diff --git a/src/errors.rs b/src/errors.rs
index 9c65dd6d..3476ceed 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -72,9 +72,10 @@ pub enum ApiError {
     /// 1. [`EditMessageText`]
     ///
     /// [`EditMessageText`]: crate::payloads::EditMessageText
-    #[serde(rename = "Bad Request: message is not modified: specified new message content and \
-                      reply markup are exactly the same as a current content and reply markup \
-                      of the message")]
+    #[serde(
+        rename = "Bad Request: message is not modified: specified new message content and reply \
+                  markup are exactly the same as a current content and reply markup of the message"
+    )]
     MessageNotModified,
 
     /// Occurs when bot tries to forward or delete a message which was deleted.
@@ -294,8 +295,10 @@ pub enum ApiError {
     /// 1. [`AnswerCallbackQuery`]
     ///
     /// [`AnswerCallbackQuery`]: crate::payloads::AnswerCallbackQuery
-    #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
-                      invalid")]
+    #[serde(
+        rename = "Bad Request: query is too old and response timeout expired or query id is \
+                  invalid"
+    )]
     InvalidQueryID,
 
     /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
@@ -323,8 +326,10 @@ pub enum ApiError {
     /// 1. [`SendMessage`]
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
-    #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
-                      unallowed in the inline keyboard")]
+    #[serde(
+        rename = "Bad Request: can't parse inline keyboard button: Text buttons are unallowed in \
+                  the inline keyboard"
+    )]
     TextButtonsAreUnallowed,
 
     /// Occurs when bot tries to get file by wrong file id.
@@ -417,8 +422,10 @@ pub enum ApiError {
     /// 1. [`SetWebhook`]
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
-    #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
-                      or 8443")]
+    #[serde(
+        rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 or \
+                  8443"
+    )]
     BadWebhookPort,
 
     /// Occurs when bot tries to set webhook to unknown host.
@@ -427,7 +434,9 @@ pub enum ApiError {
     /// 1. [`SetWebhook`]
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
-    #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
+    #[serde(
+        rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known"
+    )]
     UnknownHost,
 
     /// Occurs when bot tries to set webhook to invalid URL.
@@ -509,8 +518,10 @@ pub enum ApiError {
     /// 1. [`GetUpdates`]
     ///
     /// [`GetUpdates`]: crate::payloads::GetUpdates
-    #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
-                      bot instance is running")]
+    #[serde(
+        rename = "Conflict: terminated by other getUpdates request; make sure that only one bot \
+                  instance is running"
+    )]
     TerminatedByOtherGetUpdates,
 
     /// Occurs when bot tries to get file by invalid file id.
diff --git a/src/net/download.rs b/src/net/download.rs
index 5c123cb7..da05352d 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -94,15 +94,18 @@ pub fn download_file<'o, D>(
 where
     D: ?Sized + AsyncWrite + Unpin,
 {
-    client.get(file_url(api_url, token, path)).send().then(move |r| async move {
-        let mut res = r?.error_for_status()?;
+    client
+        .get(file_url(api_url, token, path))
+        .send()
+        .then(move |r| async move {
+            let mut res = r?.error_for_status()?;
 
-        while let Some(chunk) = res.chunk().await? {
-            dst.write_all(&chunk).await?;
-        }
+            while let Some(chunk) = res.chunk().await? {
+                dst.write_all(&chunk).await?;
+            }
 
-        Ok(())
-    })
+            Ok(())
+        })
 }
 
 /// Download a file from Telegram as [`Stream`].
@@ -116,8 +119,11 @@ pub fn download_file_stream(
     token: &str,
     path: &str,
 ) -> impl Stream<Item = reqwest::Result<Bytes>> + 'static {
-    client.get(file_url(api_url, token, path)).send().into_stream().flat_map(|res| {
-        match res.and_then(Response::error_for_status) {
+    client
+        .get(file_url(api_url, token, path))
+        .send()
+        .into_stream()
+        .flat_map(|res| match res.and_then(Response::error_for_status) {
             Ok(res) => Either::Left(unfold(res, |mut res| async {
                 match res.chunk().await {
                     Err(err) => Some((Err(err), res)),
@@ -126,6 +132,5 @@ pub fn download_file_stream(
                 }
             })),
             Err(err) => Either::Right(once(ready(Err(err)))),
-        }
-    })
+        })
 }
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 119213aa..944e1538 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -18,16 +18,24 @@ pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests
 fn method_url(base: reqwest::Url, token: &str, method_name: &str) -> reqwest::Url {
-    base.join(&format!("/bot{token}/{method}", token = token, method = method_name))
-        .expect("failed to format url")
+    base.join(&format!(
+        "/bot{token}/{method}",
+        token = token,
+        method = method_name
+    ))
+    .expect("failed to format url")
 }
 
 /// Creates URL for downloading a file. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#file
 fn file_url(base: reqwest::Url, token: &str, file_path: &str) -> reqwest::Url {
-    base.join(&format!("file/bot{token}/{file}", token = token, file = file_path))
-        .expect("failed to format url")
+    base.join(&format!(
+        "file/bot{token}/{file}",
+        token = token,
+        file = file_path
+    ))
+    .expect("failed to format url")
 }
 
 #[cfg(test)]
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index 04f8f4c1..34242bb3 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -33,7 +33,12 @@ impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
     fn into(self) -> Result<R, RequestError> {
         match self {
             TelegramResponse::Ok { response, .. } => Ok(response),
-            TelegramResponse::Err { error, error_code, response_parameters, .. } => {
+            TelegramResponse::Err {
+                error,
+                error_code,
+                response_parameters,
+                ..
+            } => {
                 if let Some(params) = response_parameters {
                     match params {
                         ResponseParameters::RetryAfter(i) => Err(RequestError::RetryAfter(i)),
@@ -64,7 +69,10 @@ mod tests {
 
         assert!(matches!(
             val,
-            TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. }
+            TelegramResponse::Err {
+                error: ApiError::TerminatedByOtherGetUpdates,
+                ..
+            }
         ));
     }
 
diff --git a/src/requests/request.rs b/src/requests/request.rs
index abc48fa1..cdde179b 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -39,10 +39,14 @@ pub trait Request: HasPayload {
     /// Send this request.
     ///
     /// ## Examples
-    // FIXME(waffle): ignored until full request redesign lands
-    /// ```ignore
+    /// ```
     /// # async {
-    /// use teloxide_core::{methods::GetMe, requests::{Request, RequestJson}, types::User, bot::Bot};
+    /// use teloxide_core::{
+    ///     bot::Bot,
+    ///     methods::GetMe,
+    ///     requests::{Request, RequestJson},
+    ///     types::User,
+    /// };
     ///
     /// let bot = Bot::new("TOKEN");
     /// let method = GetMe::new();
@@ -63,8 +67,7 @@ pub trait Request: HasPayload {
     /// and then serializing it, this method should just serialize the data.)
     ///
     /// ## Examples
-    // FIXME(waffle): ignored until full request redesign lands
-    /// ```ignore
+    /// ```
     /// # async {
     /// use teloxide_core::prelude::*;
     ///
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index e31da1a4..5bdce22b 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -216,7 +216,11 @@ impl Serializer for MultipartTopLvlSerializer {
     }
 
     fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(MultipartMapSerializer { parts: vec![], files: vec![], key: None })
+        Ok(MultipartMapSerializer {
+            parts: vec![],
+            files: vec![],
+            key: None,
+        })
     }
 
     fn serialize_struct(
@@ -245,7 +249,10 @@ pub(crate) struct MultipartSerializer {
 
 impl MultipartSerializer {
     fn new() -> Self {
-        Self { parts: Vec::new(), files: vec![] }
+        Self {
+            parts: Vec::new(),
+            files: vec![],
+        }
     }
 }
 
@@ -269,8 +276,10 @@ impl SerializeStruct for MultipartSerializer {
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let form =
-            self.parts.into_iter().fold(Form::new(), |acc, (key, value)| acc.part(key, value));
+        let form = self
+            .parts
+            .into_iter()
+            .fold(Form::new(), |acc, (key, value)| acc.part(key, value));
 
         if self.files.is_empty() {
             //Ok(Either::Left(ready(Ok(form))))
@@ -322,8 +331,10 @@ impl SerializeMap for MultipartMapSerializer {
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let form =
-            self.parts.into_iter().fold(Form::new(), |acc, (key, value)| acc.part(key, value));
+        let form = self
+            .parts
+            .into_iter()
+            .fold(Form::new(), |acc, (key, value)| acc.part(key, value));
 
         if self.files.is_empty() {
             //Ok(Either::Left(ready(Ok(form))))
@@ -479,7 +490,10 @@ impl Serializer for PartSerializer {
     }
 
     fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(Self::SerializeSeq { array_json_parts: vec![], files: vec![] })
+        Ok(Self::SerializeSeq {
+            array_json_parts: vec![],
+            files: vec![],
+        })
     }
 
     fn serialize_tuple(self, _: usize) -> Result<Self::SerializeTuple, Self::Error> {
@@ -556,7 +570,9 @@ impl SerializeStructVariant for PartFromFile {
     where
         T: Serialize,
     {
-        self.inner.serialize_field(key, value).map_err(Error::InputFileUnserializer)
+        self.inner
+            .serialize_field(key, value)
+            .map_err(Error::InputFileUnserializer)
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
@@ -638,7 +654,10 @@ impl SerializeStruct for PartSerializerStruct {
             serde_json::ser::State::First => serde_json::ser::State::First,
             serde_json::ser::State::Rest => serde_json::ser::State::Rest,
         };
-        let mut ser = serde_json::ser::Compound::Map { ser: &mut self.0, state };
+        let mut ser = serde_json::ser::Compound::Map {
+            ser: &mut self.0,
+            state,
+        };
 
         // special case media (required for `edit_message_media` to work)
         if key == "media" {
@@ -673,7 +692,10 @@ impl SerializeStruct for PartSerializerStruct {
             serde_json::ser::State::First => serde_json::ser::State::First,
             serde_json::ser::State::Rest => serde_json::ser::State::Rest,
         };
-        let ser = serde_json::ser::Compound::Map { ser: &mut self.0, state };
+        let ser = serde_json::ser::Compound::Map {
+            ser: &mut self.0,
+            state,
+        };
         SerializeStruct::end(ser)?;
 
         let json = self.0.into_inner();
diff --git a/src/serde_multipart/unserializers.rs b/src/serde_multipart/unserializers.rs
index b4b4775f..1068f211 100644
--- a/src/serde_multipart/unserializers.rs
+++ b/src/serde_multipart/unserializers.rs
@@ -12,10 +12,22 @@ use serde::ser;
 #[derive(Debug, PartialEq, Eq)]
 pub enum UnserializerError {
     Custom(String),
-    UnsupportedType { ty: &'static str, supported: &'static str },
-    UnexpectedField { name: &'static str, expected: &'static [&'static str] },
-    UnexpectedVariant { name: &'static str, expected: &'static [&'static str] },
-    WrongLen { len: usize, expected: usize },
+    UnsupportedType {
+        ty: &'static str,
+        supported: &'static str,
+    },
+    UnexpectedField {
+        name: &'static str,
+        expected: &'static [&'static str],
+    },
+    UnexpectedVariant {
+        name: &'static str,
+        expected: &'static [&'static str],
+    },
+    WrongLen {
+        len: usize,
+        expected: usize,
+    },
 }
 
 impl ser::Error for UnserializerError {
@@ -38,7 +50,11 @@ impl Display for UnserializerError {
             ),
             Self::Custom(s) => write!(f, "Custom serde error: {}", s),
             Self::UnsupportedType { ty, supported } => {
-                write!(f, "Unsupported type: `{}`, supported type(s): `{}`", ty, supported)
+                write!(
+                    f,
+                    "Unsupported type: `{}`, supported type(s): `{}`",
+                    ty, supported
+                )
             }
             Self::UnexpectedVariant { name, expected } => write!(
                 f,
@@ -74,8 +90,10 @@ fn test() {
     let value = InputFile::FileId(String::from("file_id"));
     assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
 
-    let value =
-        InputFile::Memory { file_name: String::from("name"), data: Cow::Owned(vec![1, 2, 3]) };
+    let value = InputFile::Memory {
+        file_name: String::from("name"),
+        data: Cow::Owned(vec![1, 2, 3]),
+    };
     assert_eq!(value.serialize(InputFileUnserializer::memory()), Ok(value));
 
     let value = InputFile::File("a/b/c".into());
diff --git a/src/serde_multipart/unserializers/input_file.rs b/src/serde_multipart/unserializers/input_file.rs
index d3cc94ff..bcdd11ff 100644
--- a/src/serde_multipart/unserializers/input_file.rs
+++ b/src/serde_multipart/unserializers/input_file.rs
@@ -13,13 +13,19 @@ use crate::{
 };
 
 pub(crate) enum InputFileUnserializer {
-    Memory { file_name: String, data: Cow<'static, [u8]> },
+    Memory {
+        file_name: String,
+        data: Cow<'static, [u8]>,
+    },
     NotMem,
 }
 
 impl InputFileUnserializer {
     pub(crate) fn memory() -> Self {
-        Self::Memory { file_name: String::new(), data: Cow::Borrowed(&[]) }
+        Self::Memory {
+            file_name: String::new(),
+            data: Cow::Borrowed(&[]),
+        }
     }
 }
 
@@ -73,7 +79,10 @@ impl Serializer for InputFileUnserializer {
         len: usize,
     ) -> Result<Self::SerializeStructVariant, Self::Error> {
         if name != "InputFile" {
-            return Err(UnserializerError::UnsupportedType { ty: name, supported: "InputFile" });
+            return Err(UnserializerError::UnsupportedType {
+                ty: name,
+                supported: "InputFile",
+            });
         }
 
         if variant != "Memory" {
diff --git a/src/types/bot_command.rs b/src/types/bot_command.rs
index cb6d9c6e..5ea4f1c2 100644
--- a/src/types/bot_command.rs
+++ b/src/types/bot_command.rs
@@ -20,7 +20,10 @@ impl BotCommand {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self { command: command.into(), description: description.into() }
+        Self {
+            command: command.into(),
+            description: description.into(),
+        }
     }
 
     pub fn command<S>(mut self, val: S) -> Self
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 3a9e7dfe..3ac14786 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -26,7 +26,11 @@ pub struct Chat {
 
 impl Chat {
     pub fn new(id: i64, kind: ChatKind) -> Self {
-        Self { id, kind, photo: None }
+        Self {
+            id,
+            kind,
+            photo: None,
+        }
     }
 
     pub fn id(mut self, val: i64) -> Self {
@@ -89,7 +93,13 @@ pub struct ChatPublic {
 
 impl ChatPublic {
     pub fn new(kind: PublicChatKind) -> Self {
-        Self { title: None, kind, description: None, invite_link: None, pinned_message: None }
+        Self {
+            title: None,
+            kind,
+            description: None,
+            invite_link: None,
+            pinned_message: None,
+        }
     }
 
     pub fn title<S>(mut self, val: S) -> Self
@@ -261,7 +271,10 @@ impl<'de> serde::de::Visitor<'de> for PrivateChatKindVisitor {
     fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
         match v {
             "private" => Ok(()),
-            _ => Err(E::invalid_value(serde::de::Unexpected::Str(v), &r#""private""#)),
+            _ => Err(E::invalid_value(
+                serde::de::Unexpected::Str(v),
+                &r#""private""#,
+            )),
         }
     }
 }
@@ -278,16 +291,31 @@ impl Chat {
         matches!(self.kind, ChatKind::Private(_))
     }
     pub fn is_group(&self) -> bool {
-        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Group(_), .. }))
+        matches!(
+            self.kind,
+            ChatKind::Public(ChatPublic {
+                kind: PublicChatKind::Group(_),
+                ..
+            })
+        )
     }
     pub fn is_supergroup(&self) -> bool {
         matches!(
             self.kind,
-            ChatKind::Public(ChatPublic { kind: PublicChatKind::Supergroup(_), .. })
+            ChatKind::Public(ChatPublic {
+                kind: PublicChatKind::Supergroup(_),
+                ..
+            })
         )
     }
     pub fn is_channel(&self) -> bool {
-        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Channel(_), .. }))
+        matches!(
+            self.kind,
+            ChatKind::Public(ChatPublic {
+                kind: PublicChatKind::Channel(_),
+                ..
+            })
+        )
     }
 
     pub fn is_chat(&self) -> bool {
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 46c5c7cf..9aa5101c 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -163,7 +163,9 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_change_info`] field.
     pub fn can_change_info(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_change_info, .. }) => Some(*can_change_info),
+            Self::Administrator(Administrator {
+                can_change_info, ..
+            }) => Some(*can_change_info),
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -175,7 +177,9 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_post_messages`] field.
     pub fn can_post_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_post_messages, .. }) => *can_post_messages,
+            Self::Administrator(Administrator {
+                can_post_messages, ..
+            }) => *can_post_messages,
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -187,7 +191,9 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_edit_messages`] field.
     pub fn can_edit_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_edit_messages, .. }) => *can_edit_messages,
+            Self::Administrator(Administrator {
+                can_edit_messages, ..
+            }) => *can_edit_messages,
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -199,9 +205,10 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_delete_messages`] field.
     pub fn can_delete_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_delete_messages, .. }) => {
-                Some(*can_delete_messages)
-            }
+            Self::Administrator(Administrator {
+                can_delete_messages,
+                ..
+            }) => Some(*can_delete_messages),
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -213,7 +220,9 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_invite_users`] field.
     pub fn can_invite_users(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_invite_users, .. }) => Some(*can_invite_users),
+            Self::Administrator(Administrator {
+                can_invite_users, ..
+            }) => Some(*can_invite_users),
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -225,9 +234,10 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_restrict_members`] field.
     pub fn can_restrict_members(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_restrict_members, .. }) => {
-                Some(*can_restrict_members)
-            }
+            Self::Administrator(Administrator {
+                can_restrict_members,
+                ..
+            }) => Some(*can_restrict_members),
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -239,7 +249,9 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_pin_messages`] field.
     pub fn can_pin_messages(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_pin_messages, .. }) => *can_pin_messages,
+            Self::Administrator(Administrator {
+                can_pin_messages, ..
+            }) => *can_pin_messages,
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -251,9 +263,10 @@ impl ChatMemberKind {
     /// Getter for [`Administrator::can_promote_members`] field.
     pub fn can_promote_members(&self) -> Option<bool> {
         match &self {
-            Self::Administrator(Administrator { can_promote_members, .. }) => {
-                Some(*can_promote_members)
-            }
+            Self::Administrator(Administrator {
+                can_promote_members,
+                ..
+            }) => Some(*can_promote_members),
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
@@ -265,7 +278,9 @@ impl ChatMemberKind {
     /// Getter for [`Restricted::can_send_messages`] field.
     pub fn can_send_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted(Restricted { can_send_messages, .. }) => Some(*can_send_messages),
+            Self::Restricted(Restricted {
+                can_send_messages, ..
+            }) => Some(*can_send_messages),
             Self::Creator(_)
             | Self::Administrator(_)
             | Self::Member
@@ -277,9 +292,10 @@ impl ChatMemberKind {
     /// Getter for [`Restricted::can_send_media_messages`] field.
     pub fn can_send_media_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted(Restricted { can_send_media_messages, .. }) => {
-                Some(*can_send_media_messages)
-            }
+            Self::Restricted(Restricted {
+                can_send_media_messages,
+                ..
+            }) => Some(*can_send_media_messages),
             Self::Creator(_)
             | Self::Administrator(_)
             | Self::Member
@@ -291,9 +307,10 @@ impl ChatMemberKind {
     /// Getter for [`Restricted::can_send_other_messages`] field.
     pub fn can_send_other_messages(&self) -> Option<bool> {
         match &self {
-            Self::Restricted(Restricted { can_send_other_messages, .. }) => {
-                Some(*can_send_other_messages)
-            }
+            Self::Restricted(Restricted {
+                can_send_other_messages,
+                ..
+            }) => Some(*can_send_other_messages),
             Self::Creator(_)
             | Self::Administrator(_)
             | Self::Member
@@ -305,9 +322,10 @@ impl ChatMemberKind {
     /// Getter for [`Restricted::can_add_web_page_previews`] field.
     pub fn can_add_web_page_previews(&self) -> Option<bool> {
         match &self {
-            Self::Restricted(Restricted { can_add_web_page_previews, .. }) => {
-                Some(*can_add_web_page_previews)
-            }
+            Self::Restricted(Restricted {
+                can_add_web_page_previews,
+                ..
+            }) => Some(*can_add_web_page_previews),
             Self::Creator(_)
             | Self::Administrator(_)
             | Self::Member
diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
index 332273e7..5e3562a5 100644
--- a/src/types/encrypted_credentials.rs
+++ b/src/types/encrypted_credentials.rs
@@ -37,7 +37,11 @@ impl EncryptedCredentials {
         S2: Into<String>,
         S3: Into<String>,
     {
-        Self { data: data.into(), hash: hash.into(), secret: secret.into() }
+        Self {
+            data: data.into(),
+            hash: hash.into(),
+            secret: secret.into(),
+        }
     }
 
     pub fn data<S>(mut self, val: S) -> Self
diff --git a/src/types/encrypted_passport_element.rs b/src/types/encrypted_passport_element.rs
index 98ed43a2..584e9d9a 100644
--- a/src/types/encrypted_passport_element.rs
+++ b/src/types/encrypted_passport_element.rs
@@ -24,7 +24,10 @@ impl EncryptedPassportElement {
     where
         S: Into<String>,
     {
-        Self { hash: hash.into(), kind }
+        Self {
+            hash: hash.into(),
+            kind,
+        }
     }
 
     pub fn hash<S>(mut self, val: S) -> Self
@@ -140,7 +143,12 @@ impl EncryptedPassportElementPassport {
     where
         S: Into<String>,
     {
-        Self { data: data.into(), front_side, selfie, translation: None }
+        Self {
+            data: data.into(),
+            front_side,
+            selfie,
+            translation: None,
+        }
     }
 
     pub fn data<S>(mut self, val: S) -> Self
@@ -233,7 +241,13 @@ impl EncryptedPassportElementDriverLicense {
     where
         S: Into<String>,
     {
-        Self { data: data.into(), front_side, reverse_side, selfie, translation: None }
+        Self {
+            data: data.into(),
+            front_side,
+            reverse_side,
+            selfie,
+            translation: None,
+        }
     }
 
     pub fn data<S>(mut self, val: S) -> Self
@@ -330,7 +344,13 @@ impl EncryptedPassportElementIdentityCard {
     where
         S: Into<String>,
     {
-        Self { data: data.into(), front_side, reverse_side, selfie, translation: None }
+        Self {
+            data: data.into(),
+            front_side,
+            reverse_side,
+            selfie,
+            translation: None,
+        }
     }
 
     pub fn data<S>(mut self, val: S) -> Self
@@ -413,7 +433,12 @@ impl EncryptedPassportElementInternalPassport {
     where
         S: Into<String>,
     {
-        Self { data: data.into(), front_side, selfie, translation: None }
+        Self {
+            data: data.into(),
+            front_side,
+            selfie,
+            translation: None,
+        }
     }
 
     pub fn data<S>(mut self, val: S) -> Self
@@ -505,7 +530,10 @@ impl EncryptedPassportElementUtilityBill {
     where
         F: Into<Vec<PassportFile>>,
     {
-        Self { files: files.into(), translation: None }
+        Self {
+            files: files.into(),
+            translation: None,
+        }
     }
 
     pub fn files<P>(mut self, val: P) -> Self
@@ -556,7 +584,10 @@ impl EncryptedPassportElementBankStatement {
     where
         F: Into<Vec<PassportFile>>,
     {
-        Self { files: files.into(), translation: None }
+        Self {
+            files: files.into(),
+            translation: None,
+        }
     }
 
     pub fn files<P>(mut self, val: P) -> Self
@@ -607,7 +638,10 @@ impl EncryptedPassportElementRentalAgreement {
     where
         F: Into<Vec<PassportFile>>,
     {
-        Self { files: files.into(), translation: None }
+        Self {
+            files: files.into(),
+            translation: None,
+        }
     }
 
     pub fn files<P>(mut self, val: P) -> Self
@@ -658,7 +692,10 @@ impl EncryptedPassportElementPassportRegistration {
     where
         F: Into<Vec<PassportFile>>,
     {
-        Self { files: files.into(), translation: None }
+        Self {
+            files: files.into(),
+            translation: None,
+        }
     }
 
     pub fn files<P>(mut self, val: P) -> Self
@@ -709,7 +746,10 @@ impl EncryptedPassportElementTemporaryRegistration {
     where
         F: Into<Vec<PassportFile>>,
     {
-        Self { files: files.into(), translation: None }
+        Self {
+            files: files.into(),
+            translation: None,
+        }
     }
 
     pub fn files<P>(mut self, val: P) -> Self
@@ -742,7 +782,9 @@ impl EncryptedPassportElementPhoneNumber {
     where
         S: Into<String>,
     {
-        Self { phone_number: phone_number.into() }
+        Self {
+            phone_number: phone_number.into(),
+        }
     }
 
     pub fn phone_number<S>(mut self, val: S) -> Self
@@ -766,7 +808,9 @@ impl EncryptedPassportElementEmail {
     where
         S: Into<String>,
     {
-        Self { email: email.into() }
+        Self {
+            email: email.into(),
+        }
     }
 
     pub fn email<S>(mut self, val: S) -> Self
diff --git a/src/types/game.rs b/src/types/game.rs
index 477f7988..ca3f4e7d 100644
--- a/src/types/game.rs
+++ b/src/types/game.rs
@@ -20,8 +20,6 @@ pub struct Game {
     /// Photo that will be displayed in the game message in chats.
     pub photo: Vec<PhotoSize>,
 
-    // FIXME(waffle): SetGameScore method is missing for some reason O_o
-    #[allow(broken_intra_doc_links)]
     /// Brief description of the game or high scores included in the game
     /// message. Can be automatically edited to include current high scores
     /// for the game when the bot calls [`SetGameScore`], or manually
diff --git a/src/types/game_high_score.rs b/src/types/game_high_score.rs
index 4d64e515..57ac5719 100644
--- a/src/types/game_high_score.rs
+++ b/src/types/game_high_score.rs
@@ -19,7 +19,11 @@ pub struct GameHighScore {
 
 impl GameHighScore {
     pub fn new(position: u32, user: User, score: u32) -> Self {
-        Self { position, user, score }
+        Self {
+            position,
+            user,
+            score,
+        }
     }
 
     pub fn position(mut self, val: u32) -> Self {
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 8f65d04b..86a5af04 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -18,7 +18,10 @@ impl InlineKeyboardButton {
     where
         S: Into<String>,
     {
-        Self { text: text.into(), kind }
+        Self {
+            text: text.into(),
+            kind,
+        }
     }
 
     pub fn text<S>(mut self, val: S) -> Self
@@ -105,11 +108,17 @@ pub enum InlineKeyboardButtonKind {
 /// ```
 impl InlineKeyboardButton {
     pub fn url(text: String, url: String) -> InlineKeyboardButton {
-        InlineKeyboardButton { text, kind: InlineKeyboardButtonKind::Url(url) }
+        InlineKeyboardButton {
+            text,
+            kind: InlineKeyboardButtonKind::Url(url),
+        }
     }
 
     pub fn callback(text: String, callback_data: String) -> InlineKeyboardButton {
-        InlineKeyboardButton { text, kind: InlineKeyboardButtonKind::CallbackData(callback_data) }
+        InlineKeyboardButton {
+            text,
+            kind: InlineKeyboardButtonKind::CallbackData(callback_data),
+        }
     }
 
     pub fn switch_inline_query(text: String, switch_inline_query: String) -> InlineKeyboardButton {
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index d0e56444..25618524 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -35,7 +35,9 @@ impl InlineKeyboardMarkup {
         I1: Into<Vec<I2>>,
         I2: Into<Vec<InlineKeyboardButton>>,
     {
-        Self { inline_keyboard: inline_keyboard.into().into_iter().map(Into::into).collect() }
+        Self {
+            inline_keyboard: inline_keyboard.into().into_iter().map(Into::into).collect(),
+        }
     }
 
     pub fn inline_keyboard<I1, I2>(mut self, val: I1) -> Self
@@ -73,7 +75,9 @@ mod tests {
         let markup =
             InlineKeyboardMarkup::default().append_row(vec![button1.clone(), button2.clone()]);
 
-        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
+        let expected = InlineKeyboardMarkup {
+            inline_keyboard: vec![vec![button1, button2]],
+        };
 
         assert_eq!(markup, expected);
     }
@@ -87,7 +91,9 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(button2.clone(), 0);
 
-        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
+        let expected = InlineKeyboardMarkup {
+            inline_keyboard: vec![vec![button1, button2]],
+        };
 
         assert_eq!(markup, expected);
     }
@@ -101,7 +107,9 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(button2.clone(), 1);
 
-        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1], vec![button2]] };
+        let expected = InlineKeyboardMarkup {
+            inline_keyboard: vec![vec![button1], vec![button2]],
+        };
 
         assert_eq!(markup, expected);
     }
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
index 9411822d..0eba0270 100644
--- a/src/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -34,7 +34,13 @@ impl InlineQuery {
         S2: Into<String>,
         S3: Into<String>,
     {
-        Self { id: id.into(), from, location: None, query: query.into(), offset: offset.into() }
+        Self {
+            id: id.into(),
+            from,
+            location: None,
+            query: query.into(),
+            offset: offset.into(),
+        }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
diff --git a/src/types/inline_query_result_game.rs b/src/types/inline_query_result_game.rs
index 0436074b..9e6c074e 100644
--- a/src/types/inline_query_result_game.rs
+++ b/src/types/inline_query_result_game.rs
@@ -28,7 +28,11 @@ impl InlineQueryResultGame {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self { id: id.into(), game_short_name: game_short_name.into(), reply_markup: None }
+        Self {
+            id: id.into(),
+            game_short_name: game_short_name.into(),
+            reply_markup: None,
+        }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 6bd0b171..eb9bd600 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -8,7 +8,10 @@ use std::{borrow::Cow, path::PathBuf};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum InputFile {
     File(PathBuf),
-    Memory { file_name: String, data: Cow<'static, [u8]> },
+    Memory {
+        file_name: String,
+        data: Cow<'static, [u8]>,
+    },
     Url(String),
     FileId(String),
 }
@@ -26,7 +29,10 @@ impl InputFile {
         S: Into<String>,
         D: Into<Cow<'static, [u8]>>,
     {
-        Self::Memory { file_name: file_name.into(), data: data.into() }
+        Self::Memory {
+            file_name: file_name.into(),
+            data: data.into(),
+        }
     }
 
     pub fn url<T>(url: T) -> Self
@@ -100,7 +106,11 @@ impl InputFile {
 
         match self {
             Self::File(path_to_file) => {
-                let file_name = path_to_file.file_name().unwrap().to_string_lossy().into_owned();
+                let file_name = path_to_file
+                    .file_name()
+                    .unwrap()
+                    .to_string_lossy()
+                    .into_owned();
 
                 let file = FramedRead::new(tokio::fs::File::open(path_to_file).await?, FileDecoder);
 
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 603a4a16..a5d3dd84 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -39,7 +39,11 @@ pub struct InputMediaPhoto {
 
 impl InputMediaPhoto {
     pub fn new(media: InputFile) -> Self {
-        Self { media, caption: None, parse_mode: None }
+        Self {
+            media,
+            caption: None,
+            parse_mode: None,
+        }
     }
 
     pub fn media(mut self, val: InputFile) -> Self {
@@ -374,7 +378,12 @@ pub struct InputMediaDocument {
 
 impl InputMediaDocument {
     pub fn new(media: InputFile) -> Self {
-        Self { media, thumb: None, caption: None, parse_mode: None }
+        Self {
+            media,
+            thumb: None,
+            caption: None,
+            parse_mode: None,
+        }
     }
 
     pub fn thumb(mut self, val: InputFile) -> Self {
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index 10d1d2f3..169fdd1c 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -39,7 +39,11 @@ impl InputMessageContentText {
     where
         S: Into<String>,
     {
-        Self { message_text: message_text.into(), parse_mode: None, disable_web_page_preview: None }
+        Self {
+            message_text: message_text.into(),
+            parse_mode: None,
+            disable_web_page_preview: None,
+        }
     }
 
     pub fn message_text<S>(mut self, val: S) -> Self
@@ -79,7 +83,11 @@ pub struct InputMessageContentLocation {
 
 impl InputMessageContentLocation {
     pub fn new(latitude: f64, longitude: f64) -> Self {
-        Self { latitude, longitude, live_period: None }
+        Self {
+            latitude,
+            longitude,
+            live_period: None,
+        }
     }
 
     pub fn latitude(mut self, val: f64) -> Self {
diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index b245a5a2..f25f4f52 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -29,7 +29,10 @@ impl KeyboardButton {
     where
         T: Into<String>,
     {
-        Self { text: text.into(), request: None }
+        Self {
+            text: text.into(),
+            request: None,
+        }
     }
 
     pub fn request<T>(mut self, val: T) -> Self
@@ -77,15 +80,24 @@ impl<'de> Deserialize<'de> for ButtonRequest {
     {
         let raw = RawRequest::deserialize(deserializer)?;
         match raw {
-            RawRequest { contact: Some(_), location: Some(_), poll: Some(_) } => {
-                Err(D::Error::custom(
-                    "`request_contact` and `request_location` fields are mutually exclusive, but \
-                     both were provided",
-                ))
-            }
-            RawRequest { contact: Some(_), .. } => Ok(Self::Contact),
-            RawRequest { location: Some(_), .. } => Ok(Self::Location),
-            RawRequest { poll: Some(poll_type), .. } => Ok(Self::KeyboardButtonPollType(poll_type)),
+            RawRequest {
+                contact: Some(_),
+                location: Some(_),
+                poll: Some(_),
+            } => Err(D::Error::custom(
+                "`request_contact` and `request_location` fields are mutually exclusive, but both \
+                 were provided",
+            )),
+            RawRequest {
+                contact: Some(_), ..
+            } => Ok(Self::Contact),
+            RawRequest {
+                location: Some(_), ..
+            } => Ok(Self::Location),
+            RawRequest {
+                poll: Some(poll_type),
+                ..
+            } => Ok(Self::KeyboardButtonPollType(poll_type)),
             _ => Err(D::Error::custom(
                 "Either one of `request_contact` and `request_location` fields is required",
             )),
@@ -99,16 +111,24 @@ impl Serialize for ButtonRequest {
         S: Serializer,
     {
         match self {
-            Self::Contact => {
-                RawRequest { contact: Some(True), location: None, poll: None }.serialize(serializer)
+            Self::Contact => RawRequest {
+                contact: Some(True),
+                location: None,
+                poll: None,
             }
-            Self::Location => {
-                RawRequest { contact: None, location: Some(True), poll: None }.serialize(serializer)
+            .serialize(serializer),
+            Self::Location => RawRequest {
+                contact: None,
+                location: Some(True),
+                poll: None,
             }
-            Self::KeyboardButtonPollType(poll_type) => {
-                RawRequest { contact: None, location: None, poll: Some(poll_type.clone()) }
-                    .serialize(serializer)
+            .serialize(serializer),
+            Self::KeyboardButtonPollType(poll_type) => RawRequest {
+                contact: None,
+                location: None,
+                poll: Some(poll_type.clone()),
             }
+            .serialize(serializer),
         }
     }
 }
@@ -119,7 +139,10 @@ mod tests {
 
     #[test]
     fn serialize_no_request() {
-        let button = KeyboardButton { text: String::from(""), request: None };
+        let button = KeyboardButton {
+            text: String::from(""),
+            request: None,
+        };
         let expected = r#"{"text":""}"#;
         let actual = serde_json::to_string(&button).unwrap();
         assert_eq!(expected, actual);
@@ -127,8 +150,10 @@ mod tests {
 
     #[test]
     fn serialize_request_contact() {
-        let button =
-            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
+        let button = KeyboardButton {
+            text: String::from(""),
+            request: Some(ButtonRequest::Contact),
+        };
         let expected = r#"{"text":"","request_contact":true}"#;
         let actual = serde_json::to_string(&button).unwrap();
         assert_eq!(expected, actual);
@@ -137,7 +162,10 @@ mod tests {
     #[test]
     fn deserialize_no_request() {
         let json = r#"{"text":""}"#;
-        let expected = KeyboardButton { text: String::from(""), request: None };
+        let expected = KeyboardButton {
+            text: String::from(""),
+            request: None,
+        };
         let actual = serde_json::from_str(json).unwrap();
         assert_eq!(expected, actual);
     }
@@ -145,8 +173,10 @@ mod tests {
     #[test]
     fn deserialize_request_contact() {
         let json = r#"{"text":"","request_contact":true}"#;
-        let expected =
-            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
+        let expected = KeyboardButton {
+            text: String::from(""),
+            request: Some(ButtonRequest::Contact),
+        };
         let actual = serde_json::from_str(json).unwrap();
         assert_eq!(expected, actual);
     }
diff --git a/src/types/keyboard_button_poll_type.rs b/src/types/keyboard_button_poll_type.rs
index 40289dd0..07c7ddc6 100644
--- a/src/types/keyboard_button_poll_type.rs
+++ b/src/types/keyboard_button_poll_type.rs
@@ -10,7 +10,9 @@ impl KeyboardButtonPollType {
     where
         S: Into<String>,
     {
-        Self { poll_type: poll_type.into() }
+        Self {
+            poll_type: poll_type.into(),
+        }
     }
 
     pub fn poll_type<S>(mut self, val: S) -> Self
diff --git a/src/types/label_price.rs b/src/types/label_price.rs
index 704aa5c6..0a5a2f72 100644
--- a/src/types/label_price.rs
+++ b/src/types/label_price.rs
@@ -24,7 +24,10 @@ impl LabeledPrice {
     where
         S: Into<String>,
     {
-        Self { label: label.into(), amount }
+        Self {
+            label: label.into(),
+            amount,
+        }
     }
 
     pub fn label<S>(mut self, val: S) -> Self
@@ -47,7 +50,10 @@ mod tests {
 
     #[test]
     fn serialize() {
-        let labeled_price = LabeledPrice { label: "Label".to_string(), amount: 60 };
+        let labeled_price = LabeledPrice {
+            label: "Label".to_string(),
+            amount: 60,
+        };
         let expected = r#"{"label":"Label","amount":60}"#;
         let actual = serde_json::to_string(&labeled_price).unwrap();
         assert_eq!(actual, expected);
diff --git a/src/types/location.rs b/src/types/location.rs
index 8c37f4fb..7fd1a71d 100644
--- a/src/types/location.rs
+++ b/src/types/location.rs
@@ -12,7 +12,10 @@ pub struct Location {
 
 impl Location {
     pub fn new(longitude: f64, latitude: f64) -> Self {
-        Self { longitude, latitude }
+        Self {
+            longitude,
+            latitude,
+        }
     }
 
     pub fn latitude(mut self, val: f64) -> Self {
diff --git a/src/types/mask_position.rs b/src/types/mask_position.rs
index cd0d0828..bf52eccf 100644
--- a/src/types/mask_position.rs
+++ b/src/types/mask_position.rs
@@ -29,7 +29,12 @@ impl MaskPosition {
     where
         S: Into<String>,
     {
-        Self { point: point.into(), x_shift, y_shift, scale }
+        Self {
+            point: point.into(),
+            x_shift,
+            y_shift,
+            scale,
+        }
     }
 
     pub fn point<S>(mut self, val: S) -> Self
diff --git a/src/types/me.rs b/src/types/me.rs
index bf07b50f..3f7d1c32 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -28,7 +28,12 @@ impl Me {
         can_read_all_group_messages: bool,
         supports_inline_queries: bool,
     ) -> Self {
-        Self { user, can_join_groups, can_read_all_group_messages, supports_inline_queries }
+        Self {
+            user,
+            can_join_groups,
+            can_read_all_group_messages,
+            supports_inline_queries,
+        }
     }
 
     pub fn user(mut self, val: User) -> Self {
diff --git a/src/types/message.rs b/src/types/message.rs
index 8a6890a1..1e13e158 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -33,7 +33,13 @@ pub struct Message {
 
 impl Message {
     pub fn new(id: i32, date: i32, chat: Chat, kind: MessageKind) -> Self {
-        Self { id, date, chat, kind, via_bot: None }
+        Self {
+            id,
+            date,
+            chat,
+            kind,
+            via_bot: None,
+        }
     }
 
     pub fn id(mut self, val: i32) -> Self {
@@ -105,7 +111,13 @@ pub struct MessageCommon {
 
 impl MessageCommon {
     pub fn new(forward_kind: ForwardKind, media_kind: MediaKind) -> Self {
-        Self { from: None, forward_kind, edit_date: None, media_kind, reply_markup: None }
+        Self {
+            from: None,
+            forward_kind,
+            edit_date: None,
+            media_kind,
+            reply_markup: None,
+        }
     }
 
     pub fn from(mut self, val: User) -> Self {
@@ -147,7 +159,9 @@ impl MessageNewChatMembers {
     where
         N: Into<Vec<User>>,
     {
-        Self { new_chat_members: new_chat_members.into() }
+        Self {
+            new_chat_members: new_chat_members.into(),
+        }
     }
 
     pub fn new_chat_members<N>(mut self, val: N) -> Self
@@ -171,7 +185,9 @@ impl MessageLeftChatMember {
     where
         N: Into<User>,
     {
-        Self { left_chat_member: left_chat_member.into() }
+        Self {
+            left_chat_member: left_chat_member.into(),
+        }
     }
 
     pub fn left_chat_member<N>(mut self, val: N) -> Self
@@ -194,7 +210,9 @@ impl MessageNewChatTitle {
     where
         N: Into<String>,
     {
-        Self { new_chat_title: new_chat_title.into() }
+        Self {
+            new_chat_title: new_chat_title.into(),
+        }
     }
 
     pub fn new_chat_title<N>(mut self, val: N) -> Self
@@ -217,7 +235,9 @@ impl MessageNewChatPhoto {
     where
         N: Into<Vec<PhotoSize>>,
     {
-        Self { new_chat_photo: new_chat_photo.into() }
+        Self {
+            new_chat_photo: new_chat_photo.into(),
+        }
     }
 
     pub fn new_chat_photo<N>(mut self, val: N) -> Self
@@ -306,7 +326,10 @@ pub struct MessageMigrate {
 
 impl MessageMigrate {
     pub fn new(migrate_to_chat_id: i64, migrate_from_chat_id: i64) -> Self {
-        Self { migrate_to_chat_id, migrate_from_chat_id }
+        Self {
+            migrate_to_chat_id,
+            migrate_from_chat_id,
+        }
     }
 
     pub fn migrate_to_chat_id(mut self, val: i64) -> Self {
@@ -331,7 +354,9 @@ pub struct MessagePinned {
 
 impl MessagePinned {
     pub fn new(pinned: Message) -> Self {
-        Self { pinned: Box::new(pinned) }
+        Self {
+            pinned: Box::new(pinned),
+        }
     }
 
     pub fn pinned(mut self, val: Message) -> Self {
@@ -395,7 +420,9 @@ impl MessageConnectedWebsite {
     where
         S: Into<String>,
     {
-        Self { connected_website: connected_website.into() }
+        Self {
+            connected_website: connected_website.into(),
+        }
     }
 
     pub fn connected_website<S>(mut self, val: S) -> Self
@@ -457,7 +484,12 @@ pub struct ForwardChannel {
 
 impl ForwardChannel {
     pub fn new(date: i32, chat: Chat, message_id: i32) -> Self {
-        Self { date, chat, message_id, signature: None }
+        Self {
+            date,
+            chat,
+            message_id,
+            signature: None,
+        }
     }
 
     pub fn date(mut self, val: i32) -> Self {
@@ -570,7 +602,12 @@ impl MediaAnimation {
     where
         CE: Into<Vec<MessageEntity>>,
     {
-        Self { animation, document: (), caption: None, caption_entities: caption_entities.into() }
+        Self {
+            animation,
+            document: (),
+            caption: None,
+            caption_entities: caption_entities.into(),
+        }
     }
 
     pub fn animation(mut self, val: Animation) -> Self {
@@ -615,7 +652,11 @@ impl MediaAudio {
     where
         CE: Into<Vec<MessageEntity>>,
     {
-        Self { audio, caption: None, caption_entities: caption_entities.into() }
+        Self {
+            audio,
+            caption: None,
+            caption_entities: caption_entities.into(),
+        }
     }
 
     pub fn audio(mut self, val: Audio) -> Self {
@@ -677,7 +718,11 @@ impl MediaDocument {
     where
         CE: Into<Vec<MessageEntity>>,
     {
-        Self { document, caption: None, caption_entities: caption_entities.into() }
+        Self {
+            document,
+            caption: None,
+            caption_entities: caption_entities.into(),
+        }
     }
 
     pub fn document(mut self, val: Document) -> Self {
@@ -857,7 +902,10 @@ impl MediaText {
         S: Into<String>,
         E: Into<Vec<MessageEntity>>,
     {
-        Self { text: text.into(), entities: entities.into() }
+        Self {
+            text: text.into(),
+            entities: entities.into(),
+        }
     }
 
     pub fn text<S>(mut self, val: S) -> Self
@@ -978,7 +1026,11 @@ impl MediaVoice {
     where
         CE: Into<Vec<MessageEntity>>,
     {
-        Self { voice, caption: None, caption_entities: caption_entities.into() }
+        Self {
+            voice,
+            caption: None,
+            caption_entities: caption_entities.into(),
+        }
     }
 
     pub fn voice(mut self, val: Voice) -> Self {
@@ -1125,7 +1177,10 @@ mod getters {
         pub fn reply_to_message(&self) -> Option<&Message> {
             match &self.kind {
                 Common(MessageCommon {
-                    forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message, .. }),
+                    forward_kind:
+                        ForwardKind::Origin(ForwardOrigin {
+                            reply_to_message, ..
+                        }),
                     ..
                 }) => reply_to_message.as_ref().map(Deref::deref),
                 _ => None,
@@ -1180,27 +1235,45 @@ mod getters {
         pub fn caption_entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
-                    media_kind: MediaKind::Animation(MediaAnimation { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Animation(MediaAnimation {
+                            caption_entities, ..
+                        }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind: MediaKind::Audio(MediaAudio { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Audio(MediaAudio {
+                            caption_entities, ..
+                        }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind: MediaKind::Document(MediaDocument { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Document(MediaDocument {
+                            caption_entities, ..
+                        }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind: MediaKind::Photo(MediaPhoto { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Photo(MediaPhoto {
+                            caption_entities, ..
+                        }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind: MediaKind::Video(MediaVideo { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Video(MediaVideo {
+                            caption_entities, ..
+                        }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind: MediaKind::Voice(MediaVoice { caption_entities, .. }),
+                    media_kind:
+                        MediaKind::Voice(MediaVoice {
+                            caption_entities, ..
+                        }),
                     ..
                 }) => Some(caption_entities),
                 _ => None,
@@ -1408,32 +1481,37 @@ mod getters {
 
         pub fn super_group_chat_created(&self) -> Option<True> {
             match &self.kind {
-                SupergroupChatCreated(MessageSupergroupChatCreated { supergroup_chat_created }) => {
-                    Some(*supergroup_chat_created)
-                }
+                SupergroupChatCreated(MessageSupergroupChatCreated {
+                    supergroup_chat_created,
+                }) => Some(*supergroup_chat_created),
                 _ => None,
             }
         }
 
         pub fn channel_chat_created(&self) -> Option<True> {
             match &self.kind {
-                ChannelChatCreated(MessageChannelChatCreated { channel_chat_created }) => {
-                    Some(*channel_chat_created)
-                }
+                ChannelChatCreated(MessageChannelChatCreated {
+                    channel_chat_created,
+                }) => Some(*channel_chat_created),
                 _ => None,
             }
         }
 
         pub fn migrate_to_chat_id(&self) -> Option<i64> {
             match &self.kind {
-                Migrate(MessageMigrate { migrate_to_chat_id, .. }) => Some(*migrate_to_chat_id),
+                Migrate(MessageMigrate {
+                    migrate_to_chat_id, ..
+                }) => Some(*migrate_to_chat_id),
                 _ => None,
             }
         }
 
         pub fn migrate_from_chat_id(&self) -> Option<i64> {
             match &self.kind {
-                Migrate(MessageMigrate { migrate_from_chat_id, .. }) => Some(*migrate_from_chat_id),
+                Migrate(MessageMigrate {
+                    migrate_from_chat_id,
+                    ..
+                }) => Some(*migrate_from_chat_id),
                 _ => None,
             }
         }
@@ -1490,13 +1568,17 @@ impl Message {
     pub fn url(&self) -> Option<reqwest::Url> {
         match &self.chat.kind {
             ChatKind::Public(ChatPublic {
-                kind: PublicChatKind::Channel(PublicChatChannel { username: Some(username) }),
+                kind:
+                    PublicChatKind::Channel(PublicChatChannel {
+                        username: Some(username),
+                    }),
                 ..
             })
             | ChatKind::Public(ChatPublic {
                 kind:
                     PublicChatKind::Supergroup(PublicChatSupergroup {
-                        username: Some(username), ..
+                        username: Some(username),
+                        ..
                     }),
                 ..
             }) => Some(
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 283199d3..79876cf0 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -21,7 +21,11 @@ pub struct MessageEntity {
 
 impl MessageEntity {
     pub fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
-        Self { kind, offset, length }
+        Self {
+            kind,
+            offset,
+            length,
+        }
     }
 
     pub fn kind(mut self, val: MessageEntityKind) -> Self {
@@ -82,7 +86,9 @@ mod tests {
 
         assert_eq!(
             MessageEntity {
-                kind: MessageEntityKind::TextLink { url: "ya.ru".into() },
+                kind: MessageEntityKind::TextLink {
+                    url: "ya.ru".into()
+                },
                 offset: 1,
                 length: 2,
             },
@@ -99,7 +105,9 @@ mod tests {
 
         assert_eq!(
             MessageEntity {
-                kind: MessageEntityKind::Pre { language: Some("rust".to_string()) },
+                kind: MessageEntityKind::Pre {
+                    language: Some("rust".to_string())
+                },
                 offset: 1,
                 length: 2,
             },
@@ -143,7 +151,9 @@ mod tests {
                     username: None,
                     language_code: None,
                 }),
-                forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message: None }),
+                forward_kind: ForwardKind::Origin(ForwardOrigin {
+                    reply_to_message: None,
+                }),
                 edit_date: None,
                 media_kind: MediaKind::Text(MediaText {
                     text: "no yes no".to_string(),
diff --git a/src/types/non_telegram_types/non_strict_vec.rs b/src/types/non_telegram_types/non_strict_vec.rs
index 0ae479c6..37bc46d7 100644
--- a/src/types/non_telegram_types/non_strict_vec.rs
+++ b/src/types/non_telegram_types/non_strict_vec.rs
@@ -10,7 +10,11 @@ pub struct NonStrictVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Err
 
 impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for NonStrictVec<T> {
     fn from(vec: Vec<Value>) -> Self {
-        Self(vec.into_iter().map(|val| from_value(val.clone()).map_err(|e| (val, e))).collect())
+        Self(
+            vec.into_iter()
+                .map(|val| from_value(val.clone()).map_err(|e| (val, e)))
+                .collect(),
+        )
     }
 }
 
diff --git a/src/types/passport_data.rs b/src/types/passport_data.rs
index c2abcd49..c34f97ea 100644
--- a/src/types/passport_data.rs
+++ b/src/types/passport_data.rs
@@ -21,7 +21,10 @@ impl PassportData {
     where
         E: Into<Vec<EncryptedPassportElement>>,
     {
-        Self { data: data.into(), credentials }
+        Self {
+            data: data.into(),
+            credentials,
+        }
     }
 
     pub fn data<E>(mut self, val: E) -> Self
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index 4ccb9335..da96fba1 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -18,7 +18,10 @@ impl PassportElementError {
     where
         S: Into<String>,
     {
-        Self { message: message.into(), kind }
+        Self {
+            message: message.into(),
+            kind,
+        }
     }
 
     pub fn message<S>(mut self, val: S) -> Self
@@ -94,7 +97,11 @@ impl PassportElementErrorDataField {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self { r#type, field_name: field_name.into(), data_hash: data_hash.into() }
+        Self {
+            r#type,
+            field_name: field_name.into(),
+            data_hash: data_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorDataFieldType) -> Self {
@@ -140,7 +147,10 @@ impl PassportElementErrorFrontSide {
     where
         S: Into<String>,
     {
-        Self { r#type, file_hash: file_hash.into() }
+        Self {
+            r#type,
+            file_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorFrontSideType) -> Self {
@@ -178,7 +188,10 @@ impl PassportElementErrorReverseSide {
     where
         S: Into<String>,
     {
-        Self { r#type, file_hash: file_hash.into() }
+        Self {
+            r#type,
+            file_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorReverseSideType) -> Self {
@@ -214,7 +227,10 @@ impl PassportElementErrorSelfie {
     where
         S: Into<String>,
     {
-        Self { r#type, file_hash: file_hash.into() }
+        Self {
+            r#type,
+            file_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorSelfieType) -> Self {
@@ -251,7 +267,10 @@ impl PassportElementErrorFile {
     where
         S: Into<String>,
     {
-        Self { r#type, file_hash: file_hash.into() }
+        Self {
+            r#type,
+            file_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorFileType) -> Self {
@@ -288,7 +307,10 @@ impl PassportElementErrorFiles {
     where
         S: Into<Vec<String>>,
     {
-        Self { r#type, file_hashes: file_hashes.into() }
+        Self {
+            r#type,
+            file_hashes: file_hashes.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorFilesType) -> Self {
@@ -326,7 +348,10 @@ impl PassportElementErrorTranslationFile {
     where
         S: Into<String>,
     {
-        Self { r#type, file_hash: file_hash.into() }
+        Self {
+            r#type,
+            file_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorTranslationFileType) -> Self {
@@ -363,7 +388,10 @@ impl PassportElementErrorTranslationFiles {
     where
         S: Into<Vec<String>>,
     {
-        Self { r#type, file_hashes: file_hashes.into() }
+        Self {
+            r#type,
+            file_hashes: file_hashes.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorTranslationFilesType) -> Self {
@@ -400,7 +428,10 @@ impl PassportElementErrorUnspecified {
     where
         S: Into<String>,
     {
-        Self { r#type, element_hash: file_hash.into() }
+        Self {
+            r#type,
+            element_hash: file_hash.into(),
+        }
     }
 
     pub fn r#type(mut self, val: PassportElementErrorUnspecifiedType) -> Self {
diff --git a/src/types/poll.rs b/src/types/poll.rs
index 54020554..8176aa5b 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -187,7 +187,10 @@ impl PollOption {
     where
         S: Into<String>,
     {
-        Self { text: text.into(), voter_count }
+        Self {
+            text: text.into(),
+            voter_count,
+        }
     }
 
     pub fn text<S>(mut self, val: S) -> Self
diff --git a/src/types/poll_answer.rs b/src/types/poll_answer.rs
index ac8c2a6b..befeb420 100644
--- a/src/types/poll_answer.rs
+++ b/src/types/poll_answer.rs
@@ -21,7 +21,11 @@ impl PollAnswer {
         S: Into<String>,
         O: Into<Vec<i32>>,
     {
-        Self { poll_id: poll_id.into(), user, option_ids: option_ids.into() }
+        Self {
+            poll_id: poll_id.into(),
+            user,
+            option_ids: option_ids.into(),
+        }
     }
 
     pub fn poll_id<S>(mut self, val: S) -> Self
diff --git a/src/types/shipping_option.rs b/src/types/shipping_option.rs
index af13f5ce..af154d6b 100644
--- a/src/types/shipping_option.rs
+++ b/src/types/shipping_option.rs
@@ -24,7 +24,11 @@ impl ShippingOption {
         S2: Into<String>,
         P: Into<Vec<LabeledPrice>>,
     {
-        Self { id: id.into(), title: title.into(), prices: prices.into() }
+        Self {
+            id: id.into(),
+            title: title.into(),
+            prices: prices.into(),
+        }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
@@ -61,7 +65,10 @@ mod tests {
         let shipping_option = ShippingOption {
             id: "0".to_string(),
             title: "Option".to_string(),
-            prices: vec![LabeledPrice { label: "Label".to_string(), amount: 60 }],
+            prices: vec![LabeledPrice {
+                label: "Label".to_string(),
+                amount: 60,
+            }],
         };
         let expected = r#"{"id":"0","title":"Option","prices":[{"label":"Label","amount":60}]}"#;
         let actual = serde_json::to_string(&shipping_option).unwrap();
diff --git a/src/types/shipping_query.rs b/src/types/shipping_query.rs
index 06ff5985..97b0fd27 100644
--- a/src/types/shipping_query.rs
+++ b/src/types/shipping_query.rs
@@ -31,7 +31,12 @@ impl ShippingQuery {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self { id: id.into(), from, invoice_payload: invoice_payload.into(), shipping_address }
+        Self {
+            id: id.into(),
+            from,
+            invoice_payload: invoice_payload.into(),
+            shipping_address,
+        }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
diff --git a/src/types/update.rs b/src/types/update.rs
index 8aa3992f..51caf7ba 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -175,7 +175,9 @@ mod test {
                         username: Some(String::from("WaffleLapkin")),
                         language_code: Some(String::from("en")),
                     }),
-                    forward_kind: ForwardKind::Origin(ForwardOrigin { reply_to_message: None }),
+                    forward_kind: ForwardKind::Origin(ForwardOrigin {
+                        reply_to_message: None,
+                    }),
                     edit_date: None,
                     media_kind: MediaKind::Text(MediaText {
                         text: String::from("hello there"),
diff --git a/src/types/user_profile_photos.rs b/src/types/user_profile_photos.rs
index 59935efc..05dec195 100644
--- a/src/types/user_profile_photos.rs
+++ b/src/types/user_profile_photos.rs
@@ -20,7 +20,10 @@ impl UserProfilePhotos {
         P1: Into<Vec<P2>>,
         P2: Into<Vec<PhotoSize>>,
     {
-        Self { total_count, photos: photos.into().into_iter().map(Into::into).collect() }
+        Self {
+            total_count,
+            photos: photos.into().into_iter().map(Into::into).collect(),
+        }
     }
 
     pub fn total_count(mut self, val: u32) -> Self {

From cf3cd63c9258c916d49b1c56e84ef3e8fca81ea3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Dec 2020 21:03:33 +0300
Subject: [PATCH 178/755] fix doc tests

---
 src/requests/request.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/requests/request.rs b/src/requests/request.rs
index cdde179b..b719abf5 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -42,17 +42,17 @@ pub trait Request: HasPayload {
     /// ```
     /// # async {
     /// use teloxide_core::{
-    ///     bot::Bot,
-    ///     methods::GetMe,
-    ///     requests::{Request, RequestJson},
+    ///     payloads::GetMe,
+    ///     requests::{JsonRequest, Request},
     ///     types::User,
+    ///     Bot,
     /// };
     ///
     /// let bot = Bot::new("TOKEN");
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
     /// let _: User = request.send().await.unwrap();
-    /// # }
+    /// # };
     /// ```
     fn send(self) -> Self::Send;
 
@@ -69,17 +69,17 @@ pub trait Request: HasPayload {
     /// ## Examples
     /// ```
     /// # async {
-    /// use teloxide_core::prelude::*;
+    /// use teloxide_core::{prelude::*, requests::Request, Bot};
     ///
     /// let bot = Bot::new("TOKEN");
-    /// # let chat_ids = vec![1, 2, 3, 4].into_iter().map(Into::into);
+    /// # let chat_ids = vec![1i64, 2, 3, 4].into_iter().map(Into::into);
     ///
     /// let mut req = bot.send_message(0, "Hi there!");
     /// for chat_id in chat_ids {
     ///     req.chat_id = chat_id;
     ///     req.send_ref().await.unwrap();
     /// }
-    /// # }
+    /// # };
     /// ```
     fn send_ref(&self) -> Self::SendRef;
 }

From 114d1c3efbaedc0e47e1023437cf7030b9c345a3 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Wed, 30 Dec 2020 17:03:29 +0300
Subject: [PATCH 179/755] Update src/bot/mod.rs

Co-authored-by: Temirkhan Myrzamadi <hirrolot@gmail.com>
---
 src/bot/mod.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 5a7654a3..3620b767 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -100,10 +100,10 @@ impl Bot {
         Self::with_client(&get_env(TELOXIDE_TOKEN), client)
     }
 
-    /// Sets custom api url.
+    /// Sets a custom API URL.
     ///
-    /// For example you can run your own [Telegram bot API server][tbas] and set
-    /// it's url using this method.
+    /// For example, you can run your own [Telegram bot API server][tbas] and set
+    /// its URL using this method.
     ///
     /// [tbas]: https://github.com/tdlib/telegram-bot-api
     ///
@@ -116,10 +116,9 @@ impl Bot {
     /// };
     ///
     /// # async {
-    /// // Setup bot
     /// let url = reqwest::Url::parse("https://localhost/tbas").unwrap();
     /// let bot = Bot::new("TOKEN").set_api_url(url);
-    /// // All methods will use "https://localhost/tbas" as an api url
+    /// // From now all methods will use "https://localhost/tbas" as an API URL.
     /// bot.get_me().send().await
     /// # };
     /// ```

From 6004d9189c091c3c35a7b3a1f6b549abc26a8e8b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Dec 2020 17:06:52 +0300
Subject: [PATCH 180/755] fmt

---
 src/bot/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 3620b767..00032315 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -102,8 +102,8 @@ impl Bot {
 
     /// Sets a custom API URL.
     ///
-    /// For example, you can run your own [Telegram bot API server][tbas] and set
-    /// its URL using this method.
+    /// For example, you can run your own [Telegram bot API server][tbas] and
+    /// set its URL using this method.
     ///
     /// [tbas]: https://github.com/tdlib/telegram-bot-api
     ///

From 71d90002cebdd0bd4514fb0d61baaa0c020e2e84 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 7 Jan 2021 15:58:51 +0300
Subject: [PATCH 181/755] update dependencies

---
 Cargo.toml               | 13 ++++++-------
 src/adaptors/throttle.rs | 33 ++++++++++++++++++---------------
 src/bot/mod.rs           |  2 +-
 src/net/request.rs       |  2 +-
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e9a9a648..3003d6ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,12 +17,11 @@ authors = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "0.2.21", features = ["fs", "stream"] }
-tokio-util = "0.3.1"
-pin-project = "0.4.23"
-bytes = "0.5.5"
-async-trait = "0.1.36"
-reqwest = { version = "0.10.6", features = ["json", "stream"] }
+tokio = { version = "1.0.1", features = ["fs"] }
+tokio-util = "0.6.0"
+pin-project = "1.0.3"
+bytes = "1.0.0"
+reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"] }
 
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
@@ -32,7 +31,7 @@ uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
 derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
-once_cell = "1.4.0"
+once_cell = "1.5.0"
 never = "0.1.0"
 
 # FIXME(waffle): use crates.io once published
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index a71fafa5..75d79a80 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -6,14 +6,14 @@ use std::{
     time::{Duration, Instant},
 };
 
-use futures::task::{Context, Poll};
+use futures::{
+    task::{Context, Poll},
+    FutureExt,
+};
 use never::Never;
-use tokio::{
-    sync::{
-        mpsc::{self, error::TryRecvError},
-        oneshot::{channel, Receiver, Sender},
-    },
-    time::delay_for,
+use tokio::sync::{
+    mpsc,
+    oneshot::{channel, Receiver, Sender},
 };
 use vecrem::VecExt;
 
@@ -182,10 +182,13 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
 
         // update local queue with latest requests
         loop {
-            match queue_rx.try_recv() {
-                Ok(req) => queue.push(req),
-                Err(TryRecvError::Empty) => break,
-                Err(TryRecvError::Closed) => close = true,
+            // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
+            match queue_rx.recv().now_or_never() {
+                Some(Some(req)) => queue.push(req),
+                // There are no items in queue
+                None => break,
+                // The queue was closed
+                Some(None) => close = true,
             }
         }
 
@@ -256,7 +259,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
 
         if allowed == 0 {
             hchats_s.clear();
-            delay_for(DELAY).await;
+            tokio::time::sleep(DELAY).await;
             continue;
         }
 
@@ -296,7 +299,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
         // It's easier to just recompute last second stats, instead of keeping
         // track of it alongside with minute stats, so we just throw this away.
         hchats_s.clear();
-        delay_for(DELAY).await;
+        tokio::time::sleep(DELAY).await;
     }
 }
 
@@ -764,7 +767,7 @@ mod chan_send {
             #[cfg(feature = "nightly")]
             {
                 fn def(
-                    mut sender: mpsc::Sender<(Id, Sender<Never>)>,
+                    sender: mpsc::Sender<(Id, Sender<Never>)>,
                     val: (Id, Sender<Never>),
                 ) -> Inner {
                     async move { sender.send(val).await }
@@ -773,7 +776,7 @@ mod chan_send {
             }
             #[cfg(not(feature = "nightly"))]
             {
-                let mut this = self;
+                let this = self;
                 return ChanSend(Box::pin(async move { this.send(val).await }));
             }
         }
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 00032315..07c78829 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -202,7 +202,7 @@ pub(crate) fn sound_bot() -> ClientBuilder {
     ClientBuilder::new()
         .connect_timeout(connect_timeout)
         .timeout(Duration::from_secs(connect_timeout.as_secs() + timeout + 2))
-        .tcp_nodelay_(true)
+        .tcp_nodelay(true)
         .default_headers(headers)
 }
 
diff --git a/src/net/request.rs b/src/net/request.rs
index 15fb3d27..b8726001 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -56,7 +56,7 @@ where
     T: DeserializeOwned,
 {
     if response.status().is_server_error() {
-        tokio::time::delay_for(DELAY_ON_SERVER_ERROR).await;
+        tokio::time::sleep(DELAY_ON_SERVER_ERROR).await;
     }
 
     serde_json::from_str::<TelegramResponse<T>>(

From 56d546215a2f12b80165d9b827d5118adc0174a9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 7 Jan 2021 16:01:46 +0300
Subject: [PATCH 182/755] fix clippy: impl From instead of Into

---
 src/net/telegram_response.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index 34242bb3..306d100a 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -29,9 +29,9 @@ pub(crate) enum TelegramResponse<R> {
     },
 }
 
-impl<R> Into<ResponseResult<R>> for TelegramResponse<R> {
-    fn into(self) -> Result<R, RequestError> {
-        match self {
+impl<R> From<TelegramResponse<R>> for ResponseResult<R> {
+    fn from(this: TelegramResponse<R>) -> ResponseResult<R> {
+        match this {
             TelegramResponse::Ok { response, .. } => Ok(response),
             TelegramResponse::Err {
                 error,

From d3ecca662baccb075a34b3f5702842e3857b22c8 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 7 Jan 2021 14:58:48 +0300
Subject: [PATCH 183/755] Normalize docs

---
 Cargo.toml   | 2 +-
 netlify.toml | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3003d6ab..09993956 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,4 +59,4 @@ full = ["throttle", "cache_me", "auto_send"]
 
 [package.metadata."docs.rs"]
 all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs", "-Znormalize-docs"]
diff --git a/netlify.toml b/netlify.toml
index be511e64..e55e0d1a 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,6 +1,6 @@
 [build] 
 command = "rustup install nightly --profile minimal && cargo +nightly doc --all-features --no-deps && cp -r target/doc _netlify_out"
-environment = { RUSTDOCFLAGS= "--cfg docsrs" } 
+environment = { RUSTDOCFLAGS= "--cfg docsrs -Znormalize-docs" } 
 publish = "_netlify_out" 
 
 [[redirects]]
diff --git a/src/lib.rs b/src/lib.rs
index 67231953..d1105eaf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //
 // To properly build docs of this crate run
 // ```console
-// $ RUSTDOCFLAGS="--cfg docsrs" cargo doc --open --all-features
+// $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
 // ```
 #![forbid(unsafe_code)]
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]

From 49c3afbc39fa0920d498e9a0d604145b59469bf7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 8 Jan 2021 00:44:19 +0300
Subject: [PATCH 184/755] fixup send_emoji method

---
 src/bot/api.rs                                      |  4 ++--
 src/local_macros.rs                                 |  6 +++---
 src/payloads/add_sticker_to_set.rs                  |  2 +-
 src/payloads/answer_callback_query.rs               |  8 ++++----
 src/payloads/answer_inline_query.rs                 |  2 +-
 src/payloads/answer_pre_checkout_query.rs           |  2 +-
 src/payloads/answer_shipping_query.rs               |  2 +-
 src/payloads/create_new_sticker_set.rs              |  2 +-
 src/payloads/delete_chat_photo.rs                   |  2 +-
 src/payloads/delete_chat_sticker_set.rs             |  2 +-
 src/payloads/delete_message.rs                      |  2 +-
 src/payloads/delete_sticker_from_set.rs             |  2 +-
 src/payloads/delete_webhook.rs                      |  2 +-
 src/payloads/edit_message_caption.rs                |  2 +-
 src/payloads/edit_message_caption_inline.rs         |  2 +-
 src/payloads/edit_message_live_location.rs          |  4 ++--
 src/payloads/edit_message_live_location_inline.rs   |  4 ++--
 src/payloads/edit_message_media.rs                  |  2 +-
 src/payloads/edit_message_media_inline.rs           |  2 +-
 src/payloads/edit_message_reply_markup.rs           |  2 +-
 src/payloads/edit_message_reply_markup_inline.rs    |  2 +-
 src/payloads/edit_message_text.rs                   |  2 +-
 src/payloads/edit_message_text_inline.rs            |  2 +-
 src/payloads/export_chat_invite_link.rs             |  2 +-
 src/payloads/forward_message.rs                     |  2 +-
 src/payloads/get_chat.rs                            |  2 +-
 src/payloads/get_chat_administrators.rs             |  2 +-
 src/payloads/get_chat_member.rs                     |  2 +-
 src/payloads/get_chat_members_count.rs              |  2 +-
 src/payloads/get_file.rs                            |  2 +-
 src/payloads/get_game_high_scores.rs                |  2 +-
 src/payloads/get_me.rs                              |  2 +-
 src/payloads/get_my_commands.rs                     |  2 +-
 src/payloads/get_sticker_set.rs                     |  2 +-
 src/payloads/get_updates.rs                         |  2 +-
 src/payloads/get_user_profile_photos.rs             |  2 +-
 src/payloads/get_webhook_info.rs                    |  4 ++--
 src/payloads/kick_chat_member.rs                    |  2 +-
 src/payloads/leave_chat.rs                          |  2 +-
 src/payloads/pin_chat_message.rs                    |  2 +-
 src/payloads/promote_chat_member.rs                 |  2 +-
 src/payloads/restrict_chat_member.rs                |  2 +-
 src/payloads/send_animation.rs                      |  2 +-
 src/payloads/send_audio.rs                          |  2 +-
 src/payloads/send_chat_action.rs                    | 10 +++++-----
 src/payloads/send_contact.rs                        |  2 +-
 src/payloads/send_dice.rs                           |  8 ++++----
 src/payloads/send_document.rs                       |  4 ++--
 src/payloads/send_game.rs                           |  2 +-
 src/payloads/send_invoice.rs                        |  2 +-
 src/payloads/send_location.rs                       |  4 ++--
 src/payloads/send_media_group.rs                    |  2 +-
 src/payloads/send_message.rs                        |  4 ++--
 src/payloads/send_photo.rs                          |  2 +-
 src/payloads/send_poll.rs                           |  2 +-
 src/payloads/send_sticker.rs                        |  2 +-
 src/payloads/send_venue.rs                          |  2 +-
 src/payloads/send_video.rs                          |  4 ++--
 src/payloads/send_video_note.rs                     |  6 +++---
 src/payloads/send_voice.rs                          |  4 ++--
 src/payloads/set_chat_administrator_custom_title.rs |  2 +-
 src/payloads/set_chat_description.rs                |  2 +-
 src/payloads/set_chat_permissions.rs                |  2 +-
 src/payloads/set_chat_photo.rs                      |  2 +-
 src/payloads/set_chat_sticker_set.rs                |  2 +-
 src/payloads/set_chat_title.rs                      |  2 +-
 src/payloads/set_game_score.rs                      |  2 +-
 src/payloads/set_game_score_inline.rs               |  2 +-
 src/payloads/set_my_commands.rs                     |  2 +-
 src/payloads/set_passport_data_errors.rs            |  2 +-
 src/payloads/set_sticker_position_in_set.rs         |  2 +-
 src/payloads/set_sticker_set_thumb.rs               |  2 +-
 src/payloads/set_webhook.rs                         |  2 +-
 src/payloads/stop_message_live_location.rs          |  4 ++--
 src/payloads/stop_message_live_location_inline.rs   |  4 ++--
 src/payloads/stop_poll.rs                           |  2 +-
 src/payloads/unban_chat_member.rs                   |  2 +-
 src/payloads/unpin_chat_message.rs                  |  2 +-
 src/payloads/upload_sticker_file.rs                 |  2 +-
 src/requests/requester.rs                           | 10 +++++-----
 80 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index f03e5cd9..e96f9216 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -299,11 +299,11 @@ impl Requester for Bot {
 
     type SendDice = JsonRequest<payloads::SendDice>;
 
-    fn send_dice<C>(&self, chat_id: C, emoji: crate::types::DiceEmoji) -> Self::SendDice
+    fn send_dice<C>(&self, chat_id: C) -> Self::SendDice
     where
         C: Into<ChatId>,
     {
-        Self::SendDice::new(self.clone(), payloads::SendDice::new(chat_id, emoji))
+        Self::SendDice::new(self.clone(), payloads::SendDice::new(chat_id))
     }
 
     type SendChatAction = JsonRequest<payloads::SendChatAction>;
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 25cffd7f..271d7cad 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -373,7 +373,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -580,9 +580,9 @@ macro_rules! requester_forward {
     (@method send_dice $body:ident $ty:ident) => {
         type SendDice = $ty![SendDice];
 
-        fn send_dice<C>(&self, chat_id: C, emoji: DiceEmoji) -> Self::SendDice where C: Into<ChatId> {
+        fn send_dice<C>(&self, chat_id: C) -> Self::SendDice where C: Into<ChatId> {
             let this = self;
-            $body!(send_dice this (chat_id: C, emoji: DiceEmoji))
+            $body!(send_dice this (chat_id: C))
         }
     };
     (@method send_chat_action $body:ident $ty:ident) => {
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 1a24bf81..e0eabc79 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 1ff7f262..7cb28587 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,8 +10,8 @@ impl_payload! {
     ///
     /// >Alternatively, the user can be redirected to the specified Game URL. For this option to work, you must first create a game for your bot via [@Botfather] and accept the terms. Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open your bot with a parameter.
     ///
-    /// [@Botfather]: https://t.me/botfather
     /// [inline keyboards]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+    /// [@Botfather]: https://t.me/botfather
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub AnswerCallbackQuery (AnswerCallbackQuerySetters) => True {
         required {
@@ -27,9 +27,9 @@ impl_payload! {
             ///
             /// Otherwise, you may use links like `t.me/your\_bot?start=XXXX` that open your bot with a parameter.
             ///
-            /// [`Game`]: crate::types::Game
-            /// [@Botfather]: https://t.me/botfather
             /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
+            /// [@Botfather]: https://t.me/botfather
+            /// [`Game`]: crate::types::Game
             pub url: String [into],
             /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
             pub cache_time: u32,
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index 7c970a97..8abddc59 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index ec884ba9..a168b72b 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index b00b29c1..5572c136 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 1b74097a..2504ce00 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index 23165b38..b27666aa 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index ba87b16a..1eaf60be 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index cf31bf93..22be46fc 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index b432c6ce..f4c4dc22 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index ebdd2823..cf741a3d 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 3b626d28..58608b40 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 565b7486..1d9d75cf 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index c183cb0a..47d1f047 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -26,8 +26,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 79389c4a..99a477fd 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -24,8 +24,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index f85aa27f..ebf88244 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index 1a3b5d28..f1c2a823 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index cc7b2777..54f7344f 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index a34db1a6..ef3f0c9e 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index fe475bce..f49aa53a 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 758de475..4ecdbfc3 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index 44b5ec3d..86b861c2 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index ce11ac85..2afb7845 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index c110722c..c04619d0 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 10cf24e4..63af85dd 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index f5e80f55..b29f05ed 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 0fd2c05e..dd48952b 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 47d9225c..b5e29fd6 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index 2678043a..565a607d 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 76e97ab7..8794d5a6 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index bfa35ecb..8d75475a 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index 35466950..a1b74857 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 3dba9e34..12965cc2 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 9ae52286..02cc174e 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index 846c907a..daf89088 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::WebhookInfo;
 impl_payload! {
     /// Use this method to get current webhook status. Requires no parameters. On success, returns a [`WebhookInfo`] object. If the bot is using [`GetUpdates`], will return an object with the _url_ field empty.
     ///
-    /// [`GetUpdates`]: crate::payloads::GetUpdates
     /// [`WebhookInfo`]: crate::types::WebhookInfo
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetWebhookInfo (GetWebhookInfoSetters) => WebhookInfo {
 
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 81f5014c..a51d6c6c 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 27af51a1..ad7b1e84 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index b3d31f1b..831d7fc6 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 6d259b4a..9d4bc68c 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index a168f493..10a1d685 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 364f821e..6e69e562 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 87cb3de6..9ae5a396 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index d4e4b859..90cf1661 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -20,13 +20,13 @@ impl_payload! {
             pub chat_id: ChatId [into],
             /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
-            /// [video notes]: crate::payloads::SendVideoNote
-            /// [audio files]: crate::payloads::SendAudio
-            /// [general files]: crate::payloads::SendDocument
-            /// [location data]: crate::payloads::SendLocation
             /// [text messages]: crate::payloads::SendMessage
             /// [photos]: crate::payloads::SendPhoto
             /// [videos]: crate::payloads::SendVideo
+            /// [audio files]: crate::payloads::SendAudio
+            /// [general files]: crate::payloads::SendDocument
+            /// [location data]: crate::payloads::SendLocation
+            /// [video notes]: crate::payloads::SendVideoNote
             pub action: ChatAction,
         }
     }
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 2f617848..e97d6148 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index a7400d23..759a6146 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -14,10 +14,10 @@ impl_payload! {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲”
-            pub emoji: DiceEmoji,
         }
         optional {
+            /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲”
+            pub emoji: DiceEmoji,
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
@@ -26,8 +26,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 8b9e9fbd..de5854df 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -38,8 +38,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index 354573d9..b16536d9 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 8941bf16..e6b6dd06 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index f9a213e1..712072bb 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 3cdf6a1d..2241744a 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 9157d52f..e8757285 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -32,8 +32,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 4cc847bf..b1ea5ae4 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 5a83b5cc..870c8c0b 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 234b2951..f2d7254e 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 20ba4eb0..7d47446c 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index e009fd0c..db789a09 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -47,8 +47,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 8aecd4fb..c53c00bc 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 impl_payload! {
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
     ///
-    /// [`Message`]: crate::types::Message
     /// [v.4.0]: https://core.telegram.org/bots/api#document
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVideoNote (SendVideoNoteSetters) => Message {
         required {
@@ -37,8 +37,8 @@ impl_payload! {
             pub reply_to_message_id: i32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index d30e5b36..77605534 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -8,8 +8,8 @@ use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 impl_payload! {
     /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
     ///
-    /// [`Audio`]: crate::types::Audio
     /// [`Document`]: crate::types::Document
+    /// [`Audio`]: crate::types::Audio
     /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendVoice (SendVoiceSetters) => Message {
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 31b63c5e..8eb39719 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index 8abbe59a..9e0650f7 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 196b320e..8aa73f8c 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 48b518cf..7578ae27 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index e28e569f..353f12f3 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 1ccc4b9b..06c77581 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 8334f64c..75a32821 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 8b53accb..4adbc8ac 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 5cbc46cf..854fa351 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index ebd3ad3a..021ce4b9 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 8b131b2a..30abb8a1 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index 7b142106..62e7af35 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index c73b843f..65ee07e1 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index fdaa08e5..e93caada 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -10,8 +10,8 @@ impl_payload! {
     ///
     /// See also: [`StopMessageLiveLocationInline`](crate::payloads::StopMessageLiveLocationInline)
     ///
-    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
     /// [`Message`]: crate::types::Message
+    /// [`StopMessageLiveLocation`]: crate::payloads::StopMessageLiveLocation
     #[derive(Debug, PartialEq, Clone, Serialize)]
     pub StopMessageLiveLocation (StopMessageLiveLocationSetters) => Message {
         required {
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index b9e18e98..b51a3572 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -24,8 +24,8 @@ impl_payload! {
         optional {
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
-            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
             pub reply_markup: ReplyMarkup [into],
         }
     }
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index d1cf267f..1d50c4bf 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 76d73e4e..05c46665 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index bfc16094..d01945e2 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 82957d99..c303f05b 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 09ff0641..6328e396 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -5,9 +5,9 @@ use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
     types::{
-        AllowedUpdate, BotCommand, ChatAction, ChatId, ChatPermissions, DiceEmoji,
-        InlineQueryResult, InputFile, InputMedia, InputSticker, LabeledPrice, PassportElementError,
-        PollType, TargetMessage,
+        AllowedUpdate, BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult,
+        InputFile, InputMedia, InputSticker, LabeledPrice, PassportElementError, PollType,
+        TargetMessage,
     },
 };
 
@@ -20,7 +20,7 @@ use crate::{
 pub trait Requester {
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (de3765b).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -240,7 +240,7 @@ pub trait Requester {
     type SendDice: Request<Payload = SendDice, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendDice`].
-    fn send_dice<C>(&self, chat_id: C, emoji: DiceEmoji) -> Self::SendDice
+    fn send_dice<C>(&self, chat_id: C) -> Self::SendDice
     where
         C: Into<ChatId>;
 

From 2ddbaa49ea3a8eef246b3780797c2c6e4e38cf05 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 8 Jan 2021 22:13:12 +0300
Subject: [PATCH 185/755] Add forward-to-deref Requester impls

This commit adds
```rust
impl<B: Requester> Requester for D<B> { ... }
```
where `D<_>` is `&_`, `&mut _`, `Box<_>`, `Arc<_>` and `Rc<_>`.
---
 src/requests/requester.rs | 85 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 6328e396..0de68ad5 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -715,3 +715,88 @@ pub trait Requester {
     where
         T: Into<TargetMessage>;
 }
+
+macro_rules! fty {
+    ($T:ident) => {
+        B::$T
+    };
+}
+
+macro_rules! fwd_deref {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        core::ops::Deref::deref($this).$m($($arg),*)
+    };
+}
+
+macro_rules! forward_all {
+    () => {
+        requester_forward! {
+            get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
+            forward_message, send_message, send_photo, send_audio, send_document, send_video,
+            send_animation, send_voice, send_video_note, send_media_group, send_location,
+            edit_message_live_location, edit_message_live_location_inline,
+            stop_message_live_location, stop_message_live_location_inline, send_venue,
+            send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+            get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+            promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+            export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+            set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
+            get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+            set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+            set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+            edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+            edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+            edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+            get_sticker_set, upload_sticker_file, create_new_sticker_set,
+            add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+            set_sticker_set_thumb, send_invoice, answer_shipping_query,
+            answer_pre_checkout_query, set_passport_data_errors, send_game,
+            set_game_score, set_game_score_inline, get_game_high_scores => fwd_deref, fty
+        }
+    };
+}
+
+impl<B> Requester for &B
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    forward_all! {}
+}
+
+impl<B> Requester for &mut B
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    forward_all! {}
+}
+
+impl<B> Requester for Box<B>
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    forward_all! {}
+}
+
+impl<B> Requester for std::sync::Arc<B>
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    forward_all! {}
+}
+
+impl<B> Requester for std::rc::Rc<B>
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    forward_all! {}
+}

From 555bfc93d5a1d788714d6dd0915b5ecf1951f503 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Jan 2021 15:59:51 +0300
Subject: [PATCH 186/755] Refactor mime type handling

- Remove `MimeWrapper` from public api
- Use `mime::Mime` in public api instead
---
 src/types/animation.rs                       |  10 +-
 src/types/audio.rs                           |  10 +-
 src/types/document.rs                        |   8 +-
 src/types/inline_query_result_document.rs    |   8 +-
 src/types/inline_query_result_video.rs       |  10 +-
 src/types/non_telegram_types/mime.rs         | 100 +++++++++++++++++++
 src/types/non_telegram_types/mime_wrapper.rs |  44 --------
 src/types/non_telegram_types/mod.rs          |   4 +-
 src/types/video.rs                           |   8 +-
 src/types/voice.rs                           |   7 +-
 10 files changed, 139 insertions(+), 70 deletions(-)
 create mode 100644 src/types/non_telegram_types/mime.rs
 delete mode 100644 src/types/non_telegram_types/mime_wrapper.rs

diff --git a/src/types/animation.rs b/src/types/animation.rs
index 9cf1b0e5..ae0c9de5 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MimeWrapper, PhotoSize};
+use crate::types::PhotoSize;
 
 /// This object represents an animation file (GIF or H.264/MPEG-4 AVC video
 /// without sound).
@@ -33,7 +34,8 @@ pub struct Animation {
     pub file_name: Option<String>,
 
     /// A MIME type of the file as defined by a sender.
-    pub mime_type: Option<MimeWrapper>,
+    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    pub mime_type: Option<Mime>,
 
     /// A size of a file.
     pub file_size: Option<u32>,
@@ -108,7 +110,7 @@ impl Animation {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = Some(val);
         self
     }
@@ -155,7 +157,7 @@ mod tests {
                 file_size: Some(3452),
             }),
             file_name: Some("some".to_string()),
-            mime_type: Some(MimeWrapper("video/gif".parse().unwrap())),
+            mime_type: Some("video/gif".parse().unwrap()),
             file_size: Some(6500),
         };
         let actual = serde_json::from_str::<Animation>(json).unwrap();
diff --git a/src/types/audio.rs b/src/types/audio.rs
index b9d6279d..23225eba 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MimeWrapper, PhotoSize};
+use crate::types::PhotoSize;
 
 /// This object represents an audio file to be treated as music by the Telegram
 /// clients.
@@ -27,7 +28,8 @@ pub struct Audio {
     pub title: Option<String>,
 
     /// A MIME type of the file as defined by a sender.
-    pub mime_type: Option<MimeWrapper>,
+    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    pub mime_type: Option<Mime>,
 
     /// A size of a file.
     pub file_size: Option<u32>,
@@ -91,7 +93,7 @@ impl Audio {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = Some(val);
         self
     }
@@ -135,7 +137,7 @@ mod tests {
             duration: 60,
             performer: Some("Performer".to_string()),
             title: Some("Title".to_string()),
-            mime_type: Some(serde_json::from_str("\"application/zip\"").unwrap()),
+            mime_type: Some("application/zip".parse().unwrap()),
             file_size: Some(123_456),
             thumb: Some(PhotoSize {
                 file_id: "id".to_string(),
diff --git a/src/types/document.rs b/src/types/document.rs
index aa60c2db..75e28918 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MimeWrapper, PhotoSize};
+use crate::types::PhotoSize;
 
 /// This object represents a general file (as opposed to [photos], [voice
 /// messages] and [audio files]).
@@ -28,7 +29,8 @@ pub struct Document {
     pub file_name: Option<String>,
 
     /// A MIME type of the file as defined by a sender.
-    pub mime_type: Option<MimeWrapper>,
+    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    pub mime_type: Option<Mime>,
 
     /// A size of a file.
     pub file_size: Option<u32>,
@@ -79,7 +81,7 @@ impl Document {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
index 7cf0a5f2..780e2cb7 100644
--- a/src/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 /// Represents a link to a file.
 ///
@@ -35,7 +36,8 @@ pub struct InlineQueryResultDocument {
 
     /// Mime type of the content of the file, either `application/pdf` or
     /// `application/zip`.
-    pub mime_type: MimeWrapper,
+    #[serde(with = "crate::types::non_telegram_types::mime::deser")]
+    pub mime_type: Mime,
 
     /// Short description of the result.
     pub description: Option<String>,
@@ -94,7 +96,7 @@ impl InlineQueryResultDocument {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = val;
         self
     }
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
index 7d190473..a9d9030f 100644
--- a/src/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, MimeWrapper, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
 
 /// Represents a link to a page containing an embedded video player or a video
 /// file.
@@ -20,7 +21,8 @@ pub struct InlineQueryResultVideo {
     pub video_url: String,
 
     /// Mime type of the content of video url, `text/html` or `video/mp4`.
-    pub mime_type: MimeWrapper,
+    #[serde(with = "crate::types::non_telegram_types::mime::deser")]
+    pub mime_type: Mime,
 
     /// URL of the thumbnail (jpeg only) for the video.
     pub thumb_url: String,
@@ -69,7 +71,7 @@ impl InlineQueryResultVideo {
     pub fn new<S1, S2, S3, S4>(
         id: S1,
         video_url: S2,
-        mime_type: MimeWrapper,
+        mime_type: Mime,
         thumb_url: S3,
         title: S4,
     ) -> Self
@@ -112,7 +114,7 @@ impl InlineQueryResultVideo {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = val;
         self
     }
diff --git a/src/types/non_telegram_types/mime.rs b/src/types/non_telegram_types/mime.rs
new file mode 100644
index 00000000..c5655cc7
--- /dev/null
+++ b/src/types/non_telegram_types/mime.rs
@@ -0,0 +1,100 @@
+use std::fmt;
+
+use mime::Mime;
+use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
+
+pub(crate) mod deser {
+    use mime::Mime;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    use super::{MimeDe, MimeSer};
+
+    pub(crate) fn serialize<S>(
+        this: &Mime,
+        serializer: S,
+    ) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+    where
+        S: Serializer,
+    {
+        MimeSer(this).serialize(serializer)
+    }
+
+    pub(crate) fn deserialize<'de, D>(
+        deserializer: D,
+    ) -> Result<Mime, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        MimeDe::deserialize(deserializer).map(|MimeDe(m)| m)
+    }
+}
+
+pub(crate) mod opt_deser {
+    use mime::Mime;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    use super::{MimeDe, MimeSer};
+
+    pub(crate) fn serialize<S>(
+        this: &Option<Mime>,
+        serializer: S,
+    ) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+    where
+        S: Serializer,
+    {
+        this.as_ref().map(MimeSer).serialize(serializer)
+    }
+
+    pub(crate) fn deserialize<'de, D>(
+        deserializer: D,
+    ) -> Result<Option<Mime>, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Option::<MimeDe>::deserialize(deserializer).map(|opt| opt.map(|MimeDe(m)| m))
+    }
+}
+
+struct MimeSer<'a>(&'a Mime);
+
+impl Serialize for MimeSer<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(self.0.as_ref())
+    }
+}
+
+struct MimeVisitor;
+impl<'a> Visitor<'a> for MimeVisitor {
+    type Value = MimeDe;
+
+    fn expecting(
+        &self,
+        formatter: &mut fmt::Formatter<'_>,
+    ) -> Result<(), serde::export::fmt::Error> {
+        formatter.write_str("mime type")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        match v.parse::<Mime>() {
+            Ok(mime_type) => Ok(MimeDe(mime_type)),
+            Err(e) => Err(E::custom(e)),
+        }
+    }
+}
+
+struct MimeDe(Mime);
+
+impl<'de> Deserialize<'de> for MimeDe {
+    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_str(MimeVisitor)
+    }
+}
diff --git a/src/types/non_telegram_types/mime_wrapper.rs b/src/types/non_telegram_types/mime_wrapper.rs
deleted file mode 100644
index 43326de6..00000000
--- a/src/types/non_telegram_types/mime_wrapper.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use derive_more::From;
-use mime::Mime;
-use serde::{de::Visitor, export::Formatter, Deserialize, Deserializer, Serialize, Serializer};
-
-/// Serializable & deserializable `MIME` wrapper.
-#[derive(Clone, Debug, Eq, Hash, PartialEq, From)]
-pub struct MimeWrapper(pub Mime);
-
-impl Serialize for MimeWrapper {
-    fn serialize<S>(&self, serializer: S) -> Result<<S as Serializer>::Ok, <S as Serializer>::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(self.0.as_ref())
-    }
-}
-
-struct MimeVisitor;
-impl<'a> Visitor<'a> for MimeVisitor {
-    type Value = MimeWrapper;
-
-    fn expecting(&self, formatter: &mut Formatter<'_>) -> Result<(), serde::export::fmt::Error> {
-        formatter.write_str("mime type")
-    }
-
-    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-    where
-        E: serde::de::Error,
-    {
-        match v.parse::<Mime>() {
-            Ok(mime_type) => Ok(MimeWrapper(mime_type)),
-            Err(e) => Err(E::custom(e)),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for MimeWrapper {
-    fn deserialize<D>(deserializer: D) -> Result<Self, <D as Deserializer<'de>>::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        deserializer.deserialize_str(MimeVisitor)
-    }
-}
diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs
index 6c8e1636..49360c4f 100644
--- a/src/types/non_telegram_types/mod.rs
+++ b/src/types/non_telegram_types/mod.rs
@@ -1,9 +1,9 @@
 pub use country_code::*;
 pub use currency::*;
-pub use mime_wrapper::*;
 pub use non_strict_vec::*;
 
 mod country_code;
 mod currency;
-mod mime_wrapper;
 mod non_strict_vec;
+
+pub(crate) mod mime;
diff --git a/src/types/video.rs b/src/types/video.rs
index 98241c49..1db5737f 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -1,6 +1,7 @@
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MimeWrapper, PhotoSize};
+use crate::types::PhotoSize;
 
 /// This object represents a video file.
 ///
@@ -29,7 +30,8 @@ pub struct Video {
     pub thumb: Option<PhotoSize>,
 
     /// Mime type of a file as defined by sender.
-    pub mime_type: Option<MimeWrapper>,
+    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    pub mime_type: Option<Mime>,
 
     /// File size.
     pub file_size: Option<u32>,
@@ -95,7 +97,7 @@ impl Video {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = Some(val);
         self
     }
diff --git a/src/types/voice.rs b/src/types/voice.rs
index f60cc204..2fc7a5b9 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -1,4 +1,4 @@
-use crate::types::MimeWrapper;
+use mime::Mime;
 use serde::{Deserialize, Serialize};
 
 /// This object represents a voice note.
@@ -19,7 +19,8 @@ pub struct Voice {
     pub duration: u32,
 
     /// MIME type of the file as defined by sender.
-    pub mime_type: Option<MimeWrapper>,
+    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    pub mime_type: Option<Mime>,
 
     /// File size.
     pub file_size: Option<u64>,
@@ -61,7 +62,7 @@ impl Voice {
         self
     }
 
-    pub fn mime_type(mut self, val: MimeWrapper) -> Self {
+    pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = Some(val);
         self
     }

From 785237985201e5445424032e2836b6b763d72290 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Jan 2021 16:08:05 +0300
Subject: [PATCH 187/755] Make Currency and CountryCode ISO compatible and add
 docs

---
 src/types/non_telegram_types/country_code.rs | 250 +++++++++++++++++
 src/types/non_telegram_types/currency.rs     | 275 +++++++++++++++++++
 2 files changed, 525 insertions(+)

diff --git a/src/types/non_telegram_types/country_code.rs b/src/types/non_telegram_types/country_code.rs
index 4f7705ac..ddb4154e 100644
--- a/src/types/non_telegram_types/country_code.rs
+++ b/src/types/non_telegram_types/country_code.rs
@@ -1,254 +1,504 @@
 use serde::{Deserialize, Serialize};
 
+/// ISO 3166-1 alpha-2 language code.
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum CountryCode {
+    /// Andorra
     AD,
+    /// United Arab Emirates
     AE,
+    /// Afghanistan
     AF,
+    /// Antigua and Barbuda
     AG,
+    /// Anguilla
     AI,
+    /// Albania
     AL,
+    /// Armenia
     AM,
+    /// Angola
     AO,
+    /// Antarctica
     AQ,
+    /// Argentina
     AR,
+    /// American Samoa
     AS,
+    /// Austria
     AT,
+    /// Australia
     AU,
+    /// Aruba
     AW,
+    /// Åland Islands
     AX,
+    /// Azerbaijan
     AZ,
+    /// Bosnia and Herzegovina
     BA,
+    /// Barbados
     BB,
+    /// Bangladesh
     BD,
+    /// Belgium
     BE,
+    /// Burkina Faso
     BF,
+    /// Bulgaria
     BG,
+    /// Bahrain
     BH,
+    /// Burundi
     BI,
+    /// Benin
     BJ,
+    /// Saint Barthélemy
     BL,
+    /// Bermuda
     BM,
+    /// Brunei Darussalam
     BN,
+    /// Bolivia (Plurinational State of)
     BO,
+    /// Bonaire, Sint Eustatius and Saba
     BQ,
+    /// Brazil
     BR,
+    /// Bahamas
     BS,
+    /// Bhutan
     BT,
+    /// Bouvet Island
     BV,
+    /// Botswana
     BW,
+    /// Belarus
     BY,
+    /// Belize
     BZ,
+    /// Canada
     CA,
+    /// Cocos (Keeling) Islands
     CC,
+    /// Congo, Democratic Republic of the
     CD,
+    /// Central African Republic
     CF,
+    /// Congo
     CG,
+    /// Switzerland
     CH,
+    /// Côte d'Ivoire
     CI,
+    /// Cook Islands
     CK,
+    /// Chile
     CL,
+    /// Cameroon
     CM,
+    /// China
     CN,
+    /// Colombia
     CO,
+    /// Costa Rica
     CR,
+    /// Cuba
     CU,
+    /// Cabo Verde
     CV,
+    /// Curaçao
     CW,
+    /// Christmas Island
     CX,
+    /// Cyprus
     CY,
+    /// Czechia
     CZ,
+    /// Germany
     DE,
+    /// Djibouti
     DJ,
+    /// Denmark
     DK,
+    /// Dominica
     DM,
+    /// Dominican Republic
     DO,
+    /// Algeria
     DZ,
+    /// Ecuador
     EC,
+    /// Estonia
     EE,
+    /// Egypt
     EG,
+    /// Western Sahara
     EH,
+    /// Eritrea
     ER,
+    /// Spain
     ES,
+    /// Ethiopia
     ET,
+    /// Finland
     FI,
+    /// Fiji
     FJ,
+    /// Falkland Islands (Malvinas)
     FK,
+    /// Micronesia (Federated States of)
     FM,
+    /// Faroe Islands
     FO,
+    /// France
     FR,
+    /// Gabon
     GA,
+    /// United Kingdom of Great Britain and Northern Ireland
     GB,
+    /// Grenada
     GD,
+    /// Georgia
     GE,
+    /// French Guiana
     GF,
+    /// Guernsey
     GG,
+    /// Ghana
     GH,
+    /// Gibraltar
     GI,
+    /// Greenland
     GL,
+    /// Gambia
     GM,
+    /// Guinea
     GN,
+    /// Guadeloupe
     GP,
+    /// Equatorial Guinea
     GQ,
+    /// Greece
     GR,
+    /// South Georgia and the South Sandwich Islands
     GS,
+    /// Guatemala
     GT,
+    /// Guam
     GU,
+    /// Guinea-Bissau
     GW,
+    /// Guyana
     GY,
+    /// Hong Kong
     HK,
+    /// Heard Island and McDonald Islands
     HM,
+    /// Honduras
     HN,
+    /// Croatia
     HR,
+    /// Haiti
     HT,
+    /// Hungary
     HU,
+    /// Indonesia
     ID,
+    /// Ireland
     IE,
+    /// Israel
     IL,
+    /// Isle of Man
     IM,
+    /// India
     IN,
+    /// British Indian Ocean Territory
     IO,
+    /// Iraq
     IQ,
+    /// Iran (Islamic Republic of)
     IR,
+    /// Iceland
     IS,
+    /// Italy
     IT,
+    /// Jersey
     JE,
+    /// Jamaica
     JM,
+    /// Jordan
     JO,
+    /// Japan
     JP,
+    /// Kenya
     KE,
+    /// Kyrgyzstan
     KG,
+    /// Cambodia
     KH,
+    /// Kiribati
     KI,
+    /// Comoros
     KM,
+    /// Saint Kitts and Nevis
     KN,
+    /// Korea (Democratic People's Republic of)
     KP,
+    /// Korea, Republic of
     KR,
+    /// Kuwait
     KW,
+    /// Cayman Islands
     KY,
+    /// Kazakhstan
     KZ,
+    /// Lao People's Democratic Republic
     LA,
+    /// Lebanon
     LB,
+    /// Saint Lucia
     LC,
+    /// Liechtenstein
     LI,
+    /// Sri Lanka
     LK,
+    /// Liberia
     LR,
+    /// Lesotho
     LS,
+    /// Lithuania
     LT,
+    /// Luxembourg
     LU,
+    /// Latvia
     LV,
+    /// Libya
     LY,
+    /// Morocco
     MA,
+    /// Monaco
     MC,
+    /// Moldova, Republic of
     MD,
+    /// Montenegro
     ME,
+    /// Saint Martin (French part)
     MF,
+    /// Madagascar
     MG,
+    /// Marshall Islands
     MH,
+    /// North Macedonia
     MK,
+    /// Mali
     ML,
+    /// Myanmar
     MM,
+    /// Mongolia
     MN,
+    /// Macao
     MO,
+    /// Northern Mariana Islands
     MP,
+    /// Martinique
     MQ,
+    /// Mauritania
     MR,
+    /// Montserrat
     MS,
+    /// Malta
     MT,
+    /// Mauritius
     MU,
+    /// Maldives
     MV,
+    /// Malawi
     MW,
+    /// Mexico
     MX,
+    /// Malaysia
     MY,
+    /// Mozambique
     MZ,
+    /// Namibia
     NA,
+    /// New Caledonia
     NC,
+    /// Niger
     NE,
+    /// Norfolk Island
     NF,
+    /// Nigeria
     NG,
+    /// Nicaragua
     NI,
+    /// Netherlands
     NL,
+    /// Norway
     NO,
+    /// Nepal
     NP,
+    /// Nauru
     NR,
+    /// Niue
     NU,
+    /// New Zealand
     NZ,
+    /// Oman
     OM,
+    /// Panama
     PA,
+    /// Peru
     PE,
+    /// French Polynesia
     PF,
+    /// Papua New Guinea
     PG,
+    /// Philippines
     PH,
+    /// Pakistan
     PK,
+    /// Poland
     PL,
+    /// Saint Pierre and Miquelon
     PM,
+    /// Pitcairn
     PN,
+    /// Puerto Rico
     PR,
+    /// Palestine, State of
     PS,
+    /// Portugal
     PT,
+    /// Palau
     PW,
+    /// Paraguay
     PY,
+    /// Qatar
     QA,
+    /// Réunion
     RE,
+    /// Romania
     RO,
+    /// Serbia
     RS,
+    /// Russian Federation
     RU,
+    /// Rwanda
     RW,
+    /// Saudi Arabia
     SA,
+    /// Solomon Islands
     SB,
+    /// Seychelles
     SC,
+    /// Sudan
     SD,
+    /// Sweden
     SE,
+    /// Singapore
     SG,
+    /// Saint Helena, Ascension and Tristan da Cunha
     SH,
+    /// Slovenia
     SI,
+    /// Svalbard and Jan Mayen
     SJ,
+    /// Slovakia
     SK,
+    /// Sierra Leone
     SL,
+    /// San Marino
     SM,
+    /// Senegal
     SN,
+    /// Somalia
     SO,
+    /// Suriname
     SR,
+    /// South Sudan
     SS,
+    /// Sao Tome and Principe
     ST,
+    /// El Salvador
     SV,
+    /// Sint Maarten (Dutch part)
     SX,
+    /// Syrian Arab Republic
     SY,
+    /// Eswatini
     SZ,
+    /// Turks and Caicos Islands
     TC,
+    /// Chad
     TD,
+    /// French Southern Territories
     TF,
+    /// Togo
     TG,
+    /// Thailand
     TH,
+    /// Tajikistan
     TJ,
+    /// Tokelau
     TK,
+    /// Timor-Leste
     TL,
+    /// Turkmenistan
     TM,
+    /// Tunisia
     TN,
+    /// Tonga
     TO,
+    /// Turkey
     TR,
+    /// Trinidad and Tobago
     TT,
+    /// Tuvalu
     TV,
+    /// Taiwan, Province of China
     TW,
+    /// Tanzania, United Republic of
     TZ,
+    /// Ukraine
     UA,
+    /// Uganda
     UG,
+    /// United States Minor Outlying Islands
     UM,
+    /// United States of America
     US,
+    /// Uruguay
     UY,
+    /// Uzbekistan
     UZ,
+    /// Holy See
     VA,
+    /// Saint Vincent and the Grenadines
     VC,
+    /// Venezuela (Bolivarian Republic of)
     VE,
+    /// Virgin Islands (British)
     VG,
+    /// Virgin Islands (U.S.)
     VI,
+    /// Viet Nam
     VN,
+    /// Vanuatu
     VU,
+    /// Wallis and Futuna
     WF,
+    /// Samoa
     WS,
+    /// Yemen
     YE,
+    /// Mayotte
     YT,
+    /// South Africa
     ZA,
+    /// Zambia
     ZM,
+    /// Zimbabwe
     ZW,
 }
diff --git a/src/types/non_telegram_types/currency.rs b/src/types/non_telegram_types/currency.rs
index 0cdebce6..dcdec729 100644
--- a/src/types/non_telegram_types/currency.rs
+++ b/src/types/non_telegram_types/currency.rs
@@ -1,89 +1,364 @@
 use serde::{Deserialize, Serialize};
 
+/// ISO 4217 currency.
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum Currency {
+    /// United Arab Emirates dirham
     AED,
+    /// Afghan afghani
     AFN,
+    /// Albanian lek
     ALL,
+    /// Armenian dram
     AMD,
+    /// Netherlands Antillean guilder
+    ANG,
+    /// Angolan kwanza
+    AOA,
+    /// Argentine peso
     ARS,
+    /// Australian dollar
     AUD,
+    /// Aruban florin
+    AWG,
+    /// Azerbaijani manat
     AZN,
+    /// Bosnia and Herzegovina convertible mark
     BAM,
+    /// Barbados dollar
+    BBD,
+    /// Bangladeshi taka
     BDT,
+    /// Bulgarian lev
     BGN,
+    /// Bahraini dinar
+    BHD,
+    /// Burundian franc
+    BIF,
+    /// Bermudian dollar
+    BMD,
+    /// Brunei dollar
     BND,
+    /// Boliviano
     BOB,
+    /// Bolivian Mvdol (funds code)
+    BOV,
+    /// Brazilian real
     BRL,
+    /// Bahamian dollar
+    BSD,
+    /// Bhutanese ngultrum
+    BTN,
+    /// Botswana pula
+    BWP,
+    /// Belarusian ruble
+    BYN,
+    /// Belize dollar
+    BZD,
+    /// Canadian dollar
     CAD,
+    /// Congolese franc
+    CDF,
+    /// WIR euro (complementary currency)
+    CHE,
+    /// Swiss franc
     CHF,
+    /// WIR franc (complementary currency)
+    CHW,
+    /// Unidad de Fomento (funds code)
+    CLF,
+    /// Chilean peso
     CLP,
+    /// Chinese yuan
     CNY,
+    /// Colombian peso
     COP,
+    /// Unidad de Valor Real (UVR) (funds code)
+    COU,
+    /// Costa Rican colon
     CRC,
+    /// Cuban convertible peso
+    CUC,
+    /// Cuban peso
+    CUP,
+    /// Cape Verdean escudo
+    CVE,
+    /// Czech koruna
     CZK,
+    /// Djiboutian franc
+    DJF,
+    /// Danish krone
     DKK,
+    /// Dominican peso
     DOP,
+    /// Algerian dinar
     DZD,
+    /// Egyptian pound
     EGP,
+    /// Eritrean nakfa
+    ERN,
+    /// Ethiopian birr
+    ETB,
+    /// Euro
     EUR,
+    /// Fiji dollar
+    FJD,
+    /// Falkland Islands pound
+    FKP,
+    /// Pound sterling
     GBP,
+    /// Georgian lari
     GEL,
+    /// Ghanaian cedi
+    GHS,
+    /// Gibraltar pound
+    GIP,
+    /// Gambian dalasi
+    GMD,
+    /// Guinean franc
+    GNF,
+    /// Guatemalan quetzal
     GTQ,
+    /// Guyanese dollar
+    GYD,
+    /// Hong Kong dollar
     HKD,
+    /// Honduran lempira
     HNL,
+    /// Croatian kuna
     HRK,
+    /// Haitian gourde
+    HTG,
+    /// Hungarian forint
     HUF,
+    /// Indonesian rupiah
     IDR,
+    /// Israeli new shekel
     ILS,
+    /// Indian rupee
     INR,
+    /// Iraqi dinar
+    IQD,
+    /// Iranian rial
+    IRR,
+    /// Icelandic króna
     ISK,
+    /// Jamaican dollar
     JMD,
+    /// Jordanian dinar
+    JOD,
+    /// Japanese yen
     JPY,
+    /// Kenyan shilling
     KES,
+    /// Kyrgyzstani som
     KGS,
+    /// Cambodian riel
+    KHR,
+    /// Comoro franc
+    KMF,
+    /// North Korean won
+    KPW,
+    /// South Korean won
     KRW,
+    /// Kuwaiti dinar
+    KWD,
+    /// Cayman Islands dollar
+    KYD,
+    /// Kazakhstani tenge
     KZT,
+    /// Lao kip
+    LAK,
+    /// Lebanese pound
     LBP,
+    /// Sri Lankan rupee
     LKR,
+    /// Liberian dollar
+    LRD,
+    /// Lesotho loti
+    LSL,
+    /// Libyan dinar
+    LYD,
+    /// Moroccan dirham
     MAD,
+    /// Moldovan leu
     MDL,
+    /// Malagasy ariary
+    MGA,
+    /// Macedonian denar
+    MKD,
+    /// Myanmar kyat
+    MMK,
+    /// Mongolian tögrög
     MNT,
+    /// Macanese pataca
+    MOP,
+    /// Mauritanian ouguiya
+    MRU,
+    /// Mauritian rupee
     MUR,
+    /// Maldivian rufiyaa
     MVR,
+    /// Malawian kwacha
+    MWK,
+    /// Mexican peso
     MXN,
+    /// Mexican Unidad de Inversion (UDI) (funds code)
+    MXV,
+    /// Malaysian ringgit
     MYR,
+    /// Mozambican metical
     MZN,
+    /// Namibian dollar
+    NAD,
+    /// Nigerian naira
     NGN,
+    /// Nicaraguan córdoba
     NIO,
+    /// Norwegian krone
     NOK,
+    /// Nepalese rupee
     NPR,
+    /// New Zealand dollar
     NZD,
+    /// Omani rial
+    OMR,
+    /// Panamanian balboa
     PAB,
+    /// Peruvian sol
     PEN,
+    /// Papua New Guinean kina
+    PGK,
+    /// Philippine peso
     PHP,
+    /// Pakistani rupee
     PKR,
+    /// Polish złoty
     PLN,
+    /// Paraguayan guaraní
     PYG,
+    /// Qatari riyal
     QAR,
+    /// Romanian leu
     RON,
+    /// Serbian dinar
     RSD,
+    /// Russian ruble
     RUB,
+    /// Rwandan franc
+    RWF,
+    /// Saudi riyal
     SAR,
+    /// Solomon Islands dollar
+    SBD,
+    /// Seychelles rupee
+    SCR,
+    /// Sudanese pound
+    SDG,
+    /// Swedish krona/kronor
     SEK,
+    /// Singapore dollar
     SGD,
+    /// Saint Helena pound
+    SHP,
+    /// Sierra Leonean leone
+    SLL,
+    /// Somali shilling
+    SOS,
+    /// Surinamese dollar
+    SRD,
+    /// South Sudanese pound
+    SSP,
+    /// São Tomé and Príncipe dobra
+    STN,
+    /// Salvadoran colón
+    SVC,
+    /// Syrian pound
+    SYP,
+    /// Swazi lilangeni
+    SZL,
+    /// Thai baht
     THB,
+    /// Tajikistani somoni
     TJS,
+    /// Turkmenistan manat
+    TMT,
+    /// Tunisian dinar
+    TND,
+    /// Tongan paʻanga
+    TOP,
+    /// Turkish lira
     TRY,
+    /// Trinidad and Tobago dollar
     TTD,
+    /// New Taiwan dollar
     TWD,
+    /// Tanzanian shilling
     TZS,
+    /// Ukrainian hryvnia
     UAH,
+    /// Ugandan shilling
     UGX,
+    /// United States dollar
     USD,
+    /// United States dollar (next day) (funds code)
+    USN,
+    /// Uruguay Peso en Unidades Indexadas (URUIURUI) (funds code)
+    UYI,
+    /// Uruguayan peso
     UYU,
+    /// Unidad previsional
+    UYW,
+    /// Uzbekistan som
     UZS,
+    /// Venezuelan bolívar soberano
+    VES,
+    /// Vietnamese đồng
     VND,
+    /// Vanuatu vatu
+    VUV,
+    /// Samoan tala
+    WST,
+    /// CFA franc BEAC
+    XAF,
+    /// Silver (one troy ounce)
+    XAG,
+    /// Gold (one troy ounce)
+    XAU,
+    /// European Composite Unit (EURCO) (bond market unit)
+    XBA,
+    /// European Monetary Unit (E.M.U.-6) (bond market unit)
+    XBB,
+    /// European Unit of Account 9 (E.U.A.-9) (bond market unit)
+    XBC,
+    /// European Unit of Account 17 (E.U.A.-17) (bond market unit)
+    XBD,
+    /// East Caribbean dollar
+    XCD,
+    /// Special drawing rights
+    XDR,
+    /// CFA franc BCEAO
+    XOF,
+    /// Palladium (one troy ounce)
+    XPD,
+    /// CFP franc (franc Pacifique)
+    XPF,
+    /// Platinum (one troy ounce)
+    XPT,
+    /// SUCRE
+    XSU,
+    /// Code reserved for testing
+    XTS,
+    /// ADB Unit of Account
+    XUA,
+    /// No currency
+    XXX,
+    /// Yemeni rial
     YER,
+    /// South African rand
     ZAR,
+    /// Zambian kwacha
+    ZMW,
+    /// Zimbabwean dollar
+    ZWL,
 }

From e513cbb453155ed3a1460204dc58ba8d939a8aaa Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Jan 2021 16:10:56 +0300
Subject: [PATCH 188/755] Add media

(example gif & logo)
---
 media/example.gif |  Bin 0 -> 110031 bytes
 media/logo.png    |  Bin 0 -> 52318 bytes
 media/logo.svg    | 1907 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1907 insertions(+)
 create mode 100644 media/example.gif
 create mode 100644 media/logo.png
 create mode 100644 media/logo.svg

diff --git a/media/example.gif b/media/example.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a0605aa6b5455e19e0281efe17329666394b4355
GIT binary patch
literal 110031
zcmeFYXH-+)+V;B=5(qtXLJdWF7m#k~MNpbZ69OVl)S!ZZh@p1~MLHOIhtNBO-XRFm
zQ9uL)R8&-o%HhBFd!GG_^Nja=KjXaDSRXP*@@1{ed#-u??(5b!)KgM+>IdBc{Q}7X
z7di*PU=TSugp!hy3PwgvO-)M=qNQhsGa(o*#Kg+L%+A1!xVRYMP!<*@)(f$5vLe9j
z?Cc0GJ`QdHP971i3n7KMc?EemD0z^AJp3ZOd{873$uB6ve@Q}shw753)FmlEn2$z8
zh)zUAL`;xYOhQ^hhCxC`QBnzzxvVTJN+&BTdsza0`9fFJ<uw5X1qH=_>53xb6;(|o
z83vWhj4CQBs;cU$8d_@df@&x|bz=afrK_pWp=k<eDKl&78Efn4=^5V8S7+6~kTqa%
zA!Bo6Gb<BE;JOz3_3PKoEv(FM+21tgv@+zdy2*db4sC7BX>Dy|>*#Lh4cI$4*`x0|
znsTF^T%0cCDdg<-z}X+T<NnCS)!pM3uSY20>3RR29iP{Q9zMQ*|Nesq4<0^#j=^9a
z`-nYG1bkcseJ=Du>S-$A?;jBGJmi^&P+%7DJm|%Xuw-m#Oh|%!Xjphy5fE<67V%g#
zB0f7ZRWZs(EGjBGDpfH$HX$}cDK0KPAwWC<mx@a(N_r-d)CeTIb0ue%Cudcqq@<*!
zXQUOWrRP>>hDvAU7G?DS*`_wRMUA<Y8hMd2c>}<!SFiF5iVNf9ii=B1D%(q%waVgT
z%gQUteK^W-@|8jSm6cUh)pgY`6>4f~Ya99q1VY_~di5I86&f<HG-O?AxKLwLORiE&
zTVLyiI>y_AIosPiI`Ar8UESTiq~2oH-V623_8FM;^-cB<&khX@4UaF6=2wl5j*eBS
zk6mc$?d0Ut<jne%r}q@$>U157L?X?|$<NGfyiQ_!J-<CWJ2yA?=1sHK{44SK)xCv<
zrNy=VrPYh;^U~Xc<&~A?xBIK@T5E52-gfJ}U3>ekSor-bmiO;B-*0{Tu={;mT6#xN
zaCi6P$F}~xy}g4B{K3J|!RM1t)m)z%rN5Y%d^<e;_Vw4dZ)e}VeU5+qIq6gQJ$&`g
zgwY?8+283Kf8RLqol{@ewY1RIG}V=pk|6_Klmp)h1WE;f0EvHU<DW8#{O7~}DU$zF
zB>#Uc64*Haf^iuT@V%ihCNcXFLVkZFT)-&Dpsrvrmi@Bl>PTJTa3WGWhRd+NXf#E{
zqQZW(zIZ%c=FV7-VMEDew$kIh)zOAh1FFuT=Vvg>vR=W_AYF4mS61yJqpMoCvn&7r
zWW}2`=1qtbi?j@+TV4Kfub<#NYa}njEVvQ^ZtMbNP);!-)bFRNSIneuN0~O~NW8yB
zEYTr*Wp86JkECj(er#D#o*{c{7{_8{Wo=XK7W{CnnVTJyHT0U#?3(@K?JX8ZKn%nY
zRT6hMHu{N6yv>>K;A#i$PhY>j<>YlJ1$IW>V~Py80x@|lsDqEWa)mCs9fa=BH>}m^
zI%inVZHoz0g(32x)seb1xj}#UAHQUN%hW>ytOv&|$clg^W+<g|=e#HA0Iu(YlA}ek
zrtaWgVczGkK}@VvixLbQ_FY|x0|@*5h)%i_=|>X#t9%JAt58*7!ebS#<QxrP31iaj
zhnS=|LH-fG@ZTpC>lBUF7AA>Q)|W|FPK#R{o^cK>@BysOWqhJ#F40uv0Q@T@@Dx9D
zTVh(RVO&ZDK!%8R&m{{1F42To7*JLpD_uv^=$ieI$`a)SAk9XlvR5~*WvOI5+F=Uf
zXuo!8`U3!Cs8cFj$$LNr36*FX;osKe#CZs1dDdr&=Gc!Kmgf5Hd3e48exGN)EK0Q%
z3n_E!iy=|Ik;o@;K1LU7-4;_ry%itu+~l$X4*9}>n^?_sq1F4ym^zA27#cnX7?Dl4
z2c^j-EepVVW!XvQQh=%{K&04$;|8S3;ABwNC;*sb0|Ya{?z|DIpWDgvLlyvG>r02g
z7T6vR9hPSfjXB+x1)w{DNcaHR8%~{gQtLg2VKT{8OvjfYaZ{dZ%G9l7lLssJZwsa0
zletYP5Y~qTo`9CPn<)jc(mG`yCm>+2OKy~qUi3UkHx~26%5s1Y&e%<}9_y^Ok3JyZ
zU<QcD=((4nOWici2Y@MOe52?Mba;psihizn?%@vM$?OfL^G}Lztf*79m+w(q{?e<B
zx{af}+4*&h99)Js)SLn%2e^O?nNieZwQNb*5k%wIZsB9YfRF4s+T#)p2jZrT^CNY3
zR9;74Cn*h|fQb^k>@(2-Ne77&{0#=2_9|N(IyKD%XZ7JeeADgwLoZ;!D7A^2=^?nO
z;QbE<>Qt~anQjPFtF+en^rL;qRou~7tmD}y@SA+69wVv&!47;+?dj2P&$r*ZKj8X7
z0JMW0CeY^`Bd#RiPUa1gfP|o+T6!#;t;;UxIuO5CNQgV2qqNJMK*p>?fh|CTq4g-h
z6og3O$7|A9YqH9bg5k_jkelwk!DtLpL?;1semS`{q!UDAkR3+BFB}!Jiee5F8Gy*O
zC<i~0dUBwpt4D+D3CY=DlVODM?crq|a!{y_{k1Qx6o8>luNZu@K$`{!(GnyBKaz)q
zDYAASn8n2x9rOGgy4C$XzADjQaD;u_FXXh&2}#91`PUaeNa2%&e9|ZY0dU<vxdn~M
z%J~4sUZNYkmkklO4xw-DGb^}D=1Mt7u6o?7Ilvd%fwomT(#CORgdht9i(laYn2Q<(
zAATzz73M)@QIL#Ob@_k_TgtTt6VosMw$x@`r)1)Dp?g2N%IxSQ!4#zhNfL*AFh;>a
zrj@D%8P3gO(F~^UWk~=#FUU3N91@JXlOjzTLih};z5`9ezSKtukLJr(E?OXu<)Z++
zDH{kLN)Gsm0Q^)yghO~D<5}S$05`x<xd6kY84CP{VGLTj@Yj(r3Mz(^#A>;NkrcF$
z!|=!Q(Rtt*cL8DBnOLnYD#!Mi`6ms*ZZ0Hd1318luFH0pdZ~7u#ej>oP!qtALIK$D
zV|xs3i7Xgy<sDo{SgO-@QV6}V9xIK;!HcLqRhT^Yv@ErKb8}On5?J(<eqjUe2ztWD
zdmQnZ(Hwh4#*Hq!s!tFCBG<%QK=%X<SR7=d4G%Ze_;FK$me@fFPaROwI#g272>>5%
zI<h0lp%4_g!#Tcyu87^8gO(~@V|SAc#y!GT;Y}S^VAWKmJ_2;EQ`!F3^8I7<$<v<_
zyTQ6p6tw!*;M!hya1OxI(>nNz&Jg$hIvdc`b^ifW3wu1VspLo+k}SYegEN{tU*G-o
zDEn;nHGdJ1y$F>kum$VpR>(G6en3%m##(@gY%wXtw>&7ZatD3P-ZIcxDgfrF<{1+$
z1`EA>2`g2`&)NZ7eL<#%2E`qlz^uIGL5G{cC_e%@h=5HZ!39ji1;9!JkMV<%({Kn!
zwtRhZdLW!zCS;V+yIvm#H#j#h0t(pED7Q_aLJi(R%PJ8WERYX!;$aN!a^Ev&;~3<)
zcFqMBHu||9pg-gV+D!UQHRS!8*wHvUna0w|r><%4YISInqOLa<u$jQM*|KJE2~Tu+
zFeMoI0dWTJAz9^baVC|;vsxW7H@QsQ4YN<@=tQx_l&=wJ*KK4qIkrR{>=`?7Du@?~
zbAoH{X&0U@5QPjtHD<UCoq@&rpN)E+w;5dCpDNczPkIG#A9$YGn1;!vF67DL2qzwI
z?uc2`>^&(};}f*p6nc3%3LkTCRTGm^!E8Zx5Gw@}G>c_4pmg4d)sZ<1i&^FXc!>9d
z!)VtEjhIRnt3<E+8zDLIEnU1hp}sxYL%)CidfW*Sk~LddMowRzZyZtxq2J<&Ip_4%
zj3^Vm7bF)s)v68Rkx8JTyMF&Im?*`rfW6%c01g5-79)o4FhsHNX;Q3AP}2daoOB^i
zvzIm3g{}l2<Vb0x|KKJ^JsvqJ*wue$Gu`*?D=vHOa*1j9vaCoM<ulS2`3>dPR}XNA
z(&wMbxe7|E3#fF8399d-!o|=VanXgyFahQdJ=Bl<7-E3WPB*z|?UwpNJ7prUY-$^y
zx_+sAM137&HCURyemdRwr!w0QsDo}ESyu-kN5i(om>ADo>^?AgI9I-MxC*!1tcS>;
zhES~U&g}L&Ar)8Kwwe$Vx2Ur-hAjOxU1@<;iWkTE6vW+Y)6ZY!<n_JB-#cd;V%WgA
z$cRUL+Shvh@N91<k3e>!L)vDYuS@e;d=lQPRPXo#z`gX?Sh&0;4FCA+R=Eq@`x5-|
z&F9~R;d7DCjwyiC^ye!J&sj5=-ceZH#?aQIpiOY6+lMsus9SY?&T1vv4K2>9^Fggo
zO%8?O^h8(_ocbkFku}1JWBwAYFGUCO#gz;v<Az}F<KQ6Y5GhwQ%`Io)G-nx+P<atW
z`V1i*La4eQoW(ELIwPFu8*aN8?r_YgjHT&DMvTaK^Yw;1W<+?ly1BPTJUEUpnvcLJ
zMLw~P^!1DM%ZLnUjSO6j3_6a)vPXp|MTJ>MMfgQUWkkiaM#U{gC7d5e;n<^-m7-Iv
zqtpDNGcuyHTBCCoqw|iV@$4}LN-;&&F(rO6Wf?IQtua-LF*V0A1oqf^rPxO6*k-@j
z){NNp*4WO)*zV(4B70n)Qrv)b+>l?~NJiXPYuv<Q+|+R#i9P<cQv95C{JdZMVn+OO
zYy9eB{M+OBb@qf!rGzc(gl)fs-He32)`Ww_gwMwbhwO>ploF4u6My<89%m$;wkG~w
zO#FMC2q17^WgNr?NA8b<W#XvXa5PIex)U56k;JH+#B7tq>Yv1(nZ(hS#I=;fbCQHa
zB=ajL3)&<L`6pA)0Ag*)5=+TaC&@C16glM-d7BhP{}iS3%oLTj6t$%kjgu4<B2`N{
zRmUb(&p*{5Gu5aq)p#lO`bnxO;-$IrOG}%VR{k%oGhf=ay|iC?>2UHAjYxA=PIIwI
zbM;Si&rI`dOY>SvdvKD5L8L!YPJd#P?(3iKmzf^WmL9m29(0n9MP!61XN1{gMEGY!
zWoE>*WyCFIB%Ea65Shu!nW;9JY5tiRnVDH_nK?_Dc_*28L{@=vR*_9siGNmEW>!U8
zR@G8g%}EvkkzKEx-Ds2D?4RA5ncd!&-MN(AeUeQ?<n$@$4A|rh`R9ye=8U!FOf2P0
zo#c=Zxv!OT=WKH4{c{&HbC=t4SC?|%p5(40@;1+v^R{gAw*B*VGxPS^@(z~rKA+?r
zB3^w{esyH?>Zkv!<IGp5ZLfYWz509d3gEzlRqzm7Jb3^fmW8Kk$I~q1=}z%*j(kRy
zd}iBx)_{EWtbC64e6Hnup3{6JM*+V|fuL=HP(Xo5R)JW1fy8ow)M<eXN1>cbp}cLO
zVnCr%R-sCJq1tkx#%Upnqex4oNXNEFFQCXEtH`Lm$auNv`e~6VN3pp|v88RXRY0+I
zR<Uh+vHfzf!)Y;^qr_RI#KpG6HK4>jtHiUt#A~_a!D$JGqx6wV=@Z*h-+)rTtkQt?
z(!k}?pwm(;M_GtUS(t5EL_k?oR#{AYS={+@S;A=<j-xzTr99QPJT0I+Bda{Cy*y{R
zJnys|&rwmJQc+}EQ4&y5mQ_*FUQxANQFB^B;Ha!uscf{ZY!0Yw&8lo~uk2i|>^`j|
za#Z!HR1MfxeTfD}vZ}_~t0tDKrcSF!9M!K?s^@I0=L4!2v#OWdt5=t+-=0>lbJT3A
z)Xdw0wgYN*vugI*YYvucKA+Yca@2lPsXel-{TWbuoK<_;Ui*8w_U~yez)1kB5+HU2
z@@E8CHi4>xK(j)iJ0rk3>ljt*nC<FVpVhHv*Ku^zajn$xoYf&Y>-kmd1?}pEp4E$F
z*Nb)3ORUsOoz=^5Hpr<q$lEn2o<D0)%5G5UXi!^e&^T*AaW-nHHtN_l>OE^T$Zj<1
zXuP}vHbz6OkWf7tu(4f}ayD3>0JSGH*{?J?JcEeJ5I9I+eI(S505!)zB=I0BPOv`E
zWDEz>SAz5jO=gu%_E<8jj+V>WV2867Y)6wgKww3ZS;1SakYubF0v{UcKy0!?w$O}&
zjMt&&1TdE=h#O00TiFtL)+TA!a+T2f)f04;2-QEV<sw1s#vzh$Fc%)gx87Kt-3GO5
z(I;K}zJsO`RJ8&@;A%wiO_tQ{L$UR?*V?~%g6#HdxscEc%Q0A4BLIimBcaWzgvb@p
z_A<zx0Hr?P@31F9GVg)L>_AFHs4k}Sz^;DMuJ%huEi19z7}LGy2{I-^e_SJcwFCXR
zN2pZo_KGDlM?&)|+uT>WskrLTIcsSHYvs^wKRaqz(OogBgg<9Qa5kuCyt#C|DeoT0
zwSy?QTE}4zlEZZE1@wKd07a^HeNh41qoH2n1jGasHr{)h-Bx-JDuC=aC$w?_O~+#p
zidBd)rbdng+4F?Rp=%^f`^*n&geTgs68e-nYbEhLM_D~)Ui~&+H4>|}DiaVjwSLPE
z@IptcUCsdfU<d&;H9vz;1l9-;y99^>7M;T%D|(THrqz{Ur<_`!vq2UTnH7m__dI4K
z#;Zm&ryU(vbEmVG8`Z-TH^hP;vWE{Mfv(VJwJ#=y^w-<B_xf3o&^H}WgegP`4t8CE
z?00lPe-C^#B0{;EcWoi+7>Eg`O_wwtZx50*B^ndE5T?ymsP172=x9!xI2<|=*vm(R
znBbch#U}>1MgrC9IJ_Y5J8DvBYDwa4ENG}58oKK_wd+;Ghwn=Ytl7w^)y4OCaY8bx
zMsKW++M^+-0c|W8h#ZovTot@80X0FkRppEZ*n^DmBi!h*-7K(|IGGu)Mi&WXnuLa`
z4m`>Rn<HD)aRchaX%^tMpkx~#0A@k<_l`qu{3iA8&mcbyt(;5LaRjzTNQ{QY)!N$i
zN9K&g(#&mFfZoOShH_0GbAUBXr!zVS?Qzp2I|!3;ZMzr93g2Oe1}PD`OT9)YyTAdf
zAe;L&dYHj|D)4?_jV^j#0O;OchJ;p*uZ=@l3E;n8HNJmF_hQCARJ|@WZhBPR_T=`g
zV%MyxTK_@J+^6N)Bcr(oYqci$;VZxAsU-<Ny~eK7zS&cKb3`>SN`k~vFBJV=@T_h@
z->(U>BTjHZb}Qb@twKER*HCu7*8Dvmde&HRA1c-bHbz1nCsw*?2aQpacBm$k!-4qh
zw$|Ikc9TVhGh)^F^19dJPnD^o<tg*STDy+c71f3H^J{Z+Yqf9Vmh56z%_f(Q#z1z5
zWbtuiR|(MIiG}+6%TDU^`y8(`Il+nQ@3vLIO}9aq+n@%ME_3X7V=h>fwEDrgDSicl
z9)CAwQb&8xWxu{)Jy9F(Rl^F05Myh&ydXtqBj;o7PO%;B;~hbEOXtgEmnB*<Z@=F8
zR7<$s8E-eUE%pvv(*n8OZ!FWERXNE5zgS!wXSwhH{CNlZJY#te^oY8H#k5x(4)&t{
z;5#{Fk81iX*%>&wm1PG}Gj0+^&ofN*L_BX7tC{`1JhXG#aZk0m=UThN@7mJw>G-o&
z-)l`jCAQDS=1bzHWoo*C6|$x0HRi}|C5;u`b2PMk1r*KGB*O*n;)3>j&E)OBE8<-5
z<AR!wPxspsZ>@d||GV{&6Ut}OWEVKqoBJ`_;dRo=n?<#4=n9c^ZG3jJRx0qr+Py9Z
zacHnazx?l7xw!pVuPJ?GOD|pj-}XU!+K=0`yF+J7V)sFmbo(roi_Tnce{l4gq1tV^
zp>8V>CE_R6xVOJlrs455kWUAoj=|S|wq8uV84@Rx?;4ns+E{#BGe1>xybnEFsX4Cf
z*>V`L<Aey{K^!vRpA&;*v1?2FV-CQVp?e@UZm1as!s_q^UfHx{*M2fpGtJpG@?d!W
z*(90jG?w}+SasS22j)gE>?M4axk1oPTZd{mw3kwk{xNDx+<$E@)$z@tgFN=Iod<dq
z{tZ+KIyvjIyY^c4-4S@dC7APv-M#fcwylxWt<ju^%g?`n>{`3jmap^v1Y(=a&s*rF
z2zTt7%W9f6atYkhKQX+&zH&eUq<;Cn_~rNNS3u9Nz<0lb&VONfk3+5=hdCZcyf}_}
zbsW=k9QW?{;wXyaJxRWL;?E2JZ>YWx<O~8`Fna(70mvYb|1kXjk9`3K7=T)U=i)wE
z0J8syTs0u5I({Jfe<4@BSQhnvBiCT0Xx=}_^;)W^;{|fHa2|_QxInImb)o53D4SCn
zqehY8e7zL0`%zEIXG>)?wQ^4zMc-6vRy(g%Scosw%5{ZscYG`9XmDRky1g$aY1@ps
z(XP(f@_D4q^V8m1)YDqWxaa3ozU+R4jj(WfaiI*qubV>&^x6q(esUjr(xkskRxL^G
zOnH-m|MTd<01~JKNnYH`zwj{(iT!`a$Cntn*k9wZVEB!+|KMZFM@7V!K~g4u8IO1R
zD02pkE&Dvkb?#9q=I!=dVka&)Ahjl==I*=+C-J-FoXQy1J0`K$IF0p-PDZJ9%OB(`
z@-H;d+-IFIh)lVC-H5L5>-Y7Ix7}Am=_CW>%ZDyKu+>^BkkMt1N+{>p_PgmcAD6^U
zMf%B41R@O?Rqd-Xy!)71gv7Z>9?>?DnZjbb1C=aM5e@g=DH=quTa!_L@T}S|Qlbp2
zRk#8Xv*b4`q!+)Vv-)Tf(F!UO-;y;u>m8RAK%K|B>paoke^V=*^Kvsk#1Ud;)W^6E
zt&RA;|BfCGwfxOJ$}PxsI|qig0zLJ9gaS~?AbkN01iOBlnj8h@Nk7gX1fep&qQhu3
zcJ&=VgmsFrFv%xiN%YNdP2ry3T6%!!>LXL$BUznXO)Bfhq$@-Qi+-`?tqo>a<?jOO
zr=Wi`X$ImyNSRi;^8ij1>*Qj(30x!18*&f3j~1s>Fob-NJ;;F*V`Zn<i7}EDB{(Vi
z8ANof%$Pe|-UH=-JMk*`m!^0pA%%wD&iCXlpvCCn@-Lp9X3JkLm_q(?0shj;nFF9N
zdqNp*p$d0~NRp0ZE)~Scol}**!aHOZYYO8+OlewnAH}9peE4du?WV!ukp#-JjJIiQ
zEyn@l9CKbkXCRKNw%bS<sW+gUv;d%h;K&e~M~|Y}gD_elz(#_dlR!L>ABF$}J`dUj
znMqN++U~uS)D-rwqgX#`rIUaGLD@^nhJV1}Zk+>gqT~ZQf^ncqmVTKgiX1TEAv48H
zQNSn|02s-1z0Ov>nGMCW_v!R5V-J!B${NSP++Rpei#4*N)8-=Uqk2IkX!|MZ9QDy&
zRYMJkQ;^<Ma#E1Ig^!+_MNYg6miR_NZiboAy!0yPn`WL0<g%7(nb*;aVK`$j@XCoB
zJ5LV%(>NeKeC|bJ-G*Yv?vUji+A=;zH9lV8OYDS0JJ|sfsw9yr_*Sw-4Mss0`I<5%
z^qK2%GuxZHw*+c4HKiVdC$I~e6}PO}cx?SlYuKyb4{C+vC~dSefz?Vkr78HrdzBj}
z<f!F6os#^Rqpvg;&S^ZN;qt3K#PtP%bhLQ=k{fSQ5bQ&j41tC~w2rW=WCEOjhWFL)
zZ;m;rPR+L$uv%>EAhGvw&;t8AbyzLY;}Wn@X*;a;RYpRjAdp<%;AfwrVyM>_<XdgK
zbym6Vup%t&^W%tYUsT+dj0`{*$n*^+qVWweKzm=-fH`?45*fISl*Q@PGj4Xn$k8EG
z(M0KU2$BM7(05al%b6k39s76$1eV8=FS=UyPvfTeeGIJ*9^5KeK)A$$+;iDEzDjRD
zF{2c0g>b16hsc2ZryzKqmNOyl!dC{s5JXvW0+rj{10>b4UVfkf)hBQ1(Dm35i#=k5
za*(L;t_APelc5HAzdnhlTTa|x-Acm*<M}Q~GEdKAl%WnEF4VYB4iy}8zHw-_E-DD6
zf20}eLa^Ypgb6TcMX6xp*#vZSwJb-+&hMJ1$Lox+&Ew!?g2C`nEKxHA1sm-BhOG~@
zQg~2Cea|B$dp=}{R=~RgP-4o0w>s<Am*FI{yq^kE5n1W66z`&gnNWVh4iMZq)595R
zk$8+&FRL?fe+~)AE9sk~KoVDf2Ggk7jT}KxbR4jC>YY{|MSr~h=RkntJT!u##D(_O
z0}!*2f3YSqv-?NW7qe^Y&>@;WQ~S(WJnW{(Yc6wAsL+#q+CM3y8m95*H;)Psv{+%4
z_Xg%1g4xajE3#@-=Cm4HMWUA?<sI?yXd#z!%JPpnbRlnK_6`Dtg8SScC>jnf9Xjhp
zKFFQX@-U>9q$+`-rfP#DbX5WHS1{nMxr4piYFO>$RjDG{Hx<@uA#)hU-A0Er4F=tK
z<)4W~tly0wBTzg1m9y3g!569h<`<=kf=IjbQLY<*<Wf#{SntNi+nwuZvVG0p&oTWP
zYbQg=@tia$t>*~`6Wv*#(_+u8#YWRP1i?E75mF_pujgu-n?T5FDdQExuqSMM%O7gy
zEXS9TZ#G!_6=3)8$F2Z5!CXD-P!T#K!%}jff@Of^;qzErqryOI52^+jAyQk;1v5M7
zjy!v>`tGa4LKDDB(Dd6F1Nrr`NF;~azz(U&Ms60rSQgQyAw}C&fxTKQh8XFzoS6z2
zfh07;bBVYOM|Z!v#nG=%9{Dr48(0jZe50m|l(Evg6@q{NjNsJoY{eV^ELU7$e9r7H
zG3%{k)@g4gvkDjvU6jYk%gAYIa3P1`E)sd`U-kObw&g5r&iTy_?X=<uP0}~E#(bx~
z>vvYUA%{^6_$Y|?8I2K&I*YW}d%1vZa#v6F^a39@773etG_pH=&1gocPk`Swes(%b
zu_0fkzm}AT5u{HZdE`Yl0@rYKc_R_LDh<hGuvXQXZ`6yrMcl--$h#~!Il(FnO+4sV
z@1nU+uIaC0okMXEm!_|e(3$7rexJYvX49fUkM1XVS-7lFE*ZP2tYtVU=&a^>!y2L`
zJ?_kEQexHz;40rX;_;D}eqA>Z+#4IU;)M&G%`3KuGaf#qw^!rQRO(o|?<Hv+#bk@r
z{1S3&=<V||d%6%@7-J)z{C20#$9ifWL344lq%q5~b90tTd!I5L$vu<jS!SaT@50Ga
z;kP7~EzDgn38N@u0z$p~tE>YbXAFzR75T;e!9M<WCr8Y<lieaS>!?ViE@MS)!KOAS
z9G>0saGy99Fxhsy{Mw8?-=NA!ozP8RGY?Ng>Xycimohbo13Et)r{FG9aZT6z*xQ@7
zxoyYYHP_aIq4C6iZ=w3;(8l{tm=w-6F#1X-6!p+_KU<4nx>Jm(_Rxx5o@0jPj4do7
zbFRX+FR=#SL1S41pZ#8OcfFhw{gy+DtYt5kyoto}S)u$&)EC;P{%^mV{Gy1iP(b`@
zviTXuE~K3~wyEK9=iT52<M6XV?;Vv(gqpMDPk!g7k4nQpWnY0Hc4b|aC>(tRCQSFr
z2&IJ*>J$<72c|4r^EsUxR73i^{vBFWYDs&9qR4+CCVv&m3>czmIrOd}1+@$@8j^z=
zASGW4vlmbuUB%QFlS9F;@`LXO2TuKhtB0u@7X->bGHBL&9zTy^bR)mLg}F|6?iOaV
zF|3>PK{^NT$5MCAWAoZvGMYluxZ34<;S)H@56-(zrPOHn=czF)$)L<dou<`D-yLo;
z;%w*+cRQp`(Gt~y8BcsLkKSS)5e~oo%Xp?J{CaD|Zc)Uobhy|qTv)^zgb!(&Q<vNg
ziJixQ;178KQ(Kf?0ELZTaHyl8pBCr__#AF3;>2+G1GDW--rG>?zA!jC9Pa!<KgAu6
z8FW_qVF4mVYbjjPWdZcV&4_i;FoqZkrx<YqpaHG?a^$A4X#}g1Ij^ZXg(e;PJ#&c&
z5H)D^fCV71>kTei6|-CRu*Y3;k6bvi6wPqtR=9NYLnMwoijj>kJc>da9eP+4^=%-^
zO%QnR%oYSdm>HaEG|}V{=!^_FwU8sl-P<2-+7Ex=0F#{7Z`ziAK%W@U?7Vb%YGK#H
z!uw+p{b$!!P0OKL7w9DMu%l?0WzbMxbelo&B-Fl7!TqTPZOgjV@uIDKn$z_eoXcY;
z5mDS?u>-$<oX;ZssX_dVANcI^;KSwC6y^<3`Z@$<8v5jr@tT#3egtc;6{GHwiyAKV
z(#9R0nN&69mq7+M($Q>~btcJPR~J`TMm|d0dPe(?t}x~_@eNM|C{3b{Y?zdG|HRc2
zkuJ*z<XvKV!Rn4gxIFcDmkCaL^nc^ySKD+K`1mvGU-;ODG0Hz9{$Kc*@oPqe;Xn8|
z!y_}g{2zQAI+}^Uz{koj3vB+u#{<4u6&Lu}(4*=k>jED~v1T`3;A4bKbLKzzShg;^
z`vM=IFc6jh!N)9SIU^VNxD7tGltUWLnMUN!Dd$}Hu>VR>{cqhD8E_SN1+akr?G2dO
z@&6-QB1=Stu>7xRNf;X_@L$oAIKCVIL`z)8(k`MUPmUj5L`!7uZLW@fFPzFlg&O@9
zZ7eej(@7L#$-3}4xhAiSULt%d-c(vQc&?2#RW8(``(wDTHCHV)xX)JH9&fH*X~Dc7
z%e~f8v)1AFeQ#~NrS@G9mW-OmxRtQcAH^i@Fwt7~ei$ckEzh{E{=<02<$G@@+8TDI
z@!GLGChd(MXUi-q9VXkG_7@0u#`8=%nm?_yKHh&j+0pXl9Wj)e_j+gR*Y_hS;*L|D
zZQplDh1XtP?`r?Czj$FFrn)+QeOd31J?FjA-FfnTcec`Ty1VP_*Wvr|S2udP|C}9P
zn1kt_p7V2nTx1;!VRc^*h6$CehtMeQu7|?)L^i^ht=u=l*<H&vBDj2aHzJV{BAZcy
zY3`fRA|+*;F%r$Yo3S!OBJbnm=iT4OD{YqvIP4tE7e2VU%_{gn`>j>c{j02ep_=;4
zPNvlQf=Ala&}!szqABZuCbPM_DK42Z9MA&zWW0+t&Dkw=7_7*Vx-gJD1HfdCfe$2`
z81(AESuv(MOeUt$I2!C&v?*MP*;|K66w<51q{Q9`#$P92cVjY>$?q-B49M&&G=rFG
z0!S{+Qs#*3%R0pt&{20lxAB~$Rh&QM;i~zR^~pUzUxx!#O%abK)wFUfhp<3Bkb@Zl
zIy0I;wAPun=ABI$$#PgYIy_w;wtN?u)Zn~dNp51NnZ;Ekstt!K%(wz=Q_-$%>N2U@
znwoQVq^`#$a3X!TD|)c3mctUG6#>2{LWEMPRak0gjSiF<7s2m#97~Bxx0Zo92AiNa
zk^KyU-(xF>dNcy>F_<xn4K}cHa-b%X#R3Mp*h1mD<b-CL-SI6UaVTB)7)d*qos;>?
z-~&1N`g9XFFH>fEN3Mq%W-vQbm`x&ZR6A!hQ#5}SA9!=XjA-atLVoQ}C6x8BqPCdg
z5Ak!4P=Bo48|du^t5wV7nzz4dhL(ClbL5UaN$)7`Vye3ZCe~(gN+Vo5t7*fWI?UIX
zM=#YCX^ag}5%bi1-Xy<1@$SH$+LqNyT$X(RSQ!L+W{a0;R8M_s_E5f|-#s|cP`Dj`
z^YH%Uso?JL0*ellu}p7;&VR2>1;7CG0HFDoJ@>AHp$HUoAt0+GRFvru5fEknPr6I6
z42O^4*M(E%!1%QR_*KP!O7PMkoj$CD7%bq7<wrg!kSOTo8xy$dVoAaljwD9X+=9re
zXcfe<Dg{9heD8-7Sz#8xMM6Tgfr4umAqqyAfq5jo>d|6AQ4}=FuESM=ksme5LZKbj
zxl~A|83~%;KL~zFc01aKsl-J@U}S|wKkMyL<%0MeAn5`>%J%>6+Jkf^-({GQ=^e|U
zcMc4gbus9K#4geR));`Uz~j#Iww8?tU9cDOcmMo|3TLoj;7?bpi*nq7gw9>6=~dEe
zXbw+F$o>8WwZfMW_DQlp*(34$1H@H`112n-M|bEM_l$r+Ov}-yo?QRG25UTIKEzq~
zuZWvrx7b-``W}ckV#3H*6^_=N5nGC8)asp=@D}?&=0l%h%^-bFka%|Rvny{d;WeYf
z%U)ZpQMP7WXCw#gp@p9!(ApnHN!d?J{de;mf}p^%9SBANPVVCqPI0H@C(liC90i=H
zeZmQxu2;$HE?rl6J#_OW@(*s&)$R|jFR{@_DdQO?xM(R$&q;UZCWOU@h0doKqhsee
z*2v<or&apO%Ambyw;+!ECs~L9VQIH0)ryK!|FTuZ$C4ODR~9<m8fN%^c4t{25LgDv
z{<Q-BCv2j(8X@t8{a3zEKb~98GRolJ`97hE!@7U+eX_Qu|H}8#UmCc`_wDFXDuq&U
zd)9|c7aG_l2#z(D&jKnbM!7Kz7u%clP4hJ)g^Nv?UJ}C{D^IrA;7*-<d;fB^9YOD^
z?U_P|q_Nb=x4paHyg#n=T(=p!<jPh;BNsIaf84TJXhXzBTcw_f55Nq!zU4Mp++ve7
zKU__!s1$LeihV5UJU^ivCUxW4x_?N?r-CL=PP@g+bM@L=?=)}QGP%x7W$+h$WAV<t
zVV<adG8ZQDTt#OOK9nT>l=g;Qo{-Nsg>y<XLC06|#dfWbsqT`)G4|puf%nS}YYZp+
zCRgG){_36_ttBVYq*bGD2=f^vCkC*`6ToV)nuWJv!d*Lf;jOT=X$0S@R)X&F1%dKe
zwrmDR91<IxB6%IQC{+b;+T(f=Ti^SyF>f2ZcHyzn&ImCNLl4HZ2a-8I=9?>f3p=zV
zFT&|?_|GtGe|WE}ClE)Rijz7id7n;8Ie+JF-qsymrU4!QqA0hm*=T0`mUc;|dxifD
zY_zpMK~G>Y=?1g3I{7vpHuxb)u`}$DOg<}j<2rkdA)?@J9`Vk!SdnG3dtstpRuYGS
zvp=1a^oj0nImBO3o9V=Q)BHB=&+|Dq4NZgay=qAGpqazgx+%M!e%J<G`rQprFMu2B
z4XNs}eG;qQBA+%_H>CIGpwhxd_fvI*!&zndO2I|b!OMfQrp`IJ<0X_)5c8mw>1&zP
z4Zh&B&t1pcm0!Al|J?u515ijD5+Q6}hrKZ2s>42-D+h=DaD9od1I)L)z7DdxRec@e
zdV2767#S(?ZA38L>)WVEY1OweiI#(J<1)h%-zVf3yuME=?NoiAQu}rAeHuj}c|_7-
zyMHueAY6U)+W5++qghjZ$sco;x9<OVW9?S`W8S`YRg*IS!WhM&^hAA*ArV#Zb2&Cn
zHf2en8uxSgiT1ZBo~y*%WJqk;dG4sp1Wmt@kWb5>=C=&-`HGh&{NA@-S)ySwT6?+^
zf2{qOzG3ox&gD?*OW}!5Up_!>HlAwyB8E<F=V(hQe+Wo5In{iwT@dHsKbS(NwBGnx
zdH0EQayaz!6c36awlb>2p}a7Kc4rA-8e8>z7q9&_ouWWdY6Y8eU2Xh5-3^s0)u}j1
zVlB4;>$Y!K-|}2)53S1KDpQcdkAuH{M=7&^qPWGe**tSYG4tM2&wjM>?pY42xDxoE
zds2rnx6TK*DNJFjzvq4XT-x#WZXsLPcSlY=oPt7`Bs04)-xeu}?riM~&qqw2oV8{f
ziVO72qH;~fazy)~AAO)S7q7xOhC!=2egkZAFXUa`LO;(`Z4lLjqwHym;=ZoQGaONu
zsb#m-iy#v$4WVEtr=Z-Bj0Z7XWbD=#RHYPWf}3%ADvGUY&tyVlJTLlR7$td1)AdAV
zcQQe1GmR@17<yhn5EeorzlHA)AJ^8GMlM1$$Z2seyg-66P9r>0;FOF30Cs?if3heL
z_zSJaU|}k6deJ@2+!dtn^@iLEk%Puyxc(qB>7RvxpWJazCwX~5CCALeRSCu7Z75p$
zAO@e!C^YZwrBHp-_ZebGA#%4p!o8Roxhhh&Wi+Ehb(!JWqL3lVW=bPn=GUA*qJ#vG
zWUd=0;2(~mN~t3A&m(xMQgZcL_0`Q&6P|35v3cGLz2q|l+}hh<sGD<RD(|IIog=0x
zwDRuqFre@!3@Ia_I?{s6I&U?vGqM98IQoRAbtNp_=)xhFIt|UQxbi2xFa{wC2oz2z
zhJ2i9|Fy^DV@z;D$%8F!sW~K66$eVuYt>c9wuIzw(xhsdu0WH-#zk7|DTDDk$f|&b
zh!AGRd_Un^Z5h$2A&(#d1hCCR@-cQ4nEl?%OJA^c6avgXHBX>-k@Yh}ojkLwYM6cA
zNLG-kQ7>T^qOY-P1~HaHyVn@sbK)D<4Hdh?AW0N-tsApp2`S_ObBkzx@lG85*jul4
zSsZ!QbeZ}5wYUGbzyW<xWbincmckhL=z4EoDO3y>fpZV_5=Ax=M%NRCiG!Hv{eE`V
zBhEflIDb73DsGK#(`-QfkkgE*Hvi?#tN=k^uok}N#1;+ee#(xS`0pwS9QinHIP<>4
z;@>J?KlNHUnwhYlKNr%vejw;rhjli8ZoZ=M{W49iH1a(}JDcINbfAwbh<cfg>R^k=
zu!W}7-gRQ2Vi|eBwsLte|4sMX#ZYla6uItt2;l^)zs$n`4wgtCR3np#E9awt=OC#f
zWL%$j<rg@W#pj9n-klC2qS;kvf{5Z;U+vpAa?Fl%tgP}ii<9&Zs+D?GE3uLNReg}3
z(&y9=n+NIMLg7sHZ9bA!`f8S`D?caw-RN09=JE<Jec)@M1syj`Ga?O=Dp-b=*6*rp
zvx3PbP&4Y6*M7PO?3_IRg2&HlgV|A@#@{8XV*7P}lXH7K^Rgr_ZhkT&2lQ%gYB8ub
z%Bg%ai-Qfd&*?RQ5#A^ekNk0G8LiW$7xz8$;!k1L#)2@BU}_I*C0-Y)_hp%DUJ<8?
z(EA4Ew<$+Pmn(KBqqlu$q)a@6Q7sQLcL(d*#FjK3W-sa9QAECg!{p3YIu#Ul^S@L-
zDEQM}#~g(M>yg~s!wXgg<By6yZF4>#%XUAIQa}peHznpC-2b{QulRH=R@iNI^W=Q~
zY2U2+9<Qn2{ZurRNQ+1;Up66!NFS3VctC*ym9#E8`!d_NUk5577=sC|(@$%TirqkO
zWNMo^_bECBiaI{7O(EvZcmOU)dknpBz<#rLqBB+suJJZttYzvGL=X?YbKLsQ@{jw&
zM$;vaTOGYi2|xHd1MgRfkk43TDyDzyT6=aia7BL&q%gwGm`NP8;?1Najo$ov@0Qxw
z+F)4Ff+TYno?I;zq|$#+<9k+1>k8uUvE~%*RJs21y_XuEJuN(+Zta|bU9LWR({USY
zMda6!CY@EKHysB`=M{h#&(^;4oES|%`w~z7XOEZ1L%5~;=QUdEy!+>8)EHI4S&2W-
z2i??Wc3;?@TzmfQJ_YKx-E8353hj&ch^_kLnx3!V|JK=}x;QwAf@=Ra2PXj|`$hbJ
z8;l@l`mezV-JpLuTi0-+{~nAm36;L+(ouddx#-e`E^iq&mg(mkq=?<lB9+aSvSk|O
z8od;ntJJH!aIZi3=4*92Vz|XwtCn(HF5GKCbM<%=<~^OywO?hc9e&s5*E(b`+$;Qq
zDuJq%;FJ?e!RrvHROdW|`=i3j)%I;|G*I%ML#+Ro?P(X)4yZ|c<!*Da#XWUetET<(
zs-Et=NyVQQ7nEXoDyyS~w5Il)nw~1>!{PtKy{<i_5^`EztP?2K3fWs<a6LbEDvr-X
z#Ujfcdo->c|FXO#kGLajiu`%}y|(2WclUV~<2o|jKUnQsRM4qeGNpKzh(Nqtep$=N
z3+6OS5Z#B|NPJMD3nP_yE3-DO+DWRrv&Nwg%#iiZ&0S|L)*~D=nEb&=UPzUUHO=L>
zMNHGtsO`t}YCmKO9gxyOhNjf_nf>tbduHGGq-f3GPrlqOvbcd0rpvr|2m6uTP}@^4
za7kua1Qn+u!G&=zS6m)nQrd-&7DsCrJpPb(t0d)y&|W;oHJr7m<*k6%rrbpKTd(&b
zuhxsmrq!ROS>I6EHSM2J44g7_)~GTCM>9*(o#tij)yWwv=J>X|DJES%xAo9SUv{Qo
z;x)zZQ)n)NCKPvnyF1HLG&}9R*r%P1ue{}&a#!u*7*1a@#%>;3v*>yaM9~NljV}w}
zqIQJs-Q5%;XiV*0QmXz83TZyPNdA=mD!N0jLLp^d(K^eL?;!Hnwe4>4etWxqC(MF)
zP0aHMCk{o<p`kq+Hc1s#FXzb;^ClF}9`qe12ZKgvOjjRPJariJ9u8zBlj{_Pe3gST
zrh0vQEdKkMvsy;;m|TOXAWdICJmvM!g#1e2<;RSvs*);?{z^3QFXxf;L|$VBOhlfE
zn8#gNVt*ZRsVgqSh*i@~y!Z8#I-+R~^Q-|zFD#QE_0p-HODOlm^jv#Xz}&r3eq|J4
zWb)Q~Ki+TiSx5@Kiat3~X=7}SB3draEwAnUVQMB8vTUB0!?Q<Qc=GXT=ywl|R0&4E
z&H~;@PwBD+x{rI8n!n2S)lpxGC~H0TI@@mD5ujtetWSFOkX5@c=CFVGlV5ssC-%wY
z_-q<Lcdo_TH8)G0ImII|%o*Ig=yuf(N@4!3YumO&JDv?DF73a&H|x7DP}TiP`Lb!$
z0@X5!*Y883V#H?BIpeK3o`G1(SW-Hw@oo=Ug%DU5nfs9y*5Y7&!;Tlw&4eXa_u9ba
z7yGc>m|o3tf4J-LaY}%S44hmBA0jLm-yB4YVXdcO=bf0RJI8ABTb1olC=bLpy8tr0
z?Nm{RM&Rw=Vbnhkg`*p0<{2hF=xE3akRQhMZ3LtyI+eN6SO?PX*1v=rbyml2%~~-H
z?b1Hk(&pH!>+gPjoT=b^&BSVN^JPMsqzL5E^&!>QJSSy{qvD-=ArK1j`Zo}dCu82Y
zP)IVn4aa?NlzL;Vpc1QDD05kFay*ljy4tWIx9dLH9%UY~3nb)v@=>Qi&O+R*ton$s
z8Q*YV*%&6MZQz1Ve?FI%)yi&cM<sd<Z=OhlYeQV!i=o6}951WRi-}c~QpOf-J2i%b
zUUNUno~Rd)nPZB;#5Bkpss!`ML{23r*RU7xud9mpp96l+iF9REZl(3!`j|_^urv8M
zg}RqubBSyCz;=BhvW=;*)8bcOH&N28!lv<tWd*E1sQYNXnnuNl@}5wY-`#A2CCty>
zz=nhwNeTq7y}>33{YZ&{D9nyP_^EZ>L*?vkZ>VxGFe>eex-g<t41oTk^a*_yzFtVN
zRtargnAof4q(q0ZNL?#+V{j2p?2G0RPd}W6qd$QCvnD^Y>!-3Lq?1Imn7ong2PU=d
zB>fJaZ9}DSPnChBNz6%;Oj@CvgDgv1Ke(ivb3$AtCZ9(gJ6Gq@D<)_yLh>@W!`_P4
z71Al@xrh%*-!WkshdHZGvlg<o!op*YQlgvAa}}i@gx?#c<5w^VPGiZB5>4f)gQ+k6
zZ1(f8RorleKfGw>DvyO>3}ca-d-=3h?x07sWY(^dS_~_AJ=q{m`@M=%<T2j^<bh0t
zP!+l($wN#$BforMlONvBL6*A6gw=;^wxei+QH-ed@xEVDCd5S4TmuEEc-`<o*3^52
z<bd$o;ip7S1dGp-zov6hmn7X}`nwV#!Q}*@MPhX2ymDyuw<#{pl`qaKBMxfJz_+|*
zUF7<l@96>JDvHMXG8N(t5F0t3Xe`9jH%(yt?v?A?G?;>km+dlmA~cBdrBi>3xZ7gH
ztp`8`f`FCH_Mebw9#4B&z`zoEaz2ih`kuLCyrXg%HF@uEe8zjPe+@=F9eSMiu-*;D
zc}jY+J%SGn`KPlr`P}B{29L={?NWq5@=wF!D}Q#NA}X_1qVlEs>TdDab|DtNriy8=
zJ&S3<H<bxK8M2=|Gp%*zE4!cQdfwl+dmk{DH!o9rBP7YO(sr?5aa1?X#4}b<RcO%l
zXNk@4gH#>6<y1Z2CjCeEy{@P%sxK)Twtu>>Q);ssVB_1yZF28Pq@cjQVoUQHH@n~P
z*)$^mSBJu*FPGE(r(exK?Ya_jPkH4KuV`Oaqso66<tMoDT=Dp2Zxu%1N++MRe?yGw
zWA8|2{c-MFBf|o@UvRO3TaD)rnnoEy9?@0?et>%Tk6okto-rP{0QUEvB*Q$;+38$U
zJwKVe!}BDKUVT;fs=@S5?oqJB+LFnY)7OPkKgum`f3$kq1d+lA)A;?_N7HvK4qyLS
zpZ({+{YJ;~!qm^^jz6C;i5;subiUMFY<#Tvj<>(2es!Py`GTeIT$cm{dO80dM&0P#
zWP9P)$EgF3OYGbdzHu_f`S&w;wBy5->658vdEXO+M|SjYoW9Nu`a-VUwRda!be^{X
zS(Dgxfan1uMl^mjOm}_$_%@hkwHILk3#JJ{KU;Vo^lRis(6YE}qFAak@1hcj-WCXl
zv-AEOo9_PE8wAonxWi*fj5ybLloTvbg@if$()@Dc#qUoR4zvyU4sJEgfa8WgkXe$x
z@|X<$^WRQT0Rk8aP@l<AaS?+SBYj)&<mh2)Hyp?XMKvN!c^`vyp`bk=(*0bg`%I*h
zl=1!9;>#f7`#sXv7fp{Cp)1Gu@n!f%uhZPc(vp5roXXG}U_b~{@-saBU2JH{LXc|<
zmi8DciGhsVf($<O{Y)ZrT?p~G6((r#!Y!SGvCQwfyD!^e;CEB<4|sY4j`}y2R{9W>
zfTy1+1!))rpsanhj(zAdK(~&4@=&nqL+UqZXx<?;2?ayoVQGgx7juv39m)t4btgbe
zlL1o4Q!k_F@aLpwo&Z%Ik$T>g;@KhfD2{4A9pnbkE~BV<m7;u2gL?3^?~vh6!*s^G
zKHPZNJf1cgi2kY{^UgHdAre-z?&F4|;e&@*tw*=xVdj32Vm}&VxUa8ic-1j=VFoA{
zP02xsia(CRh(xElM`x5pBambyJggl@lP3elD8-87sFu;R(IURbw?bdY(Er6ze+Qo5
zMh3NEKptfglzzVVcYPkRM>_0KzCkAVpy?fOAOQ^BRV>*7GJ*S$)<h<1nE*y$$v)%2
z<R>@*Jgq$td58_Vila|n_i4wIbCV$Nuw)3+D5o9D!VzjG+(n8y*|{{vv4x^t2F!Pk
zr}ia*ezt&jkWd5(Jbrlb&ZO}qfwvCH-m|BEhC`YB>5iV_P@>Q+WP;-Y1s?7zhfB4B
z<JdfK9HU7*l*#;t$#Q6VpLHKRJejYIIs%@$g^6=|iq(*z{cTDozexXwKp)taUWyLB
znvtkE5-jRYPrsXpSf`9x_c12YIsT%y!hy8dq4R{~*pEK%Od(DbRE4eN1M8um(P7V9
zGaj=82m<&gA^Kb?CK*L-WaumZ(Pw@=6@Hxgvy{C3(8rBP?XW<$MWps<OZ6mXI|x%A
zwPZU|&?cSu2xo*$`jHRgX$vTQb234BlvxGkuvq`JY(K~rAysmnF8kb_GD^l*LxxIr
zgnkM~eZEc~I7)wh@ef2|3(|ehGC+TnVx5PR9iBqo9cFNTguYs$d`3u~%m6K8;`C8e
z?Re@fnHV<|wc{|IoCl20pLz?EFpr@#%*ZHQ1o;qXdJb`y+hP#wbQ~45qlDCFxR(xW
z(B(rPJdrNj{e|RM&d~zJ0h(4VfKK|v$I>s+;a9X{3!e5ApCgj*pr7yHmcOz~=lC>@
z1O37nO|Rxjy9G~nUVtj>!WN12zt`!1lhVJ6(j#%c+!sM_9MlGx!cByDspL9F@_Dxh
zabG-5LXcZagv--cCx*ViZGz4}`t%TzxN)gmo_NP}Jm2{`-FP%rVHvqm7RWd&nQt`t
zVg$l*2TE;I5Gz*NXPA>?kYj?UEyBa<VUcYgeflzr?xx3SEmJh&a}cDmM2_+l+w$uH
zX{?zbv%^<Eg)i1&xl=k=QU;trdQps}4WKOfdq{syr2n=~rlsQhR0Yh21G}eybV(3C
zIN1C!%kdW(4Wgz=462KRR(SXZs`v&4WPD`<U&WON@4W(+i#lb>ANk=aW3ohSAUp8#
z)AC9_kL2&mpzmTa9~PeVdA>xmWg|!w?Z_knVwk!=U6N=jO-7PAv2J~oj$V}PVlrfl
zko3N;hCt=}b_uMDq7z@QUF9HLYb#>mNOn6%P?DEZCu2bOqboEKF}hh7V-4U>)}aAQ
z^v)IOr!v)V0({NU&uj=_rB-l~GT3IF;BX6~w+Q0RDD_yVasE|v%>%lFs-1MN4fCvb
zGbBG7tsP#Z*aB$F&@ixSzQVqb3xQ?_Lr40*XnW75CgXOCH;oV=Ktc`G5Lzfg=!k#`
zHT2L!5$RF|5tS+ly%VZ5F?3W=x~QO`7eQ%KL?s9!Dk>@<*f>0U&zX7loY&_&+%x}m
zueGk<YHBUOb1eWkLyrH}h_IL8T&ws3i806!pyzZMF!-=$wH1W?c=_xt&L?=79U0Qw
zdjAQfOLmO<1<xT#;*@#B%ENv?!s5P~#jUH4ijzslA40C$BM=?W^&Y@Ue+jfjcgm7F
z{{mXPA0~aramwOu1_^?kSAZUFca()dmaTUc5M7>&y|MD87foSpOIP&5xjuco_V7p+
zoGWxyavCCs014n(-T`h-PjFiVb0yHDgBKyj;XsL<T3ldXb{UHot@T{v6F=7OP*aZb
z@hf69_As``<Fb!0jdppA0&UPq-VZzHNbD#;X~55hi1FS}TA%}wE0PRI#D~iO%PXLe
zs7yRp(@r0|ZY;d_s{4EJ12p${Pp-KgR_W<ZU+01d^FG3ZN*}Gh7Z%MjmI&J705LmG
z7yvrE!<vAHoCpV^Las==FwQNuh)n}G+504>fjn%5miQVe%OM|U1V3#kpgC5U0X#tm
z2Bh}}$b!9aqn8v}w4)#)^4FcR3auCoGTnEj-A5q6(LndHw#LB&EW%VXWGwsDSf(i=
zeS54xcl@GY%y*0N(#r9$^KRFh$E*H~`<X`ZOpnvuC+fGO8Y(9mLau_5|6N=L0rZc}
zgvbA5B^)yr{--1hd?n|;#r5Be1sI2a@)E+!H2Xh{1va~NLZP_WHL3qF7P7G5A@v^B
zwWr67g^5V*Ie+sT_#|(|W2ONQP%n6a?>K`Y)VwI!j%%8~<=CiFc)NE(Bfu%w?NMf*
z3yIn&W<MzIuG1Yl4mk1nvia{zEh~>O8p0Vyix<xJQse}r@R_W3tqEX-Yh>Ew%wzQz
zN>y<MbbKzH-|qjnAiUAyK&4>{CHmTJi)wW9@ePh;Y2RpvCr`vV7RPZX;>(ydmdZub
zi>VMcODzMDzikCMT72^MH~BaX8VLe_{Z!#8=$JW<_^j-mN{E%B-3jR)-wvyEbgK8c
z)Te(D#N>GfOj3i*U|=ZX<kHMJ?BrI!MmkM#78oJXG~=aWVp3*>&GXGqgz(^S?kp}%
z#1qmCOO#*HAQRtTb{;AV<kh;CVUg>TE5uSB`EP%avfE}bm37f1FdY)P@L+{KbQflZ
zo!AwU)sUsjB?+VGWzrXfvcE~)jQ3ZAYcLs2uyXVmHl@yWLFTxoW?*2ZtR(-@3M)rC
zq9sa~#>|1sFZ&jbW7_P(-H@TP=Q%3xn$Ka&gF1!T%TaOKmIXn{c%Kjjn9B(T<A>}R
z1*#n*S^Z52byGk^URwlKvT!{^wJXTYvW_Y)k%J6qpS`7}d)sxW^NyJ(O9CYIR!e?t
zqy>Q|(`aJ2kMFI)IW(Z#e?2pdOLr4<B2vUyxqGX}N`@`9|6ZU3p13L*(;cjm&ZPJ}
z<#>G?S+Dv>uRSrSX(6p?LgCXA$0SvFHYdM%x{)<Vi0_y59lhWci+htV??`HtO)o;m
z`yY>AnzL;$P`RPv%dy^J=8t!Ug8ea8`a9vFZPKp`g6pzr*(&7_upP!)Kd$kpqiY4o
z2r#{$g@a?%WLHJY$BSBHxmOQSZ+;Li`ga)7)ggB!71&-P%lY>RA2_vXt3R}|%SC*@
z;m{EIQz^^4<e~Gb^NSn}TX^y3pUPvC5Q{)YjtuWT`*dG4e|GZ{rMZ)Xd*cIfqdPaX
zvuY^KE)i}fFah2lygrmzYNbc3?cjVjmuF^G6F*z&3#%;4&dLW;enjd2<Xdh0_#y1B
z=g+Hw_L@<Glvm$c#Jw};41b-kiz667D<nvd!o6Upqc9>fYD66v3JEnC_o8VF`@I~J
zLyS|cO}316xe~e9&kiM-%<{)yQx`g<ViB+9L0Vs~p9%Mbr0QTqz8?XwB`*mWUS1IE
zG>D%ayjd&$K6Z@}(|GcsSAZ(`7eWJWLe+zy#b`;a#7MrLjDu&6!%^fRzDp30pP{gO
zND}wW#rs&hp%lrB{I8qwLwA`u`h80^{qvr*&{xV4P8W-R3-r^6<7^zmw*{cj!V$CI
zP9|8kp<erI2?ehuW_jV$d9Sh-Rpn1{#cyXK<-T>{L;EEnCrzPYv+Ch=NkSgc&)IU}
z;RQm!#Ja*wF_&4j$mupy9{MEgfES!J&Pao`tpcl;3#g%zV&7nr37~$VX_kJ^6O?q`
zH5JPOEW79jZK+iX;Y5CD1Be;`>IFGwr}=^-LKGTL<@g?1#(Ah-*;SeG=h;cZh0l0!
zwfP=;)JVep=Wg!cM~f!k2`Plza?h)$^GaN|&1b-FeB5?>+H2d{9uK_++!7EF2bugK
zaAp3kBb|{D1pGPt>_JQ%;?|#|K$F$#Bh3k?KEU!y+E3=a8H4JKvCar&awo5Vt!xU}
z9CX$&wUMtp75{3Qgfk@Tep1plN(oxTP6>6rlaBX4;w*oA&C*1N)1ChY&V{0sL`W?n
zj(T%*&?XI%EFFrgb$OWk^3tuy9IQCE^MY}>-R*dd^nP}&eA}1B!p$^<I>Fr8<;usa
zQT0XuKB<#4yInve6Y~w*{=#dXX=y@ARq2m;B5<TrhjKhUhUB3?WmJ{`-G=~b@GP3=
z_o<qmnqXZi;l(6R0Z$-lkVTkOKBoyFK}AfA>&m!=r$0d4!~(4j1%^Y=P5Lnm0;tLD
z^=hJ;h=2;Sa?6PQvEO__se_5j35k>q;}Z3SP)fh<Rpj@}7?LehL`SqBH---G_!~F~
zi;8`@|M0rCCF-s*Q$9DkDnqm?ehhbezct<~1Gvz&6DAp+tcS0O{+9A8ZpJ7*4wKxx
z7j1-+4?nA3k75A7e1P>jz~l9kbH5?P%e_h5L2qB2kz^>{l80}gweai^o^7LUpk7dK
ziFIoFTO7O#CL=|6!*aD|w)`Fyv>!TZdjEU=YH{`IzwBzTUVUNlvfDfKeY*ZcDXbtK
z%hhxvgY92F_3~Wr`T6Zr@C(_n>z~LBFl(lv-<wOd_C9`5v#f$h>LrO!gnM}Ye$b~E
zku+zYccuoIY3}GI6gMUZABD2Q`UAiiT9D(9<r#vwVInPRH3f?9Tv_*~$Gx_HvAqlm
z^=3(uU_JM0Gm2%Rs{OW0sGn#umqdGsiOZBuqWJmK7L%Ku4HEH2C)c&^Q4a|B>O)##
zbt}uUCHM*h2{O(+X~?Vqlmx1DO;T~4d(|BQas}W7_Pk$(GCFPp{lff@1XpAK5pMIm
z4$g}Gv&dM8?D}PxArtp!L-42b{d>+kV3}t6I`$}Ppv-Emv^H*2^ZA2&F10_ZBrD(R
zbL)(`N$ysxHf*gle4ojGvz-Kw*V5$1&)u{Z&AOV_7qtH@?@8_MZq#etJO0+b3Zg$=
zsaNzpG)XTBn4c?uudC@5HV#4zTzO-z_eDGGA$imKwZr?fUmp)21jYsz+ubl(EA#@a
z$?<MHuu1(GF!gKQvFiIUz+*V;$;7*pmC=n3Zw7J`{=7Hsh+e(&TAlVJYr|^p*gAQv
zo_hb!N3SPB3Sq39^{n9lgL^T(U=fMl_Y>Q4H@(?U)a~&|#C|jszq~FY1#DZiTm5?B
z%14tMzovxrJ^njZQ3k{SNXLzo|C9p%-#!Y98=qIABxK-!cvA;B!xDTEIxxAe(Tp|o
zSPQ8yf!9Y0Y2sb|D#uzViKjgzjxUp6$w|oOqa0?f-X@>tWeB`}vf_T|N<05xv?_v^
zjqRFwJStN1PKZf|@N1J6=Y|I3hD>R)<2tS-;J&}e{^i=L6F!aRq>eV{mycYQt2#R{
zcWtVLKfe|0<s`f1_~`%QKh^MsIcn0eH^CN|UsRPPtI5^N*?vB#Cvsv;^rD)SdzHP2
zpFq%NDSI9F#C*DI*JtlEaDR^8^n{7~jnI{6sh?&>GzFrx+T?o=KU$swucbdMWxMn~
ziuKLwg<yYyNuMm#QCcK_tZPzK8DX*M{Ls>gEcMiZAo0(H-l0+Dmw)X?4i5MHSdd=B
z8@uUzXIc;^q^e20bS+*z6RTk1TfizJ8d75`!?nQ5<GbAY)+qwxNFPlVD>p?bF(_(i
z-`8!X7-K)%f$TI$J^{$0yEMaLaEl)+No?RxTE`D>H%YNv39+9JJ!KoQX1EXtfnR}{
zfd>jsn;X)?x57JSP&_R-kI*RsUnbHb5ucL<x>aJObGRXydod52N`nfkqAJ6A_uA8t
zdcGj8N?;w-TKDooV3vss=_<lg6l9+7l*S(A;mUk9x24C#4Zbn73vnn4!f=)}Ilc5N
z&TYKBa8&5%h8E=;NKCBPEU3@#p9|3c@J9|KWlYpTcvjOt7PNz?_RsHa(fNJqSoo`v
z(z8)A{Jt#J;9z}vLw&YMD4#=rV!-WRy!Rn}F9Y-vf{Jr4W})2VlYZ72u0~(f6JTgQ
z))e0M?BtRn+<ZG<_VqEsU$gZ7w1MU}_xxJx+I?otoKV=+nM1kCyc8%~BFHZv8I-Ll
zjMv-R>ArpE$-oaOk71gHm}jF-#dG{&>$X&&8_S<S&2tT-;vmp+HBzIWzc5En_h)v~
zxi?$Qtqirs;v5qyJQ5=n<{ANFIYG;}(gXex&KtQ#5LM7NI1-ih2z5jhr)H$`^cQ$U
z9j#xf-Ld>TjSI!kBxB~$8y9cvL_%{J5l^xOQsiLCwg9G4zcfn^rEqFB`@}DV!U@G_
zh?+h4Pq2<_bhfpYaifN!1u#+!prIRb&BW=Fccl%J)wXb8)6(}x#|xo*I;5vR>!l-j
zZ9hoR)SW{95xQMM*S|C}c#Fn2Pv4f9UfqK!*}5|D!hQIOC`|um=1}bXKD*YNW(@Od
z6YTGPV^ERm$Q>c6u_8(YVIWX>NtFA`_j|)~iegGN5a{<bpx4l(G{bX_bsx>pG?Ipc
z9?XgtZS+~P1;jmx@znIDonfzIimWDj5=y<;ETp(3EXf7ZWBe2d%@RF~Jxe%BM4zdJ
z83jCf$a+$y^a%>S?sB<YSc!)S6mA`e>t^zt)lQ^9wo~~L-$5*JZ#Jm+UE6(PwUjG)
z*t<6?0CcOWK;JWCj0Ml>{xZpA8&QnJV*q6o+DR@uaLuwQIxA`A-Ydq47}3x(d_wGc
zHwmu2RugGHz-S%8-!O(H>$_>EW6+URp^VIctlNcpbjFCdRI_ym2lxPwP9ymyLJQ%>
zCZ%|>dKRWbAA>@$V@hA6f)mqcg>=YE1Hu7@UMqk!RjKh2=@bk=PQn%x#|vPh-oaVe
zZWbO~riIqE3Ht=EvE>4velV*pH^+b#AaDDrot}m+Y~I>(h$D8v{5dp`*F@*XPpT6o
z2)*12=B+rDeMaB=*wi0;S9+x>0+|d#HT83HM<XKDGb3MgCVg`nYWVYlF387j2*T*l
zR4OO2Oq$6%Xic5YWKJz)*`#(F$!^(=V>=U6@?Mpil41vdT=q0ERPdn|^B6%FUpmVu
zJ(RTi#oGvBL%ob~o#IwBh%CL7uS%{?$I}J~^8psT!VJ5_xX<Q}U{fqhdz~QPdV}n?
zQ!N*NCbfG99xgiOC}}96N2Iibey;99=d-N~)uUwTw+iT<V+rg=jh78%l)_!6G%cs1
zg<Xc&oyy5nA~V=?GE?@$!#W+lHZK-7vM$phyWprB0htA`dW_T~J=*ytNH5a!-wLxV
zD2?;J#z_)%g@>s`AC4E>ug=Z}sSWA-Y8Gi1YZW1r03jD3P4-{>B(!Luh=C^ekH*Lj
zTQUdvr-aPIk}IKWbJ9YX2PK@85SCH)XAv2!5B(egse9@Cy@D9A17YcBvqCl(?s6UQ
zD_{EIr60HzV0L2byoa%g;;fxizti|gwePsJIfNWxqNp65wV5Hg4P$qn{A344v&@zV
zU<3egpAO?3X~kPn`M=*^`&M4eRhD-jh#I64W&v{9X*^e|Q^jHskkh!@=&NPnl)oB-
z*$@U7>9B>kB%h?O(qxG2=kTZQxrS+v9ib=b5NQxSjUy^bD*ZDhR}Q!+_<GnGSo-;_
zz&EPYE1d0YY0zh#@O2f*ZWxEorScAU*~vC}kxWl->6`+mrvwN2^iVu#w->2zBYd)y
z6W<!rpDb<U6?Gajcw2`v17Am<ImxEsmWTKNJ#<l^RJEWU7^O0&T{|z%bTyg9w|D_E
zW>14nWo8eln7V-_KAsl)!j=%3-Cxr!<`%bSBo@51OIoXo`wK>Ewh^5Y<~=aQOzPRj
zWuCG=;b;g~<P9M|Eyjw-_|Vz+E&L~IQLA!?geIT$uh2-(EIBXZ%<QIO4eso#d@)AI
zq3!lmEdcAeBuLTEl(&Dqbyr1>uDTF(m4I@)zZ|et;o*pX>5?dmcfcKOx7YCncgCK-
zH5-p=3%`K4(Xq$s-(b``gK-Oli7jet#elteKIETIc`%D3wbAcJ-0HXtp&*GeF}B&>
zy8{Yp)k^~zk0b6SxW_CRjhldGKq8kaKZ7rxcFXegzaiRx;m=6y%In9oCw#r&p<@F`
z6VIPr9Qt1`C=)?4HnhuUuI-3F=_L!_JsgHS{!#T_XX}4rm4CZUHvb!|Jo>lSdK{~q
zw~1X=WA5KS#{i)a0O%|CeKtnlPTG^$)hBNra$sR!SycbLTK)HvzNoP)+5QKx{WuNT
z6*pRcrewn>VeRVAtfMDp>wibG^cQblb@~2T>DuV}>%a5`{gvlm1AdMA1NR%#|Exa$
zvJ<R-#Iu%gos|M4$AGqYSP!m2P)JT@{EhnwQQef!*D1(S02elD=O=HvM*IpZb<33c
zx8&O2(RjFQB5zZOXgXygmHK4ZssBB%LR8FCt+>9cv0&Ty=<Anw#;#~C#p#zOw!BZ$
zCdV3)lTD(MiKWTrJ;|0!$<_zSBvgu>c8UWz#VIP~m^bCxlj8m#-c*VwD%D#%)t8*=
zAC(&LAKp}I$kKm!Q{kwzi2o07${8j?f~DJF)2)f=Rsrdj>FE|t>E>hUW)fTJL|BF?
zHp7INVH}WQl%CPmn9(_!(eXZ`oi+2W;D0-4ipQ$a8IbsYR3l6T>yZAxlv2zj4l|r7
zpc+0F(B?e^LkP(e$=J4IN+~37i#l{%#!1QoePElG$u5>L4$r1h+GWi-LfzTLuzYs?
zH8jxj_;<<V=Z!FpX5TV72dtB`i`Q_FMxnELUN(>Mgq;m<6{*_1l>OHA`}f1w*k3u}
z+yMT=nR^2%917BPR9`9LCpGL-uZz5AEPF#&RzfCXmM7-F=NI)STd8^-j)i(ZkUkS@
zcwPB~+Jxc?c}(%*5T>NZ=!x<8fk$BMGPw(`p13#IrD!<5zt5-CJ9{{N>PuH_%GXpU
zvR#d)?#U0cJEBh<O+I|B5qQpd_Xx(p))p|Z9P<8Aqu5>b`K<6{*?=@@h2^q22~*i}
z;g6=@r|t_$&8=M*&>riTBqfyn*-MA7xgcN`RdT5wdiAftT!fo`yzCaMdV(h5%W)&+
z*XrvH1=BJP-`}`Ymcu$OIZ<hfN~|C5SR<SqSQPOJ{d4(dM%i%Et6bRLm>pWEE+r{)
z-i3(DJgfuTde8o0$q)}XRCf%q6L0d+yJE~Ic=eXvUQ*<8r>SW0XmM&?SvbF;hkzb%
zv819or-Yd)(?2X~VM$l_l#xy}Db-qOa(31GP$cxytvNu5Zp3d1W5ZqC`(RZ$rYC>P
zC@hrM96(bnFfg+ty{HPi=6#g5mM`1?ZmmGfsIEVl##bBQpYsO8Ds*KDWUc!Xs~zb6
zugy0NQmRp89Dd_hiM24FZ^dV>D*(0k-Zd(<egZS%d<JCoe=$C?FS{#RkXKq&<?{wP
z=Vt3!bG**gu=>@G33#=(Pu=JAv(H0*k+JM&bH@&_Ypn7J0o)%-7k?s1(ncpkpnjK(
z9)<cE?ht;((|5-CJX@3ae4D&RF#|gfm_D2a-lh-0x4ce_Lgfm=`6ltnJ_xMf=L;fW
zLB8ufiW(B)7C_?QC4w8)-4H9ut$ydZ$yKX<aj3L^nB7@+-z6I7jf<+#2oe}eaHx??
zSv0wc`+B}<4H3#gayoJ&VT~I-VHzydb!=S;+VbakU$5Rp_nuZ?<IX)oVpfHH68M?8
z$rE~d9X(apMkRi?wdc{Kk*KqZVh*(o9xtLzla{%u2!v{o3#Kkt?~8LQT@j`BzcrcW
zxUPE3tHG4)sjt+A?;e`o<A@IEc=KgPJM#v9GOA{T%Ot@w>sy%0`nIP+>-e|uFcUrK
zYYS{mHh$?&<6C@~*<dCnNVI>D15GaFi&1GGYUSebL5y`OI-lG}O7SUgl|!&QKm{TQ
zwQHCbvEzIrWYQv#=99q(skxQYW}{hNJ0cF+>S9|!!%MKxEYT?Go;VoK85kaxXrC9u
zSWl}8NWvTqQMsl9m26*tOjYJ_y>qq{)>sl$+j6&8s_z{oi^;aCC@8N9mtyaGY6|#r
zF)wDwknn*hsZ%7u$|aSJmR+IVyT&i0;1AZg&c-NznJ8*RqM)C^d;-~LPe&35B9~Q<
zYnZs<{k1SV2ARioe=Jkoe9#wSmV(YVL=a>QIc2re2MTaqRZ;7?R)dpV68UUllv*y{
zKRy6!5<DCZ7ZskT*Mg=8V<G75x2;CJI1(*cLn1gb<|&TEpWgm$BGhWS1g~2CV7WKc
z$$QfJ7Q>5sqp1m1z#O;@qTwtKHq;suljooXfOx`NeO+1uQdq7&gd_*}L(N*-pF0wF
zM;WlojxDh6)0Lj2gkF|v#y>DYi}@q0+^!5(5*SnoPHCuV{rGz~yMQbbF+bNavWk<X
zU^EdW!{=DoAZ;KF$j{(Y+6pg<P%^hM9>3r}sy2a<_oP9RnHs=p!$<ys;z@}+YFh{I
zV*FzUwA#Xu=K>5*h6WUkYcSEq09#0X8RWju<<t(UT!i9FhqrK3&X+O$rp3q-V|NPB
zSug!rz}ve3Q9{tUcj)JD45T?<bT(hiHzB|Ya<#rx30OW2Un4gKKvkPWhr-T{{&E({
z@Q;Id)g9Ws01jb{pm{I`#tAnMm}dxFhB%*7P^f>7stHLweqlg}RLIfL3yBu?pwGS;
zKo0C%$EP&~dN1d)ESE6m_OaO*brQmfn4~7L6JjVl4R!b+LC+9P=Wh_kuA>{pbK49d
zkVL9@R5cg1)ksFyi|uqc@DU`Ma3Nb2TA*78EOVW8;sAjRcd{JvfR4IkD&ir_+Xp5>
z{h<;C6u#bu)0t{SZb<56Z55BhW=Q%>3GQ6^k`snwdHwVX?RBCNm7jkh_*QmNo}Vtn
z&y<vU2-->KBmR8M9{9owi!`@22X-(MpKAI$vZi6-kXQ<e3MQ?xnEFb5sWbBECV9dY
z4K8un!i_D!oQC04)*(gzZX6)R7_SHjsc*B7sX?$gSRYNifw6G%nf0q#I6ciZPt$5r
zfjdQcBQr@u7*z@QqwS{nw7qcyMI665&PQav6$~5Fg^!ByssFaLjTN2C0U#_>YtByD
z3lvaI!YngF4;XkXdR16ner~)CN%%sv8&H&jlutl>``U~gpWr?3Uc20+?mCgNmYD1(
z(q#~SQp~S2O}MZ1QmdGd{WWXF5P~89<B-=BWWa4_RdDOW+b3nkqhXGFoOuR#954Hg
zj@;g-X&+;#^7o&~0@&LqVx+xi+%g?Yy+1xpPD3&zncJrhT9j_9=70VoFfVc^-n|1|
zy%Wn(2kai^y^WpGPU{HkYV4ILRJ=fgGSLXo5!DDQ{O{`;iLIAk<m9-;8wwm7XVMJV
z>-+}3O(4|3)NU&A3gkx=uNw&cbGk@Q*c;3w7_1X)h|mH2u8`S#`9741N}bB>dAnLv
z&lu#%P4T@nDMq6c{*+6dJ%39;z48Ta<Ef#6G8xg{ZT0JTj%GTmN6TwzS7GzMQAFaS
z^}lHLQ?Xzt5=1V$n)AxR{;GX_nkKQDWn5p^NTBARW5r2Ah)giKMoOMN@|09)rM&07
zcQ~cIvDZ4<^WG<Hb)lndzo)V9^IXC2H;dPPPVC2TQ=bd3J*hf?3F?1G=7zmizPa%v
z;qh*x&EJo1N57Vi%Q*L+|NRns^qa~3Wcpy#=HK^<qd!|VXTDurjoZ^Yu|MOA2cXai
zP#k4%<-|Wj6dLg_>1gk~Y=U%u!ikcEnML04%RY1OeanEcbJqc&1JUn4qgl7Ef!8SI
z=M%cG#u2V2a4-{Ew5V{D_<kexDQn_dK0rD>aY&FVMNXVOpP;lQf;)&)hzgS*OMK*<
z$U#X61X9PYCaE=2(o7TNQI}EVWF75f01BX%p2TQO_%W08VwC!rkUX1q@l|Tdf@y*b
zA%%Y|UMAhg341MEBY^{#^z8bzZNbR@K34o+kw^VMB9GPi4-E<W-<UM+KaFcBPwug#
zL)y_*&L~<Q-wXTpX9-9X*^&{nlBX>d>CFM{4dZ3}39X`~Y=U<zp(ncfC4jP46-4g0
zmNN~Kb%5dT?>gRFx!xlcu|wHA2DWDEi0946-m2TT0lw7@C}?LF+vmpAB@;dQnyrcy
zG$ZQf6)G69c5_rU;^&WU)u!^(#)0=YjEnQM^}UTl(b~5T8Js3#aOZ~HBJ{}#Rd4_G
z3_-P}4*}htI=6mmo_+-_b_{3?y~fuSCH!_+fU0As39|{(T}F0ra_|e;ZQ-4icE03H
z*JN)NWzJ}lm2na2ZwAzkIzI2_3k#jQ#ce4hYA53lyYFS9rP>=Gwj2}x1%<ca9sbzj
zY|AU^XD4K^<=K71=x4McP4&V>scFm%OO$Qwpzf}#ew)=ilQ178Q*GgsJ-uSA$_KN(
zc-TD5OoPd3kxWB7r<aU<!jn0SDDMiNC30(Q9kZpOOa}oTsmr!3S>Z;UG?ue6FRsGa
z4r|mm`W*>m0seklEJ7Mvd=A-vP@^R=8?|U`MF34^j@Sm$%EVtfPlj4ah1;838AQ+x
zUms#+2~H)ECvf4P1Cd<k42q`W{N9|Oi~rq%pSAQQw67c5{es!(CW<)(SnV5=hw8Ci
ztT$6jyUgop`&LIEITcLyakG|^O|bKKL?>i&q`jthfPCHA=5|qd!Ym>PYu1l!(e=K<
zty{hC4f{_syQTZYZhKChhV2gr^oLXG_Mkh22!X~@Y9XgWEIEImd-s9`v`2$~&{jn7
zaOAkCtm#ScEuwuOsq_-xnjn`KER+cr%wQfRQI|F{m`{WBl{<&aAzPL@k2K-aqcC^I
zUkdO+wMVS^B)I;T-%;s<Jd`78hE`?+CuDi&Pd;rO5uUjwhHG#z-rGDFD+FQ<fCODr
zy=i23oXGAALoTVirrKh9Kf0}e($h$&ar}2yJ8X^ELP*;CZ;u6SOiAW@cT=BU(G~UW
z?$)h5@<LCCc32^XX+-4xS0I-me4j|5EKL}8W6DVEYYJ-=GnAW;-E`|kanIZA-=}D*
z>gZhpx7(5zo06~h7oF_;j?7|;z>AgCC1A4bl(;)>CRL&&xhBV93wGo8r!iJE=kWrL
zD8q736L_+kGqcP_bD0k2_WXeU`U^i8u5R+<<~avt)(U}nX6jzZYEVeoiK9Mz^7~V#
zt&#JejEnc%#_n7-;3)s~R**79sA1`d6}J}cPA8-^nzr0d^HdVVuTy1%wK%3Eugqz%
z7(Dm#CG+p;6myeo5y75bP<O6H<$E~K^Lyr0Ve&UImDiFYiceG3+w*(#iITh%cs{A4
z5r)AVb!9jZFT~kQhZ>Rwc<YEPSWI;)cAg0a(g|4WD2)Od6{Ma%jU0Pl?CvL#VVfi|
z0SX5N_Fj;3n|7*jA{o7peg_k6OJdpg?<Uc~Vu{FCMAhmRK3#9*<<45$hz%KcQEHy9
zWLjtQf^kMbD(lO3Ly?c#T9sQVLSvaAsZYgefFAbXub5<EkV-az&6oS-MB<tbS-*%#
zH)G+T_|w~As#0Da*jOOnGd#=-z9GIx&-=5j1~(?JLHGbD7CbW}4N(BH#M9pg1?Ka|
zjfaAk>+y9|4!fm9)F>rYV|M0oWF1(nyiJ(UD#fPZ$>Vnd1uYslbp#LHqa>Mp+AuEN
zQG{b4YHOnOFN!m%*dfm%njul8j+UqxZbuhn1DmD-ts#3`H=rWKD87EG?W_X3Bc^gV
zAi5x{&O(TXqw&bq_$1oJpj_s~!oST8PVifLx@s^U^wN+s&QJN|(Rwi(IQ)5K&{H1W
z*Qro`-sz7HMxa>atmZ6`utW-OP`~`Ky9X^F)`Z}R!BYa`<|yvRjq4%^t8=s;ccdar
zbPF%<zg<0IyMRaj*7Z=<_MYkbHDVOjB}$g;c^(>Y&y-A&g4NK|J$96Jk-w;3k~Ki;
zf$cprX%9~@tuIn>(Dy*yK+GVY)4b-prf^e`k?>AB;D}Un=O-fj^txA`K+3#CGbOPb
zHw{)r5AeUlZ$eZWv-u|$w5+J?A=ieClf-?m&j$FpLci<N+H=C~mO_kpXc#I9ET#+3
zJ4v?aFW1$)HP;?IEx+fUVWb7<!QR%|M<e7ar=`~9LY)JD)&5p|E_tyd1LCAc`!mAu
zd7-xuzaiXoWJdE#ewr9%>P;18OP1v1pr~RLz0Ah>J6keGujx47E$?J-op7qvX9;LB
zIHf6mw%8<Km$X{ZN$1R?^>^nobQWFjTdPb}{f0*+Lsqds$pc`YE6$MQ+B%{l28#v(
zNgo}2FYXoqj`_){rm*$<<XkzW3--yS(LzUoy1xNJt_lhnNG={>lUEf_Qrq?Tz*EFr
zehs+xkofA>Q{AVwHb&&PJAie~s5d)R_k@9!Z|OElY{tr^PAAm8j8!dhyBWILg>ZF(
zvRJec_WS9ViP@~PF<Y5UFXnoo&1g84(rFQ+ntcW-B{G5Tw4h0S0C?@Xv(XsbBa{yg
z=M(vRwv3hIYJ#h?DJdf*#Fi9!plEirUf9KqyQXS_CH|*<R_>0mm+yQIe>8Mvc6sx`
za`}a#NG7W#E%C8mIMt{->do%mtHwO|ok(!6j5_k5o13d7Il*}C$X~l<Pw`u(+n=|n
z=RG4@&%Wix{#i$JKNvH${$5b=X9LTyc`)Jp?0d<hKksmP4<^rB|0rMiv#I_3!Lvmp
z{fgKWC6GiE0L1|4JrI>ONrQm}7=RL4Q8^=<Ut?5p3X6K`7TN|sQz1@oxFoi2#Ql5m
zedy(^toUu7MjghWeq^U}oXUIu*wGg2ZzEFlZFFAG*}8uhyPib9ce?y$^xXxCYOcpy
zKNfz!?908Jv3~aLd9B~m+>du#!YaScujy=RJ=?XtS-Eqc{rH0I@#T9bhCarCK0fWz
z*V2=oeqUF0IqbjlPPJp_$_(&-MGYs9ruP5t>xjr#YODO`jEu$Z6;b7QUq|><W-|(J
zkj{Uml*l&cpIwCE!TXEKsU~MjI*lx`L2flZzeyADyG6rq8kTcP)g4IqSymjMW(h&e
zyBe#wOr$S}_IKt~nK~wL)$z&mDY*Bg@+&MT6xryhbnrMV0Zr}oYzKeU6=m?>@fa@k
z`(aYL(;b@9$6q`DgJ}BzsKY13i=}uFeV=pLmxQ_z!hk$kO74>%ead*sxANs_LFe3u
z>!N>zT<qMk)H6j{wUu9fzBpJK3KrC9GhKN@-Yde)foyIS{WIsl$I=7JYO`Dx3U_=e
zR_CXwNB&WI!D}H!kld}@whWud!;hyFm9OKD+f6*!P825WUL1hO)WeI0bP$$`*)lCK
z4BF+J(EJG~wKm)(q<UNs)tEQ1DI#@n>H<b2nde9NwP_Kwjq7WKzO_VD98lcBi^?i9
z#xP;!?_cxm0G8V5yl`=@$pE^;%#OKlQvH`0Qc!PwjIg>76{{&>N6;}SVDnC90r==I
z(}?JNuvkx8qBht33T`BHT~fz8*Q72V?Jh?uDcf1{1AGI(Y%1;j9qVrZcNaEFfpuV}
z9s#4}agk~eNf!$!=&UY@(Pw{F0a+fI6jB-UWYu6UmE`A()d?|BdTVxGde_*G<XlxW
zNH`jQLyUu8Jx6iT^)y47huF|sxxpktbCK}2@!+nJT&|?{*t;rFbcY;eOEfjN{SA(H
zh>!&rlrx;i^052Re5Y*zGX~#1Gcx*rNopfE?Qg4F;P}|@r<=?}S@_6EN93m~I~A1~
za^=tU_FgJj@xo8$e=?2*SOUXB>8D8GXe)&~UHZRZd8%eOBSV!r{Y+cUE96Q8w3zgK
zMTk%4!cN|>XzVmc+HE+Gf->M$5?okzNL~uNSh-Wdn8(wG1=sE5eUIB>9IODfwsQbB
zvl;oCn)pBqc9LOy;z?ijP8jq=XPd_2ncX3FZ;A<#W5Ev`HxM7_eAGuo7oksGhl<+8
zl62BHKC8YAyoq(>ZM^uJF{#fhmBXJ2wlq{uEp%}OT=*$}IAf)n%)wn|KW(Top{az3
z0U<S<OPY5@C>VjdDu`P5xuS6)r=@<K=xXx5A%QbFe5Z8SC|`%ggTxEa-byY*YWU(g
z4dfRR7P9<&(5s9~^HKs6Y`1(`O#^WMGLRbNjrhbXC+xvaeq&lNwu<DlH-52oZb8Qk
z)G_J4;7ghIMvXj46_Qi+z%Nvz&oJK9#3ggI?liP?Yp>w~SxUr>cvj@Lq%a@<8dZTN
z;6-O3RCU?JIC-D9vlnnG>xOYl@^Io}cv9zHrTgef6l)zFceHrP10wORrFpX|D#HHC
zmrtNZMq!eib1);20EeMXCIRJHNkN-3Zw{2eazlI#kb`u$n@n|tAAT*G50}g;NJfq5
zCSu8*D46T8w0p=JiykSt>h3$)F!&%0@S7q#YpZ++g9xg(k^xGvF1^Y8+~kWKQck3T
z_IO#|;WCWZ20yo2&2w)Jm=JGYeg?NX#4{FV*99x&46g$V>Kzh5-vinNAs6w<wq!k5
zCrx;72JTaAx)_&1U!;`EiK#>gFNi_ujb}xvnol-#uJ!gBOXyDofsM9tRjv(SajhS=
z{PvN<?KjYfOM|{%bu+ARY%c36g*6X<>u55BK3MhvzC2KKs|LE!!b07FM>Msi)8(FV
ze4tf#bu$rgtbqrJ(?t&xbkn^?E=&^Pdu2O(qSp)0gL%7%6pjFS_(t09qz5#Rmw6Gy
zXY|Y!su<jhO^;U1x<Ba-PtVUSi%F_s9jD_z0l77;ZH1iJ%na;CpYFbssG0lz{!{`|
zFwqle^m8d-k79;$HyB{I3&m@!l|H~a40<g5I<I#@fQ?FS=0fJA2Q*Rd@`YGR1pD0?
zj%kI(Do%<6IhU2^DJg18i5Ft5vR&l%7Bg_@rVr}_j~U<Ut}7`vFp0}O{${Aho9*p<
z`3zJdAhDf#e68+zgYtNzHtI;-u_zaF$7RnGk=sdCxn{<qu;ok(^>k?9i*QKc8H7iE
zu#4l%U_umRY0q>t+9y8GMyoGF*^HE0*lfl9qata_558(IpUid<%m*Il)7);`uXf`i
z^Gb!KAF(D5UCNuKK!{g~%Z#lG-wcl#EcmQmC(!_|`GzM)#n%@z>0P74dpbnL568C^
zYPG=`#H^vl9P2X-iak_wTl@nS?ORIC+9ewg37Jt?z8k28k?&tUF>azl?zefWYry%Y
zcznivBS)oSNo2w^B}CsK$D8@qT~7!m^%CFt)n6*5RH8WVqYBEMt_+=EIvKY2!)1Sz
z%7bPM1+>cm3b8{+13b-(dbc%)9_7l2G^4>V>((?&`W^YaWAA*yumQO-EPyO%l29B0
z8Uw(B&E#ZZSAYf=g#}9uI5yYue1Fw**<w#|)J4B?rI<0n=mP-DZF4F&#F$&@kZ}8D
zv&y2_+N^^R*njRmNNQ&2GQ@=-68^VPkzw2N1lmpDApu4CsBFfJes(3im6JUh)O7ZG
zyU5S((AeKAOs@MqqgG%3vr)8VegEO&)R!xde!t$yz2E!Z>TAr(?>7g}?mzxH_4V5C
z->U%b9tP_(N}@6a$a<bqv2u0?!uMwlBzJ&EJl=^oExN{&2LppzDVYf?Op)v3{ez#w
zgHm-j_M#sjjM-Yt<h`$W=i)L3nmnmfw(I;_<EGiOsm~wsq@;jqrawVT>&O&{-fN?q
zY}1Q3BD1$EH?5u!=b!3bzP0YIq}3Qrt@`pXCsr>Mr!_M!a`$VFp!7E5$^*mRs_-uG
z?@z&v4dW-iTnRrTy2;ZRJMq=}YD&Us^nW3=ae#P$4dB}Uu~=Zd>>-TSYQt3a<F!BS
z83QyiPki|njahA)#%Gu*wWR{DOQcH0xu0tH8z|;f<f&69aZlzcx!o;75Tui!XT;fb
zT_#0ZO=;+y2Om@#hbrJ$;tf|{+ga0|_E6sRPanA(&^N>(Ps4A!2vM>8D>^v0raNL|
znuuVM(jbh}_fM&O%1c5}Spl@b;(FcL)X;*LY=nN2R`PIxL6Bkh4r5TRS!PNdP9D08
zDsxbZBWL;&oBvqDjoH@IXRJS)PbaAdD(5eQ49(d}?z#(=OZa&&*trA~ujsttQ_y-E
z=(HTMUl3w^YI4c)<W|0AAnG;A$|?JZfp#3QsnjWh7K>(Tzn1o&Do@zr*+z|%9kYh{
zpPYG<y4UZEygE!403`g~6D%R()<_~!)mx^5+Du43JrSYOQ()%o=f}hkN7)*3o}`3J
zun48@+On)j*OzF$i3>nz6hSa7(cf+~)|fKdOs6z)CXjU+A(c-^DwaIGYI9nr$T*Z7
zs8MHNWPOS!;0h6O)BKX&yXg?f1xINE$6UEtHyW``y3j*)-XQ!lr$a+Aa57NFm_lfW
zv7WjjWNT=LA7^)qc<Iu3BQmw_c>R`yCPl+7lTlPwiJ-vjS*y*hTI{bfnk5h>%UO0E
z^N~*>Z|4*ulc&YA7=O$5$mQdWQ^18L2afsx1aE;DS?X4YOnISdOdRe-0-FYbd5`hz
zmzQ!3&I`f?z|^_P%p&CKI#k;uUIahn*}&-HRacsCsX}S*FK|37;?vm)s6gER0QGdY
zD~dKpgf_iP%58<PxP8UXNxw*rV3DR7gidULb04I5m^+uTMrYZ=esK*+NPn3x<ZJ+*
z=4dtA;wf4&qe_L7Ky2>wVLIGtir=acVZlv=tSa@?3D$bFi^{)5McgpoR0zo#s5@(5
z;L>Sgrt_1+d$IL<f%`|o1-4GubJho<=K9}^Ox0eX-QxEMv(xG>29iWgOZ^Wp-;Yzg
zY}q7D78%DOGAH>c-vRLUz)fieBWtc<u)-+h4#*1kMH#NJ&@%LF^ZqJiHzyb5%$uCJ
zHm&(>qtHh0VM_mH0GG>-yppGd7-N&g>{2l2VCClr1m?WtuPp}5Y1+`Zl8>Su&f1#u
zWe3rj=Hd(2Z+x|z3V)^t9`3Nx9BtW&GR$DXXS`)%t8CtZguI*(B?bxI@7`FRK|H|K
zMDOgw14qpD_qVHh@e|CgErBh}O64nAL{uEy<e}Wa2ht)9(#!~b^oX@uk*Yu?)`%GS
z+yu-J^k(|ENi4C+5P>m9s`mS{HHK-Wy~xzWd8H&_xB%-_L9GYTGIFQaD-3t1%Pr?6
zgN$N;grgXM;a>hpz}Ax3tEB=?_jws<<%>ktpg|or{p@2V-{9bu6key^Fk=e^(=bpe
z!aLw4#Md0{n)36aqH8%>*oFmsN*^c1UA!vKM^tf@MCfUA<#4wR_9V&-nbvz=I;-eL
z_=440)c6*bH)a4Prqh%IH-iruH7@hh`jMiz_-0a)@J0YFBt0zdu88EdCJmmnPP%4T
zp<!Gru`iNO1@N>YQ-H0Y2WB_s@o;&HMO8+Q*JD^%rraFfOXvgi*ye+)nTlswb<VNZ
zd7@m*yVU1t0x1&uSJ3I75VKjn<<gbFvDaTdwiSnv;gZI58wLCO>86zoMHFcSub+NI
z^O{BzVwXmCubkHl$4Qn_8B3aTb2Ra634OPK%};bWgj+AupbyowHO3F{6n&3847yHi
zh^T_1o+=KY#sm^rP+AAvmBOJuny)f$%BT-Z$7kZ>=&jF<<OV9)G7T&XWpgY=&m)<x
z0TyqQuK&Xtpv7zLWvr!&QHZ=$;8Lw`yYG$goaEbfY~mN0vNTJSfsiddh?8P6C}SYU
zp;*{x-x-O4yC=&G*FuHr43hfX(^)40wep4SFrgvGyQeZHGNhPYu^T=p67H!0Pcl%$
z7o6>Cm3iXP?fJ^-7iTz8gizIdR(cgfSS9^AGNhlFcFGo=hZBqM{m6IYsA>x=hg-Of
zr6u}o7>Zuj1_|(~WP4<O5%&=#dbOyvQn3QfcRms{0<@*pbHnlsXOdWqUcSm*+BX0m
zP%!>WIw(i`$i48lj;_R&O^*iP^Be3?S41jFd%wrc;XM0HovbKnw(oM_m<@_S>63mJ
zDhIK%43rZ34C*oC7BUPL?>Es3+7%z5%%a3Y$^>jN;d~F3bxFo#(eNcz{%K1YCgIdf
zhGc2X7$f6kAqA0L61B6Hl6qcIlJ(+y^{fM6-rS4YIb8#8K~zMa)HJkio;YR>#XYUD
zd?)XAI6;2aUUGl(ol@-KQ%|mr(oxGz)r!N(0PBwO#mP<0M~9E5!gJNGOYkgGr6>&e
z!Pnv+&F#e3(U>TI1_&nlPM=k08k8|l<Z5{z`7U}o&8f5I29KPs)=T_VlifP8lUuCo
zr)H{TI%6}&y=)in^oe>f7&=dV?9^Ca$X>Z@-E(@KWlZ?AlmFhGOD)0f_R9;c9%?Ng
zB0kvubX9EFRB5fK*mhlYRV>?7p=McKH(bn`rZ!yhLY)0<WEulZ&~Kwxyynq0)OlXq
zpn9LTCg{Dq&MVJ<>R?CB?M>)^Ennb{-*TJdH~qic)G$^}@>san|F)@7^lIbG<0%Qg
zfVTCKJhXyN2)ccJn1+=scMnvpf10f5qZ(({fi^2s2>!T{uJ+#gI)^lQYx(>6F?Oq6
znEU*uDX2y*Cn$t2F^wmZB|aPiUsO9}avU!j7RlK=HOFK|{*}MDhNRL;sT{PH>&wkC
zxp+U0OI|5>a`AG7LhF~ao$ia@-#x$`A5R~C_fsh4T=F8ux<*Qmcdw-zlZTCEESJA8
zYbsP}dQ$9zMm5PUud}k1yv~}toXDBMQw;!Y%`X48(<Se8M&+-C#u7ONznJR9{1iaF
zlAX%s+4UUeN1xq@;kngz6eQWF%fcL>mWL#2@M?r_VOAwMXEG1JBfT5kUHE_Es7#|0
zZtY!Zsp0s|53F`zHXND&;l3*{;sco~u?gi_rlPNXuzJT#B`hHY342B*)>Ifjcp!Dw
zk@VUO)iUB8#xu{b(1kz&HW9qk!3j1sJ9HAnn95I}y^F5S!M}NTiQA+Pg4{q^N2}*&
z6H8b@*ky>eu*p14#Ro>EHwd4XS1EcIAB>Yk>%8{u9L?6le<z{@TNj)Re;$Kyp*|35
zf2tnMaK&V!Er7*|x>f9NXu4mrYT&~($q-I@BbcNyUX7jB+~Om8q7=PbO`WbJ?;tFc
zyFJ|j-J(ZSCfg8<%&k+1Onyay`th=4>G~#C+^{235VkS8AU36^^_RFMU=6Lcl%JK_
zw3H8`4wmeS(AlT0uD60nHpZUDW_Q268|0vE&UjZ-4jF2Toj*5RNm#{1Ms}3T$+tyT
zs(({nB!I1gr#Lp-Kp*e!EX-}Bzyf<DgjS;L;XPr<<U$`>vbXYC=}k%N$Ub8NLVKr|
zBdnJ-w2*Tg#<iZKHJ_aL0u!yefXor2?5C?j>nm(@VxzoZ8qm=7?TOmx3G=$2%PJjO
z%gKpu0&D>x`H?)?$dw3L`xQT<EnG;j&Iw+uOrme3nuf+iX8jKXQXXAVYPN2Dr}1md
zQ8{8l{<NGjK^}wMn}74luX%yPY!NTgvsREp`N3YwwS<xrQ|;aHL{Tth=06E4{5J8|
zdt5K&B-PJ{Bz+#-p(j7<+;Mv3Ueg!vnSoDVebG<g)V?bw)dw@Wm+~`YUCV^2*!Ml7
zxl$rUtcT{W<CL{B?*_K)yng5Uj?$C-P0Opfhj=wfF+AD@{G7s|jp<HrB97Eg&vn<H
zxugQ>`ZnL@gtEZ;JK=zGrU{TZvmYQq<#05YAPq+0|96$P%ECNv&jHY(v1$%U(`1&h
zB6I4coMGgXfFpzSMG(F97S%@+NEG+dJ?Jl|!#zN^7FtsiWfGg27g{P@G>>SKh{z}~
zRjA1P2P{IOQ+){C>f-dFcTG&jB`@_HvIh2}pZyha&64FJzZ8~`b8FZX{f#8fgFMft
zn7QuH50E4nbt(#Co>NUX!~_!BO)ChXU|S*L#gPN?+o4=y{E}nhR}BUw1(Ixax2y5i
zj-zEWN@C)0yyOpZp`QPsA}}B^2#zsPeP$V;?OiJ)a*NjqN*6@VCqYbHXxO*j{!9yT
z0j=e6%b)_`BE;AesRw+`y`z_lRyLG^OA+VfBl6UIjE`Pkr6D^<3rZ?#R0WqUFMN;i
zpNJY_vAs$=F_fAKedRCXxNPP8urTN<8`H3^^#<pJY4pbpzthzZjwZ|cd3dN}ZwNdL
z70=z1Hz!`n8U(^Do9l2A9)l|t0v{)mNb1L70gKZgL1b>c<SD_+n`(wH$4p;lR6+;L
zRleKi@e~vlO7?BZBY&DTTjDTmC|?=q4?F*74h=cUX#9COBpU$A(>#`{={EuQ-*qVC
zOo4FWyr1nuRO)71xuG=(c3u6;LBc6UBI>irk8EoMmFfd(pxzLRx~@i<vk-GxOcEZh
zz-N6HtDViPpzdz6gl?rcE4$hgi9ji_^tV^uJe)d-*w8m=HMG0_(5m{QM6QHf;@K6+
zj=24|ETFO()|gfn!wtu>Nt6Ir6I%hiX-zR|s!?^Dp(J(mjZUlBtraF`@d&|{HM2wO
z)Io$K#gpEx=^`Ujs&rm9b)fnt$Rr$TO1HVN23Au|UI`#C$^4N5Qgke2imIQ9at<PF
znT&XS^l{Ffa#Dd_cY}QKg;h{GxUQ*8tb00%7b3w6sgY1?{hltc<0Q*QWFT{OOvY^&
zL?-DBdJN?iKx;P7N4wQlk(Tl($M&JRLuw?R;_e4ZvYk9TiMOMZ+xe1Gmp<pHBZM7g
z0!o#&4?;)BPIsY*je^|Iuuj|IKK#L&TFqm@$htYl%c;Byw`?yONTFG_E~E+Xf5?%Z
zKODcq?=k@-0@7A!ET2i<<9!mtSF{eF;~fA;lRO_dq2;Ztd;6OuBrzxCWB7Z(F()y=
zv4J%D@_ahc({OikC`(AES%6Om1Mhjx(JY#2Y!f<d6d!5SBLI-W_4xGAO)j-#!1}?$
z63<>MQlA&B*(VKw9QB`?oXshK5Sg&hX~VL8%TGm8+LL`;-K}X>+ukC-m&UBS+pkY;
z`=9>3JT1O&**te13SrnR?b{pQoytEKmRfpleBV?6j|fs4T4BD)=<4b#W$|>AUw~ff
z7GhqoSB`yit^K~y?qA-x(bLjLsU1(2b9f@oyj)e1h^qc}BRu74?3+K=#vXAiU7*;+
zt?_f4C8;WfpAqU^_^}ZA`0U#+G#}l!Y<dLkk+ba=3!N)ucKr{YdMW)#OSldcIg0A>
zd0bj1wWPohPk&~wPrH2XG*fRi8()?9xjE(4R--=K^qS~@@q%%HRDc!W+5b@#AQ5%^
z|K=4!@|DE@$tyVQUNzy4^9r6*5fHQQwPS@G7PsTl+uu!GXLXxMHnVS-$_3iZ?nZT-
zAHE?F&pymHzcyW~lQm)_?;vN;V49VioY^V!;*N;3_v>H0Qj7O^trEp5)UnHLsOL3(
zr5e>XP`<Y##SBXSOFAUQoc7fDLh_?Pe)BC{4NL9`<6K-IX4t&2FJ3a?K*c{#Oz-;V
z&OkMPO98nvPQ=nc+X19T4CrLy(8I3a1uwK|t|Gyt;>Epl$^{q+>eI9{pf-WhM?J-W
zjzS9>0`s)??cF_xgV(KNmxx1heiM9|#aG>#u^C6)MZLYR_%cgX?43f$%1+g;pM<Pl
z(^+1XrP}`RpI+$>{TB`9(l}juz6zq(3bF>giJHsNnjj6h3Ougfb>MAIDd431LC!PN
z{vX2L^Plbaar=)fK@dB35PR=b(Zq}$qjuHaQLAdTO$4>YEQ*>ns;y0xzKu}Srdq2F
zRi)LwDIL08KELbE=lgp+uIsw-`UhTj&f`4J<9Hsd%*ht4P=U138z{DsRS99|-a?TU
zRS+8n#SHdN1DpAz3s}+!TcLWPFz-aFuk9Nw^U9Eb&i6Uzx7otH8a{xfSKg+G3zPLQ
zim2R(E9yAicg~2YP->&+Zon^TG>SCvPIo+D^p<Mbq<ecX7x4qmnpz<CTfrt8ep;ni
zuPSbmRvJr)&wBc{0TG6_zI#I|L&C&<Ropl()!BSHDiiZFu#Q27i@kntz1L30`I|9C
ztvLSFP#Ue~@M^gv&p`aGUSW;Bgdu&fU`C7GuVefUH+nv^Y)yeVou@k{C7`qq3Sg^W
z_Q)XUUH`i`SJ)EkZ2?##QLJ_L2JL6{7}7>|%`9x6XJHfBjA{)VzPZd6GET=T=^n0+
z$k&4z0kcuWv~&KIs%pKgI=~9EP(yn7+Izj-l3!PJzah?e!G)_MWg<*Qzqm(U+$dqI
z|LRL2XbHS$`7$N)#)n;Z*uQ*we4g{G%%qym9;<HQ-yo&F4{Vl4Q{R^)LUj-}?sGF#
zs&2lCuK_1a{)K}ND`w4C;%GtR4cF|Vj+;@Jh|^nHXBg6`*Z^@^<_pWb#mgwICB&0c
z%Z1gR9m%y^Wa!Yg9>$RPz+Qq;3E}SY4U%Hd$e{E9n>VYa{0{tpcpq14A;tP0Y&)_l
z!Xu#3>y8{JBnuG7#Ta>Y6X%=+S@M;rd(>B(cW~72qkyhjM(m#6obwixFF(5W7xo?_
z{TGhI$p3c!3xA6C(2WbqghM9L&YwoF_-vGPc(wNivhUn_6n~jnl5hhj|Ld{-F9z&_
z2@rPZ=LGuV!>U>5-+HzgiSt+xJ!KmPF#YxuXGo?2n7rGfTOL_tF*BL&m{Q5OsRU6u
z6R0MhV}F|E(#p8WBNzrjd;m5QPo^QW4D!I8ID@G{H(jY04HWQ)6tU!K;HhEzZRmJN
zg1L`ZS(QV+U{fO=5j5!DSf7;<2e*RQa&f5x>!tn0#O=A$)cULSl7>cZx&9V2ssh88
zh2D$3s3mc<shj*=n!WMI%tt`D=AK7yL>fHZ2RMc`MY!x!;+AT8`4>!=@eEX0x(@)x
zl<rL$r?A@A33R-|<24w>sio);g_SBILGBuCew+7PlT?5vL;jyyl8pRGb;wsHY+_-7
z)ch;+Wg!L$FXX#hKMHfD{>T+ITly-C*(PVAQ7pCFgg+nJCU~1C4MT?S@m5>}J8OZ<
zsK~Kf2hd#O_AiDUwrF|hBhVE!aQRj!;pu`{XGrj33M>yQztwbl@2UZi5!nU|Astqe
zSuJwE)81p-IWiPqv4IliYA*PZIAmMz@d>$ZD&5{SxGp!$ES&~d`mln!*$t3DCV`a%
ze4i&$9g1G>rl7ygL6ucDAy8ME#h=H(EETe5F94x>l*d|<G|pCCOHy1is^jV95;OK>
zl^1aMCjt4@uor8+vtMN_o(+(=K$Roii+cfe5s#D&9Kk=CEJJwuLimFb=bnGa_M%Pe
z;sOoj8V?u5+U|jndw>wN`6}jx7lIjdlDj?uB-M!HD5cWOeISzJK`06GV70bxtn(F>
z5#9mn*sbm%xTx147rULW6dLU83A~tc{X<BApX6<>(*yNvBXb55&bg$a;pO^{6i!U4
z*OOi$2LJf-U3-3DZMa=V`;aF1a&MXY^6{XADN^B4Bfq=MA8F<mw_pJ$mh?)0BjB)Y
z)7`%Nqu$9HO73_Gb?1&WW`)~gYQ1doC1mk$ugAHlLs-?pJl0@>p}=IUO^82?Gqca+
zeD!Y5HK{BXM+c-X^65eHz+wgLRt+R_NF*BQMb5`FXwQ+8lkKLwfBwZPxj09JErpZw
z3tK>TffSL4i(4XwTO5|X@|VN7(y*SX>Xxvf>lKd&hqz6kYJ)>wH?Z%-ozJOS_No=t
zD^R%64ZfaFMRB~y9aTfM*uPxrmRlG;XyeK0nM2S~{$3XWB|Y{HyVqgNNw}^5Yh{+@
zhx*-*oB-X~m05;y^#ksW_eQ6WmB`<Ysy0G*D^Pvt4D09$!9VZuYc7)6Pep4_E%ON@
zE7SSk(wf)@f-^f^XRdpEsrhP&fGVIQZZAh&^1T#du=q3L?$h!6UY|m|_}pGT%fYwr
zg@(8*pPy+P!#^w?2nk~UwKN+u-qltSlxBJ7MNf=YbKdmFq(s5hAxF)oqjlnBwa(g@
zb!Wpl;s?u~wbcWqs}n-R0PKab*R@(b_hujXpFdJw{`<G5>gIz`-S>Ak5xKoIY3u)6
z2qW<S7{a(Vb5!~3_j@dR-`p+h;~K#~yLg+vh1)a7_oV*_N!^N{sJD)6&Rzc?{w#jH
zi!Jiu&GnBWj0w+1XCm6KtnUk$CXBtviRiw({)zY2FWP^vNh$%#0Cs@D{~<o0f->&C
zi2t1cjUI3H9ywdaH0T^}I};ypO>eN-*;qlQILFyC=7P6*k)ls`q6^`kRj~%+>vb2k
z25co(?<XA5+4#KtY#H;oNkew=p7C9S?4Oa%wq=eK@#)DZ`Iir6|4Cw%|0cEEt~LvW
zMEF|X(TX|Fniw`p1>X_Rj-l2t=ASLbi0K7O_!$GsB{H`Hxq4MS&2N0w*b7&aATU`0
zAv3gKXI1}&I-ZXy@(yo@<SnhYU2qvY{}ei_M)fLUyS;l+pl%6D9j$`D9lXFQYyT*e
z|4Ik*x>VO(wieDe4vZ;mFJCAI&Dd=o%-<4Dzi}$0n)>sy<4Z<=E?)DzO1-PA<%h%X
z;OlxBy!CQgQ~~*|_|602Sf0J5d1hkC``e*w1Rpb`X+Mbp!flN|Ta59B8L&Gpku73w
z>UkTJIfP%#!?GC0m^Hi17L8KR7Goq*V!#ATshinIyY%y}V1u~U>-ael-kHF<tQOMS
zH<vH$!!Ci&E;d8aIJ>u2IAxJ0$t)sCf*O<Q+sf_uKoMA?=olX*iE|0tlY(50<^t#(
zmOv+vKKGJcPz>eIYRX8Qb@;q1BBf~ElkI|>%elz_KXc>$WoZhjIcQGHcd#Uh!!b4@
zRp9EYHdDc1s+TdBULwFpcz3-Zu%;J#$_c2<^<FZ#d;{WnslH!?mLW!tO=8jX5OGkz
zjdTXw5^kX#1?zvWlE`k!&7#^e`Zzej9}Tcwozq&WI||i5SmFi91Do;&jjT%coTNrV
zxnz1m;@uEBUv=GP+ZYHEa}xYU4!DdP)hk2*<C-7<lcs-%EfO3@Q9|3b{33MU_%unR
zk>!N2IuD;Rv;PB%8xcjvV~<BJKbv<`9u`huv3~l<<Ri5VV<0|a81o|~^La4aVrG9)
z{FCh7*<p~XLGT!JdLQfoolkP5S0S65`<sg8yna`+@&sd(8EY*MsxW1ij+hP+M4AkJ
zHCm~X_`Z(+=Vz-CY1IX6AX{?^BI@l`fn+dxo<DF?T=TjQ$35S)NU7ZD@`}Kf>2ZGP
z_&!)*4Nv8&nAggDnU!Ng%29M)fes{`Y{`1Y4zF?6+s}T;2s2dMf?RC=j$6{pXT|Ie
z*2dOIBR$x4qm+d6UOxJK=hv7Qi1{3vD3mO(UNlz0ru!Y6SFOpQ@hI-?S>*9#Lj^?K
zJM#Y3l?H~UY&t1p@8^lhY%1Sir`NJ@fBqn0FFF7pmOsBah%$Djt}gkeqqe0DQ|TVN
zD$=@BOxC11pUaEC^C1*p&)|OV(PR$-{Nkl?UZ+*4PPg_@-Jc|$Q2-;<>zOK6Rzhw0
zC{si3B8It<L8utO06Eo1!1x8gu{_C)%4pkLGW{e2;HCjQ;77XvP%c2Cq#UbaazV2#
z$>98}YVAfci~o3Q22eIta%qsl&*aM#WcS9fw_aH4Y{M{k6_f&>&;B}~C|HdFz3)aN
zEPCNy9GlB3;_q>Y<_R|LNgDqnaAT;i1do@DN3{%hsy8b_d|hqh7d%q$N~mEjw+eV5
z)t1pJ?2AFLiqp?<z5(D*2%{?;%ZoZvPq!Us7V8|A_vwV$h%7|(N4heyw5#Eh4XjpP
zk=fIEnI+)rCVD?AcwXL`GT%V>L7PZVns-?Jl9QZYtI#xkxFP=Ik;NKIp7k;erEJ`2
z1|n&yyPx4SNBvt8;SLyw==Nl^pizUE3IggoJ9?7vUbucBBbwzaS$qk{w>5t2(}9Wc
z?XSbiJ}PNT86yu=dM98BFcQYOq|q$qxW4{~<u3e-fGRKpZ<1tyR?``}F?`&BIkI4e
z4;y>1jwJKzkcB(vhn+4V8dY9cbA8^m42w$wA)CqKEe<_K8*fFvQLAdIelB{ew4->d
z*j{kEFe){QasMMIr1SIfVCoR1MTO@b?i>B~^@ZmR>PD`52h8^8yXcjU2mI$$@!1dN
zpI@0v3R2}|v2RcnyDc$I1MV5K+BoAbD&y^pE_b<9@r)!W@1|HZ{jfdrmv1u+7O9!v
zmkK&X)?7u#<Ah#-`-*1}d>XxT{G`6|^TOyhs%Oe`U9uZ;)4NM7L2k}jjK*@csU?p>
zWPWYza>bWIR2v3-i#6_uh9QJB2hX0We=IJiYTTk8+%L1#snsi7euzvIPpR=-Z2Vd8
z%@`LLDPIrcCl9i;v<mltGlz^l0U%=9N1Kkk4jvR5Y;R%D<i$;S0Ccp9<`kL!+_svQ
zWGL`9r8(vsV2xZC7`QiufbLVX^>ehMMWqx5+N&!}g_gypr;=q;(yP7uT6!`K8HrbQ
zP0r)In-Ou--T9<y;c{(Z=ZAOlOQ#h5w)Z&zsdz56oow;I#(#it7oB3u<xmXkDQD&n
z+<zjDY0iU}Cdau`xrh8cR=Q>{_@x$rypTFC`NdL;@2ackiLvQkOa1Y#{Z6`i>gTyQ
z1~%1bpn{4J9&T86(WK)!a>`fvR1y)XrBT80-~%A*F@}<asv2N$$>xkPyBS2$yLdg2
za`1DmcNmhVykrJXdV5jwbD-AQpLdX^zidg>VnagK#oxz1v#!t_2;;6%Scj~_TmZcR
zUvFF1-3I#ZD$Ugh21*+av!w<N_Fn(<(ZixDfS<*<U*|(hTTCH;3xO(fBOFOS_$l`F
z^Hm_!QP?k9V*v@qc=FCCKUr#i0lWL%X7yslbr$N<hk_rMdGk_Owwc~?oHkvv;thjb
z8(`sE@l^LU3w6C#P_A}7reUJ-w*YE6@s65im2o9B#6$6XK-MI1hJ6@N5wN|&cmWSY
z4}#r`p71@<lx!b3xtlIO;K&%!hp);x)DexB%?!$V>hn-4Mjgb5za7NY2g-wVI!oMl
zd|b_=2HXUva#jPN>U1(2>Dh*I3@R4*IV}81Lg<XY%@1sN6}0O7j&gjf0gSma;@O2t
z6q9x|fcFMCNmB~p(%L$7^g6^N;qQ?p`v6wqjBeG5W6yL3bL~I=Id@ui*vj~)K5pR0
z>tC<G53)a9x^?sSPObZiPr%coi)`1g;4ZDtJd6Hv|89Q3EdMVnr?22|(wzV0$|wQK
z&xDcx{}4tn7PYFuR<R+3yzjVkUh98Sq#R12<9VCx##EG^z=_OU2^_B0>>j6@oRY&T
zsZto8jGmxUZ?vvIUP#K42|mU$i{boD*;FOL-YNHGmCP}I2j%hM#sylL;i>Kp)q(S(
z&ZX@-;_3zk#Fg&q=htjrEi*GUet~n0&fp)o$~Luy8?Y)xtPREqCblG*4!-{U?m1uX
zMZ9LjJAb&BB*OYmp~2>dQH47_VQak+T)Mr-T6#Q6zCh`RueTED?YI<Q+?P=v;(@{0
z-WjqZY(w|<w{GIv!RBbG8K_5bV=HlY@ahPUow@HC<BMdW(#L#VTZ7r6r=l11HMApU
z_(ndOlncy&U$(JyqBMN(d8{O5O3&Wa?Tejllbi{!PEH0TewlW9bA9vE%QqBCdaW~Q
z?$b*vRk3WcXA;Zb9aJ)^&%{e-H2v0c=-~=)>h&ek?pDMBA$IoG-E+nENor?LCX#RF
ze~8~4t(NfCr{&!eLsPv1$bMA#$m`q-THl3qXnN`Ep<muXndGZ*CvROdM@Ot8ey_+B
z`HH2{YHwqqQaNWwt~xrjiYQ^NT9MpFW09>x7;y#rdfkbko^@4<LW`l+I)|2cFa3QY
zR|d}|o+1YbFP^$(9`speJ#)0J8!kUlr@mdwkY5X9HyHxko9jL}g)u1^Co!{W2D=lM
zIJR`-*>!h2i)WS9V&8peYi+NSkX#90ycgI~56acsKAy8>{;a~wu9MfC!Y242a{EQE
z%BN#Pd`lt}t&^oAXUY8Vo2q{xg~-LOD3Sbpp2=znmnIxgP7iKJa=2Rdv<wBwH8&=P
zEAZ0zpOxt)7|q$*^7;;CL=19BTM6<N-p}`&YVQfu$*Ebr^;C$+F{lNsrsQxdIH8`Y
zkj^=mt0j=;Y{C4Jo_9NCF9@71ErdtxTV|5DNSFf$L&|+yI*=`B`)WbDFrV{2!h|>3
zm!&y$h!U+u${SKMbp-GZ>V03T`j@G4yI>~p&()Dh39IN+qj2M0Xzc9#Yxn8$3NHmK
zGT4OxVk=p8&oWef#KQ-O+`0raL#0L(=3W2CB)}uRzNsz7Fd?nLD*mLE!hmzbgZ%ZK
zBwqRq5RB(-O$=<4c4N0XBU-Th&UQlDT(2oPBF2}hp2acTlX&&uYB`F5y@~2V7cW*T
z<fwl0HQ?DEL!Bp!_j;B3j~83V-V>^|6Bwk@1!uV-$Z%}xbNttYyLsGV3}gR(NXe{+
zV4)+Z#Q+2kl8)cC-6GH!!JJ&@kf!{(D-On-t-!qSbltT;%1cj9Q29xqZjRk$efkiD
z367TX9o*Q7t*Nzy&k3%#4!1d~zyruIA%N@D#_0l%O@tdQWhHM-PHpEppIm4Bj0u3*
zr#ExM49N)Kv#7df*#zfYlu%xhmbkGnUWhEo+M0wV*$O0uf{>`dBCv_4rl>H@<2(M@
zb8a%($E=F=q=^rjSC<b(=8FUKtZ^Bj3=WNC#?&Mi6NAxmEe%hiEZ$fPEJ5YM8L;0p
zOcOILEz0KyW2T&GB5Io$GwXKD(yQUsGpF7Uc?(5x@g~ZtP1;I%8lRz}<XMKx?z@CZ
zw$`nz{`73{Vx|fHdcvWcutEZl4^o)K?`c%EYO&RAg<o?>&Cw`C1b?%$T0y6&WwdGu
zI8b6{&}pG(h?JnR4hG^YLuBgEY59;RqtF6u80KRKR@qP#%V!3l1yGX-0$*T8L*%!s
zGW<a*o6c6PW64{a8p)v)9_C9p84#Ud=voC)I{}7-O%%lY8D3MVmejPqm`6M|Kn3XH
z%~+eDbzl+`)A5+YhoY3xAsWkYhKIJUE1c|1u7<7zfyz8@nUm>v4E)S!9|qN!%Buxi
z)?}g-yv-^;Ygi>XGtAWuW;cb_B9Wf_c8@uXJoOrC87H7<peJJ^uTe8AVp4pGM6vuq
ztwH8FSgz<uwMK>ra&7S%98Ws^!wGJ6gqbO`y}X;e#DY}u8b&fkP9asL#0Fo5AUQo<
z$bfDN6=r<fU4wdfI&LS$DU+m898X=z?m}%i*WleO>;{)_31}zhYkZhXLN<DxV~VTV
zX!k+{@8a2Ov*bKGP@IM*N0FhxoajEX6NOtk?GWQHO{9UBIeU5~-&Nra#40JRd*Z=y
zIq@LRjr@|MM`PEwZbUHEX9A?#`&mh^4Hm$`!A{MkiriP3${Vvvv_!zwW1)XpJey+7
zyQTa8HTJ(|Dd;yeFpzj)o$@8^Kr&btnWv=VIhK_N9tN^~I<RK=0sD=9Y4M}Wsibh6
zF7&atE-2neYU%6NCYsl>^&DqRcB0E5)NxSkhOG%H>ZRqul?GF#ptIU?6LSZxGa(^a
za!6<=A!hP4RlJgUGQ-P<6@PJ5UL-xUYv0k2KKxuKpTTpwZxO74L-+nry_p0T3YMwm
zt1ijL|M2(Qa$NyRkdJZ|+FAYKAiiqA@ul#ERM16%S;?#7=n`9b#K1lwTM4S<oX2E#
z<rbPu7~u$a4>GJ-tu}=*UH9T0U1duZ7~M@#G$4j-fDPDPJPly+)0<j%7J)A5pN2?W
zLZ<Asd@Y{cVNzC{hK<!sYOR38#!Ge~cNWWTR~tzME9OUhG+`&E#V~7hg~hP<O**oX
zMM5J#KFRXsNDTz>mCOMVfMN#tfp!t20g)d(sx~V!f-F0r@Sb(*W&E$vBr7*Af7jVY
zpEgL*?8Ac6bIadJUO)FlQ0`*dbD<qg>2uW=pGKBHS%0H(1v`74?dZ;_TZ4&o{Jc#C
zwNC!}-nB5D#Jdlp8*aNx*f;3RS9q*vIA8jx&=Y@-pE>4%^!5GJ-|;J#D!*2#JA4Xh
z=ni=#;{S43?{mYquQUI~UF$#99{soCm-VmD*DixZKAltkT_G$KJLFb+;L7)VUD4a`
zhe748&dhjKLflEAq3*}%fAH@z*G@dvgpOrRYR7x@qn8>gr7ih%CWsHCCXkiWhPiQ{
zL+)0sy(!qzV%J~4bowhAsQWDP+VA=7E0F^|ZYQ+?`tMe<qW13Ve_6iEywi~@oL*4)
zYwY_UFzwxc3nMi^2EYOk@jr#ph(e8#>>PVC;w;dL&!cBxbJYxzjvK8;b5VwDQ(pq#
z)>;;u8?;OO2MiOVWiXkn^k%?I>IFJ>g3C7zD@ELRep}f?KS=JuvAbMb`lRV-+79KJ
z;wAlZAyKsr^VV!L^R2pjYh$cJw(k6*F7&>y4U+_u^m}i+S=R|Q)glmP2{9~~3I3}4
zx7ZPfQq#%8)uSC&5pNG1nowdH*G|t3_O<g)MGE^|aZJxRFHs%+Zjt*h^l9i^l1OQ3
z@732*X9dXwqkmpBy7%??E^#|{u%Qek(T>%`8kTy0;~;(-t^S7<1BgqFxLN|W_KGE`
zNQ&B?3Kahq(U5PnDX&(*W%MT0X|-=xmUW2~l{Oaj(8xLo3We{)tgZG4zzK1&xtGFj
z^4w$QTJMYv?t)XZY-!?j6@PB^T<Sefu)A=zi}FTcL)y&-vjZ05TIa5n)k!Nb=_b6Y
zyU0n%uO<tV!*P{eQKns*EOJ-X@#UrDIvIi=>YD=&1=Z(d*4&^K+31a0GM00kQCViR
zjKjEI>M1*X8?t6t3UskiEAd4V9bZeZ#mh!wnY7orPx!M=qPN~4<*ObS@yOZQ!Arj4
zd2%r$U?!mA<qsz-m%bu#!mv!;VMj~BccyMNMxzDN@-p5C^VIx!P)<?zLANo0x_>IR
zYjJ@;)?Lf<wPq2<FKBTnD6Y4p*(I`zgTW8!aAx?JAJS-PE73=l&aV}gx5S_N<pnfn
ztz0aOE{e!wS1%6jObQqCTW(U@*p}mM&e|+x=6A#APj|<&fu(fT0A>}EhAY62;=7L9
zWoGvNZ>KvW$rFk`4BKv0ZN->c=v5&C7s;x$5G{`%Elp;5sQjVKx~|E3pVh$lDRzT5
zngfY7F-=5^o4&POXVvMe>2RJDvt4JoQha8r*^UNs1C1}xpIJVs`ns<|(<5@>{dgP}
ztpJLgqvmF0Lh^yur?8O#{of}2kv3WB62^YUbbbJ)demMCtz&F7W>Rf*Y7r5)>pSAO
z#$@Mjs%64u!HtocKyVPKGKPm*`}nK5^GUX$nK!FLB@m6@kuNgMIb_>8G;g}G<zPat
z_@SwV*RiZSRW(Pi^{U4iIT{8v?&<85CKP1D2fBu)vG;$%{k;nd(W5OO4y}TsZ!P*l
zqgnYwMxt**6$zsZ(H%#<n~K+|W|KegnrrNW6WKr5DILN3-J#syaCW{%Ogdi){eLY!
z{mNQhy;hgtn<OD3iwANJHd#{PXojpR@RO8o<4_}cs4A0u_i|sl<pJfegV|ApL61D{
z$<Zoj@`MdIT-ZghTMM`JK;;c4X`tY(HDFEM04g7^8A^X?G2wJUj0?_I$G}Q*mw_UU
z(#{=Hf_=R6zT|c0Bf;ss^zl1oGJ{=YDk`7zvei>4lb!+rg*V#bScsHS(zi`QkiB%7
zX&groR5t!NBbM;qM7CQwCtk-+Su1HoVrxEHeX~kXx={@k$$}KjORhS2MN$Y$=6Mmk
zAub9vVfYy#=$lMqh8awpQ7Yg*1e(hD&NHjO)B@uglg}9MTQ0Ww4E0TekmEtP>F{C7
z)50Y{>AY%=Gedmgu?@!;(5MVsU2YbC>H`rkBMrMR8obUl3VnBo7s#O~*Y=iYF;?MQ
z`6kBzf_DzhNh6Ni*)z;hj2=!@-ZTE3yOCI}cCYlbCvC1n4SBevv$8S@i}9hVoihLm
zsMzQ>r>lwQFU;O>=D0HR1uNz(!zoxc#$B<fLilxAAM{GxJIt4(ePP!`%+CC@&>zmv
zKQ@~LH4SR6V`8bRyI{doE|BHL-c2`FrVSZp7=;V2cp7^-5+*ewxzpJzvaUp?Qw%R^
zkd`o>X2)|54f;II>v>ac>-G-CkXFHkLMHyc4=*aDjtu2dayU__c`0^_G4zG3#S<Md
z**OUHrY_19SWWKViVzRYmh-bFu{<vO>J_w+CIG+h)Fa>sB+iY9|J>0liePCn*JSdL
zO?dTahX*XMf?^SsVjU7`1lB!h@nd~5mVG+j*)gQR=}Jt|E*guezc+oqPm8kVxZIWY
z4^hs$;8$5Gy}2cri&5ROjAK~J>GAXI2awn8s}9bd5Y;%E?<4s&`c9XX;E?eTSkh8v
z(LF}lKrDFN%_Dj4Hd;{D1n2rBO&njO1FyP*&wqlo-kXcs06?$glEi<iaifn@+;5ab
z*y6`g*$iy0Bu2~E2xNmwCg}mCjb-zrnkPgwm4-A~e^HFVfQe_M7WmK>?~{^Ifrk;-
zEn41+fWD9EFGtuUt-q~Dl#ZI{w^Mp*wprEdC)x(!g)1K_&Rak3yx6T)*b(}ML;3b|
zt*rLUq0q}izmZey`Y_P)S)kP-`Sx^>|1@Q--(QWrv>GB2RenW*s=F394n91(n~S02
zoX{!>-x_dWVxWd2dOl0!IGFR&PLk2;%x=vwkK#rk&CY1CLIgjAwVK4<im%Mo?<&*&
zv!{Q5^@Y}NSmovG2)mbM%RzFQ4-M6V-2N?F4ETGsYHvUAUk%dqm3tj`p6rKoYy4Uq
z`g_#z>>N?=SKou-d*5>I|97-R4UlqnR!9BMvzk%O89`1mWadPo%kgdAL!x99gjwV4
z;V_v4tt)gws2MGgfpo`#o9Zo$gB1{Hv#7d>LJUW0(8>5h?Og@8GX`+`JzM5;1-zYz
z&Q}A8dl`O_k71_swHigitSZn23HOt#F_uj0l6rA=Nq6LY6~hFTT_W`2r1~ZOgstuu
zEO%xXE{ZTH$o|Bs0YFTV@1?RA@-I5at{vxJKcuG5n!1~s6Lg(ypI`BnxG>$Y>jjVf
zUIHO$_@h(1%L^VJl*#Vvg}?4UytG9~s)?-~?czTtPAJZ8v;T0oDj(WE-gi_jzltlv
zgdc$K36u`mkxYrcQm2nfswC^%2tDb7%S<m+^Eg}R-%^#Z`rc)Fk5cPQ$9|-r$89+~
zKkl+6<7Kg846yF004M#`Kz|l_TwMJ)$Ek29-eUEYly!*2CjeaY@jL&^`Ujp=UPVIb
zS1y}pelm0H3Vv#?IvMU?3Ce4QX&XL;dP|JD-DdCXEQsz@Ea<J@F+R%6EXu%YB-*}4
z+sGir*p|U_C|i5*T~w|{ozTQ(=2lrpavb|>bs;M=_fogwz3m}CX2&oPn@-}HSK*|n
zSYwJPZ<<HOZwF!*nMV`j{EBy};zRxn1j1C})`2l^N+w}=LELJpOANhm@Q%++8V0h?
zb*hP)jT$AKy2?r(9m?LrG`{1qQ6|No;W^FC4((;SUmvC9aPF(#E!WTJ7{&*08{Z{9
zCKt>&AHoeM{4S)B*UgwPE|$dyb=Z9HGv|r@qAg$5eE5PtGf!B224%+iyG#KS;X>1)
zqH%|w!GzY(d@@M8<>8$*t;|5JsrEfgU%2nGzND3ma`!RCIHoh%BKm}GV9&cC*B`EW
za#dY4I?}HHy*-@}_?nrg)YR%u>D<y-vs8jQf;}j&I&3!bH4D#JZt|B$xJyj<aOb_)
z8VLwFZBZQ;#w|(aGkWx-x$E$E;e^qq0VhfA%g$RXRpjog%n2w{)KDEya(n1Yu7nO&
z6%WX1y9Q3Jv(QYNXks#c@hW_}1xKeFK>1q=v#veI`=k*-F)-R&51DVf4FbgE{OJuz
zaquNyCYu|Qnz|bf1dt^J%aop2edOo6?kn-Qoa>~eZ@3o~M{r}^KZeP#aX$$K<OO~G
z)wf{@F@r%l-T-VS!79by6r{f=rcWmJb$-17`)s8Js$ZPedMz)6ec2KVQNS&0w+f+k
zGt{Zt8(ECn^DRf_U(=p(ll^=I_Yio!*Y7WU{~9Vd@WX6pH$cx&*yc*P1taF~(S-t{
z&*j`Ien|Q)y>JpmSt^v?2VUs#PW$)r^7*8b7QZ_?T~|{6wJ*8r8YzV2{P)J-0TgpO
z$Hjge5gwt?Z^t%(%l?D*Oe8WfSjgnD-hGjCU2gjl=k;rn?ky(lHp$+C0we!;L#l47
z*@+vN7qXhejLdF^WLlJXNk&%Nnn+KuzR~zXV=%#?s$1;<CX}4>TZibI@idOKYY0PF
zo%tg3^JcbmPXB|t8_*R5&(~$CFv1t~Mw%%4x8Fcg3rVt?E{X};p0IJO%T{c{{wdKw
zNNJ3j2eAx7FPY`Rz62C^a^vYJRm>G`w#<Hwji)Fvkf)j&pw`=1d#<3uSISp#G%#Jf
zy!0MG<(?#sIa|}}yEGo}Wj2GxBTb4lf}?9Q#)TTNB^=yg`cWpP%vh=Th*Rv{342rx
zT2h-epQPXm=PVqAXo~ybo$M%_9&IE&N)S~lYf`?@)A-xiggkzqp<>T+oa<&4qlJ(x
z*WmcrPksJ@Vh!~=uC~|A$B4qaXa~*0XfZS|gPo-#E#Axhy^W{$Edrbpr?qYA%eeyf
zyysgC_Z(!;*N_!b5a(hRp4C#=<0)~al`?q(j1azQW8AfZA4kM7UpQwoLMaBh7>b(=
zVX{Hz$X%?eiT<N$f#_V*_`s-6U|$8w!u_r?rozukp*6+WeT=gOZ_FNFaBI-oSFpQe
zsm^4<syw_vs-SO>V{9%}!TFt>DAmM}9XQk-l*+(8JrNL6v(j{Wt`2EtHLilmhtPsY
zE1jE|ShIp@A>ImrOrc!8QP(E=7D@s(3bAI%zmp9`b(gz@h0A&}XtplOn;842%bexe
zek*Em5n)yzu7S&zHL90L4QlR@ueU8b6<fOkU}L-Yy;v#y3!qxff6vcLfq^o>&2+(c
zX7u#W+C#cQxa+bj^j~U2Y%vEfFEHA9C4~Km6s~-C3n#QSlM_o4d-^$@%WkXhVabT1
z)?udCz86`A>4|!GM0V6~`$u1X+*kVB7MfzYEiQO6j<;^lzdf}rb^c_6kkei$&G|yk
zX+_2HMqAM%-MPCt>f>#Bu$=cvmtS6An98V@ESn8|yKjBs`b>)d$lj*kzaHE%Gf}8+
zzSO^oX>bucr5!nfKbh;@rOk!TAgcYMxr`E4RHS1xjM3T8jHO2xPR|Z=F+FRmCyy6T
zrV#}y70%`XeDk1<NQbVL;ETEH|K0UeJL9FA0~Y@KxFy4Z__Xl<%}h0^!?xAXGLh<9
zzJ#_KFcXtThR`_`8Z-Ze9HSs$jf6295e~7d3(TuG&K1EW6-K?EsicO<E%=ybpH&!H
zCj;Mh?A2z7wr2%#H8$B-=tc#1P4eVd@|Z#L_dXnfM%giZwyt-Yi1!HLZzofp2Zy=c
z&vir#$x6!C6I#MIKWMf%b1-p((w}!faO)Y%k+6u_pI&<#R;=jr&BV&Ju{<6x)yUlB
ztTkQK6IYO2Vvy#w=HOIm^`!gL+V?LhtLLQZ#t`QX^>VEG)w+0ivI(GTPaa3Do_rbY
z=<G<s^Pi9KTeB1_?<I(=ji27Iej0O}*d62gxbjb1)cFUJb6XyNPqd=v|FvD?$D_mX
zEuk-kw6}zCdEkUBr@K+#-}Ov~<)Vu6AVYpJf@fFMf+R2>U3})&3VOs`ZmzedN_(x2
z>yj>=yVf50)XSkdsT%^wmMlhcns7)Y9?wGxRjzGm9U3v7ftB``Qt?CcFDo!TuOh%u
zZV27hSS-!3_PX&-fwfN|mJ^@FX$wma@3G|?XBU;-&bQ#?mhin!-!5j?@yuw-D`n6z
zvt+r*dAvi$kUHw4uA01O#ccStFIJv!^Y-@JNS-glQIyCmn5bgLnYh%L4nZ^(D1#ze
zft%+{g}FIWMT(P87cw;}mU*#JTjdR9jptpc^EdN#&bExes`IxLMT49CBBnRu1#g_J
z8_LQL{1w=%Yg%ao{)d?=7_kO-sKlO)MY(7%8E__b0d&&0v@#<MeQ<AeECh8Kwn4KG
z_a0`>Grz3-F&FhMUIL*zUq6!V*Sp_o076)RRnV)C*Y*deS6ywQ8OqmG(D9msSQ@)k
z7E3qSC-F`%l+jaKrzh;F4gLVPj-6N`I<-b2>fKARePg;&AnujKD8p9}l7$b8d8Zm~
zEm7c7D8qO^*K`{H^-jAwrH#(TZr&x&PC9()xpk<xmf8fPWHw7i$0woh#y0Fm+i|<d
zzUdWe-KiCMne`8fpxp3+CFWJkwa4N<iF~#=Fema8l@8<)xwgUaM^}3(!_<i#Gq@l9
z${=5KiA1L&!a}mWc)-@TW8%+ES(|Dg9#6AXJhfM5<~)x22$hU)$nfCpu;+5ULL`7p
z_u0Ph3~HmV>X&CwthL7slXU6#)c+|ss~p}WJe<GkbM2dB_?zoTRMM63=Udv~PkMeV
zovc5#qKp^}AuCh*p?A{X7*<_mZ<ICELoD7khHd>*0Ut2{M#B#2Ui!a;5uAG=Sg`xT
zg|t8HNgUjQ7_H*F(cy9czA5@0WMGHXK22ke#p^}mX3o*JDM}VyX7NKBQTw>{jH*?=
zaoR1$$V#At37!;m^kH@|_XuwcY=p&ik%PDUAVoEcu2mT+DH=C#dcISfRzn(fW3okU
zAxElo3`Th}+8BJ3lhqueOvofd_K>N!K*s!j%#5nL7Xx2v|B+a96-Z>41oY-@dItKG
zlIwaTfdWl5Mb}A)9Hv#U-mFejo~z0Z+pnBQpEIM-{Hc@e9y)XecFxs<qSmZpja08p
z2VWp}=2>p9y{cb3=P<>gKtx9&-OOr?v-o=>qpm`_$}E|JO^u$H7{^Lo)}r4UMIrj(
zk0;}iM<tIsO?8WzI(|mTxziT;A_j-D09c?2t6AlD)KHe?4X*MN+Z{O~?35iIF+zZH
z+}c{$Y>9c=QTEjLuEs&>-2~c5zRG<%c8=r8bsVjTc@3%_1DuTwW<6iu=B4HmG#=~c
z<1&PXHQ-}&?Q)c3Vpn%@qBWYHE@}Y4XprjiT)yx=*-=*Wo#f$JMunDBA!HoLNOa^e
zPtL>u^Tu{%4)VCcNrLQg!31HTqKlNKxQW|>#18%r00As?*dR;N#FTHZ&OYFztvM;@
z118(H;()f>Rr+T&5j-fijqIqiBgc`pM{DYuzb}HTg1W{sx`z|-!5QG(ibh-$yDbIu
zcrjbI>Z_Hg3l1s603S2@hH6@YiWeP^XOc9yEbqhB9S>YEr&qxs)xad-R57-q`JE&$
zWV%S?R@WrSP{5**C~{pR$$`7bqsz;rWJxj~+~UbWt)i(&NyrH$*5y&+$r@?u{AcM*
z{!t`U$pn%vnMY&RpD^+aXUOudbK(#L{(I*b!Pi4DkarHs5K%(#%7c65Gm#+TKTifV
zbB3e=IjxS|Vvs3+U&x5$bDRC}5;<mHLJTP!1*~S&>%_6T1OmBkv?hU_F%n8_SQsG^
zT%<9?jOjMusu=|HlK}Riog_%;jyIon)%exqI^Cn5E^Wngab}KR3JMq>cUhGZZP^Bk
zdivifC||s;w;j3H->;jN#{b-xccN%fXh62Z<uuXr##xf{Y`}Q!WF~f|qw@RI|2JSv
zV(YA8wAwW|8!%3@?yTXPJ{vGzoq?xy*15_1O^mKQ&tp?B<WSqQOwgF*_$Yaxqxj*6
zan?eBk>)}7y$^`jEickjuR8k*4>>)jE(1HennWMG1JL8=#1o>Me5QAj;pb%~EIQgQ
zS?yfTq^%q#Y`5Lr7}2)5v-*<vZs(N>Kc9f}vX3gGA9nrzbn$%MV*W#o&xx#`+^@w+
zRP1#9pU4x|2T6jz=`fq#VZNDz)bqdp-$~A8wYca>;ejtEJ>~Ptm!qe6^p1>P3e9U@
zh@N2`I5PNNK6gPhdJdv@jO7!aGd+!3`19Ylc9pZ~Lff<Ne^g8%-K~pK76m*^oM#Su
zTa7W<bP0T>x${l&#2fBsRL(lMrl?rNehFv30KcTqq)_0{<XB;$v#g;h5qaNIk<ZUX
zwL@kUA#*{0vI*|qpLntmx3+A>FK@2+{dZbm=Y1?cF}z)1`N4j7G~q3IP3whQk9UhJ
zbkck1qa}a5NRxX;rfYZD8t`sPymD(#Q_|T^Pu=(0GDM8&!@v=>vvg%Bd&p~OjtXYF
zibI~I=!<O$bDnf6?1{F0+f+5qaJok;CNQ{HMl-cACFBE{RUvuhlR%XATGhWeV@AP~
z?$DLUo1qdzJujiJ>cN~pWENFM#tmPdy4}##-SSJ=j~!-K(~Ri{$zFn9@le-oJSbax
ztreOKX5#Z5uH=b<+%7b2`Ek+XdR281yDo!}6xE-@1ZFMBjmI)T<X?T^@HNp4r^Sdo
z<|TP?tfnG#l5N2`0s>(&3|zg9OR2W^nZQhEgNARdGPs&!shAF;`n*=l@1D)njXg+#
z<%L~Ig3J<lnH9GwW`uTNa4#iz#?g8=IYwgZZdo$+IiBqe@^)rNo~XR9;kNK^WC^0G
zcx~9mC(<$^I7O1zan`t^oIEbFk3|LN8N1t*yf2#v7q$H&kaB@}lI}%c|6YZuN|Io!
zfe3#a%IDl~W39BYi#GBpC7gE9b4%M@-e^_M6wm5S#ijenWXWw=l`5G9BkJY;Ojw1&
zh<z*eeFDMM#!AxQu1bjNH~b|oND_~{Usrm4$1UQBcjx!CxA(E#&ehxb#=afAN<thm
zdEBtSMellVnRPtlZJZKtb?InwLtqwU?2IZbyazKpmts59+CcBV;)`|;KeDP@{th6k
z{Y-&M>p;J@4?oEg2YP6?NEKq!_5F1}t72fC)rw+_Ivx(|h)z~s@0ws7ik=wbtW8VB
zwLwHu7M7oagqJB`EkoNo)XE*FIX2uCnGwZxjh9wh&cs`YMQXCRN{6#u!RAdDf=_f6
z<eYOZE<onwE<7{*v?Da5s%<zA4=d``3WN%qjNQDNX8s|gl4FTg-O=-aVQ}4@wby@i
zw;nor-7XT7!YH<q>B&tjo$WJ@GPJr4ymAA%A|go>7$f}3iZ^a%=?rU1dv@mcJm5|K
zSE3=;BgFQKlC)goZdHM`&Q^=0wd!^7p#fKuyB<&5H{QZQW}$Nr`khifGfVf;k2y`C
zr=$Ojudf-w(?#H@y78Pz<qKTea~aE_`w=Wvs-cFWo+eQS)qDtkwCv>gCEMOjRP@Fc
zTzZc1ve<~}-}#Rmrr2=~-31Ar6C0@=arpTg)oF_5bdpNlphW*O_`v!uD)4zSIAHj$
zo6IoF-+52?DSH~r&uEGs(;gSPQMIuYTbrVXd4Xss5mORkbVy2PL1&m!6&jNjw#1p_
zlX`J-YWwiWCj=IQw&FT|78iE6JC>ahYU*sZKmp{)UY5V2RF<5ezj>OujMs2}^a!V4
zrv${>lQA&V$KjnT5Tbx$?WXQ<uqnVo#9s-OhWoImXKmh8qNZ4;)mj`MrV9O)fOjv+
z*o+B?q0Q4Ur6{{R?jL9HP%&18{9tttPf0hCi!Bs~!Emq6G!1J<6IQP(7;!vVV>qQG
zf=uC8J}WY;+jXOx!Phu-yo`H?GWgV5ppLr~rB``u(aF>Jcit9D{bD%^p^dCm-%?Yx
zl~d!K<6*^;vUCmLJoG%NM&LXbU5}0%u+5fJm(DkVpj(0dQxEt=@{-!dZ)=hA*-|Pv
ztMCC_q*xkAIINV4StWp76#@mP4#rv8+b@{^fN523Lv@z<iU7WB!cy;=3_i|V6HZul
z$zJTE`CkOmCehcEn<_njJ8DFnsVpYpJ-sc}0f>P(ml&Q@cY}l)oFk&Q8mp=Yz3xYv
zDT^5Jc<LcDa-1ef-Xa{r)@I^M1%Iu5$mirRb&R>aADWROE6fHZI`=cu<eY%VGLJRv
zJBRLp9?r+VgUOgU;&oe!xmNb@*Cd}z6h9Zd*d^z9L~cmmzNiu)%<21YUJl?CuN<GR
zsYvmT|0f;ohZOl^rxVMZdyQGDsPBP|I~K#?n<5@i$n$Ii8kt*5Y&IatKZpYwTH+n*
zY;sHdV}mWI(Y`aC=`7Q_h8?U~{)OJ)JfLad<5JVtKByDI^RnN!E$O8Va#+;@XX$(Z
zOL#KpPx6O{>yKM<AM$lhtJ!FEHr`fE<9Q0UrC_aZ%g)b8i9}|pBpbWG8BIhZ6p^jQ
zj`R)YI0+I9uPH^iym#LYtu+cT_tD7kO2^jliFnM2)F4vS_lG#U8=;LrDl0+LMd*zu
zR9P1X)70={JWmCwo4io?oSJk#mq39y=;lMQ{<0tM-@=q2NIyo|Pc`{qL(IM;3QsZ}
zcqQiO=GNEVIP<spz@QQT?3ztcK{>(VS93<;vJ5uAl~k7IYE1W0p#5lwQEuz5#3uv;
zGr=g26Gi*Crj}EkM~vZB5Y|Zm0U019@%ymQ^7X9{wmR{sUN3eua3~pCwYu=qD?8D%
zEXgGooN7#s0EF8I=N?PFXnM*P^JPIJ_}GA%tKRj_>Ece9{in6~Vl2xl;3NLyss_&w
z%}#rXWfia|wS}6hk<5?*=wx6qg$=WLgag?U>0o6#4pD`IXd;2!!@KpEsfv7sI>FVC
zF*YE_@O$J|;PUag&k;EL;&vlf(<d>#ePRzkyaA(LxSXoEofID0WlOvitPP3)0IO~D
z4cE7ULpjcZbKoo2(OkWrkKK-aBuBwWJI&mf&IoIcPlacR%3WjCx(NGVm0G@7owmvn
z{Q`zllA6MhnZ-9w&W8<SKz=6Lt9SX38)bT$VwfbJB?2MUdF9iU*(a~R&wPLS>(9R=
z_I^5}&5vQhzXxeH{abvqKgQ1gJ*4LLZ%f;pOuGI3QZn1Wqdj{vbC$lm-E;0ed788!
zSa*CP5%<<Y1hD7^{>u3H9Np#aKc$2E-&)>0X$}$PUpo4`edAPb(f01I9+uNjtl@eu
z`3b-K7jOKi5>4B?lbhIaRQc2Y=8fPS_SnyS@4ml!ACH|F5G_4W*E<=JzVPM6zeNjo
z-fZt*v-w!W{^u#*>9+yKr*GPFPfOe{AGDhyo_>!%eHL5u^5&6K!eDn?^KF6uMx862
z2`c;lKevPFjN73?W0&<B+dWeN`IQP{oWbkkZEta@td2rVKJVviGi2-y;_IYppWRl`
zRw@+pgBurutUgT97SWTUsubow9R4;WQ`3w8NmRa6@muP<`n)?^K*?O@0c@i=B85i}
zA5~VzopDjwZv_~-woLrA8uq&1$}i;$?Bx@n6O}1hBh>ibXo=Y+!Iy4;krXbz&nXK)
zk80CnI(LceVCzWgrkqw*T-17Zi)FLf!H@c)0+|V5Z45@yjeLhA>|w@Nj=2Rvr*&O{
zVCU|z;FWI8##o;%4<IOLup-<z*m3Fgm}X_k&-VnNskWzw3T@J~X`%XbZ7f^;*_HrL
zhgRI3Cs-CTxP9`rvdH@FU9K<@s4N!sY+bSL7PdOp@Us4HIOVd}7QP@$W2@yN)tl(W
zhZS7g?4Cn{Y~Nbx9dC3@C%yKye+J=krb5)|mc9I%g)rZjK5&MMd7iJUqUf<Aqmna7
zP67%I(enk(q_q;4tyHBU0F)E!9vJQ(GRh^M|31zq9gJg>9TGQX+vay`fh~<)LXp41
z<OexAYfb6gQNz^eX0N);bYg*(loSzS2eSJ8)eU!$94Jt6RW7Z;+p=tX!Qy6oK)xCy
zxudoQ_TYu-?KE>L6GoBq%(>Z0D{w4j*v$h33IACEI8*7T;$AqqbLp&JiAX1_BzL&E
zH21ov8NsWVj-m)J?ehcBE-jP61`l1u8e1U)O&_(I0!h16ez+mgo9-;*i<pz4*uiEE
zSQeP2Z4G3*z&!CG_gYAF`HIxWE*VTP9zmjVg1s&p2TUF}__lSIQtOZFJF+pTdr`h}
zLZK|-T+9hO(^@g>Yh#uB{8I$(o3j0_558AL%@$QVhyP2(I25#vjrNmvA#*BBW{DrP
z95^JC{Nm_yd-x>s=s=E2eTl%ci*T-JbI%E_Y6otUK4$WgiE;a|d~^R9bMf%GK`=IR
zq9P8Oqh<=S#9!pm`x1yl{ZSzn*NQmLYP(TSH$otVq`uwIHQHP~II=T^W$44OldWop
z9b-=aSB*_=2oH&~B`)Y0FIG!bD9ki2!Lbtv64gYEnYYxvcsmB&F@!A)xE}0jEvo8W
z`V34F?2>#J0kSlXL2=tXna|s`sy;vWkU{QF)Y!?eml2T#<KS<1CU{qDZIvG~`t6mk
znX3R5w*r?t$DRkCuY)u5j-9zLbHr<aB4f5itv#$)8~l0ii-6^ZI+foc_=L2(?tRsI
z`0z(4?l>b=5knU1h&|XAhC0$&ohkqxLU05NU<g+S*|}@2zT6)VgmKE?lf5zSdnP)%
zhYVs~Sk}*&IlZl9kWxewYwu!-#%VYf!Hl-Pw$jK7zT$v<Nc|vk5Dt+|WvD@1_2I|7
zDpniBVa{HdAqy%t-n&31sn!f89xsU7J?W>>y9d|<x`}FhucGFRKL>}*xHwI<WmctD
zJihTV!0|iG&w)`{UeHyyogrI601TQWT=v3mDknMP$Z@VLcTt-qU<9YBRez?SW-qJX
zF&)J@ZWzbC$in7ehms|wqFFjvqw6TDY;Y{F4wCNG`Ht$wU@HDrjLoZj0mTV3)N-7t
zl7ji-k%Kd?cu6)lM^({<#_=p)>X>GGTQ;NjD9pnQq1<b%x-|}~;Eq6t*GUMc3%Tmk
zZ1ZHc!JLIu3$A~dP78|2TcF0Nq`W0)msl5B_%N+O_sZ4WlW7@%Ph*-Gd4eZ;TMW;*
zGCY#hhzzF>`<u8ovTf$&*x5c1&t*0+_Q20qr5W<uVwbRJDx{|+MQ|O(b7nD#C!i%L
zU;0gT7Z}b@p(6q;lEE@@e1*nY*n6OJBWe*n*}Retb@5#6m|}hf^tn%HAN*}@XD8ts
z{=tH@G}#3e1S}$ar1+rs)}2%-heP-?bx?JgnTQPa;z_cAyV2C&W4d`=g(vR;oaD|9
z9L-P4Q0aSH;bp0Yq8xDY{j;)RvMkPKaX^aURso)aw$CN>tG9xUY_xYdNfN$kC|;~t
zv}-WJ?-X1Eajy~Pr;AamUl{5p!r4si@0<@VM<Y<Oc;3FIry+a8%tXU7Fb0)QUeW|q
z=d(rxnVHC<J;fj{FRY{{m-_9*d#bXNG@(gsJv&Pwd6Eww#}vC$guLqi`F#&#2XJMo
zBXOQl+;qdQl{^S+5xgk>_S#SaA{qCvAILxUP6h!D3HNFH9xk8klT^a(nk*)8LN-&w
z6%m+y1s7VeC+In_V|cBgr{HYblpHtmfe{q7JiaXAmHErkM(B?LH*esfv+z8l$RS;E
zRm9NblL|&mERZt?u2!U#Tm{6;jWB6Su%&1zB-RHlNyt&(X5)v@)vzs`rQgD4j@@Zx
z(nxl;=;p>xDc_5*kE3JmzKgW&=;}i(BV3f?ne@0>Vx87-3))b^BEK-OzBg*di`%&n
zXT<u)tKe8ei>htWBDgX-EqWz%@3uQBpzwo=M;ptt@||Xlhm>TVeR#pIt=T(PAKQ6s
zpXl4MQux->=5S-Z3Ktbi<UN@HO8$>awWR}}Ou`HyXcTB0eqN~;0YmR}7lB*l0fkiP
z!#`84iG!4tjLozASU8s1NbE@|7#jTJC-MOpH9eyEzc_oZsHPWgUpu4`NCHV{p_)Lz
zAVoS60YeW+2}KM=79~^xK@brvNeChIPz4p~iU>*-u&hOwE={CrKtw=P?C5eWPTsN4
z80YN$-JJ1V<s!LBE;8qT&fk2Vtm-qWIkVA0Shu=$Uf|@@&d3zqgBOU=grL&ja)Rqz
z%D`b%;hA{pKBN>e@O~#_I6EpRR;t<fe5c3<Oxz1Uq5V$!0K6~DjLkSMCvK@rF2Y85
zyeEvGbxD{Oq~#5m&ZV2iS_e3ph8_(UWhbqizs$lLJo-ybu87+JV|sgQtf29MK!11&
z+)OfHk)FxYvBX}D6rf#?_6f}`$FU1|^YT{`KvixG$YD+9Uu^|sII;Q29cqe{b6UT^
zR#sCd-k;p8{A}cM^P0%*Zq%#2T7#rK|H8Te2<I60yr&yN<*f?8;#>ZeAGqv0#Me7S
z-C=%L*#%bCH-ark*dPOygxBi9Ok+7(P1TZS6#VN(yP^6aR7c=)-^YlUQt?aNV6jwX
zTlJ}7rE83P?ZU5cM=x8e#Z)4~DOOlE-*R8#nm<IZj(PZ!x3t4o9gYgE`_~H>isZ#A
z$=Zrr${F)1QkN%(_u#>h63;8@mBLXxh+Px#qwtk~g(XC&LU#U;fJtbCKg4Mlq^Dyn
z+R2dXWGc)vmG+o8EK8Zh5(sS65?RC&)}c<8<~&P#kEMf6(Icf8&{B*NQ%EH#CY>p!
zb#aK@l)Ao@V_cLKF$Lku23nj3GT9n1KgTdrm+x$~PDKl>B+fIHFb{BpsoIlRv>`<+
zS_pj4yYXbIOGx4|3g=TAJAx}8u*vkH$<@Vi6!%ikVgXU}Oz%x41TRg2lKP=J4G-hG
z%A~!pOHH83xpp$WOSnP?pS^Ri+@wwvhbxm;mo}EiIVeyl?qT9OS&>AJFq(5YjO7y+
z8a|({g-t7>q%_vW{m(|y?SBAWp;xlPt8WKLt4l+TN+`{1)@%U)ZaHk1f^*<mW+1``
zSOW!8N9uj=xH=8l>8LXi0C)dlQKD<ha#vicQeI_7@VhxJd3|3{K=D|3-fj16CrfCB
zN92;x8QK%CTFyJwVK}11@1lbzzuyRmPpwKYyt@Qg>CCw(3B5hv;(XA1QXh5l!2<zh
zWqBk6GsX+BTpqZazm`E3!nwYGpv5pAy^6*Z{rx#lZoowLbOX_ft`@SQ1Ao~mB}2)J
z@FbAb<$?y((q7zB^O<cQvWp_$ZaCExh^6RwAqP&khuwd{b#fy(Hw9k5+Ii?j$e@wW
zeMgl>#QyDjCvyWReGh|QZb{$OR*)n<#sz6yf7iz>8M~!aVM=irp%1tx)7o(s7bPh;
z3;CrO&azSl+SnC#z~ZcTGL)&}Y_t|Rvq}ahxg%Hvw+d)LE=AP_Smi_uP@AoLAZO7>
zZ?=R7NrJ?<;E*pC>7VQcUENZ=J0cOd)eH<mQel`Z(+Mnq)OiCX#8Q`>3E<MS0+}q;
zn`8kEXZ~s+<yhhK^~@_aT`vor0Hu&T-y~udA&O?NtZFURk4PNy`s4wU)@1prEyq})
zn7~VMLOk`D8R@Gp<3VCtQas{7G0k<*fzGQKnDNUC&d;vO44lu_5iX`NYYIj8H!39w
ze%;}>SH1!d{h?`eOW0ATDq_+{Xc?%Mj$f9mB6~tCtH8Ysi7LJO=_9TnFKb&7!$*o=
zJ&o@uWctHL^bVm&m8QotlE6l=X%)M=!jO!yFm|PCWB#617Z3xU;KCemB9FYhQk~8D
zHLwL+eD_!Gy_KY;n~Fb`=fQuuL7R~J&%~Br8f~qsoIS}K(vkD#U98Xdp?PRh<)^ie
zVxI~nXBG7*zm0RzC4{&2stD0pV!;YsMV9G6v)+#uONbfW9^BiD;wH0fx}7bOZQ-u_
zbGEuN0lR{Txd{HIr{0`WE5G~DI|`ILtDEuz27)>Dzfk$HenV^?wzB^i#sXi8N%%_u
zlZ))`q&#vmb<4D(8<(5AS*#%0g(9zyyqLki%7o&ar6nZ^J!swPC>|+dU4yBY{-@Sw
zvu&>jNNsiP@JZ|1T7;O%g?Ej4Bs|-h2fpADk;I8rE{Oz`oL|YVD&3MJU+XZAv8IH;
zXCF`eAx;obZhVs}HXk@f6rF&j&j8cyxb7|!pHT4c83Rsq8_Gz<U&xO~-WG`Y0%H|T
z7In;7S$t0?xJ{CnvRLe$)l15m!et@-tpI~cp>L<V&*6HcuSA`R$QhM2$+0zJQvIFZ
zjzVQo0>ip)rd+8d?;!swaz-5#<~5(|MQjlsj+yXBNy?h;Ti$Ao$s1x91BCM)G^bsJ
zkkO2(5>l8{xkRU!(iQv-av`(C?|qCiX9PSYX4(Jm&%+3E6+pNj%}5RlgQz09F_UW9
z`a=NtbCj2fjt43PcM#Fq<8OoU@8U{XTRj;qC7JLB4<pzPjdDW@A}^5tZlOJ&20<MG
z7xFTEafC{ogKbrDYlMd;<qnD~kH#}so0<M^O-f!yB${TgpfH}W8XHT&3$`UjX}e6F
zX#hMA#vQ=)vo=k7?lFhl=$lQV2Si%3eKt_48nE;~E~lfEb1JOi+oudHs65ei7aczF
zwb}Q<Y+AaO&Ds{h<}yRUH%0<4uyC8Xx$alV^lz3dQ)Ml_r<MZhBoyAqza8hG^QE#=
zl^w~>hd-pFc?(rAEXe}fCX^fG5F-w$1dM5aF}rgCqyUZ!HKu$|+4>r)?8>x0kq{^q
z+uf%WGA3-&?aJnH0&(|dN=cfvlMQ5Tf<}zGO$+13@4SKh4El5OS|3w)VYbFb$}xn7
z#%y^U6nc6A9C7orX$<&8=((_35p@Q{#?U3sE6T;#5{)_KKoAOo*$WGM=+q7RH;S~d
z|NdNQRybH+#TQ{8|D)dGTFj_=bl1p<3qmx}EQZ1lEXA}xk6IcGCM00t7J^(^cB6IW
z=A?J}B2~OXT0Q8{9q&484YcdNR%q}CItR+|$PW7D64bs7dlr-4ld`O3ct+0CvnNj&
zr)Y8J#_M4Rysp`z*!sa3`+H|I>k(prI}%Ad?p_;*cqsq%gM}4{$Q4PA*ft@GLZZ)U
zn*!wapOScH(<F6HzNAV_1w<Z6L7lEfFzb3Up}HPP0bQq3@98+M!43yKwm3@ZhvP-a
zXB_^%HR<QiFT50UY7g6*{l$9yaXwz~gUbWX{sy>BGyMOv0sf?HEib6<T9JsWe(d#b
z+2J!u&!iuOC!_@4M)dpV$@WD0vjvY*lMqY1-x>OA!;Jw7C!oqtDEy=?7;UGf1DL>O
zsplp2b4fgf^2`&1`-jR|U|xG<8jr5qiT!D_+r5xJQn8RdwW188c(BEzs<9O&v9=|m
zBEDh4*Q#rv;?rEqR~b5!as^fcUjb$jk2iW{?E!}a@|7qj3o+r2Og;12zjgz>Wsg}-
ziquRMQ)|K|<kPqMveMo%Bdx^A^?;&ApxB)gAzo|bpl(FowIW+Jl#Ksy>~{FQjQVWr
z44wF9n?WzxMl~s^p%<cUl{ftWNX&zv;eW{X*><O=oII&K7PhABpC|X?4~!0q-4rC1
z5h-f9++O#Z7`1v-SI?S`wPXX1*0kUgnxa9Iuoq}ZKOt_q*pq>D-YdVCKb;Od5;adx
z6c5J?N$Kuqxj-VPkP)?E2v|Y}#FwSuP$;*4QxSny#l{BLR0Kw$>~tq)pxK!lu+SuH
z;&xGe#3;A$(`KaSP~Kx)J6W!;!kV6;^rdC&v3}>??T#sFuQ8ib_q^(8kT4+xHTD$n
z)Zt9TUR9$XJ*C*|+;x=G2W0FGp&LwGX=v6&x!^vLU%F}I+m6YNAogN{dPViuPAO|P
ztvNEX9<l$te9O@z^`kE)ZIR#)4xm_J-f2vU`+ec6N!~n*pT{{`qH*UlUJqF0lRI6!
zQfz8A(X+{yps^=I^O{()-uB_1vsVX0&D01<LoK`N#(4*R_wT(I%OicCya>L~kEy)&
z@4l_(S{{?Cyz_Wal=NYh1G?i3lnd+o2vPm_lMew-mKgf^>9Sj1B@6nqSIEa7mWCF%
z6Xhf;W2I5hP-WSK+e&CPy^t1ICHds!!AruMl6Z1lF$kfQuisyME)*CiJA`e1!T4L)
zd|+2m84c5`xS%>DVV)N+7Kg=8K{KRNvMOWsDg;*Dlqg=b2`%v$4icmT_1XntN$ga+
zM92R(oi=R<Akb;Yr*J@(oIgB#g(f*66yrHnG}byT04sf#%SakZy*MNx@hR;jR@%{$
z>pq|67?_$t#7Fygre@Pvd7Iqyy(A=qYZb;_XQn&WrMJhXdv2ze52fo8GYW~R1$*3o
zDl@!FG7?uaOkkNu@tLKR%xa4aH!Qammhnej=J&KruduX&M07Wd8&C9(8On$($r2VQ
z&H?zJV2CI{2%xDam|i;mkERp&e_?tY|2L*5q;2R^m4G^|o}jRRs~JuwxF?wopRE|V
zs_N6iw%5NkmTMUIa=E1S_IMfWk|;#Zqt3MooPFq@3vqYcQ=Mf0rM3>`m+9D9nqFGS
zuS_-K^=3#dsf~)meeAA%eYoj5?^rs>xnyljl~>oB_5^#OHESFPfRUq~h?8}W@mnL$
zXKoFNK9SRKxNzKQ*NC-JCnaWM|6$oCxnccWMspyG98h#*dGMi+ad;msl~q{sLD?#*
z${>%K5N4g}*xNEP_r9Xz_0W^{iCYaa8V&)r9$~mjV1!w~#4qg;s>}8otUzTy^u3eL
z9TaBzws><`Y{`_)0dGx=kw?eq;J~|A(l$VdsOQ&!be+zARnI_XozNc+%UXpD#Wu(W
z@A5AQ$^jh#NI7s?2o-{j3WDU@oQaU_&qKrqW6-I?Q7RKg{KquZ>3;P0Wm+aX4`8q6
zz5YUn?=%#60o^sYX!Ju}a1dQQc}qB5TB_d_b_Ojx#d~VsR&M+WF(XT0W=-Z5N_(ND
zwND1xuV<{q7C4*#tO?>51U;m?`tUry^R8jHo{pQv+_D<KA+pnXwG5$%_XV8ZFs7HU
zrGrAvUo!N=Xl~dMRMkpXE#k6e%h0CvuP1^*CBNxb7R_5xj$xzmc)vY65p<{2w{b{B
zvYNE8E1Hw|4gBl$h0e+Lv|BP>HMX=T#H$*44>k^=8Y_RtSirm_^)=7NKpA4jULg`M
zRGd1!1po%ue5bY@HQ^l9{ekN&y*o*LNRyvnMno}C*ZpMSeLaH(mClBx=tm1|)S1Uo
z*fA&5pM!nl4d7<X96C)e-kUbdNNT#aG@1XhSCYM3WxTemKWVfqxqg_Cv~yxg{9702
z-BZnkzKkn`<J}|oH(~KE#@V8?<B>c~?5^cyDbV&fsbdK741S#VG<Fxvb1@Z@lJJzj
zp7cgq)dC~=?ef}hvK|DZ^GT!PXN7x$MVS`nyJd!@+wL-?Z2!`-Q36%*Fm##^KS&Z&
zbXp41JtvwTaq;^5A4Zi8|NNo0+bt`eCVVah9(By14OMgng8FHpb2Cc^R(v<WrNZS|
zonxri4l%!!_cedqdKRq5QTnQsmCE0j)eWz|djV<xK3jwBeG?O<f)xLBkBpewIb>-H
z!F7AN>_DZgPIjqkvDZ{8OO()jmDX`c=M)sz^5$)S`d-A7PN}4yqFV6u8H|vf1m!z3
zXMDudz4eCn=h(lV(-0Uf3gh@BM5KlJ5w`~GThwzs%u82+EEV*dk<xfk*r5cWqm}?%
zk7y5tEzhJ~muq2?eA0s$r{k<l6Mmo~*aKpzXYJ+pJ?pN)<-iI9v?WnG-O7+ACOVWn
zq@yF%&+fFbkrQF@3El7=SFYja5EP*$lcH=EV<7UAN%l@OVb2C+vUk@m0|pE|X%jG8
z--WBDdK@VSqKdMFg7i93DaO$Or!~K(B*#U)$rd^U%;Sq5n?}YGBLmdu=PrvaAicx<
z0~{x9<zHZn{}}+ElKxdp>eSU$X;D+$>Resq<e9|GW*VxeNSJ8Pzz>60VHp&=QKgpb
z3DaJcW>J7PKVF>n5OwaBLz?2;cP>^)RPkl!Go2lOnEm_d_^vD;B}kR2AvOZ%Aqvn?
zGrW`Bt)jSzdV0v~wc2>9GLYcj_oU>){*6B>(tzqXI}>PN=SA=x%Uj76>LOKX09vod
z4n0&~_~A2m`=F>}+^L$DJDl&|@QOc1ea-o?$6SN0G&RDz>0dXp<NHC;=%~;pK0!>0
zss)gtsV+}XA@!(8`1MDK<@G_LbQB01Foh-v2QmSsEX-_Et?87&bTrsjM(1876L48k
zCEH5Ni9wGOP`Msb9ttyh+mXN~pro2AB7WieJ(RG@)!xFgjJ;=M0zlNq*+C({Vo}(3
z^Tc?pRY7Xupi1;>&!dLtQpZZ<%??7v>gPbwZ503uLIpR(`H<orlyBC9=9yw-x~vn;
zLRxP?@+u`DbxXtBBJ$4N_<c<)ASBkx`h5VhN5typjf;f}wjAj+$wMfC#rwdE4&+&n
z3LKRi4giP3V@v9l!fUC3{O;B{X@XD$f~;2Os<0r}FA!8Nz;}`aDOupHt(fA3j#yx$
z16XsrUnwq^O!n-BDeg9<L8OaC6U4qU{+1o=B}_Bm6}DaLx*tdS15(>{K_}NbyL+iU
z6G=^H+kScVvkvAPpTqCr`J2SyBxd<*dSXC6V7F%SlUw9So}5?r!6hsM{TJKvk==6N
zqNS_b84s%%h2I4~_+W9%#kG7%zOJn%Lym<n`9mM0J4~YWMbBHtXx`hb;p1;c#utVj
z@M8K*$}FhZAK%9<Z9<lyC$j>So=UJX>ra0;<R}xIqL9xgKPKSbWUXgwS5B^^!}Fo_
z&sQs6qTXHcqk5c?^tjPUS%-j6hGqY*Fbk{%Yh<`qf2N1aXEw2<>eY|Pf%(TUT-Kv`
z*=kMNy%{<6S@c)F^diA{YL+jf{Wko8w5WA!-fm#P>Uxzf6;N(6sC8Vlou%V(L=!j+
z)-H6t@i#99=ZPDFlrZOIldWXEcos14NpKCA44pHlW)xn}J|m24nigY7dZa1j6+icD
zXzEv~;(uT^bc>?u$K9=(-;Z)tB)&b@5ZIS!#}DMnoA)R5zyp~o{FAGN6>LeaaH?lU
zS{r9yYwk0lEB2^80DKq*6a@Czax`tQX3lORZUhlz-th+FnmhSVtJzU@ue8u6Et9Gw
z4r-U*gf!oHqdf^7fUz-%S4M_)dD#JDBHPfsUyDg7=tl%yQ&c=t>9SY?i~G+p#BK(n
zY7%NQX0w_*i5^|jMnNgK#b+CZcA7Yl8Z7`3)zpjDY&!p^{`@0Q9$iZD|FaUV5P!01
z=kja%`oCZ6T%K&7EWeP`WbQ8<0LTqK{P*-e`@3+n{rh7FB$oF%xX!`fA7b@*{FJiq
zyn~kkoWEjU{UxgY<S^+=`Cp&%vHOG`7jsv+m`gmq_uu2M{`GzbR}S92ZT{i4vDuHA
z!?k~o*8ENV>(Z}M;Fau(13Qh4`*w+u{}xRCv5$AXJbCis%)v_{Q<4*J6I17|Gz&AH
zb}%rj$%vuzeQ!^RkeFBBCJ%Oa+!fZ*lKJoLR=Oa_Kl*<Xc>HcCOhVb<zmUu-P^ut-
z_n#oY=W^$N6q3S6GIn4s^u9cz%{AZB7S)j=xl<#NI(Y=gH2t`o$Kll5&&o`%h(aRH
z*16``<Q_T!J9}q_eW2Xo8?k+Rpx#qeG#kfcoxF!=iuktG-muVu={3o&`_iz~s%_QA
zp8wvs(gw5oJ*0Qbsp2o5l7;AR$}`a-@ld^{Q5vh#rWguW(!B7wdNj8I7g93QC<w)Q
z^7qhdty^k^x_2*Is~5g=EF_G!FU-`2b!e@V|BO@@^ly$6zPAe11-i=a4E5?cEx$i6
zZas7jlA=A^V98r43{TrWs~XL8E7>pF4KjS^*g*RxH<)#;Bl_d3GbtaDFXIwd9=K*A
zw~~fXp7Us~Y9`flK_%g$=bY%xnit1)$LKTT?4MDs*~ZwAx=Q0s)AQn_6)<YV{}}GM
zyMz#yQWDYsz7hw)(0j+(LR2gxbqUqB%Hgl8ph!o)>(Q_xC6q}~psVeT*iPb8U*oX`
zs;A^KjX0Gf#}fQQZP6vVbyC__{{S(;yD*IbYJp0s=gUr~!)|;Xjvk-RR^=@B>!Y}1
zh+ApiZHDCZQe)fMY|<KCWg;~paM;NN7$r+KN>R6*wN7!%KVXerOT=@qD<a!*o`c^h
zc}!6`TBUfpT>af=mHYayxVPoJ+?ly`!*}Xl`l?5mJ*y2`<?<RB^)`livL$->2P3Dg
zA14(|T*9yE(IjluYMuu7&2BZ^oqQ?coc8nL-iCh=jza|ofc0!~FHIyH@1M{3BB)3V
z_bmS;h2weTcMqt{lb!3G8pWS&Gb@XGLS_yU=J3}wvrd&!9j}Y1Ec1HdOIKY?7b2}n
z`wcIsG9g|FhmSe3Kjga0mK=TVrIsSpbS*P`I-jbPVt+RdBEt9d#>~uxm79%?sh*&`
z@a+~0h1QF2C*^JB-WknWD1+SbT8grSg_zdZSy?wN!%-ms{1jl$5;O1@Kt)o>l7kpT
zEQrDl+810#_kEvr@#<nV6GRtuX}a#Ok%u}@z^$Xrmn8K|6shQ&Jh_x_YvZ>wG$wxB
z{K2wvs`Y)^$dgKu8oThe;g}+zPk=)jR%Xm`CdE^lTaLVHEO@_VG;!&%lUgoe)XNf&
zkanni()wq%-UyBI!EA|rwiE(a%$@WvHGsE|j(@B>Ea?YfW<GhA-k0I;Q(iOaf9;oP
z!k(<a6nXMgWA~U@^O`a?gJjR8Z%AnW3TV^_!?U0A@ipD54DAsX`<|Gzc}xY6saDN=
zMG$TlR=Xv%#A54tavm^=j&jm5#}9q@rej7C5CADtI*)&}Vm?RPtqrk!W@GM0Bh*j^
z=@jXGFe_6|3KeF&jG9|!fs(<Q#}1nU3BYdAJq6bwg;rkTpjFP>{^}6-LJABlk+BDR
zpPW2%y|=p=g6QSSD2duc@(6jO@y|FA3+0dTg_Y)=uE4g=t6I=LLFuar|7w3jL|!<@
z=6!4)Rv8S0C^J2F4<G2o=Hm}kaeJsBg=Z}KLS2A}L!C&NTyHNSfDX^qwbIco<SId{
zv&Lh`B83>X@W;xaKtfC8MbjQHZJgNI^gb5^k0KA%N9eCL%Ace1z}`B2gQYt1SkiF`
z$!|B3JhqhshJ1}^FS2#~bpU!4=ta$0N_oI0EPB@JPi@)jHon#wyvddAs*wF2dng%5
zB0_mLs&CtT4g|aZsv)sX>L)wUAtQgQzI?D+#rjH?Tk9m4^c%JPQ6~gHhqKuU{C=ZB
zfN)wasQdUJPgn$H4fGIwX-3*cMl@7tWbCeO3_XYU{07wWxaDh_vv<H<uE@<%VG})r
ztQO5xzfH!oI1awV(gA!D@9z7jNjvh$?<rJ7wcl-XzLZ#<meTSrw26T)QF$Cwtn49x
zWdFkByom7V8Zs`Z2#Hgz)O_A~(quX|H+gmkeXwW<TcUol1R_o+RY4_}OMqtwf_%5Q
zKwxd`{kQZKnphE6(#`ll>MAAVCwbOL`UFz;1_WNFby9LfFYE38DocPP>KD!bIk{{<
z)JA$pFr7x{uDyIMk0WKOZZpMVi9uMOn(p%+Dy8KiHDt3TsB!1igbiL)ag!lzy5>4R
z|58I~lg5_UnjGG??$%JJjw?$CzyL|>r+->L_0LWoPF?{ijTa5-B?Z7e*}W1a&Hd=X
zlxyAHGa9awR`P@XrwT3#W0r_ANgep?Kmkh!%E`{KjjXV_(VZO?mJ%}BE5XzO#A!I_
zoC8?}g3Q(qN5Md16Km5lt`!3yA(ap@1KA->OLS6Gid^p`cv?Vz;Lx*9Cc@VNdk_qB
z(h9f33)E1sfZ_r66EEF@(@aq#RKN67BV!>l$4mEt9?|-|FG<Cu(XN4yr@oXem~OQ0
z{G13)?=JtpgZ$ZHi#pe|v_lv*2c6#R*ep&&-D<n#BqNpLzep(f*B|B8%X0~`o)%It
z<Y}3q-0i?KMSr)}gZL3yO%Eqq)eNgooI0Jxelr#8V}D;<u|FUVIuEW)Z#FA?cWUM#
zVcahsRD6m@xAmENaT#{zOm<|hhup%9bX?1UQ#;q`J`)YMj4XC8evp3p@VV;G_(#>f
z?>+A>%{=7{KQhbSmhMY>Iqb*1W&BU5Lt6h!(0%)kr*02Z|6hXq#Q#4?W|e;w2x-5D
zYPHYSr!8;ep8k5;{vr0>`Q>*C!ha7A+>31qUEaak{XOtJI`+ZI<@b{R1IerdC<QnJ
z=>MnrsOU)n3uZla{~O7yDVX&P2$0MXZ9}oE{ZKh8%N+`a&d8UxsW(k;sU78L82@?0
zOK-#O8tLd_O-XC$Xo-2sw1;}z<|xm$V9vU}E!?5hxjG}u;W>S<-mNn5ME$wbuDATM
z6ObBT>rcuCEVdm9?0GwX%k`@%%lhiQYY#}{ZbcaGhiU<mSt~#9N64(orFWb|w%Ky`
z9_Cgd498kF#m&y)o2!ZicZE?)b*c47)p{I9Y^>Ub$1+OaMuE+a-C9y(Zj~Q^K-*Cv
zg7d}<(^a_#k@Fo<e1ACDEDIC0r2XpQ@>C5s3neAz!RtO{nW{EW2;cweJ9egEbNYxL
zSI{5*{o(y1_pp!urW$+_;<;akheJSx{&{UTlflwqe5U056w*R~GIqJZ6YQdGiTJS9
zRJRyGKe4s`I>5Zz;xmY`Wf-%XE*wInnjYBb%h8L6u&(<_RffGz=0wi$(|%OEmeq*&
zvQW-Otb_%jX5;tprfZB1q~U}arq|8-P#Y_IH+bt5EP~?hlDS2EJ6`f+tadQU1Rc(l
z%k*aiiqmH+VZ;Y~<t&|1qRK>$(o2wY0WiDE$*6R)9azLMWYBoa=pjY11h#T^Xdw$U
zk*M$h`^+LJ34}P6TyY`K4?pjEQte6Gsv6_~&jM~dyt*HX$~;h2aKoZ3$$e8r<t*Dn
zT4=Vtl-x&G4!<nU91J!8k@YnEHflRh%~o#{k0O*3L2{AB(eNoFha_w+39ejt+F0Na
z)UXYhlme)Bg85FAE0=!;l%U^?IA+b5do=!08Dn&YGP?NXcEd)3D1qR`-JY^~Z}}Of
z`h-3cei;U5i<xd!s7yRv-H>=zf<3p0G&~plL(=l@lvLBeQoOgOA*^FQH1olrY0RH$
z&ulq;;$9Xqf;S4@8FgMH_lPqv^tj9)S>ay?OySp%s#lzj)LY=kY|{10-)xT?F|BnD
zXt!j5#7)I6lRnG_S`my&ue3L}Ti8ve!k4?w?gtGg7yCM(8onoCH<r6bu9GYR#l49H
zw%Nr=Eanks&#3S5)eMW#U+Ot)+-KRRU-wO_R;~-wm#O`;vjxrtO9>J75=pQ>1BO1)
zOsJcc`Z;^ApY#?!L||Iij7;qMwj0S&$tA5HA3s$jt_fL>@~kq)Y_i8c&HwsI9x-|q
z33zkJ{L)uK`LQ2Hc)i#s76_Dh`oZxp^Z$hYOdX^DoVlC(=f2&N41rE~oYIDn+2q>&
z^9w8<FR6WCkEQfW4Qt{#RvX}Xgz`eo78$)GqU4gY*duD$gHaX>7D{A8lrfyYnv^4h
z9QbKF7MaePRtj?Y6(Z+JYCe;y2oVMsvj6KdZ1h64{4$?oL|KK1jok+3^ABt$cJ>w6
zsDsgYtkJ9ow<G59;IH^ekv-c1J*8$x9%;rZvY;fO2BZ)X=7ANlM#hwU%E{4}1kDkT
z9pAACm(C|kbjCilJp0<62RmWCh~i3)eInCnPy{@D@YFC)8Q0XE8sQH+yJsI-h$thO
z1_*nQ>>~$CGTU)_<sfD^vcKC)0D80gK&*@1tb$9hxIB=31t<YfIlirXyg%JaJm(?9
zV25agwMS$MTkz1F=G*ZGD8&Q$-nvI^GTxK6%_}@g`gdYbP%H)Lm1wP-HRu@Krlqvt
zzo9vhmwp0G5gjh|F^1XfUp;_bC#&xrSId}Fk0uVgEPdsuYWr8nNUD^-OQFjD8(slu
z*g!vl-8POm;TSu=N|tF#watBid`s>%0_lb_!5Cn=YgJAcCS=yq9;spa8B~gT3O<lF
z&BTV~3UTM*c{93^CTD6?!ALFd7#y;KB~LN*YD<y>6k&)!U^DqtNpm(NV<%^!Da9BL
z1|IWf$<fD79Nzv6^83|Brb$sGeCM8{whPlLnY}8iIFRq-ZZq|HE5nLwcOx}-&=H#4
z1(*kFj2wvNGoFI*#Ah|osv<}ROONeZ@y7!T*)dJ&D;OWt-NAD>t(b75K#qbpK0b{f
zW)-T@l=gf-=`}3CU<ppcXQ$flz)(UF4j`W35Fa8_CX`M3(2le$Mk!PhsqnB^hbUs8
z@CUCQ$am^hqXw!9JjMkgZ6U+V&i3re+<r6kfQ4=oYE(;hQoA-u6use(X2Mt$Y=xV}
zbWywQxLvS%VpA^ux!bG`+pN@Is3U})8&W_9tyekEMfdsb#%TLhFJ^C;28w(|Yr89?
zg3^PP<tGfcPiGEiO@Ub=-%fSMSYiBrfXT=txIF1YZGdUWYu(&Qknjctg|@Tq%tVr3
zjEs7hexJ`8*LAt1j(c6E*&UhO*6V8-&{lGZ>l+Nt4*T5#(*ReHPrN(>m8AxYw8id6
zV4XD}S8kLV#glRG)ZeD)(|8yw7N+czEd%e}EB0|4ozb~&G56b_+m<DzD`B@JcG5D~
z)H%>85muhJhJy2CFsni*%bkZG6{J!EBN(@CeOlh+j!F5PTW<cczN~KY!bV&xrpd}N
zaGftkp8@L@g$!D2Bo4_MJki-w5j?V;`bd8+CM$GBPmZrL(TIIi1;3Ox{VokFI}cK4
zH9gkdy2!GX#s7lK{yF;Ib6-yRZd_@@ADJJ<E>5ZOFB`>X?p{46(`WG#Yy0p(v#<im
zM`gc<((xsGvHy1}My)neDW>8K`>?mN)TYy4Lak{^3OCe$g^(-^{2^W7K!k?b{BYmH
z_ovxhQ?f?NtIJ+~vM~iUYZ|MEC(50^2*11d7QfZyw0Atd3iM>i@>o)MX7tyJgQvEf
zLrrE*{NKnv9YBMiqj39g9R&>jpX~d8Ngfd0|0Q`4Y>#3q1=}NJLR%RAe{%`Wt`BAK
zbQHY}ep+P|86^PCSO%#4XXQNLDg~u~D^==P6+1kL$a`i-W&XRPE;U`PW1VS>z^4p5
zm7Tbxo!`p@rl~|oyNXI>NNM{%;Yi6FA+UGLc$dQr6Tc3**|=P>EpkwwK{GL!<DHXq
zbbHjo!{E`4M)~#VzMCBXiszOEM$WaCivQHbEOm~x#0E(*ddZ?q0p&b*$7Q24oll~c
z=H6=)%wQS+cKaB*`}lSjy1tup>iDp+1eDEkvS^kJ?rJ?Vy6$f4sLsl6-FI+y`tf09
z@yzQS^RlE!)L+*^e-z8Q$(P_Sw|Gz7X!-IJuqFsjV<p%9A~DvLFE1{eea28c_t>Ks
zB%xse(ZvL{N#^V&|A52h0T7HoucnosO583+YKPyLluK)30-PBO)HQcX(q6oa89$~V
zFoQp~iPT6K;*}(0Xj4vrN3nf^NP0!k@$<Mls}iO^msMWn9{Zr?e8|V2d`h$r+$E3(
z^h>yy|D?Yzkiw;|N|;10s)&&e`fb(}yo41lU3e(fDlB1B=ZX-Bp5nx>XKjFTU4C4e
zWxI^%B<1pmqTmU$A0<QC<r|GM<if4lnaw+1b3xULxPSQWhqq|^a)et#U%jXek%K`?
zM$VS%&Q+OJ5#gp=WAn)K)6D)Ec6`f)t>OpLg0z>H^z{(Htf-FwBD~ynI=GVd%@u?P
z14J~6S4Y%L78r4p(bT|Faf{v%`$)hCOyQ|B=0!)*R?>Tt8No{ikF?J~D@!M?eGz3x
znC(_b(C;r{3w?|`ch<|SrGFL<=eOUo(lS|^msT~srRQ+}$ubL(mw+>`I%%zN#3nu1
zF(E~)J>q2$wQt_`VrXu;^ViTzj&xNCyCkv{z;w4p#kp_+s5NQUUlnw^P3}~~n6ndk
z))g2<lhQD~vlCz^e|86*e()(tp4_oUO26sZsrz~c>!7kPAfbB(e?f{1S(BNou+KV(
z0>FnNdBctRsUH?WF25+cR7%q-6Z5;<>1Hz1yZMrM_AEfca}}s^4l@ai+614ovIj67
z?@dzlXi_8Fu%upv=%%MPMcy04we>nTV26_-1ADTMU)7$c_c&Kh1`2)rapLzyi%Qrm
z`IEF4(4M&TwTdI@O2OM;w6YjhxS!Dnj%xgq)YfL>9K5D#>@IF_?)PVT*kED{@b8se
z{E@2u3w!-UQ^+K4soUnfc0MYn5Q!-mb_TWo=w=o^J7`zo57AIQNYM#0N3MGdgQ(?d
z9_tKvI*O3Nv@}|YN)_7V=)I()u}VURx_52O_P3|BY~MrEKvVLBrq8{bhGZzUC-ot=
zI9Gm+Cug4LD{)nghni<fy(AZXS${!_TezK88|MTdObUHY4{`!^&4Nb5RICUL6%_&u
z0?fN!b_&U8dPD{Ao}>RVB*)$NV#h5T9zHU6D3K`oLRnNjKh@elPQ9BSCA!f7N!7Ml
zg2@nU-G-sQpKXpNg7v|@!<u&v3S^Zs1WmF%O9!0SWN!hu_LShe(wCu&o}67QQe+Ob
zFlxRkSqbJ6;)0{H$(|FYY_{<kx)qvK2aw44G{U5yFnT&=S~9(|^AvufM16^YZf$QC
zw;Ib0W0JLp!AsV6<#8jKq@sm=RNM$2&_D__0qc!NU#4S&x)_`dFQMc`QGIiJZ>^v9
z&QJ>A(7Mkw8H5u53iyck%ZF-7#&V>)2gyx&%q!ZSi1JQUZpR}S2vB`&g)&opz-cHU
zgDNx-=A3=M5&*MYom?jB!p|?Sk<`P4%c&vq)4zRn6?-#96)3ssQ)KxJ=0SjK(7_-c
z+3omA9_D6@JR(K-^+o~DjKZ(Ke}}19?Al_wI_M-6mI71NQ>P$;jHi9KJj9jLRZ87;
z^{7^d`g;^^OxPuu{=8``$3H~jSDix0hslahBf}+`CZ@YAWp;Dc0S_F)dHO|=P5MxF
z1KEECU>9<_eIaF^t|E~?FMg&ZD6PYdjC>#qW6&2^;22vKrB=s~4x{<=uG|#PZX@`6
z#S;J$g&_$tcvxQdQ~GzKwy1m7bv@v1&8oV;s}2y>7Z|Unv-G_virx$KD)Z-_%6$Jp
zvA`f9-=>*5BNkYBMIJpt`w!UwY{)wC%C1F9<&o^5Xkbce<W8~NNH^qs1BNsFu!H?z
zsNo8^=z3Q7sPybGSVJ#BWsO|bah{;#CEUv_qgHtlG-9L5A1y`uCt^GOZHRiV;8!_J
zgKAf635@^IZ0k*QX*XtgUE(E19NagsX~Rp4EV`p<Dekzdm8gV<9nGo~QStvwrr*fh
zN^;ziTcC*<ZZu?dg?SBWiox>_1aPIW(ncCsCarXtUcDZs1C(|0?*&Tgy{kk9kiV1%
zxNqj_kXxXuWW|P-x6T@t;^(MVHJOYQ6s1Cl?aVk6B*BE3vd6`k?c|bWmZoMclBbj+
zb&b3&Mfb-$8Yx;y$8`1$d*da#46NOp!UEv(gpq$=*xo1`lTwoB%o<hH>LT;PT#S}%
zRuLTsC{c~R^7yyX@{Z$9XmOQT-(BY)k2-t`Ge+doUPIFzWxGFK$UMpjtNHO=yX?#r
zaRPrh`p09{-j5vjHr@}v#0GiiPh1tkf2R^v2$mUs|GoN4h_<1sRx_mZlsW%dW(+X#
zbcOUl)vRl}=XN$-+qjsT0-n;Hi)@UWG+ab`#IbYDuGol4d$2tGWqqXF1n-r8ByL08
zFi8_~Vxd*F*0I#mKG>#6>fT)s_nWgbl|&o3-Qv#gpR;Zy#E2xM`(T#0QS{QobD2xy
zKFg7bk19uH&XjnXNk3LXRC3<B-yNtsCvRlQ3X&bzNxJUX)$%6l)8|jY0tB8?6$_&D
z>5iU+M)1-Dr{YIi@YEOguTnvwT}E%B_y%vSI<mdhiX^Oro2m*h+94|~_J3;KgG9~;
zc`V(__KGu&t^db-1o&`sv#_(ScE8w9UZLRaebt)!qfc5$D_ff(`gabtA<CX?=XW5r
zC6WY8#2&xof}ZLHv-POH5qk|Cst1gDgMHj+X|qLGWB!w{vpnW^s7TcNRp<fZj-QZW
z?21>-Q~S#JzAVWcFP*W=MS@JT#J-_LAa_fFIFVB@e%=kJe#pSqp|sAHk_Nbic@e+N
z2lC^z7*^HEKf;QgqgFIw!=g6Igg*O1+}mt|qqoIsQPBnFO(|LD7u6x7uKzihv$vqz
zNL#~1bf%*uxN;3Ndp>=nfnNf~f6ez!_SyhFD|!;ue$Xb+qSwJ_r#3|8`qlL6EQK(U
zpt>6m)AcLLR@nJ&5Gnh83$@fV%wC-_pRu=f`S~Zvwo&JeuOJ)zCfmDl$h+9fbj0<+
z)sQadj%>Yyspt)I=^8MiCE?RGAM+m!l9$=F=dDo@Y7pg~_E*8Z>K)V5b6YoH`M2dw
z$j%*nl^)sIxAu8GN6VPs)*^6!9Ay>Ab}oZsWTWS!W{%$skiNB506e<WWGrMY7j=J&
zU>ev5bQ;W3QWQu#4G*@*PL}YfmgAN3aaPI}1rVHaTLDu-{R~8j@|nyB@AjTXQ>kgj
zWfo_7iU-F#BZ5`oh0Z1`3T<)bxtFg$JNx6TBZ}myQ|jl*8=_8@<kH>ll9$J1%Pp2B
z|K4m}U32(239{c0>bW97@nFt_rM^>i4V3$xYT{%(I?m-zh=@m-pSJh0SSN8_qGy}d
z^(^RBDmkR`z#l5Uub&7<O+lD(I;}#T(Ot&RHi87X8wTkGY(Ev}JX7HngVA`%Om;E-
zR8wGTvf1yK91(xm^!%GgPSSS_y|Pf2(tS<mUthr>TK(1h2Mv062TrR|f9>>vo;@GS
z)t-2^6!ZF9?z1Y1lm&Hy`wI^LI7G*}mu)8E;+{7>PM&|-4gIWo0siP|u5yuZs}KcA
z0H)zJVK|qj9qV_Z-9lCYSABI414gV~nqf-JlfzOJwtdP$L7gf4Sf=$74ZJ5gg)Goq
zbJLV_iP(<}X^pbhl&?-c@I^BZ2(Z8de$sG%ivn}^sTIO<U&NCL6=~XK1i|@~z1l{;
zCX)e@l<w~_ekhc4SKZ};#$#cNNTENqB#{bF0OhJJXiW;@I8LJqEIWz?sL`mvQZDVE
zosR6~T3h3=#lQnC#n<G_4}$st!tJ;KEhgPTw^)`N^#G4VM7pAXZqL!(;&hJ0P|dzc
zz%(qIh;Yqbhb5hKMd(=qg%}i}P~b`YO1!rSTlXR@2I|se9t93rh(=5fH2QvnF$onS
zu0GEPZ>fkKeSEf5@{_EoWBN@g|4>}L&@JPbo_r}7IAn2c&S)Y<NtSCBBocc{gGAXE
zQokV)IxCAKh!QP}+qgcjI=in7`qyUEq#!*JV0|0=GN%MR0JDOPD|lWD_#KMgccesI
z+begJqnj**Es!<UZbq%#692v9XTyM)D@DG>&1~6*UMBL0*5mTq4da4($x6>C#PAFH
zoLnNVd)}erb|Z@$Ie6Y%ia*@zE{w$KvN;$mRpEQKXa=fmOOL8HS4zzW6F!|t{i+7t
z{3-MyX3?XWr3=tV0yn}4IR}2f1y0lICveawtR_p>oN(p?RQ?Rr^!YVUK*{kJ!_PF?
z@$%h*$-YvLai@K?#3h^!rF2Bq!4%l|Q9+3s^;##!WA|8LN!TG$cMWlWeFFDY?+{IE
z<_P6tP6IFIx{>+_NbIJ+(eZIx_?Q~gX1N$wzclW<=`GL1MB}I_*2m*G`Vl<$M*7|%
zQao2_^noEDvvnfQ-bXg#VF7NQZGE`Ln>T#JKeJ}9UO-$eH|nm%#UABFANRaIQ8tIe
z`%mFI>}AF7w8Iu~l!JoJ9Y=26Po&H7Kw}KgrUqPCJ<E~u?@RIfT_CH@uRv=?@?M-P
zt|~-h2)_(@VD>5@r+#!WI#}ORQ(1CIic1=*uuC;P+*cUzR%Mo21Mb$8H0XtBU<{O4
zk-Nu8*eHvQ+qGNy#d5daoV29swO$uZ5x#FPgs+SBQaQxhFUQn1QIe%{d*@{8{6tey
z#HJbYqa8k@PPt%D6l@k|EpTqF$^NS`y@*T<N@Q8%K1A@KrWdq*+XImes8l7|CqoT?
zjz2p8n&yfXCSs50pYrv(9ZC|93?sAYbLB1|O5E=n08A$y4Jr$8P3Gz_760a*Iz*WB
z@)yy0+=EzLT%41k3{(rlS5$ij&l@`-wZRxJoLVC!LSs5q>>!Vu{ylSmvR<cn@MgW2
z4rG6Y!>423LFp%Fg_>*@3_?#ol@yZEj6OxYMiWTRfpE-jon2SwtT>bpLpD(w{u1m-
zS$)zzqz>q3M*lepYq{*Ma~6KDA!U$mW6k}5vkj`+?@Da;jJm1T-w!p_!3`=WJD1<n
zBlC9I)=Wj?Z`rjNRBS0-$Q1m&Fk7&Z@<9Z}*ZG`}su5zbHHDPE`#-S936&(tJW&=Q
zdIIQ!{*SuHFVEikaHvB!<|(+sN~n$@*HS3vxk(q7+Wj?>83;c&!Zul&98{{P5JK$;
zT23lwPr66a3`hQGBUF8O)VyG%##a06FjSwz%%mD*tMkHuQ}|;APzoN9TLG>hx?ecc
zkR>ZHK@^(35+qP8MRlf<pM+Z0I6`D(P6t5s3oEk%5!Es+SM@Y%fJKczz{Fy#2bxSK
zth~GV61n;2%k|!WitDV!qr!Uk#Vsq6p*r2a(EGnS-erT1>L?L+g-4Vn(Ok1IBZMar
zDCSuq6qBp;4>IQR3mL%nRTK~wjYI)$Cc(yNXaEo5HVL+)f{!&_QQ-+;sArxFGZbiN
zggeheXsC^=m*?yVYIV&07tBL21~3dQ_W7KK;PS1G_12C7rG@JYF5fnpcoHhvlW`Qw
z)*zwGh^S;vie(Ag?<5L+o~;~~LaAfx??rjQPP=uUJw!`&9%B1Y*m{DGosX<}%Mx*o
zKSe>!9aLaVvGrm(5qli-O^$ye>MShH&o#|DF(rYha5xcdg9U7Kq}jx>uMDvTUyYT>
z4Wmh>!nlc+dmQc_CxDB}C1UeBxxLNFg+%Vv60R!+RaA#coaZLgrJtvvYc|uFo$Mqc
z=O#&_tS&v5lzu-kEfmJ+MgRAV%nbosI`F@>m7tUKW{}8qH94w9!7C3?IUvZ$_zBEZ
zlhvGDb0dY)J5B{CIrsY6J*#I!yj;CtWt-vEp*-f`5N$ZFHdRf@&Q0{W#wkG*rNvca
zPQzpTI)3SQ-F$0A4=SJ{WZNcc=|Qqx&xLok#hR_R3<Hc1R?W;4H#KIL+5HY)M)y}9
zD~=!3{y6_Qu~jNa%Ad}#ORA!Ub??2mk&W_m3w(a=`X6VK`T}1*E^T-bm7*>cjU`6}
zJ%t48NM>X%22YfJxsd84|K&kspJg70po4Ij74o!(b{WbqEG~5`J~{Z{`v#z_15&}!
zkT}ESE%GZC-S@^F`yPAkCul3JoZWiqk>EM#5Wi}daCsM@Yf9LA-2^%NGQ{B3lLhr2
zwNpk<=z4O5q=t$-NB|c+?0NGPRMF!4r}G}B{K$fvw(StIXEe@C`IU_$7>H4Ql4ZCQ
zC%iEChpEQd%^RU3n{zytuovIWs*qn*$tiIP%ZvKtn|P8Z`{wo^sS8chJSEtB%GJ{v
z31O%_yV`1kr6&}SBS^dytQr}42T-Mv!Bvi4>-Y<*BpYQ&&2_D5BdV?^d)JC6>kx#s
z5GjGBpT1xFR>3kR<jBD?NR;{{M$&pjNcX}K5fO>y#z~aM%{S*aE%=Ngag)qwS}5<9
zo<w*JW?olXAKAWdL6t-b%{bjTem23i&aUURhAAI*;ZWJ^MO;t4f&ZM7Qzn7@JZ4(*
zVP$p2hu|nvnFaev>ASWgW3)MlCGS%0wG7@#{}7d&_%+%i8PjqRxMI5y<?K#<17pUi
z6LbRQMhx1@K$nvIRgsTA_7;el^fd*-GrKHJc~4dr153}nfOLd+XDM4}LK+_8C-izz
zahV4bBB%O<8|J!49tvh1-LgMy>k*wbA_OZda|f>LVf?ZNvl%0KDROGX4QBxxpb}#&
z3}%0`T8zZ{*;eWswP*t^LSx$t|KpRwNnZmWq)bM{sNBq!hOyNM1ACEEMs~A^?<);A
zEsWYr)c4OG7VhP?XV(%{dCyhG!b<W;3H<ka^_ZQW@y8f<Z6#H&tf|bBAg_l&5a(!r
z)*skfH|9!ivSP2^3hnZn5PtukA0k)y)0563b*{9Npi6h6A1_e~EITmReBiX7eAHKQ
z^N4rx*O%tShMjBQzkDd5c}?}A3lpWfjiLxoQc0CJ7)dn;C0A1wi|6$oebMbu_dATt
zCTb7{YoCgaHpsDL4@+$pBWln`gEf1_k^rgNoMuD_Lqu_tO5<qWCj4CBT;`E10djy^
zyX6u2H4^aCp~=iBN>6kpDvkX3vug6X3SgI;R_90L&9$osPAm-S$YD|egl@6auIEwv
zdi-|WJS&mjITrdLR+33OjoaiEmub#t2O9J{Dwt-)KEUTl5e|b_rUCB`N#1Afyixkb
z5WX{FXaheKq%|?!XZKn7&)MvNgyW7A<h5p<zdY<OOU8>e;Ly;}mBUwN?)1E_so+v2
zt<+})c%3?3RBVh@lyqeE@46|Jp~pJ!1stF;VfXk1ntsAI=75_1mO4B{#S?gBo!r^U
zoweC6<iTxlUR|S$24F6@YgDr%AbsY@J)C_?@BQtbv1EoS;KwHXLd@oI3c%fSM)xFO
z$PV;amJqHU^Fji|%h@0aVA?<5K%4D{S&6A~$wPq84^zjYwJdJT1?EUP1@G6HNNrpL
z#*SM&u0q;?@!_v_q=}NnIjI&XM}FtJf$nF8(}VfOj~{WxWYACrF!=(`jH&z!^XNtT
z!6RG1f_P#^={10^P*51f_U)ieG~*7o4F(}<2BdrZ4wRkHeB1QEB0FCa4_2Y}Ii{^6
zulmKCkR7I@9;02OYl1j)^>!xxpHx}-f)z9j2nA0!;<`0`rkjb5x*1B@4V(3Q@h{9q
z7C7)56Jhk!Wo1^8mUD<5P8Zp|*>>UH;ht~aeDc$PMjLLjYT=1UnCjKVtzm#dbiBHd
zuxY<Y!@{tbQdNsEY%~41=deYKR-o;fLuWg$pW8_$t~5NFp1-=c53z4uXi|k7;vJs9
z`7WEM;|`eo3JbP=jvG#Q_x++<%)MkQ_dEFpzMp{fsY|Fh%C;7l@K5DnJIb5>v5_B|
zOqUHjcSNaoHME!Uu-X*|yHE!;?eF0L1QV)7a@2cKedV=5<l`lP?PTFb>cv@*VslDG
z;B!)!Uy_x)=cY8Q7?<YJ6m<9#3BNvD@kcMYD#i<DuY0-8DSrMnqJPGwGVr{8M1n1@
zvjUuG4$6s_v{#_+%0X*%AISwe;zYt&R<@cq`;;Wl=Fi`b5-)oC%y$~&50=-T<=#B0
z3=;zWWLm}Ga|Sko+IZEelI1_{*t(uTC-yNSzf{@=U#!{Z0Y#Wrv>rj`H%IcotTgT&
zAsfxh2VO#j9yYJ)VQQ{f=w}JTu8<!~^42bCKE%66SvZK$nR1)F)w6o&{0GPyi`>aU
z-xEUvI)uhBx1s*^vG%tnA}NJ_LxZYOauxv!w~)(I^C`Y5HGWu)`*(ptl8gT7!SjXL
z_s6A38B~1{53=|&EgWfvNEgM@NtG3x>z{Ra>#~ioPMYd(KjEB!e*Y7CovA;d)5wUR
z5uAy`%=jcINB3ge%?<=vv@WkQ_WG>+Yz1415}?3}w`y0BowBfu+2l2?`LFEdD-akT
z0aP-sR44RJ$+a80rSO!FM-<>8og2NVLH*8sf6FP&{Mc;$qOpgIQ2qEg?9ty)6(o;U
z@vmW^_96>;kTe9}dqTYRxz)(2#U9YWm(C{L6(Tner*y8#cy3yV>JjBS2b^d!@J%CK
zwQME&WPFhhbenZ{h#s9Vd@elY>AR%GzsjsCZW~yOx_lg7kl#%iA`t~4P%$rqo00eb
z(%(U@hCwhf2~R#g5mK-}N>J0!`aOJ!CeS7L&Z1aPPQLk+d#qPUZbHS=<EG}qp3>FG
zAX#9*7(SE#`?Vq{X^^A=3F1Ar((B0xY>WFgOCELlU!1-BBh&x?|G&+~uw|P$pLTGV
z^T;VtbDr}tA;~#}5G6?)Gjkr6D9K?YshpEk&dsSD%c)vOlxLw5)id9{zMmi7@7L$Y
z&p+|F-5$65^?JF00@8&QDZujE|Gt&#{`15hAP}%gCO;Jw^5h0e4s(vU*MBQy&H@Ec
z{wDiD%v0y*4WI2?I%_7**1NXj{0@6ain@F4)Zd3?3jgMxPKLzzLk?^7qKHTeu}L6c
z9JKpU90rgD$5PgQ#)}a_N5{e5{t!_wo}?A{?R6r=^@?W!g|CMKThqXmP-Xh5GEmu&
zkK!0;l0sOjY5_%yaSqO<3g}z{#Yzh?5ISCIhi21&q%;{e@`C{F$gHSkN17QKVd+J4
z=%Da7(H!fL_L6C`&~#S@PXV6plSnf<j_|Ha7XZ@8iD`CF`mKkkke}(Hbu=Re{b&bW
zN{1c`%@Ci6k0?RKacCFoP{fW5LLKeGZmQv0MxFrU2!ZaHC_O5{IM$Qwq`oGZ&0$!r
zF%%f-1xD%d48*nFv;sy(Y1sKoWX3HchVd-DdRM$QG5vpY6m)rlReON{fA5dHm=nhZ
z+nd4jh|y+wf>mD3$*Gl7P(7G0eK<>2u$kRcKybZY7WUqzL?dE;Hr%49_Bzq?y5*s5
zi@_{}xTJ0cNiTKys(?i+wV$=#UF%Y94ezJb9TSp7F)fWZIrutoO;&DaUGK3f)U;%C
z_26(mLjL%$|1SbsD`c`RWTZVxyY1O1OHAg~T?sAE2J`e`)}3^kkYg}8vCE@gUR}M_
z0341*Oa<^1V+;QwE1U(AMK%@;Pdt3x_)y24Rqv&3<vJf+rMKgHgV!A=CH1S_ijA#R
zO2XeWP5{gbwCJeQ&unczNJ{lwoF%=i226jE+JAPzXK(#mozl)__*03qWU4jbN?oHl
zfLz*Hd9a*U+00nGnSnev>RL2(d~57D!r~|~-QEDm?o%*ci05;qd?>YaBsf4ouR{fN
z(ERQLUXql=y+uB!a0r!m!<w8m&(`cs<`JmCsVqkVbXWjq244pXDj|egZ^dq*ANdfx
z*+g$hk@vW{IF$>^vz-f`tmHo`G|hzcrQ@6o=3)2)SN1CKi11df|5fnmlVTP!T`?_7
zR}cwBO76Uq(VV%U4hOB|=p>%1^5@OBMFXmX_{ZuZTi*NDWTWK7MSk5MG8Uw)T{8Nt
zkCpJ1t;iNwS$?e@upYw+sI3vG+*g60&G%|L34qVJ(yC7fP?e3#Nq0Uq7KLz!!X(OX
zJGdVONUxcDm;4}zsBWvk>SF@|D(!d5yK{^dY3f>3FfT#n9&%_!$wD)x`=4Wx)A$2f
zdu0V`;+u+7LlP>mY+;l2{-PJ%eAPjl;cI2jv5FC4KN`$UNNPRMftZ$D+MkPs=4I2$
zcEaL76T1V~6|d#2Tv8`)#_(zO@AV+#&}sPa%++Q3$PUZFNkQhsRr(OAdI;w3s@K@u
zdbSz#ViLTia=<tXY6&!Z&hF4N;;)`^RQ4rTLbJALayzD5i$ObcVX1wrd)CXHE&^Y-
zDYwJ_yxGkL^GgN#8lTtQm-v#s)St%A9({9B-)JsJHBa|c(?2`rMqQ5wu7ab^v9q}S
z->7CTIRalUjy|Ht9$7(wjnDNV#wL(on*)|2B;TD2GR8>IdJ2+nIbpI`GPD4|6Ji3*
z0`A>&4;&Zo{x)0!Z!10RF2Uv`aw+nFoJkW+V#CFyUKZ?=?)2bRL`+MUA-B8b=gk?}
ze!i@?gnS=u2a-2!a@27euI_LT@zfmK$oBw*p=y>mV@5@N!`fq|6VX^FREO1Ud%%&i
z8bRRWf>dJC?eg^S(<kA(J@Pbt1m0uQgiAuE=LBa$%W5d^jhzh#FNg_}D`jM99D_tr
zC`qSZC_84Fv`-|#Co2#sEKwWdBbx;EN}|x$Du8;79x@_q*jqR}P05pMo=U4qBCNd3
z0v8_AHBl3WnTSYL5g<<;Xt7MmzFU$gsQn*+6L_vK>%}?c<&s*Hb&NGyX;XL)0zh{q
ziE8=@6mZR!pyzx!c=-azU6`eizvXP=cndsch0jA<;})qCn<wy;2+gtN80-oN?(a1M
zv1{YUz`7vWn*u>U$ao=dWOK`OMO-EMDsFI>86C5Rgmni(OM8WsQC1if!CHCdwZci=
zvof}8HOCTN9z|)qcg4H#|Ah5gI6ZO{ascv+c8CE2)(Wq$a}<-@CIFE<3#`3`h<X+8
zENN)jpT(T@*hLX>WP$~9(Fb_Q`rP#-Nt-j0RsJ%q-rzHw{EJJ_G~t&ZP&A1xdFJ40
zK9q~p6EfCK0-COWENtvd5+1GX3f9+3l8+|vf%B^dE!y96-m6X>W{$fXXjJkahArE5
zqJ!+sGOBAdf9P>Z{f`4HEId2oDtL&JW=@HPv-ER@q|j%J?g?7dy$IwS=RK)?kTs?e
zjNF}5GuKji*%%tuFp23CP}~Grd1;vP5AmP<4yY<fQWjlq@ZIQ+cs*#%k{%}C)e>oL
zFnX~S`*X<B^7^&>M5E_T6*F={KzpWNGNcfvFRf@^$xaK7K3kcq83u12ey|@rcn@y0
zu?XFshYasLe5TGZXax%%eSco0FSh!t3%(rSLT(s=+^2jIaye`{X%D^(R<c8@e}{uF
zKf`N+YGf7x6f`PwnPrX|ub6pyz=9(c;x&L3RJSy%W#P|yJ$!FU*1Ov%L{(R02jF)3
zF;-Vrg2izm77;Nn&niyLW=uc!QzsVHu01MSAHSAqlupgM!n2{4x;p{X!48VOo8d(M
ze2=VZI6}`-ZRl}s0C!0p<ap1#Yn$PKMp{gN&yNWx)6`Kq-zOR8DzDrJA(OF%QD-=A
zpHQBONv&}m<QXVEHU#hwFG9v+3S)pzwRHMHpuvGStxw~6sxS935!~Cz<^Ub-pfE{Z
z{u7VxN9-8XNX(H$?7vC_qQjO2m_9V0f*ko6W)Q>@xFlb(ct>GUNq-a>RCrApRyJr0
z&;F}Lw|37Vb*VggQUBfCTF;iGeJ}cz$Dn+#e})SM#1}gm)SSW_X~lD8^?p#P>%Bq|
z8setU$y5XEEH!}L{CG`DDfV$|MOJX7YAInbQSvjSOY^rH9x%{SdHMCXPe9<E1FjZ-
zzVp2#Dv5Rw=zi8MaB0|zt82-+-FdyT{dPy3SQ9Bk**3;5I8|)%Px~<#=jw07&O3mi
zk5w>n)7GE{?vnI6sMkMcP{Ud$%PfcEP0cR6W&*grFGe2rbSnTiR0!%KCu0U<K)K7L
zZkIiwlNxW)<yUMlA**&Hxxyo2T&{r8teJ2ig-@Q0UCpXn#%W;vZ+<P~@_w3qrJpvZ
z@2VEU`~fVfM#=+~Zje|b3Hs`3YWoQHAD$fcHL{8sTx&@Pc=ot+RUY@)5c4(ZXVUDy
z_c2e8I)z|h$u|7YE-(y}zcP+yE-j-dJ>M>Wy?UFo3{og~W|Q*e)@?@r!^u4=?Fc^a
zsHt^y2x^9}40GSm<g&jA>iNju9m!17FBXd5N59JdsMQ{NcjXl7&9!pgTiX%K!puJ_
z51;Ny2OJ^e&R$xRund{G2K{kwAMt_j)^Gl~zxFmqZe3n0dbZ28A+L=nAh&Lx+PQe;
z=-!+HYQ*r?ukZWhPknipo_&@7)_D5LT>;$N=LvvBMDg>aPd`)GDu^_ROMiZ*z<*Mb
z|E~^P1;7^2`d|AMzZ953s;o5skEhjSw&FhmdrjRiPC*bQTht<Jl#E&)%p)8PMGsB-
z4_$-146`dxp=rgUnt#Xn)(c+VIx6wc95z6C7(wEL_^?^)ZZ%2sL|aOczm+gG3G}9u
zU<VPj%8eV{7A^E{;a7mH*@h2Tl!>)O)UfW{KWU-bD-97Y9>Uw5Q1IS9<kje7e@4~2
z?$;K1DPXSCwzx~vh5w25A<Mag4vXyo?qp`3gtpxJRLzvFaGR&|OxF2PP|?Oc1EcU$
z#Fu*JLULV6KfZjBaq8-bUD`rebj~#|;aaA<XYM=RV??uDQ{>(~{rByYq)qOd{T3w`
z{%-~F<WM^a`9umiP_>IZaI@p*r8`rVd~j)BO4P#Q!5nW_kA63+d=g41miHp+DYpp|
z@J+0$Ogmt-;9mkaT8!tw>EMtOXPr>*09W$y(gC3~P(bAkFrF5N<=v@X2SfpcR>nvG
z9?0EzefnUTerP(iz*6j9MWD&12O|%st2rT+tM9q)sNLS!o2C0#5ba~qE2aWhV%8OO
zXOaytX<2U)@h79^yn2oUqJsN!uO3V7vxDnF#$Dj2*@4cNr%PrA3y{aY^WD&o=7F;+
zS___QzllsceRY(EpnyTK(-MaUW{UER_RvB@l?<E*QZ)3vd5xhSXrH`LldINy$4oXh
zCOakSRdK$NVAb^qGjZFAqPxYD^^v)k7qiY-NCq#>#qT8th1sI@nE>y6?vmq!5v>tB
zSAm3npw2=}Q2=1cH(Rrb*Yoz*ZlphMsE$a~L)fA8Vn23vm;ci05~NMIYjaV-+U2FK
zI&^9820*a`C#gu}(3kt*vt6b@(e6BmX4!3{e<36|?qF{0?SaXXn!#>9Z&tTt=)^*9
zFK)Rb*C4CajC@+*Y_))eoVQDk5qG6JcjR<L<W;LEPN>TZqh_3r7q(Fup|84WZ)e=w
z2D6oP6j5i6>RITHUNO>!RVa#8#Dnw!(M1{2G{kd<)Zn8171VSn+&z3@CwgkIpWvDr
zVEAy24v8ISLC-nP*J>tmj(sXQZQ#ccgBnTNiC(Z#;Tl#cp8qor;B&fl*>#$U{wDRl
zE!+>U@97eA(&9<vTCR~UrypiqVHpcN1-GKCPEqc@`ApJJi9Fme=ij9LEV$v%Z=|lK
zDBTOy`1iuM<}{Pb|0p;=9Fu&(Bcd5{v!-Yc?Q2%?HY1OnQkutY9vq^K;m9_M<NVQ-
z5l6R*cWd#_NqLQ5On%*kZVcNPl|=<1Z=f(Xu&p|i5NgVKE)?oSk>b-idu7f3U3_9I
z+|8rHSE8~1F7G*1Jw6NHLCzrVRAkuv0mPz-0i*lG-Xa^;%j8l~jzMG(Fis2%Zk=Tc
zh4V^D25iZ7j(}D&jt^r_Or6ilMc%sblnT&R;$@%J+GAV(&REN8cF0583#?9*)MO{^
z;cN#HZGnoBS(r0egkUrD<+zjV_0IQ#Yjp$Qdl==Rsbwok(tYGws(2PA{U+d!<%uCn
z&?OFiZ*dJCZZzU-!nKwgL#1Y!Y-Y2jvcaV8Yj|Q>5pa!P^S&s5AvV}}954dUM_f;C
z?9~ttlly=fdO)u;JNfrBzflRsUNsVhdpA4?37bR+Hk!%y3Z{Frq<Vf2S@KWWVZ&Hd
zNLV^B1x3ATv^{`?Yor-1`R2_P5A8dYaxphm8y1LOJutp3w#;0Zg#eE|>4#Pk4c=ZD
z)Yzt$wgM}v|2V(#*|rW3<CEJNvQb7UPKbKagkM*_7E%FWViQBpi%y6bEft73=M<Gm
zHSr--UHH_S;*oCt<}z%cJ7YSkc8|<c9vk;(*8v%*#84Cxgwb6~=N~4nSTgH9%0gFS
znpu{;x<1UP4Ku?CLWE^#Qa%_Gc<WCjMehD9CJepo_(@So_5L^KHe7J+R*brDPnduy
zr2>oD1nV8Q>j<E6jgN9BJZ+a>HTR%$;M^hHT5nD8hlH%{7M#sSH>z8iEP|nOtWXFU
z-Wu8LezW|Z<%oOder9m(x=|G9dU0*mW`A2$e+W-c1V@B1LD+7qYv#J{@nzz`JIC&|
zr`*lq4jNousOWDo0ah)%#RGb>?#CZIBOWsT1tXC|GOMy1WP%yeg3=a%7qqGl%EL~!
z;$6cIs&HB>NhT`7ma@a2sl#$q6pVo@MrYo>(-R?cnwt$a>drD0+?5~L%*>=oq96zR
zTAJ>;8ukY;6vn%SI=jbDzgDX#m&INY9U8_TS>*mn`AqryEn0gtmG4)xVvk_`mzqci
z^)kw`e22eM4!)35XBsFea{t7QP|5rCvU?@Jx*{#TYH+@QAjv+0b;;FASSZm#db+~e
zV8bH_|Bi2;s1`7K?nP>G+w|Ovcsf{VC-NFK7>6#EBop`@!$=ECqD&|STdYy=rdR7_
zyf~DNjbd8b&ubiQYGLz@i`NsaF{s_1zKwDI!yD8LIynKOh=f{s1tK5h{lF;#KYPEH
z)_L$W9uWNm>OwRdf$p?6nw}I*)WiUViR;NS7%IOnPkQA|X_e@H?|jz)dv@qmNJ~^y
z2drS>hkgL4`%RQ0oCaJ8b!Z#8SqG@N@dj~Gsqx;E&iKCHi_U3=ogXisO^vzn4tdeA
z`}gH9ks^!l&K@%A*^)b0&~@qko0N{elc3na*~2PgFFQzo@5LrOK7o_?YLq1@|COHI
zb?EOl|DKIg-ZrbH>z&ZU;peB`eo3V*t{O@l0xLyF7fvm%e0lL`RG6och1`5=pl$qe
z{mHkYuaB3cCpx-MJ^kWrZ?gI!r6W-;db8?fau86!@ReZ7)^yh84a6zqcKlkx{p#QU
zMCCtT{OI(vbK&1FiT`gD`TrXk@bcHI$A5n`=0Ev(ijz36{dOno`Q@dA{KU5kZ-3GS
zQr@RKCoYM+-A%Pg;a(L<T-|@Omy(h4uIA;1PhU;{clu2SP{BJho&2vgNI(W0*3JAs
zXQncv#>xRYD8JPeUFQVN!dRGhk(;T~WP<yV!a@?;zCcMc@8Wkt&9IH5UvJJ(3tQ|4
z&>UVpm?P#$#s+@Um~FXZrLOPZY<EHA<ip4XbHVAUb9YF$9rMR?r0u+Uo}Dk5-&S*_
zl~^{3Nsy6qRuxS_y{!ROaJl*9%}$<zNB9Hok^OohtWu@E3XQ_K?=lsgn=b*!sSB%`
zqHLQ06szoRN9FZ8CPA#gp|TAugd%!1S;5O52HsM@rg(RniL>-n--BLtcEm0#w6lkc
zg+gR%jKvgO*@b5feV?~T<d+2^H`$8SY5ONDpNA4cfn5;hpxNW!uP$I?;V&QGfgCnC
zC^ll?h3PPP@Z{P_<XN-rzA!EQ8M+<od!eHte^j*%w7|;K<-8o!!X5KnNzxt7Or)c<
zrb&t82HfPLVR=^ysV9AKi0P=T=N(&+C^3X!I3`0Hb29}J@QNoExPhDqaiQsX`9-wo
zOzsbTbgEn(&uGs)>SVcMun_YtTTYKmL`bbuL|Nxx{wo0%K`R0|%s0Vzluks#AHmhB
zlH0;QYl(fMUR>4IRcBSfpWL(sisi?u6In&MreSZE9Ss|j4Q^Es|82y_B*&_<opPer
z;YL3zct-o^%6LpIh9|`V5U%d0Up>B_-bpZ8|8w<40zq}jg)F>UJVY$lY9m}*(h#K>
zwM||W_u<A^1OdDm)<_RmK^yp$RxP_+X$f*;s+^LRn$w+d{k{6=1{_;8CchCkCW!)9
zj)rQ>J<gQ~<R@6DEin2@4IizFl8oQdK(>GgGCH#1_yPPJZc*{mWK$m)6AHL*%e2xt
z(Hj&KIt*=PKoF4MoW|6P79(en8mVW=mC+W0X3uXnGP<j)?iRalx5c|a^`+*U4J*23
zg|6XdMulEHx8;4<7Gstrd^TN*CWXSKzw_BOKwrff4mV)TgeOa&dDTmeW9Pel=j~1-
zfT1b~(fNMwm?LYm`>B&P4JmLzb&<Ej4r()iLpgG8MAv>1=0U8L_$63h?qVczD(w=;
zHU@m~4dvU0>0;LpPCdVODr)A}0V#k{Wk<)!^RkpUy=rqe-m`h5l+8Hu9h4qz@?^UI
z{R6&%jFIkkev+dwsM7#+u*6v{kLW6E!<<e%dDGb#H}8euQ%5_(zvV;+*}s`M-7K{V
znuD2B_+4?EEqgFNSw4Y(B)|TXEz~_ybzHWzQk(J@D4^{&E}hm|VZhE}^~zWBS0ZU)
zdbT(2b(rNIK)3|;0WddVlevLh|DXjt_*$1uZe2xWa*q(i$WoGM+xXHn4uL%(@0Kg>
zO9mb0P8#g*@ar9x?FXqoD!fNyWh%G&Lo~aA2Z9?@5%B;4YMoad1}Ew14@e*ANssEH
z-j8>wQdV!|k^<}cTm>7V<|x&&%k5T-m^%mjY0d_b%TJbuo?`^b6vob!^$+M4b0!;l
zvt-MBd766KBFBT80^q!(g}G(wLI0o+NyhFng9ZfoOxnSBlDYh-EI=^G4V0r08y>ZG
zn6XIc6_3%w9*zb$EaFN;q<M!bN-)Syw?`pDBM?7Ls?e|@pkg+#hwpStpN>f{7XRCX
zp~Cu4#9%YgFg9cyfYOu_Lq^C}n#<pPe#$A~(dj22LIserqG|{#mFy2Y$o7^~FyB95
z;T0f!STw`fG2zj<4|sGw<)hhm|MVpUTOd^Wqp~eQF`Ac|2Q3VezQw9hYlBK66gf~e
z(orR=_X(&dKg$>_U#zC1?5?_)N%9<>c|Z{~KULz14p9#saAg1yr9R2QG(ZhW`o>(H
zuF!Xekcr}LJxux$3w@Y64Ipsdg+7q1%-rdqqb)R!8N0=z*(Aloo`mCe5;GRd6pY9u
z;`!V9K-xbYl^#C{4$<HJfqzYDmwApE%hx_CR*l-aSSZbRzfc4qrXsZGRsZQoA2{o~
z7B~uORkqq{Y0{|zZQXpU{mGh-2D%N$hI72kIdj*&m*@)xBpKLncIW<0E+I*hn!$Dv
z4b+9>W)`ePy{hH#9(aYix)VZSDB5{fHui5{dcKkB!>HhD5x<!{u#<l_4+1UVP4bJ7
z!5P`H7@h5(P=>5Ze&OzReaT%)tRm*^O(NSQO_*YIE&OggY$fTf5(YB4;>+}+g%Jwq
zW%A8^R7RfjL~|XHE@PT)c?YXg7EPAVDb_U=mJ3EO)3rwt!Z|gPpm3s<<e7Rqv)%*Z
zG5ObHrkTWKWziY;ShM~uiNx8ehAc0jQ~trFe&2o+XnnvxZjlhrQj_nXyvDIN{e;k^
z{ctjX$VU=1UQLv7TCJn|iBW7?sqABPRCvYVDurVb`&Mg4!dpV%Osj4$y|369s_FNu
z01ifJsNqZ6G8Sg%urr_#0Oea0rJ7D<VRoss&>w9E1p`5nr@=4ett$qtPTwxiFNUIA
z-C(Pg47H!#-@R5^K(xe8eWX9-lm#5gA6)rxiuKv_3$L7X6o<IgpwA~xWO`3s$29-V
zx`3eypEcT(w?CPHN%Eg!K!<1Zoz7dKQ`4$y@baUZA5Mc@Y5h>}g7(DD@p-ZJgLXFx
zXPlw{<8V~u>*E-47hY6iEG_YM##>bBk0-*YREOYHR8koA*+)=JChX6w;1axF#c3<c
zoqb09Wyf7PM<&0X?=rThqwVN{?d)@1IK>d{y(ZK9+r^JfmQ+s<kI1ELXE2gi9eO-Q
z;pYBj4=yF!zdtpm;`i?6>&}-Li3gn)|Gciu{<vtL(b0|lg7B7kqYk?8i@bU{!AIuA
zXMuI&foosB*ZnU0DEF>qMj_>V`4!WDltiHa!)(+6R013UzW=p(Kt=zjbr(!-s{9W`
zNT`9+ME(C;cd}B=!Gi?^$NFSObItRsM1jtDDbdx@8`@`5yTY+qVyfz>_~}RIY9WW2
zh00Mu0fdQcqkI!LJN<E?+s<-Jt>en;)eZw};0Q~P$)D#fW({YfUq89D*cl?+hCbs{
zYVugQMp5(B)5Hakdo^oXX#TNG>|g&IEU~srDO0?KW9)|R1Kk6s2j(bu-RuTHjBhv2
z#(n61Qma+(5_|CDfSsJcTJejorc<{cPoxJw|6=!|{O18)*$!j!Y?E+F*u`7Ro9sz*
z%Ncsq6WGi28W_2Df1w?~o<Qz5_?DJVj!qr(d|0vCLJat_{YE$^Pp>2ODqm#ZvG(v^
zRS$HEPs&J>DOA~qQSJ+;e#)(k89Z*Akfz{uNXScmuDUsLC>Jgk5>>%>Ab7FB#?LHG
zDS;L$TG>y^khklmz(B_BV}iuNUE#!(%IdOAaFqL~M?TH}y}9HgbWetkK|z4d9Jm`+
zq+srPEBQ@H-G?}8Qz1)UqyAU`fG6LeqH|qa9Ag){T$CZL7=ahXD!Lzi-2%uNiuRfX
z-nHN$7m$NL7+JWSVPiQ6zv-iU`Yk@c;xy9S?w9QcWTi`*lkq#a<qM&+%6*vX_#My?
zp1NyzhpeTe+9Tu*-cQXoJZ?8wV^q;)%O6KAh``Yj?hQxSD+Kxv;7ZA&v#FcGf=*FC
z`(0Lr*|DGQW=;o#*0XxWS5OCnXh;seL&Ik-cCQ=%A~nS-jsQ_*mgMIjEtKwN+NO_d
znrWs3*N+b;+Q@hQV20i>QgN}R8*Qf^{MgoVacJSn+dOotykAq{*n<UhWMgt+RFN$e
zMaHD*9w<7WZ&YNOo%d+v4Uf_nAh}HzMIU!4@VI1l=hW!Nd~u!;6|$2pr|)j@-Qf7}
z?RV$*5{r~B&IP;14F!>^zCHzdOuxNTS~ukDzf^HIjzdD7W~Q>|`eO2btWLaNM9ns3
zl(V#gfrGhs_Qzz6Tx1%eACPdZ8sVYKo^!$(b}s#RH}dUbd7ugC`i0;dnyn8G9FjE(
zce}Amt&uN}`E<-zge7=z00P*3{*%3&^d$W-y5u?A(ebS?`w~aI<dXFFKEH@KcY}?>
zb-&+Mcxi{j;$Ph=o_lzc{g{v(_(w;R?bOk@+iI~>U8lwhR4$Z~mD*C%`O{<7)VW~?
zbdB!420Klu-+<Z;d4%@7!*`Ell6EHbDlebqT_6XEVNE&D9PY^sFy11&&92>mXaoAv
zXhfL!;a^dz$_o|zQvUsXXZq8^xCk4_up(b<iOMNZyn^C=^kcqBLFI+8zREB}e!K};
zR+TUX+3%l#|0S85gZF%ljqAEZdRJuR2%@ST`0EOPY`t-5(;{&=3zq5&KectbX4Pqi
ze29h6l|XBM^R)Uh4o0;SA=z&ih;y@aMz#Yp<Y?s9;SIW=pd@rqz7jV7hN$RMX!%{y
ztm@MDB|eV`3x%GoUJ{S;a+Knsyz0e7&x6nd7$5WY>5R3I)RR9qEur^|A>o94G4}$X
z*$&{2A7uhF9M(HC&6N{~%7i_s256O7Ur!`di_-nA6o&BZJF@Q!u^2zm&mM@i(xD4W
zn>EG77$B8s>lj%iT1{i2NvQtI`ThfX-`o-5{#+L;F8?mSxr*$?DGNQLF@w=p`*POr
zamBBL9CV-`E&pw-a!^Oqn5F2$(#RMg<t2L8xY_MU#41wUpJb*>&Ww~SJj6H0uQdFf
zFMTPaG@C&(Q^W|o$$TmQz91;XA;FTCoGbPaY=aq|rVWKn$t-a|5KlXy(xjl|y&KX8
z8(W^H`G55o=)i&oCg{59J?v#EhMqOiBh`Z>O}sn$uZMVNWSB7Oq8*vPPrOqz%0f1P
z^v(n_S?45chq2mSN@J{FOG3B?vMw?FruTXj<SQMh-D>9?rs1lK`hfG$yP4(3MyFSV
zapEOHibCO>hx7`E%FT82A-+_@xyj>eRs01h2wu($t6DniRZT;izSxgAXBXnr+eVSj
z5AdoYN=j|$J)~w`sHrgf&K6xRK?AHB+;2_Kj^XPw3WNzY%oDokt5w~(MbWke4!@{+
z^47PbO6*!*PIJy+dpti_QSCG|ol@8n0?Lt8aS`J&oHd3jM8?+Ve6o&zQk8Ll#*-K-
ziRd30H?m)}Y4GguftcTQj)hrBk7!(VlSkfU@@`+*<YA(@O^@y|l2rB&y2=5ibl7h-
z;wbaJyr&B)m%jqqUk&peiKoGS0?Oww4<0mcJ?kZ7n6O42YnCj<z(ENu;zNfFw+hT<
z1?3lfUu)~Egf){QMDRpt(TUH;2EXHE5*X#0te{LG*-!g?eMEL~Gq%ZHABYX2Gja>2
zL1b@`ge<`w;Z~Px`sWVZ{FR$Oz4D&TY>&_{J92p&t{V^xq_}Fh%Mm8%VwMjeuM+PY
zW+CYsYdr@X>PUb*-*u|PFU&o8j(jTOiQ(nCXPd&C#1sJj@5L}YHuDF`nu0&E-~-AU
zKNG@Vmb!KaJ&V1V0LY4pJnl_FCB3mW2utc$Js3U;V(pl*Zvx1kzb$mh5VN7F5AJ3-
zgeH`2R|GqATzd{H4H%x;efSlzL6sKM$FXrRF)HK6DWH+j0r>z1kx3QQt1v@U@e*jk
zeFIlj2feYC8N^$P?;#mbDgPVri+1pHK5tNs{qjwW!(UgHMGCqx-c4UL;e3a?1kEsM
zmyx+bH!xVJjv{@^vS(xUjTO23h5h!o)D0<|5${wr%?|VBCd0(NhI(#li868m)SAYu
zi_HmdNL-Av^Xr4Xa=3G|phex6rC$mrUVP7>QFKcEt>%{hW!1K<VAT;!w~ZKT&FlWJ
zh^@l{)0^5>dOe%dO@fwcOwdh>w~CkMjbE##OWurn`q9VC;gjCi_;9=*{!WV_dF|xc
zAHJJd_62g`w?DtcZ~pyeT>8X1;pHXe+ww0PzMA;OD{s7&*~kCyNDmQk2jC1i_TL*1
z@_#lSG^cT?mlx?d(u!H;lv-tLco!hMt88-#u09idca+#RT3FY@!tUS!mJ!yv65Vpz
zo|>I9+f~w1XLeXq!E~5rU($T;=cmk;8g!_PutjbJ9Ki`8ge>-Fj@cAP8hdJK3bsAc
zzb#+FqG#49=lMQq{y9mtc&;JpK#qzikGvb}Fyi1pF!6z&*I*hu%GSBj0Q+aeN|#@>
zJdv%W6uQ(=AbOjz_$2vfoul8APKlSr0pNFwFrEH)fs1Q)!sk|^kIalx_-^@XutrE&
zjY<0K52RMpO2<&;X12zuSF^{Lli=%&?GMnI)_s`Owfjnf!JNS&S(D!pGXuIx$M7<L
zdK9#eW{BU;wh%fW-1PA+rP!>QBa}L4!z<QzediD#Sv>^v&wSvMIu8mJkR>ka>&QgG
zu#im609EBoa8{k6Kb=oaG|P>0vb#G@EPcyOd75c)O<%Px_O+=-vpD-whinEPA3Smp
zk;3%C@p>8KD5y#BNh9vnIr#E%0Mn}=_yo**TuiYqxY{dhqEu-v#;biDrwE#J1qKMW
zZK2ecN-oxh*TLsPZ&-oSxt{QNep}_x;@gr}#s98{ogavqa}zzGUxy9@jw&562Cfvn
zsJ^?mUY<>yFCe+X8`0h8veXQib;o=6ughs&kxQ(%7WT%vC@X0xA20zm2}T6>#jT-4
zI}94lk4>)Bs@?|r8g8^UJlS)TIcV39u+RUF^NcPn#JiYG7iXWO=F<SKxy!N38>K(M
z%<B!S?d#X=kDBx|VSA>fswZ!ppNBvB(JuAQo*5i_*DN3}Q>OcLAw;BUx?Xvsb=qTf
z5-D&@QC_hXR?R6r^fxhf;A`m#SdKW_16fqsSeUBxJG1D3H<zXE8#7#HqM_f{$|jn@
zpD8*B*)aGU`&ZkiUL4-#e#@IWk|v$+7S+);{=7jJ+oQP%CcVzzK>qPNTmlx&oiAyv
zcDS@!+gBtn82or8AdWmfSf0Zp7a5$HZ>`QV{*3nPF#gBm;M_Z4LowXpJG_-ya={Le
zt~Ze$^5$J-#8l?{iU$_t!}YQE<s4+~-%=9uX9N3%Mmm1O4TBBk9M<RpMY~H!`Ig;A
z3bh}z6jd8hZ)SsIgYN5vE&CZMe`Wm>wp=vy`sPRyc+(#fmpM2#w#R&&{OyInw*xU{
z5_iz9pagLeVNUjeSJ1IuQ_XK<M$eoUCQI(;q^a*tlEk+d05qSYlA8Sy)<ctUC|-I3
zAP3H^G|Dm^)=eNYNe$yDPa|Rf+p5C)4ifc$-{Vv1+5Dz;mGJdL^%CWK<GA47oQWKM
zIjlzZ)lq%(06jj@k}&$#KJhzY&m>S29*$5nryfY$wWfv?c=DBgY(39Ri#LyBg*fQn
z5O1}Vbm8gZD#G$L4rH7D=U_j{X{moCKqvNO#pw~tyOOIV+j)Qk8ukDrHH~)sQz^!*
z239V+b(rL8NBGX+0M?L_L9p@bpAvKo1D_i)xj5Wj4cR)$Eq@;R{<hF7`E0l_UAJI4
z1KgX=?%ycN>4)t0KR@htq@JlgG^!?82%&}G&}ReE@uqiR&5LQ&cCeT-Um7`$Lpe<C
z=oZlcj`&$_yHnVn1u#XK9c(Z-D5;;SM&$RJugb5}QL3x^Nr*r%>vu+yEqgbw+2~b*
zG%LUwS7Z0DU)mtv@M`vx)LUkP75yQ$7in@Dh*Ya?lthknjnYWlm{q)}(xu%Yq<V#b
zS2Ip#Fc?Wvv4FpO5)2`4hgx6vC)-O_l_kOYaX*Y;?>0lK9<rPP4KBCJ2(ia=MtdP$
zOd-=@H`8GR0&^^_*ajR3B<l`e+rS`7^>~eAC>Y-sFdE5h_2a9g@k<s?vY<quLnDnH
z8X+J^t`IyZXRTPXcC;K^0R_RjbGD5Ox^%;kg-IW9VHluP*QEIOYNa-FEVCg2rgW<L
z1m7oa;i*qsYO3S6<x7#~9~>uBz!5_@#Te$3CB+j;s^|-$LRmx_wV)DVZRs9LytWT+
zY*oT~@R1M<Df!`Qt8OZfP^EaV^EtyCqZ!>Z4N$zifn=4aMqa@Hm1nDNT><~|$nx$a
zwL%<U5F%-@?S1ulQnMh6Ly_w?Y<kd}EB&b&4Bh>t>nphOSXgN41gpy1x!sHp)tIW6
z^QdK~>zk6EEhGG(`Kc;zOCi>7_QfA1g34qrv;&GY)@8vR+-9)C{15y@0}GM6uj+42
zTZlAJgny-L%WZW$H{b)BT&@8>^SR3aZ^Q(y8@T0Tj``~pHm7EAjqo;}H*Hh=``;z8
z#72n9_xvXL7>XB9&NpX*VN{|@U$f+NH`^2+7b0`bd&qt#`?SVLmP^N>!rm+4y}ga2
zT%=7f0XBX^NocKz7p}&gZ#jD^qZx4koO)QNk|v);DIlp6+Gx=f@H8gVO0o*>7)Fg#
zaAY3LzBUdd5^m>~X{1UIOtI-3TF#D0PF2!$e%sf(0lD-1?;bsBR6ck2Tr<=A-2AJd
z=5zNC-(2ub^Qj+@KW`@4y%AbuH2K7HC-=tK#-!(ArT-q&w|Qgw#Qz@C0ILm+=3t(B
zjGnbq*R&mE1r-+H8O%6M)g<Bbm`qvQ<`s?&OB^zP(Av%_M?Pp+V>YeOw!q+QR`Pd_
z;>+@E*qm#hr8T3JEG$m_UUbzUev>;;l;u=r6gof`Y#C7VP_{qXr#mC4>QW504f3q$
zKZx$U<NCh$s`P{VZ#vh<U4sl@$6q@fvfrjz+UDo9%37EQinYZq2e*c5o^v>Kf4S3j
zDznHl@(iId4SUBddzLFwP|7wIS5cwyo<tPOFyOYhkVmmPuiv~<pW=|j>?C~qJ)}dT
zR0)Jr2Oj7B^Kp}7dRhK#iBjz)vhZ14;ml%PR7v)J2I$R}wiZ6no!gWl7t-}q!4|1S
zL`==+i9HclxZ$x^cX`9GJZi6^ZwmK4WI|Ny<p(M?(QJHM!K9C&B7cbWrpWn7CByO-
zxtJZa;ITAb#ZWAlG{l<pc86jiHXiNoO`n=In}@qHXd@SLw>qkV7|H%vDIOT^C4G{K
zD-^4l`w2}M-|MI{D6Wg8OBZ`s_#gQhujD2-KNjDgT7OmLL;k*8X}&>aJk<7l_#wfN
z{NhU6lQ&sooU1po*a`E2ZcCvb8Hon9%7%C1Lqt<;+j>|=Y4-_X7iCt{><L-sfwpeq
zo2<<IwZtlZao4f{L3Wtaud?e)@#*2p`Cj{|S{pYa#3AHnnSX##m!)w)O}qauHD|IC
zMkS;bN+?GjEwmVxPuS2IDWgX-@*1z`B(NOBD+ZV4wbdjBXe(uv8W5F=z#H^ED1M{S
z;6*E1@rj2gTtIuWV(iMgB2r7>olEU%TWgn$opZ*}3PDjV<)@>JDVbsh^&+FXX<~GH
zYF2KOI!qlHe^pb_W|Zw!8s8g~A0*+-aDu<z!3G`KWN+WUYpSF3**fZjyYofOYj+}o
zmdXnJB4sTDMnX0lPr%y0ZpV8%U^i*@HNLODwM3i{Hf{|XSL7RGM7)}+y^B+j?Usc1
z$Is&j{55~lfz#*mU!8C^nt4kw-1iLE3A^=X6%TBkAT7wv{308i8<8U|UyWcqe3ei?
z{DsbwyVa7DWb-<#1-*LEMi4c;gLWUfFGp{Qk$7l@`7Y??M&h%lSR;tQmwGZaF=f{}
zh<Nn{@nK_N^46e=v#@$Qv?WJ(p22tZdgJkDmAWnhFCKrrCBq_Z0s%#Tc2};QO8M4D
z=rcB6cRBUsv0>1eDZF6JgM$BDMVj|k&kb~K{XO`08_daC(if3lYqVL`Rq1eWO}+H&
zAenDdLiextW~yW>WVtca;J8$f*cj3JOXN1`w;UTt<qGm2=a_FJm*X}OWjY9I=7rWF
zbsW_nED+aW+FFwijI4z0U+U3{ulPr<1j>Jec2!hPd?iM3^F5xZ)GuDxiz=1$-)jiC
zcLA#-J%;cWbtEGQS~*$fu)saV0NRJH3b>C$xu#ycX2E;BbV+xH<T<i6byq9Vy<rJ*
zwjfg!N-!`YRRgA6D=xgpOI}2aH(&yQ?`+4<dHZMK?$%j*mSKHe8F=;n3G(qbI{Ejj
zXpU-+EaZQEfnG<mA>r8c7~5{tN;Uu3q_v32d`vKQb5Y6k=WWN~xa5e&8fngP_^p7u
zQWKmsoe~1d^Sm|y!7|gx4?p6}9Wh5W^6f1RVh>y6QO{uMj*S-`kH(#a;B=G?b021$
zbLE1{B^5O3)cr>?($xpx!S;d~>yHur=gL<fr(+9S%0xCQlY6_%I5|3F7n+nr@5QV9
zH2%SGz_6}Vx>$-gkMrjje~l>C_2NP^CPY7tyDOL~0EK6t!GBay`SHFOy(){wU~`Pl
z)em$Eu&o6G@XUwyz0mvg*osFMFcVv%m)AbF{O}d2It%?NSpgL>)2~;bX6mBEp1FVl
zsPZ-F&+pusRLYN3n?mb9<_5Mxas3xggG*1mi#U?Ff|m)Nkv)MaIF_II1tu`_`S_mk
zk@G8QGHL_ZrqD^s9+*_XS2>{R_FiaET0{=g?7h1Bns3;ED*)07-v$AMRDDSxaYC=f
zo?Tw@KHK8l$@QVyLXb1L?p5L)FKQgFvCQS^F_}F^MwrqgcB|y{!xi_mq!K(;qf1QM
zck)dFp=mnL1E9asmuh;|BGW0Z=$35f#;L?f-Up4Dyef43QnmC%a#(cXf}ODYcf%w0
z9+VF8h_etNXY5oY!Rt=4r~z^cy`BEiDtr8lLsV0x{d*Wn(8588&-STtmw`c(ckLE`
zs*BJ=d#`?PaQOT>FSq?LnH|Q5E@_0=hZXdHV-L{ju@(h-)QlJZ2r79cGV>##(g%V8
z%;o8#cYnVQ{ayI1!$%T^>jcFx{U-|xdMRy*cI6RzP%32o^;y{*6)}HG;rcg~S{KlM
z?&>j(Jcw;};);drx8F@9$?m{X#R>?k<AoQYAk+NTy=1<o0m_tDK!HZ!7?67|Tv3x+
zxU-@dfQ(b_inB=F{W=x2^G-8f5LWJjg9N0;yD6G7agwR1a!zZ5fNr7r*`z7M6$Skz
zs_>h<_nGypakn&ysS318coG?VA}Q`wOW}&jVVyR$*n3W9pC9G)l-ssHInETy0SMSg
zrpdvY5Vwbor;h(Sgv*NQje5=oeldsyeR>TLr1?X*%Hhp?6~iIl6cGWOvt~<CUa9Yn
zWk7kQ`7aSM`Fel2f-eb|TODuF+`E?e9wgq9JF*24`SV^*g>n5~##S1|WToEs?e1g!
zxVT@f$saUCE?PI=iyMw!`Jg*@eypH*t6;=r^61gsQP&q!6_2Mc7#WhgE<}GfeIS)8
zxAh2o<3&hYbV7-Tv;9a>c|x9E+2@n_osVne&)47G+wi|-OZs2-Dk9)Ek3V?tzZMQS
zO3jx;eBbk*s!th%m%+%EP>ophLhy77@`th%q0MaDY`ki@?@+UuU7C1_$>cY@<;V@p
zDWS;iHKZarA4Hn09<*~TBa1zSeQP=GTyeD8y!qfNCkt%royS@dMQMc$)87kO+15|n
zWN*-#uIsDV2!|+$@d>=Raq{tW$&co%f@|(ANw4mQEx536-s<R@I5|3d!mumQqBMQJ
zD6FU_%Br}=GPmjDK-On^t@zv>_dAv~98#xFwi3C){7U)1ds=OQK`Os*-l@%m39A_L
zgN(1WZ!L4jV}q16SV~hTuhfoh|E?Z%$R`Z>IcUmke_h}Hu>bg4o{x5OCpA=;UCVH!
zqc#7)+D^I&396zqf2WvGcK7!fX~OE2Ovp_SmJ5n3W8+0~MKXrOp%9b{p$GSS%TUG`
zu-XUH!q7QF)XO(#id>k9=9zM0q<BfiK8^DZ5cIUyvf!V8u2r7?`A5Z{LE^U!^u6-0
zrJ$&wtm2UK&5013bc0tMp}2vK32Q>jo?$uB?EJbCwKCYv(_L4#RVv7yBo(53I7vBA
zNny6m`UbZjFK_6#dgpXB6AW^9_R@M~!P4jNR*q`-Mbv<c6GKlQ>G(%gm8nE`LD2FQ
z+r1DGZWyNSV1O9`;<ag1&g6BH?_4W1+qN)^0_^MOL?*=BnV|=5MO7+|bYJ0(Nnc{A
zV0Bt^J@cronF}ZhFr#>~kLF(u#zKQ+wW{65)lV)le&V&VEicmQpQp~&i$S8=ZyJ@B
zx!~cI<3lBybFaE3Gvw(63zk@;+x<sJ_05>c%<-R6`fOS+JZ{>bR0mGr@aHG`E-l&K
z&iOlX8Ueny=^iOPDGsTW^?F=#<tL3GFjyYut7_)=2kgLUwNmdHL%A%KCa%-S{DXsk
zPXwA>`U6%QyOoL0kuW1yj-2N*1oB?q+#y9j3JED(A-P6b90!okFdpb(zf{(O&xhsM
zJ7-5~x|}MF7d04LhoV)r?vqahiA1#QgQn%9Gd7zR&wUI#4KU-^O$9rE|J7DM5@O~e
ziWI*ekiQupp8YK1+g?3MuwTel$K}M46A$+Q3m41p`52GmUR?kCW;SW3YG)jLQ}uA%
zE-&EBoYiawn0>qY^l*^qNB6C-W;?Am&lMhA5+)2V@MmX#lno~{+y9{H3n%_eXGiuC
zv1SnQjaZYH3wYtoZa(C;dn`BX8y^HYO`xhgem8f7nUZE%%HOO=HnA6xJe<1GTO<<l
zN89oqo_tsGV4bV!8G~s|KeDg_8a<v#?M}onVgx#G1>^J<IpUC#0NDsx;AvD?-{}pO
zF7kd9Avz5a3AKTX`HdfpPL$N#cer{;=5H_zMRr?L6Ud9A_<Pugy}w_pl<`mE2)%>+
z>J^GuW-}V0bE3OMF-PEleU2Td!w2@y4$a87HP-FOUKvUJeNpwq2MH+#O5(nagw<@8
zM@~S6m+|vMKOZ?^oE}veng@U*=H6$NmyY+<ca*Fo96<lBGE+`P3$?QEs?dURjGh7y
z9MPitiCmfwY?csdgK)uy)!ibLY2k`BDiBPSQ#2R6{+wBmdb*|eh1+eN6J7zXY^bXy
zwvwLO#fUF|G@>nmhh3QAKqqIBPwQMAgf;9$NWX@VLaBVW%3=;*m|*IC_ZP6&&|ogb
za-aR_AXqTgRMfkb%;+uq7E|jS$Dx)t&$cmxh=Rr-)|#zyk{LW){(;S&%R*6AJoWCL
zr3loB0jmI^?IiC?PBP`5M(k?a#t#dTwll>RJ(-BL9#v4LkP^Z$hi-T7dc3Wl>2zrJ
z??o6muV@s{zl-3fk%W>;*1dxxH2jHa*IEK95{+*|5nLM-DJ$C=6-ZU^3J`gDDA!x}
z{ewW4zH9M4udgH@zYlO(is1W|DQ8fK;8*0{ms&Fu_ha8EPt*hGr>|Yv{Qk^yC>96z
zCs{O30^r;V!6+|FuYq}%1He;yz2iCNp`o%sRDu$oU@imFsjZD4;MGW62yaVNUV-i$
zOX4yDW8J9Y`)Dlee8n;q!J40uzpI_!O^sZLdkv;>n}WD!lA4P$-{x^HQ^#*xhuTY~
zFSa#lGR$SrI&*J^r(N!)S{|`-dsFD)4{?yxJYV%q6m4cDq;bslqIV%6;s*wHiP@kc
zkM!KlrFDJ_8H4z6=U4!vZbK=Cy<f9GcsUr8719{5zU2Rql-Pr}-LOzAD@e68Qj*St
z(jlo__~+n$spyzg5mX?;*-ItfY9l+qVObjAKWI3(m6?!ZkN%u^SDxN<L~c81Pda$8
zS;@9QX(@<`x%k{ZG?sNUlBxW8cG#m<r?AN(NaG-PXg@^fni&kqlWyRG^0o?|nS4;W
zeW(u?`M0^WdURFolJ|=Q&&?aRVF8B(x?iU7>)wj$I*k(f^*mhbd*ymW2u|C0IQ?QP
zPp7bMcjDJ%$&1!n!?AUzOTVTn4z$(TIDT@w@oT!ysjdF_*eB1&zh)Zq+8Rzfe)d`T
z^{V4V+x-h;pZ$LSdfk1Xy)naaBT(k|EXS$6`P$e<=;7aU<9Y3^w;lh9IPrM!BPXFf
z_Q^jdE-buycR!&c-1Lk0wG*#C<|T9nJo$3`;lj+<=!7nB)33)~pP2dSl<?G14)H$;
z2O@yYo9q9ba1gjhnrtC3Zz^LEc4cH9SuhogHcR4tFl@+|Jc%7--dv}86QWj1GEvWM
z<ogtjY+FKmOo>?6-Wms~mcS0(i^=TM{p1^DZ6Bzfo`+88k!sz~HIvKvY%dkM7x>(5
z=TQGXb4~G2)uRnz0>gFJ1tn)61in-2n{jpSZ}rMg9#z!Wnr=KoJ$5->OuLt#A*vwT
zqC0)6>GJ!hVxMA19s0ncXWlM$zp(L4u{cW4{#-4OD1pSScIi=Ue5<e-e|<)kMtc*F
zpY=nMF-i}c-U)sEecY$6ELiLG%subHalnA$%N_eg75z@)4-c0-)}bYZLl(CCxBebC
zjtw8K=l5wUd-OK9A&Fl=<I<m?i07vAwx3MxUhIA|RrbC70ay%Ix43ys^jrW8vOsCF
zt#ttG3=P8cyH|prLlz6zH>3~!aH~v5960Wuuy!ouwQXmcj)yid&-xu>I^BwA&FN51
z3l)#`q{_?lG7*%X%OP(w(dCj7DffA)%?MOfD3EDvCBaSXA0R7uy-w)21i47F=UDO~
zfgw58gGw{k?Lq}Ti<o-IP_s<Ufk}6LyE^3pB!8og_~|tr#e^sEiV)tal_^=uERni?
zD`E{eUu@H?IzvYV^SZLxvWG@(4oBC9@g*&;U(<AOVX8tTnX$^bEs%W_5Yqa}4tOdh
z*4^QJnd+y&>SeL1RB(H}F@FP+?h<*=arT->DwD&ii-0%&gen1DPCsuLvGcdj)S1Tt
z&D!ZPE2djsO9har`qer7B-`So=*XlR73V|0dQZ2{gA{$wv_!@6$lmv*0<nJ#VrKA_
zEBFW3y{GR+C?{9VS=NGP)Tr`FRTeSEvg-vgGQgFRm!{L2xLDyd++Ag&UXBduo|lWw
zm?`+9`zyRSk>VBl^g~&&Z%~6>16ayvwK=SB7TX7rlWpRZPjbsdjDakOE%c~pzaOAs
zC0RsYRe%bFs043mc7%aEbCV<9I>hLd1{b~)%7V9^0z6^w<J*m5?g=iI?+tr3>AvG8
zI|C9js(uum6h^0?Y5%SZGdWb97LuE8BPn5cXd&>zn}+W1AuDjb_tIKV08{n`hx&@X
zPF@PVlVb#a*Jt;p`fIY~3Q*5~;M2XIIM~6R6{qtbZ(b<7q*iU{XRLTzgf_d$<SrQ#
z7bQfUzfiJQmA^rf%A8FqgO@VpSer-w{R$6$<-fCV?p^2JfhqFu<dnm(f8`~Z-ICUZ
zPb?<FQ|8ayRN6oY1pv~do75-%X7$5HPu`1;8)r!`3Wy#Wc$xI=v(=U-FR?XSnK08h
zKTEKBI-abpu!ONv-f2{WX{1tWmk$I^bCJlnvx5CqB=LRPM0TJTQDKqnJ|J`(7BQXX
zKiPOg$=Lq^VN*-AMi}s?;Wa?syehGq*gu-{!8m{`B4>HM!mDn}JcL6Ob%O>%HIPr5
z!Cc$Y^+1t_ud@|$vOTjgOMF2pxk@iyWP)Y*ziPx92s&h5SQm!0Z*r`(f4R^qjerk*
zVr)YczXk`(oXS}#&IfRai0nqbCN=*I<9Rp=IO{5}DQNBQg#%wNwEWy*m?P24jQZxv
zzXnzAwA!SAbSnacK|ot_uN(ix>1ByCbJ;G_nE#KkxBhGT|Ns4$ET}PR^kBp&2?1%h
zQKJU}f+CI-6e$sr&=oamq=1SeMMR|p41CcgC?E<bA_6KQzQ7<X&fcHz<?=o6bACDh
z#PfN3-0!#h^$I}OS^YVd_9*vOlMJL~@QZ{V$ny_YG&aj`>9Z>8akN_*qT$B+cT_56
zCO2`8iS1sX@0TZ){wu%w%^G?7W$O9uFYJxqr6H&xyClD_<vUub$SacAZ{4`$(hkfW
z!nh^Vs6_?1AbtPtPT8@=Z`IT}6<zkkKS?xP$sb2M<zFakL@T-~4s4^!J$0zae36OE
zCfR!?OeU7K#xJ0bM`@)CU6WQ!_wqjV6VIbmh_yyE`m%&XzRABTYKnQ}6lSGk(s)g!
zi7*!*VEHf);jR@RT;52lFN^Ab=o0{KW!Jx@R;Id{z|ajd^Zhy0=S@ZiVu9YQb@tY9
zK|fAz6;6Bk)&H7PP&Y{C1pqd%kTIc`gYK>L)Z9TLe4exbgPY$SQP~9A7>_sJ!GVn`
zx{y!z_nHfVLq3)f5M;I&O|!5IZ)@Mw4yf*m7`$kWHLWf^xu?r)t*0r;ntFNW+=ixD
zR1#uTg&z6%dung8qV9#Bpl8LY6q;)bJ)AW4EiCYo<=t1vj36~8*?bM61N`lY&EF@+
z{i^!aZ3Bzd)u*)8e8_+j+n2PH!|jq9w_l3%J#_RBzwPA}dfhtOQJ30U#H!ct5r@vn
zgtI#|_}!w?7)RA=35(sYJd0GaUQ@E`M?~jjX5uFN+f5rzLvtyo@ISl2>fX~`g;B#K
z6qm}iZ8@gG-wfXvCmW7qvf7LpogLJ}@yl(6=QBY~E>TuY31^Tx*P7e-Fwde6vmfvJ
zS9;01Bm)<VMKyj1l+eJ^5sz}D9%S1sJxOF?r}G5R=`={mct`h41<*OJxdh!JUL2a6
z&iD*{C!m?-ROdhNMihSN?u^^{N!|1W%v;Lb++B9K3fb~;vw0@cR_6#)Y)O1md*eK0
z{)4qp`iPAEXNc&=a9Q1ycKH>ln=Z_9V$SMkvJ6A}vpj<3K(mOmx|j7JJjo#0RHdI^
zzXlkBOu_k&kJ*b|OUa!n=;`7_Hn)E|6!BOuArnu6gQD9+F_jUPV~mFu$|!M3f1RUV
z!SJ7`GrF&iU#}kTh3N;U>19<Un<YYeP`!W~o{yAVyf*cj23e^;jgR>3mqf11%Xbod
zsa_J~Q?ICB;ldHMOZl}!uv{e$in1yq>}&%KQ2}aY6@55c(}%$8YJ%;WgMgu+`!@aO
zGCh*94YEkhR5x?Y&`}}VA2P<3X(`xCUE{|RtwkQUe9QDr#v<E#9OVTBd}$>hX)aVj
z?@-($`<_tXrQz45M>y@0my}J^;PEr-rtWx0Pyd-mj_<q;j%5>X4ktr|guX`8G4tPE
zT_uBTDfRgSS6S#4`toeqljf6D=IU{KelOpG=RBI?+1=dr@QPINYs9bScdsg;pPJ=D
z0wArzop1U*@*oBkxKc`(L;rlZeZ=za@X<@}1p{{b6oNW6x7PN)>%>#a))m3C(|-v9
z?~?O_x`gB^61RS*<|Hn`(V1AEjU%G8j>|!6)IOmDhNf*5(W`?=+%(jUPs!*eCr=UN
zz{f*7<7gd!#MM*itryW^6PHx|f#nmJ4uH^BmjJW_ejys&)}9>d23gA&RcJy-P({^;
zl8+A3#QcF-Ta1Be&@V}I)e3q&T}+$?4&?Hkrb5kUn3iNw<H5^^;Ra+qrb`L!fe3(L
zoHCb2drL$eHBLD(6cDNyb}|$bd5Wo3NpnwU{M&a~pd>Y|8yA5|Jv)<JSxNIY7BQdH
zj9$5z7@r2yOT9dkcF9;o?r8ctEZzS900JK5r9u1uD-Hg)w<?I7_dk7CzPh2N|5zrV
z|DU5gUD>|e_o8l%W3ldu5!OZbTIVwC*)^?<Z;Q{aTPPmzov3zBhaC3gI~%4rUS-EA
zKX$CuZiHPedqvfks7{!=Nm0xYe^fUn%<nCE`YhFd;)PR3R8x=m>4urcT!~vIXr)#6
z6#u?d5==<WG&1#;U=_d7XKyp-yYqdw#z7tqZv`Zc=CtKHVy_qdK-vs{nXyYyIv773
z<G*0nDIjB;<h>m}JC)E>IW-e~dKh;`qXAot4tSmRV$3CN?&_)8S&36UiPQOVPkeay
zr%GNWA#a8vr}x{E%^u!ab=`1p{>EIiV<W!g9KQ6(B>rRD!K!tM>z=AF+*U=P$ISPv
z^8^B#K;_}rHxA7+f6-MHFD`O%*}9MDhQ;ze-woYt&Zdh4l0|G+d|6jbE(9=zDyzt%
zhh;@l75gy~fCKv(yM@vcaL+twe}>&WCrz*gDr_NJk*YR3)0PbtvsSMWx#f}W5>a8U
zPmzI2PfZBBzIU%YS4ehaWhDp{_=Y5s3G}OIGM6qrI#ld{baznimT#liI;ny@7btdt
z>A@c|RvI{`3N7N5-WZ+gd$58ulx`c#6z`L|DMlK2!LJNt(Z<Pc!THZEMoeHi+6G!b
zLu7^!`#3wni^r(^{%sk({P^;jfZ&+<IVOKy^7#jDc5q9Eqvhy4I5&Jz3vE+dwur4x
zX{biC4Vov4XIa-3%UmpdEGxZ8ay}yBhNEqX8s;MzxMw=$-iy3O7CJ+-<C?nKyv3e3
z`sD+q>}op?z@yuZEq~)Ob7HQq-c-12wRWNM++OuJ4=hCCO&)c$$I98TKa}ax^F=>N
zCRBhl*T~k+m2|b7GJnbE{warrRqmO?3F>wNaINFLkf`RKe~spv+YjJg%eHiyd$Mfg
z&xxgYPvUV-<5v7~t-4g16T*`_eJ`T=4m|&)6L1hlnZ`j9tliUdec=Y<K**h)w<l!w
zvtu4<ygRzs$5VL_EFb$U`n?o~g6vg$=Q?+mlfZAEzUuK{KAYk1eKfa#Mpip}us!;W
ztq7Jq$Pd24V+kLuG>`Di?&fC7pW4!cVb5Z4GU5mFVefvd-+3q4raN-2_u|M-Ve<3$
zdwm7=VP2c_<79Vh8x!50>d66#Aacyb&A#6G%+HrU;V6&hw3J>UZ+{qd1D#G6-<$9H
zOgww-aD&U={oR(itvY|<AH-ar{wP`HW_|Rag;IQvH|sVY1@?l2X_&crU4bk5z8%kf
zGuO#USP{10XJ?FE2^RXA@<ih69m!sAKg-r`b{(WAVS0%SM?<mz7+0`{Y&UfO1pe{9
zdhZD~ehk+`>t%Q@!vcWw2qL!!DWJzB@!P0s4c#9`1p3}=W*(PU1i!fMqPWKBn};w+
z;(pXK7_l-n2DU~XzsOh)JZi~mf~gERU&5lFzD<gMU}H^X_|TTtX+(rjhq?p0u1o&0
zs!53M8DTEoCC+rw*n#4XRW%3S$C@xGl>GB&uTk-02m{BDy~qblmZH&K)lC#S68wIN
zU;ZM?qeF<+5MO<}Im&@bUh;6;L@G}a9N7(6jRubIJT30A2SusOTcAvn^#Cv1=#E(!
zveSRfb&@qGP_#=A5Qa_i`?eDKBr$Yxuf3->uPZ?s-#;P-KkOqc;NkR7JOU8)MdsrV
zf|B+NwGc5kR{+uqIai3*Q<-i_!jpu*m@N@B@&Oiveiok~K}Jb>*eOUfw1T@>smsaG
z+^)ooR`z2+oA4ZHD-Z{nGSInMhj5@5Wq!6%_2N0teW@ZRAZ3OnD%nOI|AvH^%W=pv
zR-K3?kj5xYH{t>L%MS+1uaP0!fiaKPeJUZJ+$Rz>Qv=?jL;_K^aF0+re~f2*Ph*PQ
z6eZ20q_Ko(HK<bYHGNn6SqAcfv~m=1`e`sRMH{o|l5#4YKU9M!5SriTt+KS!RYX%a
zFiW78nS}?=VCDP0(!-M7HvPkJ_vJUbB`G;S_lYF5oI2b}Kv803ZyZe-5tRt|WhxeP
z5D?jHrFWt<+akS2utHqhYMx|i)VwHQ97+`VP8%F{_QHtR9DqKSdK|8M2J?m4C(>N?
zhA(|hr1txP1E7gii)y9tf|Pab?yG8B?pVkHXe#v^Fsrd~+EJeyW)O)Gu&?s~VQ4kN
z(EM({Awmkk^8G05hs6E(KE+vnf&ss@frB@pBw7P>;EO}R@Q(mt4JT!r(xMz`OPf}>
zJwb+xe$!#ASn1}jjkg+cc}nzfk2IyLt6b<y;w+u@)i1U}FG!FHsN152z>ExY6uX{S
zBep`<alIuN;!~*!3>CJ;Y|b9>d%2&@9=(^DLg)AMRzg|+zCm3lJ_Aq~KuMrMG<n5F
zw(H^$AL1CknL5iqDw?~@w6hHLhu`CxDA9xfFvyWnqrJj2EUk2168)yRCjl)8<!gDp
z`P?FXS+P{83vTTE1mCd+*8XvT$eMs09Y$PDWQJLmad7IoSRmAl+;GU*^XrcQfx7G$
zNG&&4<{W7Fk0*F9=c2IYCLbD&A~zh?ieMxa$G3IVsVu;~8P%XS?hXg{dL9UvRi|N_
z=HX8e%}cPj?EHPc;PdLTPFNV>#(<0@zA!W`SuN-tvYUA8ui$3Id7tTUEyiug*B7E7
zCz1V&*8Ir)$mGmNgtmRp>-(UY_TOk$-sUAy6<^agw4wpDR2ZQ_g$nz@>bWd-;r$0O
z5nuHW?^6bXign9xe=ZhN1|mX9f$VSR#v~%IYe`6JPIa*qg1QTq51z3+4M)gggXUC)
z3BxLzV2i?!2Du#{eess>GmqrIT@D<)6<?)N@i+miq5v0K>)LsgR4h)o5hbiHZ%56_
zmU8v4wDPJFsZ*muoXNM}JErV1G%QzagS;NtZlbP77A~Xc2>>q?)XGWD12|;;vVCw@
z=cASEL#sGPhy2JusO2DnL*Q?Y(w*T~)@p{CE{(BsJkt9=yTE?;)|}h}cmQBtjfb4O
zl~81gl9(s#ScBd`QBM1+zek;&<d6F=Xd<%Rx4=No&i$dCn_0f?&O2z=OE<oycmrUk
zQSf4p<m#4qwm-x#Ca&hDIFJKS<Ur$4a5Nl2=fcj8LnOJ0H?Leq5ibht#!7e4WkazF
z#&~3jNT*ux8J^0#>vG8}Kb4_G?G=Vz1w&DfsX%5L&Cq$~7L_`tSzVk(2~A}simAlZ
zPDc|<m<MNA_T&gVZ`K{6q5KQc|Lz6p^Hy{YfFu9CrengbWW#V_|50|n{!aMMI4=_@
z9XjQ$Yh6I#ka$Esb>u(+9ueXDz};3RU)RP`zYtq9#@6!r3s>IEdrs+Xu3$>)_?d=P
z$fx)Qy{|n|WMXLKvwVbF8?efjP^mYRKj`3SWu9Diun$w3OR`@YiMxF~wlvB8nBFT@
zN2xf8?4Tm&GjHNAXVmgTS0{Y=&bvkgf%L2WkFNk86*-w~F7y-zDL<L%Vu<ILrUqY^
zEonU-&r%GIXq0--Hp&I<Iz4STvpQ0%o>sZsLI&mB0sq$ZFedo>Cja^PB>8I5XFI1D
z%llZHNdMj*kk-4LM~QC7r)#YDgOewFN@f+U)MegYH`)1TD?vS_FW7vK?K9q-|LXpq
zU;Bl_H>WU5o?;~IH@C^mLnC{ixQX-qM@ExkeyhGEY8u-j4pfOih0XuLPr?*iLkH*5
z<Uup9SeCOQFL?sYD+uOIpJoOGO`!z}w6&(WXs|H>_If`E@RQ~v>B~xvuvIsVraFi(
zSJuRx`k_d(<6N0>OlVY1kskzAllEn%8L9Cy$+*<uF_E-j3$qbHYYO(XI2D~dc8i{2
zlYwLATy$t0EScnV19ObG$8kq(^l+2HQPPk}+@_d`kAD0mb)aG)lw((WvR>qaw(N44
z3ViXmVU}yA2SAqSw7bu8wA@?Z%ayBTU^B{m-NH1W3Id|R$bXKhj|SPiujHjp3DyE`
zbUeY;q66AEDB)X29HCSv<E(NP9Ju)Vz7^oQTeh3_vlh`rrQT%l>JPYA>#Ji@Z1)2&
zSG92KtrWS3n`>TjTz6E8(c8D80K=yHz<UG_i^|c2ANjW{!vbAw9Wlm3RBM@b4&QT&
zR-_m^IzU`(t8avR<lp|kZ`+DWig+Ki;XQbv@WFu;H&LR?v!~5ZTaW$5j<$y#6@E5Z
z+v^-e<*7=ZgErh|bhR{bE}c8F8~5{U^sWn=kBS9u_cgEzn+b?zn7xjV=8|*&NnEFA
z4diV>j(-2<zD4xAFssFb#KSDs(|1}0z31O%iF&$r@^o#_W|Md10PlKP)nuZSB@g6N
zNX5dQ&T0v5Pdi%43mYc?I`LqgYn6|93G}9vBqT1>!48T#20naS^mg>TX>jk~pIfD3
zM>#6FL6uHeuNWHtzatdpx#^oNDU~xjH0JKs;IBJQr_We56zaEms{^Hc9M5&Wz4gy%
z!utEA%5?b(mcp(uM2~8yoLoiBVZ3~@BeiO^RaJEK*eUa1xRoHLBVXF@rhqRiNC1kk
zBGW3eTz%A0(dTZo{w?TA;xc0d4X%pltI(f&9yrID0dJI1je`XOAzmY-xx#LNTAzCD
zqD4QW{go@EC(+#=Xk7@nzytGonCkNQpmolrMk{$smt!y1UQhP%35RiYlkQd7KnW^z
zGS)?Em}zbIu}@!<Ok;a~R$Tt*t+OaDk~OmFS*}IPT&k&6huA;wYiLZf@UCQcR^gV%
zqX*6ME2uu+13RF0P@e!q>scT)=O?A#qsv)pfwFAjJxw;3U{d4rX#&RZM}JIi>#p>Q
zKrOG_5Ael8Di+>~E2?F?&re7w?oNt?i#$Q5D)U2|tjMFOR!CjN2q1?5aK{SV8OxIy
z(6m)3Au#ccJ%yJ7Z6w$nD5@5PQEajze*Kp2CuW6Qd#du3I{~EE`3E>L)3&_n`(SH(
zEVvC{Gs^}FZqZ%OLF@_dvC+m3zN-S!XBY&H&CKGLnbPlip-l#!X|@A`*Qh=$73ieN
zvB@q6!}P0SRbgps_D|!T2};)8_D7~wo}*g}1eK?%1ROmOXS6i=;E*0>hB_y`6<-25
zhI|w(Fm>e)?#75mufC4=YK+gXLP8^7?lCtCySAA?IMEK*Y^5PG>sHr6H>J4REjLr)
zR;W1dtjMv+${l0BFJHxIiC^zvx^#!HOxAk^S8s^8ue@`dug#Jmcil4!>PO(CI_`V`
z$Jvh^5qmapNR@n~B*il|2|JO>(5*<-8_!d&8*H}R#EPc1hFCtvKQY?Rasx?HPk(5Y
zrs=%rHulr}v7wS6qOBqb9omg95`iMJ7NSNrPgp+jrv#6aM2azd$f7(@*!H%A^KO7h
zk)8~bmVzE>v?>~%wWV9rgIm#qJC<vvzVJQ|)}PzTl~D}o8O5YehUxN2ll;d$R^id>
zOaqk#^I%R^9_9SA3-`nzBZ9rze}C&NPKI)n%vY~3)T=%<P)DhYRY`AQWIXobsx<AX
z(6rmK5`-Thr5NK11eZl%ceCLR*tW}>J=X7wbB6A8V2T0VMUSyrBjPv|2JjMrj}N3b
zrUFl+hCaQf;cObSE@Yz8A<F&}Pvw0qGk2@k8MMC2CkOT~HZ?V?7;*z0P_Y7NY`;(e
zYRm{<6>D}?C+d#`AT&#laxLkEzkW1_ukO8?DERbTxE^Ehp@BlRY%DlU(eYitotRE|
zMh>_O5N}UAluP>}WYrC^@dk>UR~PN@ogKj~t3&%@Pq<?h-TJz214Z?+%35CWQIiWU
z2pa|Ku@n)G1`qNoq8cC?9H`Kf15?eKL&*j)620WI;Eu|!$n&MSoraB)zJw|GU46e`
zWt{k|;7Oe>5F#l5^$5kS_H^+&MNTRp;6xE;E1syO2cz-H2V<e1PLvR|2w2?PI51E2
zLvPfdR2a__Q2p4P7}Rp(s2p57Y>d5Ut_1qCe{jfFgA)DH*H`LzU4DYraY3d=rFRrK
zLNAK=uN|ILhU>gw+uG@2$VV8vRreo#=3770*;losc>lC+WFtNW?an<muDz#Q{LFUD
zr_o)sQsyMH4UmzDGWcvQ)3HAE9<-Ypzt6Dbly#+ciHh2uE~Sja9tlYw2D}WB$;dQd
z2MOS~au-)z*6zZvz@QGH*t6Xbi-ndszM^9t)tjqg&5ViZi!5=#tqpeJPb^}b+YmSN
zGJ)kPVw(<>NR53~FY`wv0pBx)j|sl2+=Xm$GaSrzTKB6?^*kF2T=KM(kp3CeAj)4;
z`tsqoj!`v$51hWlwBo3ario8g@h#p7<#(yiJ%(k6G9Z4zc`uIhj;bZo(`L!rN#WpY
z0~ef3qp6D93M}B0S`2C0-?HgQKla2X%`W8=#!`e2M-6@hiv}2@M93mrX<(%$MdMy_
z5m=y24V^g-iMk*nT8BQ=6o1!^)@+5CY!sZ*72uDTE9SyhCoieM>EgSWVlJR0xRDiy
zWK^g5V*L|*CDrE+(fB4nxqPgK0JseWXi^ko8_$YPWARlu*o{M$mc8Lbc@uJqmEGyB
zqZbg|c$sJ>6;Jc3i^*f8hOLO*>rn;+X@R?`SBYuoOH%(Iv5&6lHRLVQ!|3MYwX@9s
zC-#9aulPW2RSo9QKL;T;15=<Gco{0MokbOM$PKu34Uw^cbI9MW%W(f1)K^T<JT?wi
z|LA<IBMKoJk}0lU0uG-1+<~WD)v^m>!AD+_unsoS!I>BCY0V}EE!C_KgkuhPm3FxZ
zZVm-HIcCP{`*gnyxLR4-_fp39dHMTZ=7xx$fa|r^fFAFZ${>5LTa|)j@U8Log}j`?
z$+x(0?<=x+Vpe<}E23#VAs9Tz&n+%%_Uj<^|B1h1&v;gBrg2VCm_KD{NS)?gvwQ#C
zbk(}yfq{|yL423hREpU3C=JAL!HxZRm-z>?@g1g?KPOC_Cf?uuCz}hfd;rlLd%Aw%
zj#fzRJ72oQ^E2C_O9P1EP6FKQmtn_@MO&;gn1Yg1L>>4Uc5qaWVY2d`x|jYUPfp9e
zI*o8AnT#=Atgfp(v$qT`RstMTo<Q29OkQU`<!pgs)HzL~nb?m^A@58rD$e0_Y+n|;
zEeSOrjpmYqvf6^armGlQvhtyF!RW5E?PWcc7`Mmqu9llC+e1nMltOo~bFA`c&M)!Z
zr9#Z;*MO{^>U@N<??~z7(cBK6zdql4iv(BG%}X;n-7Lk9V8xk?U(@gFL*`Y>h0GM~
zDWAJl%*L=MPv!=J*UqJO?-vMY+}Z4TR`>D4IahqE6Q6y)U!@qSB>su%j7dxs;UoYJ
zq4n!M?;mo~xYAR2x)JR&F`*wQ?Ko3HnUVxR!N~x@@-ttgk(#$CXqqC7w`@?^T3)(y
zMrZ1REb-Q337km<#ccM`)+MPUc)fx2+f9#K3GaH*<gNjl@Y=&KHBa~|gNW+G<8FG0
zw1zW2{U4<O8W+RqP^omn5!ZHBe|k<=XIv}HTDIytZ%GWnetoWVC1vI|#QxQKjnRIq
zx`U5c%CizJ2b@dhW*48qxbl_XbKyWPGrFrn`Of4dT1D5^Z7bF)+u+QRUID|1dt*k2
zTno+{zDmn;LUAAa?aLY|$0^ee&Wikj4jWB2{)wB5R(saA#Br4an4g)KTbkFK$LY>o
zhFKcDM?n{rmol#iwXbHk|A||i3bHzM_Dn!|l<B&==Ip!Ecx{RU_xcyJ)qkoYOqV09
z4mh7Ve5B>#JGuK!U7xtZ4hTbF$B92{ef$cK|7Azs$Qc^(O)!|`EL$3{P=i5_-xSv6
z^~*Oj-0S>3-K%|msMlAzYvWd|0U!7iKj2?%h2^ARFZ@Ry0Ww6%`ZAoG7z37nGoIJz
z=Q}EX7kd&D+isQ-t1Q-AK<fM43xPe0jLt2%VW4q}KkH%-X89=y0LF{x5|zaGrjEvc
zr}k_JRtf1W0O0$L9K>1pzlnR^SM&(H!Z;O)K3)QUAD(VCkZhMWr2ZcKt~Lvs#c?<r
ze-$&$mxDP`FP;Y<Fw+-dKO_^Q#zm>tb(r>c@hZ@%N&?b5?cthzuaLL7knn?P!Ne15
zawT05%Z152JUK5swxP<Pnq#M(lNUQ_Ov0*1(bo*`a();GDP8ZlisRL!&wYk#9vBv&
zW)advj<Z%NYS~K5ZlGKE>jop35z1p6#yP1{-2^|#C$OG+zVNDUc!sRNlwx$ta=EmT
zI?$Dq!#L{zRbrap$-fu!<P2&xJ`EzxTK$DPLS;6cruk8j{Db-5Q+Xnm+|Vgt>f7I{
zdbpVVQO};Sf&f+s^8P7P$55(6T-3srmN+trS}C;)$rR{P&%0!~Nzaf;)s`L_ygy4q
zN~X^szjL3x^gnkZy}Iw=!v_qhNtDu`pby*RD;Y{;E=Yn3f<G9{3c#jF$!X8qCud|-
zZ49XW5>r!NyfERD56XQ%+q?OBy7zwa^E1GMuSJjKAC%Sp!Ftn6#Hw%*Z7MB^y;WQ@
zT_a27Xz?P!&C|bwH2w)#)&tnrX%O$dKD3pxAwuVLsSm48*Zy^p!WbU`SQ3tI*e@l1
zrfLqXEt*7)G&NG4RYA}D=mQbCQb}?*uF6k9jNMy-^2gVlKH0IIZ53M{E}!uN*VfqW
zdo0|kbJ9K#RBt?(cK{`gQH&?i_*?J3x^&dJe?$3&h~wz0;^CE{i0RS{!U`}A8Jr^N
zf(4?Ix+N0+Xc-3aw?({u|3EhLfO72{V_yi+1ei|5n?5w<Zgb9K?p!hcIf8Vc1w#d+
z!T=vaD*)9ku|Sk&($)Lv8+)%BOMcH^`r~!Q#@f0|SUpPTKo~*}$pWdZ*u*bM&@5%?
zFgMy21J=!VV=ujs=xB8fsQXR8ccs#^U5g!ff_odVFtIC?*q5pWzU<)sPjU)E1(N9p
z6k0yG{^z=qkv(0j<Ykky@e2gapQL=R^}s1zZR?N@Ge+H&&dA=B=4aNGnlRUWDXF2V
zBKxEFBB=seg#?YGOLcD?9jt^;%1%4`=q>tFE<$^6OLiR)FOaQbjl%NQJrMr%WWA>-
z;`JH>FOJ=_SXb%ucfH(fIcV~r9>8B3hm3B5sgsF<{f3`!Ts6EacVq!ZIP2Tl3Y2Wb
zkVb)CuWy-rO%Fg##SfnK6$}02kJPHH;yz0=D4$`tzu;g6LVLQE;r@fK6(Qp3GjNc9
zPw1JYdlHuno^f|f_{fA<M^8T1<s`RYPJjq^0l&GXlKonu`}Nhb=xd;H(5=RvnYS)R
z?NaSMNdim_kbGkS*pef$X<O6K1=U5BM-5!`eQ{>(Bp_94DXqj8E4>eAs#G&h=Qips
z$y{l#?_c*u>N5}QE7scZ30d&VRtU=88ul<}Z219jfRVZz{tu#s!w5C4pJa>&mt#@<
ztz5Vlg(<%oQ(9rgK<l`&X9_0yWtM8M(#-BpsW)$DND3&4W4eXQbotD>-mJeV<*#4Y
z=W~W~HzMv0-6CG0_3*p!kd#Ex=7=<lhTr;}_R*`KY2dE?<TXCv?}c8Io6S=4Tbf<n
z!fXmluf&qyxvLu<_r&1U4cX(@b1fQ=D@C^rI(jxePu}R9lHzMk{`N4}!Z!BQUh(ey
z4n6J6=K1oLQE=MYpq=HXb2__YlKXqZgK^)r`KL2|6@JA$PRCAGD%^Z4Z2faV@-l_b
z>F?6b8=9lSpMHHh{CoGsKiK~cO?tdpnG>(p&iiNrz;Ib|BbUhFRocym8Y_C!P%;|4
z>RSL0?xW*1SEtL$!k^XBb{EAu6#xYF>$8TU7umSL*IEqg0#z#ucM`>S_*`JRg4b(2
z<9l7LTb1A&NLXq9&0dybPTj=0!j-Dqx%iqML#Hz1_)QSkYVh+>e1pM{A?oX?RRTY7
zO5lz|fqR|bNLT-(3z3oU06PF!otmy+6UFw;O3<2@t;|(mqvc4@nVI(3r1h{@Nx4yg
z#6e|6HUwGL`5e?z^U&d7R!Xt?Q4Gl;qewqC=~vwR=$mr@eKBQ-aCv2J$MeKn!IgV>
zQ~^ZR)5zcQBF5|q7`!w8<zjXea-sL;exp}ZNlh8ui_jiF;V?#-`gz)D==u&JK0lQ8
z&h_>}XKcsR_jKud8)6e820rdir?zL7WURLJTC<enu2tA7^cW~V^Dzu=@*_#QxfdGj
z6~^Z>UCtU&m|CW>x%y8h#D<RXTTBgjc5s<K8GGiKypU~_Rl01%cOctH&`&H^w}GfX
zkRYsrUBpcVy~sA++QiJ*Ts^NuhX83(0H`g8F>$$Js(KK4R!<D-+~7Ssc5Pv<cPUJG
zYrqi(O*sWGN4@;Ec+tQ<k7h*|s~NqP71Qf%YW}g{Q^>Y=?*I(6aSFyQ7$^`*<LO?e
zi2}Yh8He7)E(uoEClu6VT$|h<lrit~X22EmwU`reP9xskME!BrQ=>QWEgDq=3|!82
zRURDZ)Xo02@wlB>(IusSBnqK!y>+HHn;I@X3e2#V2olyfW!=P*Jm0{0Mx7&iE0~u0
z*1$jzl}(KDRQ#LM9rFQFw}`jkJ0GHCr|2$^VJ~m`nCtzepqxv^GVAqYqVh6~B@`Uh
zTK2-#ImSeuMH=dDJhVyZG#rx5UG%LPr~st^)avVuwrU{k*0tzEIXRlQ2-{sR5MpXa
zIB6rD6FV{0lp`Q}EU$BK-##$^RgO3A1LrhR70!IVt$0NSVAj(?8qr?d98h8lrfR8A
zDc<aL*6Xh>P*tuP*taP#sE=qFd?nU8p*Qm`p-O8=NmNiLa+EPzMcC<L<{0$MFrI!a
zJL5Nn<Wa=MXWk4E<AvvBbBvogq-?p?m=|(iFJFj^__fiF+lH@zw7-(^a?`{P$ZV3F
zQO8iixj90!)rnT)$={4$->23uu?P~Ve)jWnf#+LWLoI90ra~7T#&oA{-uvs5tE)(9
z%>5n^eP}ea@g(dWQ@F9|hkzE!u%|2K<CI<3YSX_7K*BhV?XMSb-~Wuy5Z`WAk)U5V
zST@5dZN1Q~OUOOa<dNu5TisOCSuzgMvj@=3y71VqfdJB+@w?pzydNMi&NS|W!rxcw
zlzE4ppBiUM?+3vxqh<Y#u~ceP2T(tHc{9T_iKP;1EA9}_e{lf-YeGx5`J*BPFyHwO
z`H2hTE#0h(F>q%Ry`>T8l(c}KxkTFRJo{J!5HhOhEJn957Fmyvbdpz3J;fh5+ho1+
zG!VAamS%N_;4KQd(QF!$iL}O=qp>OV12Z_Ags8|s)R1r}D2tq`E#{5^zbceu{2^n-
z9a}|B&1Z>ygq~zziI6hef21LdfK^BFHMLEo{_&vE*_wHxVfKXMBLu8J?;t#3RZu_O
z9^}6J+Ndy^v8nq$aRHxaP%`UO#v)*URi<wB!P+EQcG!+C>LDHo5HUn8k{-2F8s6I{
z4newvc&4bej+N{Ph8>o^FmTP-NFaK*;XH8p)M0f!)VpA%@Lng++wM`#y47D!`7`Z?
zVnVax9#_d7(!#pcNdWk~7ca<F4Jd&s1X83mk!mu%cC*9(By};XSzXo#z3IKTXXqhk
ze2bbIvDYN~UU;WseP!y@9fhA%Nv(OOdFgHC_=!bD$|DKe*lxDRMVy%GFFNFrVz&5a
zH8HJg)QpZiOY_%X<VwcZyx!%xuWbm@jS?Z6UeKI?fJyY+Pyn8=S)&@oEK>=v1zz?S
z=v*_D-rdvy?re_&X0jSsV+_qsN`uzl9-%~zt#9}A!vH5Qbn(m6y86FfR_<SW(Guk@
zZfyNXL7Me%_ClgZhQaM8w+G_nd{rWT&g@8R6ulBsbL^f*xBs&g{Z(GBZ$0|zgis~A
z(T|thDzqqtl=w{XE0A1BDA)AQo>Nxb&oJN{dPc)(L+S3#yAFyIL-fK!QEzlXs>1~5
zro6lL-!@pmyeKd9nxT47X6Pd1w3ZiZ!BGOg4oT}~iE@b2Y5b=w>*)NC>Yq!Db+IVX
z6}~?<#*h$uG3DA)EibAfyx99}b54}5>f@t*FT4EBQs+Enzc>eg{Ar0;VAkH=dS~kA
z{*tLo@5T@3Ze+5Q(jqiDb|fWHv;mKh@gQ9tb`!1@e%<<oni3gfy&oI2A^BD5fnc$V
z)Dd1ODQ-IJQRl1=7O|_Pys*?nX7r*1%3^f7UL6K(?Zq|V9q@u*hbn_eQkS!W4zY=-
zO@mo)70_VSIlF>q5-gx19CD7&(HSSeIs**#%pjYujrG?>g8c#8K}sCQon~raK0&O<
zOG)TeLgW$i9|WQE`9tvHXR`}9C}A_x>%P#_q&Af-MSX@TN`>3GlDhWMK)?YH4(}PW
zyK_j*@QDgxTF9ONVsqCXV$YrLwZ2fi*7Sv(#tzxE9J1D;rj$~`-Q)sKUH|%i#m#X;
z1c!w`1|Q(CSqrwK2xvC3Y&1#h+*n1rh;o~AJ>4Kh39;`@mmBY4d*42AqcucTlk|7<
zc54O5;OYHmZUJ92h91E@ZaHS;s!b*(^%gWxZB+3;&sJ(x!c8u~``w!JRFyRV3vH7|
zUrTd+NYNiRB;a0J{%|Sl6N`Ld0C4S-JY@JAkB-gMWhZlsF%>!1s2)-!N}qA9U47X7
z6x_xbm1;+obLr#`_)ShMRI6S8Xqz|cDJGJtv|_!0zLC&hG`5j!KfjqO`G_#*#Iakc
z5afj>r~r%Od&Y88q=_JEy>oH+yNk%_Mv}1YIN;*tI$Nmy@cIkCubI5{q;n|q>joEQ
z7E}S(=9&gl@8vB9_U+6FU$TAm>|D|B<WCwVkG35;{w-!-zVZ7*F8t@A8-FushyMup
z9RBrQM+7x-@~`U6eJg|K3F!it|NgW~c71=ze*5yaByDZy^46(KpXoGB`ei;KU1)`N
z<|rL)OvjYa|Fh$qq08^mu^5JuF+<s#p&HM?moPLs7+N!o1G@}eo>bSEY2eK?if0=0
zq`Do<{}kPJnFI`rWX$48&v=tDatX_!gXJ{Ca@l23Fe&cFDIVS_JoTA(Ny@Q~6yKQ?
zzugonCN&~Yn?z0}hNcpD-m|(?%b`?@l~i+hni)RLl$>S~nr57ycBn4RXeiBaCCvby
zeh{CoPfpjx{I>{K4{(nc1>OED3U)JL{}Gur0{=&3mh>NyS&Hbv(@ybCRd#7IR!YBl
zR}kbpl_UDCsDS=FynawaBX@Jzx(MlWm$PN%P^@)!pmn0^)C7)9F3>n(kecDl7T0dY
zRt-Lrx5;cgmeBVj)cxMcZVhJ*6uL$WdjlDS$2nph0*m6VJ6^f1;!x_|6cFr)x$V)L
zx>uvT=|;0bOqTn0kc6i@0=H5FQuwEJgGZa`R#y(pcP5rwG3Di?PXKy>`g)Yd(G^*Z
z++7e;)mipbqV)P|+u)-^kxZ7tMmI+PlTvkQbq(&1N%>g9COOZf8HbQ^tVOsljc7zW
zXY=P`_wS1ncFw(BS<g5~s_6U$SMw5id}S4%^Rf@8-^vs_@g#92qfkEKR>vu7qAW`6
zxh`3K@x&#HdNs^_`}d&*TkzUIjtE+IMqUhB(OYy{g4l`zv#~|b*-{^i6=U<Qx9Evx
zsGb~R1>q~1UoyLo<5t*E@;vjS&9Y47DuN|svT0sD>Xs1Omq)^r@-sL9^d8E*+<F28
zQ`^L*Y5yp^;$~iGPRg+3Gi-fXq#0r#lm{Wc_fHIC1@XJ<H=0mvBIj|-*MMl2OCk{K
zK&%vlGmqO&VS@*m;^I@|(G^`xm5LN(P&x!ke+V`WKJD=iXJG%J_-by@;>l~*;`XJx
z^v`3WNdR?1#gIv?ZS`>-)4$xc`os058C<Q985y(j&|a5((0yZ6t93-Lr%a*IceUGv
zGa}EqQk4aENI3^A5zVeXvepXgua_w!?@0l;zQGk?rV>I!^Vh5VyvrZyd_fE&dnX--
zg?D?(<jvLQX8kk(;L%YxpCHF;Hpks2L8e1OCRlAv3gzw)nm|0=*VNNnB#-`Xe6L%P
z^Dr!7yU_|M<EBMVk!>}|Xntg3$v9b~b1o5hiuCc<Ig2M7amp2p?H=)N6^Sv9vX@tv
z&!9uqwN?w?mfhJIMx42xvXl2`jtv4+gy?yya@}C|#-F3xmw_zpo%y7D`*5ND)1rw=
zuin<a@OhWcuTEK9c*6gDX>*GC!R@Ta+54okSH)@X-+g`SYrcso7do{->lHKvl5yGk
z{jFbqt~dU3AiH)?_NE<Z7Ws_A=3t%)97ueJb6J1d7x8;*sP{?MWlbDq(dMyCPNrPU
z&EABsGp8bx%nOeSTDZTh7G;auS5^JlTaj#$Q!Wxso?vmp%aKBR3&)@T7=&^D{(bu>
zGEZ^gNUAmoTm63HU)o?G>eu6)!_`4nf;}7>r<&e{>~W#bR8F;N^gIfeRb;dVrb6w!
z1)w?f&?~)j@*JgXg~lGxqPNIjay&uc<AD?&-AcJ68sfOH;Azl`)!pZy`7&1zq>;B+
zVxafXAZQb#%a|=*enEsse-!qe0c*0pTSIu#cJ~f{yM`G)!x?(u{^}wSOe@6gK36(R
zU>|>tYES&^df7Dyr_8F+memLnAUBcl-#0bP>h+Ru(yeb`n!DLiikwMr>$ycDDb$-I
zo>W<BQ-&f>+)2-eB@LRbR0t)EFUf6`RBY>-=!*GO!(x`5dL&v8`$KS;iJ@Qv-7O*N
z=iDO2s2Ur0nwY6{gw5*AJ2OU8PKaqs>0`3W&lpIC2eD4+HUj7ldO!TL##QQR(#L~l
zieum0j+6*==R!GXc7&>EGLUO$(6>4o;*Cx&rLj~Z@cSJVhP3Oe+yRNsQp<~zEu{mY
zc0boz(xJMO?h^K*Dw7lZX7G`u)n1tDN~xoHrLcPbIF@LNPOpl^iTQYo*iJ~gMB9QD
z>PP2|<d7A%2dV|_Dr_|p7TRB3G`KjzN!2Z*XZQvvVH)ZN{-(k+EOrZUf0vhWY`v~>
z`9`_QKA491!+&&K)+%t~>4%SZiTlE<K$?qupnHP?!F?Wy2_9Ao`_|Jb<gT+XIW+E6
z!q7KFmH?vbxwBXR%qV0DlwW0g^7){Hy1~LNxPRAEG!;r01H&>-eAdWAvj#7v8G`dZ
z6OPfue5(x<*e|uV>xQfTZTN5>o(G5_H7OzY>y0jk3lLy+253gQ7xwo>>qB13J#UnB
zZg4_p1GR0AHVG*M-R1bAvlD$=I$l`=ch3SyR0Mh4NFlN&LNB&3W4<lJFy|txw&#qm
zZ&a|zlaxEwm@a#=7*3&0{NHtk5#Kw%9c(@n0psMelNvn!>8Glw5boE%f>&4PZVp(?
zyg5pxd=qiw=s2(me(rAZtX_bvPPhnid2NNoy`CN?Gk)SOtCH0TNX<$lE{%Ak>L(6I
z=ctLY<*&^21-?hB=!c^=NPR<cv_@}iOV9&szov8XQ(O<q=RSmsaJZXU+#W9Zh-Wg*
z)V0QLQ(^kQ2_Qt>SKBOej)+)AFoLAWmV1pV)FM|PcxytDsIE^EJj^-{PJ|m!fC!A#
zg^nXF<eA6y1~BYc#-)g8cP%eIT~p;NwcqWv#=;zrn<$k>ys$ELUOSuodZb!nqh>5|
z&CAL|Y5)BF21V0pA4%o^b~_jXS^(BOyTkuKgrU+<cFo?+)pqW6rh#P;AKnU!H<r;q
zJ;nR;4(7N^5T)&T_lM*{`Tu~7Mnt4EwZg9rZ&f)nBtRAkv0s-5^MG-D-mQZ!C8~#m
zJVxWcRoPmYDKtrMXG=c_e_idV*%n@+d%VHjtyx*O-lyCGOgJVM>Qt;Cag}do*NUnd
zx%2f^=9Me=<`cJek+##>$MmQj-YFy2w>}Noowlz>M4$U8PtI-azdiV%#g}p2q}NI<
zXSUgoDp`<?ROdmQWsar`+@JmSiBVw%{=#qU_b|Lu`kwPbbO>g2<n!AvC2z{l#Xl=D
zyLUmyK(pML9Vr{8J|FY3BJAw`MG+u49beA<boWX`5O#wXu3OLl`>X%i_L{&PP^Alo
zwCxh5MeGIXyZb`Nf(FTpGcb8Gw19OtOpQXIL)zg}vle?Z`jclQ!^A)#rBk1{sXtIb
zu3~8KmBkdj4rYMG-ZE~KY{#l|6UB*tJ7Lj|LJvqK&oErrpjoi6lKJC!hU_B#5ca%b
zt-iaMT$mU<WMwWS*T@VWOF|h^Q3N@6G$hyfU2GUCd#_J)ggm=ytfX8~g1=&6F7TZw
zU`FFftjeRdrLOgkBJ8j81&j5Qdp(X)V#9=jTu~By1Ud`7$*A^~{V2+=^j@nIRkph%
zP18-kMzmG9Ww0L_X6X31P92`^@!BJMG0QYx+$U$3j4z+<b-5!(BYeCZ)L2z-+=_RH
zDc<UM;G5m11sb{M<1i7}bi5-S$Q9=sw+pqm{e(>eR!{a7a{w}nO2nFxQVYMw9k&Q*
za{ikP$V+c0yt=PMWO1oE$^QIq#<!F^e~0~_{{w)bPUFj26j-~YkFI<93X+whoj)@H
z!!I`6tY;cliaKDOFtU8ne8aE|-5)6pi?L!yeV249K1Z_@abrn&;<&tm=N6)GwyVyr
zOZC0CsHmQ_MdoJ}ra%ltgVK&|PL<>mF8cg#9V!1{)Mnrrd0kgIDAs}kzMWyQZ4&^~
zjY}@PyKlGp&e`maH&5ltVIQ-VECl$JP8pXOuT+DD&nL_m9{up_mNBI+Ft^OXy27CC
z{@l3@YZ=4Q>bpPJMk&3{%k&SyJD*#pBM!Z(TJyKVpZ1yPvN3DQPXIJX-gu~g`zQ~1
z#Hj+i&a~O-IB8TRJc}mwqz3%no;#;Aw!XR<{3u}R=(}GwP6RY<^KJXTmg|#*$P0Tf
z)1Iu@_!9>H{`&psx!@;{Z`VFexz{sViI@L4Qh)U+w#AR%OE6c*5~sM9zW7bX8%MkB
zNw@nyQy6M?yC;Zv41ixEHy-o(hQYCq-EQ<vrL%QZ<f%GS=?9<b3M}g!0d%k30w~3x
zk2<sO`?1@puI7MwpOX&5xL0veH;t?{#E@^YRz>P5SU21dQEUS7VS?D6t(Bnb-q!ai
z16T@zcZ?X{t=PsvpI#+PPY(@1@|!NH)0b=}y|eh0a-~Lgm&9AVI|~T|yn+EZ<Yyfz
ztaVB5-!40|*NWN1#VEA|Yg`OERPZ=tsbGRPr*Ja1)oP1U`*(Ip_18`gwPC5KF>AoA
z@RXgFrLMn#;#=Rg@97W+u)+i_SPR@W^!I@qEh?!G^Ef>Zu<1_!4zJbq56g<<=3KrY
zTO=QhqTS8dEJb8}H1MBAoRNM}_<afSuPMmoul<r-3Feb#wxS^MVPtx#cTXMW+kSel
zAgdHKi&hbv5juL;O71%srj_FF5+2|tqBx@#B%nxQ!aeA(DYgf7MY2P!MMVcXKAQCV
z!(=&1u^cxm8>kW~PvAQvw-07frfBa_jF$7?1^#dvq_Gp4YVZ%Z1{xWri9*jS7SkCn
zds68|pjbRHxYA9Iog>*w)iYBkfl9u5@M)3!&ue`!A#H*Sj|JR5hX4>{IDqTl^&37}
z!}yvxjdq{u>Y8$J4|zS$jtHIbz?a}a>;$;Az6k3#cSi5e>rTb5G;~iM;0UP|OCFCt
zPY4QMOYMMPdR?JvdHpFSp21%g;??4kBqOBy=H-J1np)|2_^-|3>v#4){%8c*)1o9a
zkH30fpyt!49dWtcEAsuV_RC{~Mgj;>j_$#Gf*cyTy65<EsvyQ}!V1JXQy}imP;LO&
zp8PXXA#51{eWpEh1Ud=IFH{jNg+n!?=$U?irB<S~on>lMfz4E(s!}WAFAH7DWBoj7
zD2W8n+_Ki<bYylYsgz6ON9g8;tzmNM&`X>Yg2905nr3GDd$W4T^p);@%z!`5Z5r^|
z|Iz-ns|oje0sK6`k4<O~<})?jMvI|!I6BKdPU#-%d{8H*V%Ro(jv<@NLj=M5lms#)
z6s>xMw6SkpHLJY%;%A@gyQ~NKycXeSaiNDB8PeNam=&f*2VvX@SiN-N_|5p`rzigk
zMYlcuwDD1VI7aH+kynrM-q0QdXnDq5&&@ie{ON)Ee=joh0ZqKpuj~K*hjP1_K++K0
zANZd|2F^itMwy~Y#vCM_eqlY(my1;}!pwH%sPLG*Uz!&6svR?wWm<=nHz#n8rTW?d
z{TgC5cEIq{Q@vkn+!%T?3vg)~`fm8@;@biTak&=13Yt(KhU;92vX_y~#uOlwuU3q|
zJf0YN=S};M1$$A6(|O%C{z0s4lQ`<AHimcR20sLtYxh{PUl#{V60YWcHvm3r*BLfC
zrSN`D6Lmt*s~CH@r=xBxx6#giP3lkRjKwqXQh(K}^?-#ec7r!Itd$P6$kg>p6#Nxs
z@tm6yB49xJ{1la->psGl$lXft2zwLvd&mWJMe(!c{)qD3hyLx`leb-6Dc5uziXm%K
zTgi*aI~9|qhyO7umBu-0iP*@$#_%4l2E<A`EA;S!H=v@c<=w^YDMcdh(I)~GGow&o
z#E1&35uelK*c*WjeSuT*r|R+swSW2?eXb|TM*|AmYi*GrXb-EB<44?LULjF;P$k-D
zL|Ww&h5WgSVirl`b{3H9Eg&B7hg(yOp28}o>?{|!>Qq6$a-f-6#R12`+AWikely)q
ziRuDDtW;Y#i=DsNLGLaWOTxm;w|`?oEEjjb!&QW#F<$scgmr4Mx%tH&{ys4eE24rx
zH9zTfBgs);<Ji%<lBvz0<8XL3-A#3?V_$`%biBNgm5QZwSrMVqu^<f(hILIzMLpZi
z5t>33RXMG~E8zLKV^LghV@H(6dEQTsXOk#&t+)7LAT0{>-zMwj2`vxvgU_1OS#(QS
z2R~N)z&n6?x!HFFUqKa1Au2vja7}nsep67LZB24)fu0M=?F8zI-hJ|igia-TQLD2`
zwj0%}5(YNZLIC5G$C3Ri5@JKHKhjtA3-l#I=6km_T68q?St1Uuq*`+h)Tl}6W5oes
z?RyO$A3PrI%k;$(Wi0%cTL?mJ#W@DvM?}RZbR<pRcLrRl)zLKD#6X{Ooa6`+r^J~*
z-bCGe5i_wjXC)hcKv*;a&;Z#-<KYzUTRtMf8kV6S)$2U==GeRBe>)*K!Nv1G#;*zM
z{`~5kDUO~yow9(Qk|ads>K5#-W@HxREP-a7O?>Y@(sJrB`_|b5qYxBfu2q7T6cF95
zcXY8%GS~3X?OgNmu1&8e^Tf`qJCPdbBvgt(v9;i^eB~i1LZwGE^7rm!I#_txR(RQv
z*z!*Ht{U1yhxw!`+Lgm8Wx4+S8_C3pzXh~PcHjrvyZdrMad1i7&lJwljNHqpzOrMW
zA-#g&9C04P4U*M(u$<a=3Dg9zC5d#SH4exDmyg5LYIQ8K{7=cr3W8y1U2<a&%eW8=
z2=gaO1Vn|4f4ffDKONsIyNF6T;F$JH)ys_Et3jypV7{P2s5SiAnBU}6C08WeN)e$4
zaPPAbj~)`dVsnofI#(&-W{ZLmNm+pg@8_bLtPNj_WV@fi*)CuP;YxWanyrDrouWZ{
zN0Vf-mZE82VZV^jWJVPN4Cea^&cZgcfLvSEL-ze!+WHDkzDn=-5LQ{fS@{^CEyP3}
z<s3IzaK2z3sjxTHKw$7!nvpaV$&ce&nX(&0sRsH|-L5}5Dfj25L;o70PLKjHDjunN
zWr~PEN?>%~@;jw}{hNJWZ-ta%B#GA$&hRHV%sTm#>B^Rne~&hx5fY5e-Qx*MMA0@S
z)r6tpea9s3k?Y;?RE?Ugkr!uMu1YEgcYLw04*8OQd5ZVcox1fbq!oAO*TIkGpM0K2
zSu#9@Qu+uxl7NIdX60&MpP8=16XyKrRhOWCS9z909?3)cuhS_5mxno_3sqdc;APu?
zhDle)S=gdhb?fI3ToT5uZtmhkv`%VR9AmGGgpk&(cG^2UtZ~vV&Z}llSB&HNJj<IQ
z%QHP;8M?7Lw{R*7hOP7$)H>!(i5gAHyN~X#JzplX6RcqpTu-uZ{%uH&tzqqK+695w
zcqwrW*HC{1#wh>PA(3=T@Pe&nzSz|#-&GF5kv<KjhIMmuM`e^LkovouYK4uY<nL0p
ze*5}g%4Wx_3D`O}FD;NGn%pnlqF)X$PD{n8E2*AeceqtsEbf+05F{;RbWY@;4~O+c
zBlLSZ%Oj%ij;cmV4I?S!1qj8V-+aSF+D3Vy<Eo(0Zq$sg=)+iHbUINi0qgtEYgJM4
zm2yid>Rtc%okzA)b&}6+SJ;;KqrcPdg@7rnFRJcWkEDREeCF65CxKw^qMwDpD*sny
zXC4ma|F`|wXKa}ngRu-_ERlUISsKmQcVpj$$P$GtCDqIzd&ZJoS%xTzsFajtELk#y
z&}OSpNqq@z?)lyKa~#j__dI{ye_zM-K91|J&-pp8^Zh#0Nku<;`?VC5tC;f0*j<&Z
zRXPoRcTOb8^r52p8;Z#yROQQo9IdOZWHvF76%?S&95U5pmmkM5(Ar8vAmmA>6ftSG
ze#El9Vq)|H#Nl3_QM4@zM7{oH^6U_JjgrK)<#7Wf?-z)=wW?S-zn?4H8-<2-V<T!S
zs0+Q_8Lz+DJR}4WOjtt$k=>{t<P2?@z4J}osl@e@$G$J2(3%&&rhJWH5(-Q~B&<mk
zl_+&s_Ib)BZcTfXMm|q+3a~uK3WP>72<<Z3OcX-y_mS+y%8s*^?Pd-UZRsLx)9V#a
zh&ch3p`QQRP?`lB6MHiKD#YWahP+G0CmB0e<YuHFYBlBA<$KyxLESheq2jfu@cp@$
zFS9L-CLObDjf_!aGCVbu$#r|JUwGl}9xQ)xo`o}LNVoBs6sYMmD;ug)_Gjno6QL+&
ztg$vUZPY=fI!*ZOE6&BevSU9leEi9+-j3Jv@I28nf0;nNd|1~0{*dh3h__QWK$0Dt
zCPCwk(o3dGmR8mjg}Kw$pF&m<lt&Z4h#U1^U;PJJSd%LzZ2uoI0g})T)ij^Hrs=4H
z|8F2r7O!eH&t^KFm0N18V-?lPvMS&;nXTSxknhdS<^S_9AdqpYr~iHa;FDPGu+fy%
zyDLPl=GKZlRM|iss3~G9ZW|}4`%RzsXpaAMwQ)gKhgg(p7g{}LVOf;eb4zr=&pUa0
zDYNfAk5i8VdT=s=!(JVvt}gjzm&YmB(c?c2Q5#+^Ws)_tge4>#yl7?@WmNB?8PUg+
z13q753p+$D$95Cva2+4hjK>ozjpvm%+9+X7QYankFx!w>UDbv)#TKmFE9k9y<@%qp
zgEMy`|9Z3=U<_Bl%i%Aj$Q7zKZAW4Iy{I=V@sEXt5Bt@ke#Q6HWu;Dr9i$}ZD>r<#
z9W1)wbN<KgNh`U^-ylI6#HwI80=TN#Yvy$1J4${)IORF9H_16q<J^!;8je*3b|)28
z;Cs-H<Y+ce=Bx?QZHgMmt;EU!7R3DlT4tfJRUM|tQ&r1>6m>{cFWH95Ay9s7p@2|e
z6~YX2kjjKp=6keUk})~JX^owzka00I70_Gg90*|OKzg(|a4G^50%*jT!l2YZCP+Y?
z%7uV?3|t*2jd{|U{2EHf9WH@-`hbPN$1TYyodqSUawt8j7Y=&k#MCn{RJwWHCLP-y
zzsKSgw8>pDV?w7W`@Oa$*)acH8SrAGvfxY9mK_>C5yK=s8>084J*Hau88>FmINaPz
zcji}9O?9P)=FaAi*F<^N4)6(EMuCJH*{Mvq3q#ci^?PM5xmk?^$yusRExnE+a_2Cv
zM;dRtBWVCB1U^AXz_XwY$O_L<1#(V)l|8?r%n_`m@HO|$Jsk8q|LHwgP)z_%<5Qk8
zGM1&Bpn&WRmZ-t4Psi?$_zezgjBXCejiifFRD$ybbjZ$aIsPJAo!`iR>%rg0nr0bo
z;b{VxUVDnWs(>qK`+V#S=#4Xfmu^AC*P(x!b-#tWf^lTd9BcV&mHDUbCi1EZjyP*q
z;G;`%8r`3<nWuqO?VI<8BAjnV3LI}6B0SLSMHK2ien95&_~xidhj-ndpX&ItRC8I7
zuZ5JJ4Ax!Vx{0D)r)Fo{%<b?5Ez1rEUE7-nb{C9iK|~|IRrSusoEhryAW%v%Y>tL<
z0h~$80Zv`%{8HNa_`ElG$B45H$|yLzo~_>c2&FxRkLi+rSVsI<?tJ~>24|q@&-M?9
zL(I^Q*0B#fRIKL5A#}`DDWhJaori*w<9BCG9~T^Es(!hc*exVb#Q_<v<Or|Tz6L1u
z=z|lf5^KA-9f(s744oS-Akp_XzKU+J_*qs4iwM$N?GbkqxX9}x@m5k1nW)+<;Bcrw
ze1F429UHE3NY|FYc`ehMxXVc~`W%oP8_b2CkEMge{1pltOfPyiVFe<*02^t>T#OXo
z@gQ-S49bK)+LG*}y)Y7Q$tJ%2a_UEn2dwf&zn+3-N@LA{P(Ok=H648x|KgPt7@2Ot
z;p9rm!P{wz8i@idreN&CtZrD=2l=X8W>Wyj_uzfvl`knpDso+A31XHJnuStRZ%D8V
zD|+_lByKCB0*R;8JtjKw#fT5$D{A2D8)Bwx7Gb$;Mv_4tESAEgX|pLgV^HUk<itQs
zX}z_t7fO^WF?295lpNEZEVa(1CPOB3Zr&4&>f>MDr0N|ZKH5lHlpF%Q3)?r0F*U|b
zAQTnmC+z9nnvs1|AO2i<IBFV5%x$8M5x#FfyK=S#*W;09{*r6ha}|wL_D3P149oLZ
zTFYf$l<JN3j*kY!)_y{!A0)3o@0NFoxY1d6C^~%P^8J+{kiG+;WYOqUJ6LF)d*5J8
z90+4I*Aavz1kW@&d!u8{orHt~M!zF!9^JtWc)&>rMn(d)tsXI^U~lK;U}}w`<#KZ@
zt*(aa(XxPkgd%C+5Hmq<yUH~yocLv^qi0?<?;kqWOf}725C)K*unY&xpt2L9`e=vk
z6i^OpWB*jDw@Qdvig+>f!7<5_Z3uG>$RwN*7*7p|Rs8lHVPvv@+1S_&86x!C%_K5(
z8Mhk>Ga8+<Z-==xm({If`O3|G?;4vkqg(-s3PcH!t-Eg&Z$~F9%%*z9om~)?_{l*V
z(wnN}o2Y>{d?hoUw{;4FVn0p#?d0h~svgU<*d(6B(yqI{sG4CbXx`)2R+v`%>3>mj
zd%2sA)Sv;ScmUc3*oAG7YMWhK-#0l8SmU+A`?p8f4scMw;rJ9Wkte=7?iEYVdqg4z
zUTvb;-Zp8vgXnV^xD>IIcaGhjy?{09{p*r)c%0ZA!R&T722lg~Fm?U(WMaZG$q8Sx
z9=_qGgBL>D(&&XdPk^g707W3b$NWb9{g&k0>=1axbpE~{;jbmTXf%i+M~;&OmX<E^
zyvhrvxT`ZMhpf+yQpr0gr_H-$Yac(J*<#t!?*41JpZvTnDef4o3FDc9xOEeGLeMXk
zf^LB}bf883bk4ZE!XFZwx>YnTjF6kB0;!@bwx1N;C#0=_*oPjg)^J3@d>yVJR!}Q4
zmJNK90H1e3(0GkFmncoKqXW)u)q2(Bn)|MN><y#mC*mu4YMA^UK;qqtrmVWrke%=C
z%u(;L@F%#9<ki`^J3SPMYm<3T0n24moj-2fIV5|fp&Il)GTzF+?enh_D~K4g(SUW{
zpp~-C`%8NikX$`xT>H0<0GETHh*GAT&ffw&Oo%pG+4Cvklr1M_*!O)Mp~1EmCLla!
z>VMatI~r-WG7%{Qq`&V=l;vKFg)wBV+45An3*b2Gm!;0(U@659K6on|P|TUBH%gk<
zE+xZ{OwtdWm<2teyzIEpE%2dP%=D8o73}B}Bf{1TLAf3?ERbo6d+-&f_xzTB#W+E{
zGdlpnf1~Xk3LU;6hliMPosuaeOj)}ciuTv56}^P=0be6zZy0_Q%RN1j`|F?DufIp>
z$%*9<$iL$aTe*0{+W)Xdpc2_bXn*cLbo||>|JjGeg0(~atL<nOP?-!CD<qJ+53PBM
zKOh~=vcRKy`D5kk#>znwDI6iP+$eQ~Gkr@`u=1{Vp}!HsRLK@mK~;`v|0gC$ox3-7
zpi5L;s*MVfzL$r(7xDZ`VWLruHospN;56!haLCBy;I+h|vaYZI+xcsSw7C9;ZNEo>
zr7+|9HqqdBPjgka8SuD<cDCj}x}iRf!|woviFKVJKi-nUzyTY1t)*HN1&|E1C1nH`
z_7bF-HT632PId_?I-o1Zu$y$EG^o#o{pj%X%3*K|+P#9H<)nU|%Q8gWz%5kY?ccxU
z_w8)V`^-bJN7p>#X|~e?@D_`AQjdS0NShfviqs$7v1>}mlOfP&vXVey&K7(&lBj+W
z7BwEJ9Y2NYmMZFy6*Z`ua!kWzh8`a$`zS3>+IVU#yrzgiYJ3hEqf8M{Oa&5(IUI<D
z7((T>I600G8lAG;y=+dQLXgm0NL^p1Ji)WIhT=lW=h5;(K?GqK2$^f9h*Rj0N=z)s
ztR3l+ivx?%Wijg1%~Z-a#kMI~M_YX+Mm?C|;sc&rPKAIbENdb7Boih{f#=)@@?%Up
zJjd@EvzJFZKY)`yN#@}>33t_SGT6fh<sLkOj5WrsW?Lfl&9VCshBB;27G8XLvIABC
z5|F1h5}^6r6pJAR+r~YPMG$FKPK#gv34vt?h+m-(5rwOlt)#=Z=)7)O`9<R$J94mR
zg3d${z>x=e-b}YmQ1~Gq(Qh|Sbndt$^Qm<&q;|JJo)z)vO$BMq-`VM~mNMI3P#$~I
zwEz;A%aQ}MkY$Djtb3p~$p@bB9V^V$L&5>kiW<HuNFi}JGiPKD^ZOflZ^-6a?+#6<
zmEExwNK|Xu+QLvgxxEu3mVAXd+Dm{k!RQWDv7kZk=T}<e?r<Er7IY8jtZo&Oyfp%h
zO7_2_YZC0x2&!xQ=asvKN+mf_U?mRFm-6NN+n_u9HpnSzYuBl1w~@%WMKpX9Oc7|&
zXTA+Mc;N?W;+pnG2dLkfpY6U(;8#B7--;Ml;Byh8ToLWtS!Z&&SCMjVey9&}hx$gQ
zkM2B<1E75ttUlI@vOmb)G<j|?YMDC_-}__8{tSQt-_+Pd{gUjiJ$}EZZTkjaY%6h4
zLU3<z#MzI!1-fvi<5|>lpjq`nmxa`gj-i<g;kk;k7k38>q)7{)39*k!3ayn;JVqQj
zRJ%^?SU?2{+Du6Av*G&Duao1;2^GL-ce2kc1?0O#!8no2*Lhex5Gz1Az9;+7Lu3rA
zw~EY}(0`5M(7LcL#rZ7|N&m4#MM=w(`+-ZwGiFy#ze^u{4?_zIoDw{#^BPp0l0qlD
zjD^hb<x_&3*=pZaCAK{R0lH}&*IiE^>z;iHrzp}jJ;s9mI89Q>OJ=-x?ImqkG9P0T
zOq!roqD`xGh><_sn{Ag6g9*eNISuj{Z!ngf%mwy$&9$Fs2A0mcuW5@}sKWTsIZ2Ce
zLCC)IlBYt7K8qgISsT;}Cjxd(b`!`#!<#si<g#@d_cbj&7(OQ|X-V+dxu<k$P2RBz
zf52vmVASV{l;7*Y+N#ft4k(<8hLqM3^JcD`i9J)E)aegEgp3`o&%1ge=$OvE%XVKM
z-pKkI3X^$D$zjappDuZIT;o#4zWqhd{Hv*a^Ea@EM{GNol3&sX3`FL$<J0@D{TlhW
z=<?9|B511krgkaWy_**C1b$*sHceCH5yxNKBm${J*s_k(@vn(4P_I-lOXg|67Uhx-
zeRB*jKammFV1fgOrRhqEI~GYjzpfqEsP1|0xi$leHW_(Fm@%fDYVX6YSHVdzMtXcK
zx8>l1r_uOs+nFEVD?FTUDtOAE`7l9wgDb}lKdR0S4b=h2$AwyND>#OKZ)&{cd((Dj
z+vNcoa$5~@%WbXtN^0N|Zk4tw>zO%R&qXJH7_B@yUV!Y_h>HV-!4;C$J-QgvXVJ|~
z(*Whxi>1PiZfC3lu@8nK_cNPuU+`-N;?^$SnL?+6r&W%g*_kgT_Tv+oV<CM5IVJaG
z(IufUjUkG_DV3MO7v3*8`Fi=#K*`M{tMo@+p|4IYxk;LKozi8Wv&<SOY!u3AoJqOb
ztC_^Y`c^0(E*sGlJyBesaqsi_eJ^Lrc1keNUrfCV@tl<-e1AV8(v#=6*O|p`yz;Jt
zX#WqrsK3Ru!t^M4rJoMn2*f27mB3{89e@AzMG)G9qR3pIZ_hs<T8+%G&?YjkcvT1A
zQ(3z73Qt$MR-NB0?<@X7k!tBf#^VHNnIL9&E-kX(FDXi0(J_cOi43;byipQX);TM=
z8|XY^i8>P3etw3y-)T`bg^p@Bdg`=wB)7#Qx3;2Sr%Nt04nqu%&f`TUit$?LnXo-<
ze3~`igA!*D*UwDSRL&j}I%ji&IoGLff;E6ThW30_<MlX`0h#3DR6yd$_g1G(c}XZM
zMdAgvfl<j&p#i02e{HgCz{?}iPv^SlSO+YMjFQgNX+9k3;`6zO0|fMB3#94Le*~fQ
zT1sxZlESPy9|4a><ykgq^VfwXG6e0-5Q_2{wKZ|~31WTFzrn4E(m`7MySfLqHl>yK
zR0=DuVC9=Qm&0D1KDMc=ar0i}>C6T1cSj!Dgieh-g3In@K*RcY*T<qEh85FqPLcT}
z4>FOR_MC_NeSzoCNJ@~}tCkzDXj^YqGKD{56=W3d?6R%wv)hvJq6YwjuBvCsBUrCM
zGJTgIy_tb3#S+Wh3KE`@<<F2BL?7eaL@lun7KG;?23je6D%Fl%K|gbSX)jbi)afe7
zUY>5H2^Xp5*ALnrDV8v2d!TrWlY&qu;n<07mr7wPZb7}ru+2;$--+(!uvLGU+Vf>8
z<%STFx1d<zIa?;Op$DyzXGiA+3E6mXxt(El7Cd*(DV^a`v;2+m`NW@nB9!T_XNNy|
zKm8~qDhB87>EMn8rb>n4x4YhvzVhUMefhMDFy{XEyWri#HH%9>sm~r{+DrZsI==sF
zLGWqj?x4fp@8$cyR~?@Id^!I2N9X>Z&D^KIKRWFHe6{~~cl_z!o$>v@zxMY5SQ<!=
z2JxW5&e9MiG~Nyx|19mmE)9wOSGp79K^Hmu|7AQoE`8LX$t%(hVrfbUn)2=?)zwSt
zvzIi7E@@eEv!BU|>B)y0l2wM1|A_v3?oxwmHrWHH{~^y{${MXgp^h~2c~;8*k!Mg{
zMRYoWW#*|8Bxx1Hf+#UTWNRf2X9a7JyK&;w3DalgdQj_@-k4wopSgv(Tke8yTBt<V
zjh?)=Ml&8yscrs#+XfP2dt*+kOi6)7ww2Sv-O{@0?zZ&V_nwD?xN;*1EG$#rW-L+!
zl;Sp+IyHAZ0B`@UGMqd$d^NE@Eb?c9d=Df=$@qdcGG8?|X%H<eI((~Am?<k%XzW=R
zJX!-M*jc@(UsX5+HM%QI3k|26UWL+1o$TO`%&ZL$wCw&M-ved_Gkz)Brq-*9EDGS&
z+M<)g7X^~_sn*H)XoCT6+oXWLV=Oy@k{t2}@AxX>-H0IIj{BsUxcTh`HEOBXlg%op
zJ~$PFg@~=-+ij&|ARG(8YEv+k^o|wCqtx5&><tL7KF()TIE3^vQ!V7O1&sw<#znvs
z?k_E15&)#_fip1yD0O)F1M=G4y_J;^D}ew_%cWZF(v}&9nXDd$tT?^5+e230WU>zc
zsrY9k(Eu`?lF8rB&N78D(<o~#`ICey$DlOp`)t|j%zS@;B$QN@Jk1A%mex@s{uKc^
z;x7ge5t^y}VDc2FJzL=OJj0tb-+^MorCBYhYMYCfIXv);zP@7UG&P6fvjKCKK(t!F
zAvZqS-??VS@o=&L1Po^|)k4S<edvhaH76rY`@;njl(9h+Yv1bH#c2Dn#JqNBusqdh
zjT<@C0Od?{CxD;fk!r6BC8px!JtYA5`vA*o8qpVQn8KiKr;V<U##tLFt@ST9IycIG
zNK%@NokqJ5A8jgF1C1kU-2lNt70PLaw9S5A(S-6xz+FB~Hdxc_oAt0y#NA%W%z<dY
z{zZNbHIT4oARv($@qKL0<rAh)s*|hM?6ON}QiYml{+Xb>uO;}BI!CP)dI7Jq$WDl^
zG;4Y39PK04=gXX5NVnxfpcu=Ekxpm0fB&dvaP#)WR@?=_d!qC|XLwmo<Y%34Q2SHl
ze&A!(v#&vB!%>v^z3h0@Ip-GmJgC{1d7R;Huh+D*B6N!!|LZZLQCcOMA%lW5p|6z0
zd>_8|aSn3O%)BHCZ8RjKOcd&_+cTxW%^QXWWkPKEBdwjkL5<KKQM&Ky+i>MypFFtY
zI?~_yDytYYvB{9aAI?Q?-Fi6_cWL^cFQ@o}Lc-$L>ZJ?OdJFCcev{V<_oF5JigHHA
zzX)QytiRpz(Ir|u`3}VgUZ(aDd~}&AN$Rw#HffXVs7|mHCkeLomdplI_LKy;_dijX
zaPj?{!Ye4>wW@_eg)2+GQ7P&x#{m9knA5?1;%@-QjK0eV{OWH>)ZhaM?ei|NhE+{)
z>s4u*-N2{AO3i8f{Ilb%)i(U|y341R&9!DUnF&G1;~Xji*$sOA*hvMzQGh!Ia_~SL
z(iF#DfE{+j0u=KdQ}DG*g6bXRfCWGt{k-?#)jU%*7)|QUCJgsQ&z$t3H4h$?N-kP?
zN~RKo7$Y#!DhePMj~0JZQajVT+9ti!n)imUn+;oHV!~A=2B>f&kiVsR{Bo9s?0W?6
znGM(8Rk)2p1gVKxc3Ac0oWcwlmQ)Wpey3*FXP=NV6awU7<%BwphzsTPn3;&1NY;!7
z<7#JZ_-ZD7eb1$c^B8BG2p5oib9RtC<tU*4Br+{KX+_`R+`jdOMiri3WvhEngcczO
zmL3a*>%^QLk9K2bYrZ}{ulUVjzl#Sw<$*hVH_zmX!MD=D$IH0A)!TTrni?<<c*bRx
zle95etS%fNedk9>38tV<;f4Isy}jOR-wVnP=?q0hC2Cb#tJV`p{_1B7=nSsMQq+!h
zRIh&lz6|2UR#6ls#T?U1V}Y_a6$MN*IgR31(b9McD1$nzdFZO4+1Z;K;LY*P2Ge}!
zu44O0`UCX<060W8%(n4iI`qg@AX8rj>_!!T{K56c@hVznC?HkvvpP%kGgL<g2<qoG
zZRJN6TN^LxR;&{N2l3NrPz#vfyiL^Ckw-{;VGgoSD+21R@~9ERy_g_bp*2}5x|id2
zcAFvmyV^Yx?C;IFjlanyyQw!UJ_oE%BG>r3`N%EPexN=P^*n(C<PjeRGvQ!s#>SLE
z`gj6~(1~d<`5cAvyV_n2ZYQbu^5uK{f#D(HiU^HiUh}kG<$K&i{=1Kj9euSLy64*T
z&xdtS$$J5MDzclT3w-?6rZT*liowa!`2(*4Sx*&x>9>-I`~srW-D;3kA6r{A#@(gA
z@0n?qZ<9N=*lFOM%vS@8z~j}%poAlD&Cd(Fm(nE{y^W<}tTLO1`Px<vPIidtdF&o9
z=S2-)yDIA2@R}ifBSjc)GW(m1Xw^cq$`JlW5uvOjB1G>w&B^zXpEiJo{<f-Cnt3)A
z*9{h@W_KHLLyXwR=*&RVRjJJ?m>ScVNoM8U7Je&w>8Q;r#F8dk7{#Bi0O#q!Jmi$A
zsn@^HtR-0n8#GDwAz;nxF79&LKkaC@EjTHf?ev7>p}oA__k6rVATJf9i02$5BQj@a
zS{~&5I9mGVbCwHcex><-H1edkH~in+lwM#UH+KT$9@h{6_}^`o|NR3Zz?eG<%^k%H
zQ2y8Q?Ls#V@PB=q|NTH6fF<x0fd9XxMAia=%(Ox=fL<Du^i2yshBEeliY&6QTH$hv
z%LvK=M;0EVrwK_1$cUWcB2el^GVrDfDlu|_03{iaw%CLzZyKIxycL0#1Edig%Z?N(
z)>=(s(8&vmy(}x<n|3hch)H(s1i@ZZN`NoV%1I2u?Vu<0TMHckx<zegYVuAIRJ|l6
zW!iWODuA>BSFwem?gNhImM)T2VN(j?;@+)F?^n_laiE3G^koaLv1^X?B(YxJ*Rq0!
zyZll5|9r?kn&`pI_msO*V^9n;?=%jED+?nAZgW3CkdcHUS_M!J_3*nbd6_AS9_m-r
zR~C9L=Apcm-R0b{A9NSA9Y4?smrWSau?}U3=t}Do<n@eunran~Ins?@UOQM9mEzRH
zW9jdsJ#k|e6-uu<7U1;z2F~1RtLiF0si|Hlk+E&g3>S$M@k9{cq`6)E<w`qdl_7&M
z4t$21B4k)#dS){vTA{O9c6c_9!sz#yjRpn{a0EO4PzlU~enm^chBX*Zz(}gb`<NI?
zP--An?ed!tF-RT-KvL8N<&}{-aAim9MN2U7KXPU%t55*LbEWZ_TugYrXoZi=xfzDD
zr@U!{n`LnDabvg9xfDB^_2OKXKFO=6>PHuAt-b<=_d6lNY6-f*Dhdxj4o9&#jZOD&
Sh9NKNz#Q3Ds!#~P@V@||Ys6Uq

literal 0
HcmV?d00001

diff --git a/media/logo.png b/media/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2155dd30fb8636c6c0c86549277e426aa48bdc9b
GIT binary patch
literal 52318
zcmY(rbyyW^_dh(FMi4fQNF!wcDk3EyEe%rAp@4L!go4tcpeP`XbV)Z#9)nUqX#u5M
zx_)bX-tQmpxvo>X_b@Z}y4U*DZMcS-!r3znXAlHAdq+`L3qf$;KXDKu0{GWo@9zij
zFJfoKdu|AVIYs}*hzhX1fnPl5E~oE)*U8G=%iQ$=;^pPV_t4SK&C=ZY0iTnrb@Hk>
z1A?$3cVusCd#5aqdp){4cu2V3TepynQR2<f(aq?4h4UbRmq;mxRVHP5Z5R_q#FLjU
z`HUw$4ChR@hUU=|qKnE>?^G}k$bUY?VdqGYUQkQ+3kaN@5VRq=<Ll(;c+hCdPjkn0
zmCD97)vwcyzES1)VEfYS++3Gy4+rKu7BAz>T;sK%hylsR19v~;toL73lO|$g{y@sA
zeBePFlsq6gj2Kx(8Jk7ry#D$p{=fhJ^Qt_fbyj5wQDVP%u^^?i)XA;K=TeW)b!7XT
zrA}2$Bv#!@fF8@l6de{ugtQJ8>bV^JeW-t#HkyN@J<A25qqkHLne)RepE+}8#A~Yc
zv3)VF+sg?`B*SsMUR6$W884k92oE8Mwq%#3d*tumUtz8OcXj+c8ylO~tyiyJJ?n_1
zv;6M`XLoP!FpspfJ2y+KBeHaspzUC$E0$$Ql+}8k4P(~d-(O5`*^BXJXbm<Xlnt9m
z;5TLd_D)r%$#;8ozftn^h>Al#O3K%_KAD}Py)cDvJ@|u}enIH{R!b`6A>ZjeL<Tc<
zXc&pry3E4D^5xBS!m|v5&hz^UvCJKpN*kX%d4ls2o~Q7wS=4c?+sR=5-CRdoCKXL_
z$31aT(fZptN-rnq<TeZubsVB^qFmB{i%eSr<_B^j+j>il>aJ~WZaU9)Q_y6ww=e17
z#1Tym_Vx9B`tadH;Jch0pYQC_vF9*(hBc0En$%smicbhT<ic)s(k~7bM{=nqO+6-L
zmNGG6?n#r3eJke0e&vel()!77_|?`IoXS&cYir+^;0N@<i!-WomCNZiqNAjIBIGcV
zZuK>3eRsF(<t07msa8yiunSI#TX7plwy;lBxs$ABitEAO1?u8pjCguhba;3^`4lb^
zGnt9ad|dCbWHH<QJS;l;c-RsjA78)DmDB3W>&K0a;%752jr?8s)?c7=Dbb|CZ`YBO
zMZ)M;n9<zYTC927vkbr8)%A`2U9yRIZgq=K3B1BC(;)=?6w_rmNTi(RqcwQ9b5*3W
z6}&+NXBqHx@-)l^gPtNM$I(h*gb#;HnBJ)-KU-g4XJ?_q!+0zW$wks$DYNV%o1LAl
z75NzG_qShR<0A=w?a@JjPT};?{+8mM{u3+C3m5PztiDQ*Ry(i}Nk8w+*UqP84m@(n
z&d#3t_>^SzY#g?W7@0n2i7O)`;~y<QvsU9YIduO+G#3YQ_3Bk)%oiLD)yO5P>8QLs
zo=00>Z?11`xy|oG_0tR5V6R=frX5q{ef#!p{rC5YKYmoI4(YsqEyKDuwfobj`qOwF
zt!n#wU*3w*X=-Yc-I}x)nt4iRBIWA({?l^`E!U`WH`>St^KY(O57ixxI5J`2trjye
zFw|4G+91EjeH^5XZaf^gpq;PP@oO$LBqUukOa4c#OP1B8g-|l4h(BMG6Kmh5r?cYW
z;hFWO-Z~@uyD=yT`SSW|R`<iiX?juuS$TPjm6588^73I8()5=8(lRnjaGm9PpRISJ
ztBeuM%6D(OyStnA?BCYclcUTef!nkht1bUlT4>rLA#t*28LDtLftrdc*gDlmzI-Ru
z=g+zJ_I943)U2bUqxFq0maKr|1GScFmzhqoSbFR<TPiKyFGYKMduuOajctk`h8wnc
zA)%q_52F0>T8}56g(OI|1RNVJ1|d@)2w7zB-@j1pIKEgtxIhq$VS!Z%4?S5SeiHQh
zHGPpu(@61}<#c<v&3Jv)XNTF}zkkI_o@fYMl-AZGkSc{;68GulC8s)<nP&ytbvjI#
zyt}z-DpFFdEXcEbA13MVQ!_KcF-&5w@}d=(eel*Ax5((-dR>!q(*j2Ff4M4jbaqZJ
z<fiF1j%NyVuJ?$oO+8m&=G7Eq67#(5T7$4L$6)BK%Jl;xV`5^ox1<X=5$GhnL{G|C
zf-HY`5p4(*8&n<WeSM_ozA{4N)VT2shhp5YBZ6jQ^D}?p&`J93U}~m&JUx9GGW}I{
z!<02tu=8GBF}#SSU`w+3L_f;H#B`izK&SEG46Bfkr$A6CMp(~31WUg8=~5}{HLW*z
z;(UB$DQ=9S?uyTMBCdHZ>+8%d9v>ZHX=$HbF|5w>j6OL&oY|jC(<{1VYHDgf(Ri<X
zhsdQus#CvI>E*?@s;a8DO5A56Vv+XF&Y0<xz!Le<kXmJDXXo%gX_42Qr=<SQ_sjGP
zJ%HzsKHOQ+c{plfVUhXy>C@F*=xy`@W<i+_usRITiz2G;geC90^t8lAN9#0ROnkwC
zJp1wE$Iq0l8XEg}tg84%J5>ZXg7js|k-S#nN|Eq4C>O%T!4dFS)K0jhr&cbsmIECC
zdPPpAA)}bbVhB_+Z?o=4GlACo*M9A}bU39Fxo{J(=38_`Jih5Pp>40IoR8NEv*Va4
zXpY7<7ONV~aN|ryMn*)<XZki7@>?OZv-gb}y)~Z;5t7meg|Y<bKd)vq7i9QA-v;l6
z=3%MBXtnq0@vgZ*UIj0DS^aX0rxzWlrq!a#hu}IH`T6+~)MvHszn0+QvJ$mad0Vb3
zJyxV!Y!DU`qg(7B{2}O0JXZ!Z8BWJS-|fZu@rD{4O_5ynG>M3!SVcv})(~PU?WH3O
ztEgy_Ee_V{+66AIKesp;E^g%V!Ghuh)li2$O<+GcIq{y)2<<DkRB)f~!$1w8eHUio
z4axo$$<zJV&wi&&4+QA@N{q#pM{CG$I*vK#pY5dQQcqphekq*;yZAfwGugqN>FMe9
zpVnz?tgKQWx+DG&-@uR(;3nO4ipkEt;J*BW!o|gf=**dqP;6%9dG+JT-f7h|mvkHb
zxBh&kJl06G`FKTC^nj-G$MTEH+e&G<slI1$3CU!io}oF}{sCVSaQmb3RoC%6DM8V_
z3i;<Nfibmib7atoL)_+iM2<&Fj2kSVwOo|_T^mltZLz&LsMb;fuj{p#SIOwmmF%3H
z4CO?=B#+AQ@Njxjcbn&-cgE{INK7AX;J@NGExCPPwoA6hr}SH{`stJ{F5kbh+(86b
zn4Pl)`U!7i1$_V7H117D5|NT#-V~9~qF5QNQGi7+^I9``{ne_b^GCgh9a?CP4XG_H
zk|Wg)k+4;#dftkWweSfG(?k0xH(X6!%efs)pkHBi*4538DM0n*MI8aZon>|^sVY1I
zg6Y}+;%nU(UW}Fy>j$QGMV}AF;1aaj2-2Q6TpB8-U}lb)3^-KXq7cYDA9Z!87^<eh
zX`*pq;Q3oVPNclNd|P<VPAbPgoXW)e7k=nmq1|A?Q!*yeDfF@d$Mv6{(=dp8ms!Ay
z>bz4qSNZT8fnl}%ZBNf?nNlAZ9TY4qrLOmP>9E+KsVTGNALVTsb9x2Z#BP7S-2VOP
zrB2N9<d`uPtAqseb?YAYy)|A@Q3l#bxj_Sp_N6_6&ibd%p7Fu9ZdzH6eB12j)R%r+
zBOu^JqNi?iTRwdF3<*iw=I_tHmX?;jFI}c3X+AlyLkCs?`6Mg=v)yoshp2o`iew;j
zFu_@AH8nDJc6KZU#pALv0X#xN4tRyXKPM{eZ~oqx3MS74fRNO#pRzUAJG0huD(~wn
zI`HkA%i)g0ShN3mu6Sa-5~B}LHCTH3usXLnTUx(>00~jA)u_LJ-E~SW1?bmd6i;=~
znY#PBSi*0m`Y!T9XLy;(VX_#To}Mm5NXFRh^+!&P?vqgR*9wfroO;SYjxt@Ms4nb0
zSe5j96;|{&9T}nQ-buUbGKsqP6>Sj)CEc)_PBaa8{K3q5^e09s|6awPTVkF)BA00+
z-&O7V14zt}Aw1ffi7hbZ5Eo~JTW|iHb-lT{84%aMH}aH&!=%K=%IXguqBi);#rC|J
zyZhfr<YeZH9T6r7Fjd0*_QuA>-fF{I-0QrFhXcm-?wZ983j2F|^Ceqec$Qx{$o^<<
ztqEVfN-^obYaE_yrF3wQEr-g|{yvP-o7N^X&Nx^)I=#fJLf`hwh{}5w5)=Au+OzM(
z3wSR7u%M%;FMwUcS&*epQZtr&A#ey#M#RzO5fW0;_8;YzS04^!ThJYd$SmwB=6|5K
z+*<mczm=ZF?<|Nh1F#@eWKBagodD${r}xNfVE~_mj!zc$8I4^9Y*S9(rkfL0eg!X1
z?j`<R8!>_3D0luPEvG<xQ9Dm+jt;B$^vsj>{48}(9!ywx_&$G7HD9Q#(v2IsgL=gV
zG^YOBGz6sd8q*hDVIITo(&o7~O~!c+fBt*^-SAuvddvBr72M5x(<It3G-MrUa^#~K
zB5Lj^MO#}~TC#Y}hVQB(i^HX+m{tW&vhV~0TmLubND2O~O|o3K`ohyMvJHbv7G@+(
zR8(H^g)9V+Jm<wWMwn=@+U9%fzY4A}c<kzGPa6x*r48n3&NRzOuO=hZ)YK|CQwKGd
zc(=cwTvLYLn<*FBS6yrutZm%jsUyrjy-@GrW?P(~3MjAKrl0-7g$q24{o_0sR!-{Q
zYip-}j#J%x%fHRf&*LF(w+BxYi2<h)l1t35*Hb3~dYUTlVwQpXasd)@$gFc78bKGc
zA1Qy!(KUk_M^(4I92Mwynl+Bb=!b`j4N-JAw*?b!z4N@2*^e@F$Nc8k@$tc?0sC^>
zOW3szdb@k&79AZh$}U$+_1$XOwy?0MM!aP=x)t-^!#JTl+b?#BlM~;vE2iUTg|$P=
z+|p9yv$N+jAAEjgGgv?~ZvMO>Ma+w=!E3EE^_Cw{gy#*E-6K_YmLEfi9gp8!eWN0H
zO)g=59O%XY?XFolu@uyCR#ds^V0d@}Ews;;lf@Gjj*6dAaQPWnKkwP+3IIk3Ylc#}
z4_-ch{uo-_S+qSti(CiH(c0U4tkXMM;}rYli%N}YqBjkNR2x7lrb~+-EU1ED+`moP
z8Y*}yr}Px=-~8lg-yrmM*lOe70p-1|Udbx5;CV*N<xs%(J3Nc!>~xsU_V&umo;02h
z-)x7dGU@*QWK)_-kz}Hyqtp3r*|CB{pJ5@MO`UQ4C8YM5gqSQFL1f3KfhPIUrGGG(
zEWKfo?YY)t+EI#WhJ$4+ep6qWd0XJi#LKpL>5{7zx8kr0{fYE!B^kYBni?7=CMIiv
zCx0ZVkYJvOQ;)k+?Vs`S@X}p>e?sq)Pp8D_=an0TiVLkGf%|DKUV1nhxoU68qOSfX
zF^t#Bhcd?E<*KD{g(%|PPWM1$@0^8c%P?}<X*}8Ugq6BZCkU(8hvj19lu2XDyZ|?v
za(p@((;g8SxmBTmxrC;hi}{0%V5a}!j?MQx3V_+qp%?(6933o`Dype@`icMjEvNXO
z&Gxy7hzJyIQP9vlZEcmxe)nz~7G-aH*fd}GdGj_Rz<>}gpTTsrw_m{MmuhNchtzwm
z#jwddOSk{|UQQxled_jQgGwSO3%-8Mf}Ypc9z=X5{EL+if@x_9MdDaTYe|YCy2)n$
z{#utA_Oy6dYIJwOfN=~D=ZSS=4g_wO6*NwSSQf=Mh!SKLp_d0zy8B3NrZXD8WeMcS
zY-74Zza`+-7psZ_mwqCIjdLcZH!dxWMbvXSY@*3;a@QA1wL@&JG5DfRf!R>ey@D?J
z1a2Z}1w`R-g94(42^+e|Go1wE(F{sft%dK#4H^Il9WbJF&JApBZM9W9jG77b#b`+z
zJt)^l@sG|6kF5SM6q(%e{VQc-llQHZ1<<&V<5-@zk*tTI+FQ{<<~Yiryu7@N5)u-D
z56@G%yo!w_*Dcc5%#7c0b#*PX9lZDmP+zU*N|HsnoSfXRhPCFqMYp7t3MKpxc<P^V
z!%zU?|B*^v{4u=$#8KEt-kbk%ulfBI+7SNp<;$0;&x!nVdq_}e>6(n-QK_VAve1={
zs|}AIKSrBhs{hVCfZFGPdwvAoro?Cn@Je}%Kr^+&;sc;M^J{NdBiMnMgc34)Bl20A
zOMQx0lY|@!6w!)f`nxhp2lyx=>dVuoPct5Vd-nsVdH5*1<8PR!b$E!FKN93Np)?Z|
zMgj#$ZTHzsfR&e*_|Ba>KUxAMX|EWBOa`8gFW?6c7U;Ao^EZV6_Uo|V;N*y42dEwa
z?FXNboLSb>bEhTsZiA;orPCxc^l@2P*$@KF7t@V9BX)Vl4MKl<(_&jrPe${HuXUoB
z9lb4LV&aG{S~@xf;vll{%suQZ9wK%9N-$dquW57R#TBj#7g*WYFu;4!(OCBI8y6@?
zlUp|^C@8!aauU~J<bG>xA^chGa2|MRDBy<4Eg#^)Xm{Hf)HD4B(6s~ZSbI5!a@r*7
zs{88LIe07-slnZl$N%TvJG^&rFpYNNGzot!jn3?C=Ln4@v9P>Iw+Y6w5)2kv=m4gV
zKE0=Lqw~D?YTexGX*;EovNDQ#%J2V2dH??Xv2A@tMIxACL4X@R4iD>X>xWr_0<!)q
zl*Iz3Azzck<;$d~`UAB1ben#TF{+&1L~iVZy^tkrkk^ud5{|HQhAkg_O1NF)INk?%
zpHiJ%)M8;E=e3YS(&8}NCyS`JVm_PqsUzX9_xhKutH{EHdjT&iefsq2V+75mGWP|o
zF+jez{C3(&_#1<Opx1Ort@7WzNe4nx>tkF(rSEEHW~>tXvs60IV($F+;Qsxo!qVoC
z>XOGHadB9nWw`1R``Lz)u`t}TSAq^MFpxgmybNN}c}x43L;cvfZJ4OI1f<S~9#?2d
z;PEs7ZPu73kDZ@mbZR*kf{pb~(GT68Pw+`Ja+GM~MmRow{_;iE%q*Sjt`k%VXY;}0
zC1~;qjB}0oNKir5ytau+D%bE0deYtHqlXINo+xJ5pCi{_y9OW}Ke8iJKe^p!_dw-b
zwEWkhahq)>S!xPifzARuCVZFZ+<-ls0R8jl&YgRG%ddKRg^Qcp@@vwKh#F<ax%@O<
z^<y%2vV1lq@0|yA`;EW9ICgYPjPgfrUqJy!G)`P##v1FfMU)Pm@Z2Il4QD|*IZJts
z&z9BTh|n7qVc)-bwkuTrng9C?CEji4W+K52qPn^|gHS2)kpJ#~T=<r&)6@x1{?7JL
zHgH}{u|;?;181)B$<Sl$aGrk>OMfgVf`!d{o4t~!+ExCUl7cwtrYT!k46^cjfcH~#
z`0~N_Qh}+=e{GpzUg>yJE%cU;aS+L3To^CpEYIs^tRDwVbW8U4hLr4+AbA0WYW<<H
z-ABjAIxX^dVq!Qa!kdHLznUUa+%@ym{(E6xn7H@)c^}WF!MzNVJ{h9G4x?WHXjJNZ
zqZTBzf)R;+mIJbZn@Wg#l*A)hS`Y_ds^<Gf12)Y6|NmyYiI&z2TL-;D-Lq%U3uzbo
zXOdObJR9(eYu3a`xAgJxabG7ZUl=M*w$0r+%Pda+M9P%TH|x(iQ1syHF%tcv@+?vo
zy~D$FGNEKTjpLos=d%Dd!Q%Xlc9i-XONqSAvJGlCY4BX>D>aqu7%2o<5`ge*d2T<&
zN}pHk3H%&4?Xz)5-=;nU_XFSnF@u320{#Plmh9uau$qiD=Ho0psW~1J?$ZlII1~Q6
z<CI@VyFg({c51#2Ta6|r#+&3|wO<mwqah>?m0TuIPv}T!FH1>FKWQs1)X2b*kD`AJ
zkc-mX++9nUm)U=JJ}q_#gB^xe`3oe?K2g%?5Kvq9_G;HG=|EM6#bi{7Vf+BFsVwj`
z;0T5&R<3`C5oXBVo_D3gC~fSm9r{lR{eK>njg1)rbhB}Fm~I3yTDwS}0-)J<QR-=S
zS}H1;&%$p3V}^h<#1JcSz+*dDfG;U236%C104HJBSt2qPi6}re1xakc&*|g2R5SPQ
zk#~x8Jtd)ApGymzp6|~R_FSefF>Q%~T}%xGBB|qnQ1bIvuK?BHzzso*vZEz2J9bNw
z@D~j@Sl|XyPqMu<tN=}kf{re9aj@{)jtsfyOy}7s=35N#Seh#gpdElBDA)GvEHKAd
z5XC}5LRvvX9IJEt@%{k`s7cR?iY^aYtZQ*8At~Rp?@+0v2yZkqmHxEv{4bu{<?p;E
zqr@Y6RH+7am^wTI#0&53K|LM*W2KZfkuJ0~cd-Oc0Rn-$*MA;32e>gU@I(YUtzg&y
zARAhhRPl2lk-I&QJs&Oqy-<%_HA(Qcv@}j;R@TDYL>tV2nQ!Wn9q`cEihj^RWq?}(
zP?Hg~=|c(g`c}hkM%BZI59zO4k&-bArz?`?;Bg{7sD1(veC@DJpIVdp`HL4%I22;0
zx}S3hyU)jcv#vcnJhU9Ebx~ANaX&baWr7R9e34u~Tx+phn`ly0R(6~B0A1?!b!#%)
zp`v`(kkrETbObhe7l_1+0nz<7m7KURx#jNP&yJv=v@SBNA!7;H%lO8T29mdYmV7i8
z-Y8TFD5Uj*i<UykS0C*;FHg2iE)2iYN<f4^*$ARNpXlsaog&rv|3YBv{Cx2QooY93
z+VO*?oc3sw7#-0K5-w`;@&qL&O%auqf^Y>E7_4G1;^U3^o>9Us0dkxP^>jvIasP|e
zb@^E4Xqd+dd2jprG%9WSaU4b}Zv&RFIs3R1t+D4E3hcLTHFbC4-<E;~>hRVdZk5{D
zJ}D_Fg87y&>-Fn*%Y~ZgIguFXB`nWK&t)#&xOV-zgB?)}^DSFL1&u8Evnpv4Z)uMn
zPN7xO>@QYr|5Gcor&$=DyAzmmIAD`YBPHCQKYwn6%^BY0w|jA<1OydIO3J=!2g6EG
z{6IF+uJoUN4R8%5Wwnp?-#eU`Fb~AW#)kIWXm1~Yp#BlWbDgGViRpN)n&>XJw=Xg*
zeJGUdvM|7@U8wst=ON*=c#nu$s(5&@VT}b4GgNq494^wzIRgM8cYgjwE;=y7C^($=
z*3ETFIf!t8L^_C_=kf6@1vkN{-klf#mDi!yFx2wK(N=H6c9N(ZaZr}$>e!vPWprYG
zJC}z_j3a?l3O5PK5Z|yHYEKby!!j~1@7OgcgJNOgw{jyz+-IP8_(4<#$U=%rN+|Yj
zI_Q0^@02o9`7q0a-dBn^hy#SQfWwuWBQdiNwC>(5H*X_20u>j4`;aK3tb&5&&hpO!
z^5?d{;Ku2N>|g&0>;d>`GtnsW;>8OTxb7Vu+A)x8rt(C9SbYPuh@lK`Q6+@2%6Hqg
zAnFf3Xi??<hn{E^f(f!+%O4K9nptPmIS{*`33Y%n(s-~~==es>MIMj=v+q1xrS0Gu
zc(Uvy29uBAD1drn5Sl^ARe(324!i=|=rYJ9`pu6-0C@*TMUfV_@ecK8DQx^ncCvsc
zGjZ|q-QRpbdhQyYUa85TXhI+$w-0dt<uF%4Q$&}!_tq|BlHfz>T$aVxLs=@m7EtX>
zr5;#cR271KWXnY0@&sV*&dTUj5ON>w{IrHP@tTiJpw9L8nVuApU<DR`?O{15EiJ9}
z#llkC_wPR5OK}5LmZIfolO*7HTTh@9d+r=D$kW9#9BKwlzEuS;iJKH@RWZVOpa7%N
z;gC6&5E`vHuy52#QsIgp`c+#5MC!GG`4hhQAW*_keqHOa^lB)h_6v|K&^f&Sys_3O
zHn>sT#zyA5|2t7<^1(Ex&Do%TuEbJl%YYg}?)m!@&1K_y>Pxys>q+sSL_u^0mtw&d
zvk3C#`iNaAukL|?UDQ?33a0+!PLqZ4=l&+{C9PG(IY8(pTl;$FiZRX!Mx&;mWsH>0
z_teR_m2<15v_jpNgSKpOiFa`jCOHbd8n=fG>t82M07Rd7w51A$lnqmah49>u8YdQb
zd7<6iijAO$K{v~mZN<&^CrYl#xPhqUnKX%VB987YWNW*Vfn9_wkAg(p{;+a#%57Zq
zPnAB=vKuOTGn6s*4X~_$?RTEpKYwhQB5VPmMx$E_P^<t$bl$y+cO~-HjpMLj)TIIo
z9q)NC&QE}+L1|W!Wqk)i&jRz<_|f4?4Rc++(OH-V_?D#6=Wh;)Ca^pFe2<@{5IfYt
zuFRR8n`;TX170>R4lb@{q3#tWJn`1klU>Q!QOCs(HWcaCQC<TWq>s=T+BM?`I@3p*
z1?q<k*X|Pme#-Tr_xcH6p72|{6<e4;rG|D|fbxA!eqN<Nn)4MhdDwY*|FauPt$iFW
zkEFyUCWgY>x%&ZoQw&Bdm&)rPpRGT?;Aa?wX5~W#uwA&&zA~ppZT<88gFVnB8y#1k
zR=j`zzRbFpxyZPI7K6c{WM-VF_UHcAT)Fp#MR8jnRT7S~uC{hU*Q0&khDbVoi-GJr
zuW#7t=CAFoto*D1(Pxj<cDSVYAtQk6c9{5!Rd)PF&tJZL3Yf?o$Q%(lxdMniRb=_!
ze*l^BTp7uMF7ZN+w;(>RHRND*tS%VnbcWMpGp7Xq#QE^dFk&h$Gx%asM;T~sUy^P_
zik@1a-OH(Io0fo_ISNYHhDj}7YVvDO7A*T2a`G-v^ef5QF1`6`b+q0_z6YB&?#-Kg
z4`F5$rpXGrJN#c3;O;w>+l9KtW1gx#B33;q;cLx@Jr2X)#cpH!KrL;AHkC8oZC#A&
z;wa}GGM^`=!EwcBBF%1uA~lB=vj;=7icC%q2kaP!5kbL+1G3w8aM!$d-<iRtD=__h
z9v_r(up-Do7my*rr;#T_>e^-RB7EpD9%A#3zNA-T)*ePdf5VpA<AksK>(`F+PK}R2
zy2|%uitKm-#hWI2O4$t!rqO4sFH3<usZf{RpS$51B|_I{boamCfD%w3SZdNV|G6v#
zc=|f%B89rAV?eur?&#MzzP-4TC<L9V1Lna$GY(LyLFf$4yx7kh2}o^Fzz?NAK%M4C
zYxw{4yj>d9nHl4~ex2$cqKyZZfSR$ufD3FI+6~0>p~m+B*(e_ieR`3(c7M2!0ih#$
z5(K524nDX+Xyzr9st7qSfRv|D*roH4UItj-#(*+En}9%>tiuY7am&uA{_XGpUsUyL
z-0BendogAxV_wb5ii_EA`KnT8io(+%qYokqFrnweG`Np;MxDHmw}*M}dIiIlvVido
z+mnwb8}>A*#KAlV*xOx&WZN6}0YbI{c8y9&VQlZ}YU>K^dFb}N+5fOC;Mf-`nByYe
zY{B}vv!KI>_L6|O3H(4XgQB45*u=yPmz<TNmzV9A$Lgq{J^Y^pUshITL9So_X#bj!
z(?k@1^BxWqT|1!DvGW3$IYtx#!lP20Kd&qn%~)ymm7%`e`RrT#sRF>x788v=2BE+D
zJ=Z3p$t91lT=937G>D1}3EJA)P)h`$D+j!4uhp@~z_kFgR*}X2xJplot_1-Zqhc0j
z_n+rkjSPL(WJ2`z_xI6#RGC(Ta<tc?9v1^n_N|L$*kp%cz;B!!u6=X2yb555l8Wki
zVq&fbkFTr;Vgzv61twN;+q&>v&)c?0{$|Cul5A&$eKs#Za|z8+PK4&CQ189L?s38i
zLp##;d){N%N48AQx~5Vr0jznS?9aKZj)}ljXt#rAiOxZK5!VaQFpFVp<rq}i3W{ps
zKsm7jfCD2cG%YO+CUpn^w<!9nIM7gof7-*ymu?(@#?)WqWSX>AJp<_lpgNh4_BWw$
zlq*SE?*J};ebtfxU|o&}53~8{$uSsSJa4__!_MEgwzdRF4<P{*2}g_%Y9^t16L@PV
zGBqpLuOw4Yw>h7Fo!-)Wt!Wn(Uy5b=8Rr;LK?xkixR)<;JcL6M7*gDp#~bKCK#}|W
z>dM0llw~W9psgfB1rh^(o(J^jyR)3{L7(&)wjGFEk??}F<Rqm9T{ouX?0=MDAf=L?
zgh8O!MS~{;2@mNdjlWMQ5e0}8;DOHPR$q`*QwOgTP~?+fLULQCGi*5~y1KMOrKYi9
zAZwm8M*u;0fSa0M^3?LLF;RC{7a>%&jFAx|D4ga%Z=iz%u^J5oH4i!{J|Ow$&oS`N
zH*bicFF=_BKj7fz?%Em23;_~1>eM2qs2G+!nPL4CkSRJS7&f`vaknAVBlC<DOr1Va
zYSr;t7u?h1wLljrB6gPD-CbBF7MMt2Y(-vs@TnC%V;ezfEMCGDL)s^-tUNqKVDAtS
z5e2ohw5+rQ1OzCms&;J5bd`f~2&}GlpXs7}%hMoH_xYd<nb3<8e>u6&iin6*pX%mo
z;lm7xFi}t!p3^Tg!vH)|kU0tQE(2y|0m%c{zj6{iBK$NYgl^EYpwEqp`s}wT1;!?;
zaD7P;p*nxlQM=OkX1_I#!2NFQ-=$&oB>|<UM@Nqyt$!fg`<-Z7N%j;w9R%cVCSF}4
z<9Nfd@_!>jc}XB8r{x=x<~>ae7)=)a8mtmpg<@W-012hTg28VqhmL@fE)dxaLhoLL
zZUGB-UfBPjawtQXLs{?A2*i&B?0*OpxAD;MnKnm(xP<D-2BFeKE?PiKV0+7V&DQsW
zbdIH_&i0^J>xYoh>(~0rW3-w*zuH1KrX%?Wo|lEp>w`(x8OsujzIlUCt&8;0@?dDg
z=DO?t5)rihuDFD4oPan5`qKa@*g>^qhX~K@0WQA^YFNRGIRf9MEcmQ;f%YBv><D-j
z8_*KJEf|D&zX3)ub$YUPI$uQga-leO0B+*#+hPwQlO>o=T~PP)e2=mGRSu&<sI~_a
zW>A#6G^a*FNsky!%fJxIfo3)hR5RxmEKnV=mg$#zCK<dEFX#VVuFPXew^(NVVkQro
zEb<*|Q6h5b2cRe5y*_1e={Lpj|9-0TpD*VMZkJ+vL{RnZvSGCfv^qA&S1Bn`dL};j
z(3znEOI<)^A7_dzDa1n%&|I@Ui0Zi`*d>nEWfqT!c{}(_8pEKH1{8y&|NgkSz=!$K
z<aZM=a3z^c&8*m|PND8YcssI|yu7@El<7eU3DnCIO@^@I?;7xe++rZLX2<l54@NLx
zk)YKhVm2W`N)1=QDnq~7ZO1tg1RVt648Y4Taqigw>2ex0h9R^lLP0Y909ql+HKA|3
z{r+8h{FTwr0~|A<<Z{p*VSKy<E}kG7D6LpNdjWOF(P;-nZqVT|r!f~?+y3XZ`wt#G
zggf|>Cds1w>T<s*DO^}A@I-vVd**Bb!D2dW+{>oTMoR)l??&-hFI^%j)GHklC5^3t
z?>^e-paV;Vs6QNr-1J+oiHw4DGW{xB8la(7WNi=XRT0E)-{64l$^;bOIv{HsCIU8D
zYrs)Y0VvJ8nkP4at}q^3v?z)J$ie^vtH^_%83JC$XkLRYB6BDMEA0+M$^+<q%#gWv
z5wxLSP)-J+n(XyzaCs)bPg-l9kR?2tJUwQC^dP#;GA+T-y3%}l;s+x{aiWaLc$c^p
z6b|t8Fz_q%U`uuZxR`I}mkwix#M*6+;?pvxNeMKp0^3hzml#R!rHrx#YY!!*dGa`H
zvR9#;j`lV{dvAd`LF%;N*2s?8JKml2@FL9`0FNE`yz$~GBN5xD&%M1}(BGn4P7aip
zGz1f&q9jlDWR?V|f6)*lbBy2>za28Sv4xogntv?N9_dDH*rDh<H+J&7`w=Y7Myv5R
zdKX}gTxR5f62fA(LyT`7s{SFo!}ia{z^p*y;IC?k1fHZ<9J-!_mkzpz<k5QYka_L+
zhhW01mYqNaSwj*ip^sdy>gWjA`$Y&{7%I-9kqd(a!A?vl*ldOL3q4pXG&1ZVwS%A%
zqk?{Mn{y%PNk#hQ(s0|qb%>>`tlkYD<I{8jOapJJaykt=?U~{RA`=A+CfK4i_nIHo
z4HpNl7vLdfsb91i&P=Ji6{Ugn<uDYLBJa!O<j9%{UlKG@CrUkd?=mfF%>$7YE>%V#
z<oSD>``$4yZ8R8!z7eH5sI=*(-HELvosABZv3^aySw$w}Vv>lUvN+`I;LAxUC)}L<
z4=qDBBxt<B%TLujWg0q``0?Lw|E{itNJ~qj5d<5iXSRSh!Fty(W%<P#GXEJQ0yJ=0
z+@>)IIRj7&p!y;<3-HndPfwuXqt}OhiO}&Gf#4`jR2K;h7<_q`xgMrs8BJB-B2B9V
z-|Q%ZKu2_68d6;n(5?X2$$qR>b4h@REn5*SwDxeSCf{4F(DcJ0UI9NVYWM;Iu#6pI
ztnfTE@Mx%=fIf5gEr-cwCUl32k`989;5Wz<1VsQ{L=JEe`e8s(sC>q>rcBiT6e^kn
z7$W@CZ&h}BVC=vXvO`tQPqs*s60{k&%w1{I03@@uNKVDp-T<*Va}d%@?#BL3^A9gA
z<u`e>As3yg`HD?Y(7kc!cI`(P>M&kVX#|pat@I5`8-XV+%qu_2ap5(8M_+-<Cs+kG
zA{@{PGCg=Wb+t{kz{-M54qTj#gF~kD_m2vF6_qH3$%};Gxq_J*78QkN`%r|21~x#v
z-5WM;xmoA2MC-e|8vU<%v4voBAsp}s=zCaX<Tp`j9Vib#=lFBIX{fFm2cjUfPNQ1q
z58rYfRhi=vSYX3BlO|t}??v~hZrFa80#{3K?5o()*PD~=(CNT}#!4IMf&_+=T|flT
z%WGy*W?=l*I{(5!L$c6hM_%BOi`;EJCYEw`E?ZHPxOQz|=$GHOp@<g-pr)We9o;{1
zluO|DJtJo+f!@?{|JqMV9G^;{<{jg67xU5(Kr?9C31m!Erqj%j#=pUz>lb*uO?R-f
zva}$h5Q3e?LZ%5aRiH0`8qn1M&yL=~@!>9NjR?F^u{BX^!jr<{iJu;Aq0sf$+FEHR
zXJZUc1iiSo0Qjca9y}q~%-2AOXJAV1F1i^cyaL39PeN<<;R!xgPBU8hwf0Z^R{AzT
zqkRotPJ4TMJmZbS=yL#qdFMe7U(bUb4Oke>6~H7o54sh4)85{-21_5_Yv<#l?A(1}
zKrZ@S(<^}YFlgY3;d>Ej0SCn3kq?NHjsvzP0UNqRX%s?!0DkF(ozn-t`Zj@9PIT|y
zy?^_#piKYrYjL0VCc9tkY#~NbpptVb6%llrV1$r|(#@qoaB;)XbQQWuWOcaJQ`>=9
zKzVz?PVH;-aqAe>5l5YWo%%bauToQEz|^sWt`}0<0Yc{Uq@)55`uZ&S$pUX24an5y
zB>%Mqe3)e$7!s!i^d#QV*C_qp?@s-ZCa6aTI>-;8V8I0jp*He|!sEZs8`7vFCr4ZA
z@NEN#Hss)6g>UD=Lgu^|cfOO?Uvn`PK|^@3h4t$1m2QEQG!34|zXx>WB*O9iJD&l!
z;d*@F0UuM}@PzBZ6j-tLY6UGM!-EKx-4k`+{|N{(dJ>?V>&Qpy@Zwd1rf5G>c?VuI
z0gV!SNP;}L&;z1)#y=|`QVH4rNLLyyfX*)fP|B#uSEu-oN2%A^1Vj;G?!pdChVl0;
zLrM+GrXZEH&;SSIf^e@%|3un4nl>{5G)v~Li^G=v9gQgtvCTh&rUgY2_xyRr$PH~}
z1VOcRRA%_z7*aA=Vx0V}jfgEr8obhx8mCftqzy1nX5cdgCNhJ7dccxZFC1UXfS#DA
zl@o#Xsjvdn`xa%GxV>8Mqk9X3m7@SLf)DhNteqTpURG8Fh%i)(G?AvNloWynzF>gi
zd#R-rrXtADQ&Loa7vsxOMkxdYP5)i<A}Y&GO_{+bpF%ZtJCMwezd(>yDBm(*sb0ov
zUM7LZ9(efp=mZSmiMT5NG?1|pWL4<5{SL!!hH&}<mEunhmiWC)v~EHcAp}71zlG;1
zfTD+11Whb<ci1%0eDQm}W79iBsvuzAQRi=xL419+vB**UaJfSJd=Pe8$7X5rn1-6#
z3_2#L87@m6<4JHcD2#NP5ce|Gr30ZD+8h3D=R;ExxE(bAsJ+*P0ZFn0J~b9#tm>Nt
zkx`Tq8W@etbaZrNKz9FM{csL})i2NqvQHM1xHlGsd$S`+7m!RIbl}Or`2*U-U2h<b
zPx@{C*LLs0^88cr+Ol#0aT{FKt0=buF9Nttuv>`^5p$vR(=({~Uiq)_?fm_we)m_}
z;cLN%lmHK`hKJqX`|Pfcqrul#Y~DrIY5uej8~FCGpproGr#Y#Mg*RjlqF+*H`o3)i
zYF)u(0x`e^=F|pgr2pQ!@D+$4z%GVgFGr<baPk2@?hvCV4}gxK6tGxkLl`tkd0?^V
z&A5_((I=3uV-*PgW17qS`06u=FrhsCTJl#Eb%0}CNruntLc0R)2>NR4XRdsNy%qx*
zjlS|vA>Kr^l%$i~lx!Ei6BaUK_V#h3f@$<yPn(}Td3&g_-X^-vxY9CJ)mL=yI@oBy
zrNoDpe^$8cEZ-|`L#Eh>5i=%Awo}@3=fWYjPVjHEQcElG2P17V#On)xiLfk|O{3PN
zadcPR2v%osb+gVqDwHHjD~bJh^h;cyjB!}d{z@Ok-0q({cPC)(crS|dgI<J!RaAQo
z3PMo-5dLx;A025441@z6snx2K(^f^cc%<X;tm0#gMJW_hj5}$Mdg$rr5ZqP_*%DUx
zk||jLl|rldL!rwpOnp4QyOB{**$+P-dM}rEp+NM1_YS!ee%S0FrV1tU8Gl4|A~1}m
zraK}}eH&ps+Kg6Tfjt`wT(!`o4o;A`LN{hbqxw3fGDH~tAjyy}=4XAs%*zZ0i{Cb`
z+$QJ|dEMyuh9(|Q3faOO$&*Q~{v??icCy_x87l_G&9O;D2}lJL)dmn;VC#gC{eyfo
z=v`#fGc&(tW+;rujNz6-K{51}z4HhR)2w~@BakyJz<V$VeGDW7g2A}SLJm)OBFLJ!
zxVQ*PTTVnF`=4!VPaBC3Qf>zbv^q^>Y&kTMg}52YghXG@KPKD@zN*M1Nf=sbk#y&@
zn*&pQN=RRO<93h@6Mh^s&kqme&&G8@AN5sj7_UV}b(Fx>3rx5rC0W3by#DI)y(h4;
zG>45aMo>R{{#!12fnI5etxAvY@0WVcz~PG91kQm{(PhWfalKa@wibg8LmOn5t^!$S
zlnfZlpOyt2j7Cs4LBNQMOE=iLM1=DsIJo@5XIh;R?riOgrew=+_^>ADkze_IW`itv
zkNnxZj?JXZ^~jvNvoI?4-$GY>7;)%@>8Y}15yTq%u}x$Bvo7m!10DX(>bT+duTxa2
z2NMm>ZOr)R%5K4NA0RG(v2j39yA3T<+)5Tr6#i)NDjhPv@6+D=5}L|G-(xU;%uw^q
z|FHVA0}5yW14b1TZbQaZ$1XWetIZ6t8zQp*OGHFs^?2Kt;WE3?V*8t_TtY;^`JrN(
zo7MTVSO;Dtm`G}tbc!^}B@A1%g!B6xhM;wrP{JXp{@9^D9)uP2NXOs^og4+|VgCrs
z(r~HRHs}gCm+!sDgM@fHSOwY<eIjr_-$n5dW(`7CadD$>6`ABL5=B2KI+AZXbpocQ
z4lA%h%}huWYTKn@OKB;{hE65TNF)e5V{i;EAOS<!2CJ37#r#HVCFq5%r&N@1iduqf
znucql&xRTKrnoqZxM0l<saU^94oovOsKNmkjdBY)osmB&mVou)c+H*g5fT3bK@;Bv
zP9Vn@soyMt0QdACyzZ00^j)L+)YH=mNd0+QTB&|As;7Z(LT%TZ%1Wed7L2vt+kbp(
zg!Z){?W0w}b;nrT4<E`(rm0%xmKtwq)MoXLEGSo;Y+?~SJ4!_A1V6N@BC$ojE&&f2
zdXBf`mcw;P&-3%>U__GPDJ{QA6u@)dfgzCfP>rL_Ug*+5Y9YNPbGf1P7G65=)g<FX
zXlS}etg!t+x6dEZmV)h!A{U(zu6Dcc;W&W~0(+-_Za?xD@NN<gI+rcxqj+;yjvM33
z-77-)`Y#QyQWj>Dframu!pV&@VkZqOHC#kr^gGWw8JvfxR#=3Vb;t~OQ4z5P%wnFT
zV8Loss_H@LL3asTc?W?(1<BQD*s?Z4r)dyIghrn~;Hji^22Il`jiPb3iKYfP5Rqv;
zW`nmjLOjjQB9*d<+2dGg#r@Qsyp=Q2<Scwzav^AP+{f)9&SVmvVvE!Hfy7rQpWil$
z8zM_LYCV3Z3(~X}5qBC7;x;OSF|T9i2ex2DOy4K;9RbYm81?8x4{M-E5jMgzQ1~to
z)bNEz0YLzEvjJ?dP{?#P53*9MAZ}OffC3W+F~9tQ9k<?Fp%CAm;MjRinR&ycMZ&v_
z44W)O@aVYJ%(N)<r{}gncg^XS`f_!XA6?nZrai>0+-C;X+{n0oten=|;J8Jw<n|_o
z(HT)eEHiIlkXE-UCRbf$I8mV85Z(X=CZw@5ltw`bM6H5<3id!VM4WBlq#4@nfIpjo
z^r~NNe-55$rkY+`9f^|X0MQz~YYqtsla<dRD#a|9e*)f!OHMBQl==gT5l!5k7qZuA
zbdYvu6Qq6>b4O}4lufsYsB^a5ua4>u&)9Rr+T_Vscmg8CQopz)^Y7M>kt%wfL>VfO
z$dXy@G6+0e5BiUopyHUBkZ^9S{)&d0@PN^z`Rsov_#7FU11=_J6x%@~=DFM_h$(~I
zposh01QW1e1z26w5QkWPfrL_q5{?-hD}lp!Xw(i~{!aIbT~`d#-70?{@&bc9>fpve
zKsqNfmi#jLEj);`i*pfRi@bhrmNi}>Hj}%6sh;d=d4cp`9@FqGS9ty<RiS3n!<`;m
ztqStUGv!0>`xTEBrD!-CzLW~+s4KSf)o6a?13&9t)ebqMMh$B7Tmu}UP}EsN2csB5
zrc<DZqA{&!aEBIvObUuF-4(=yK_V7vp&w4j#7dGFEOZ3Qxp=k|TnDoNbW0gXu;^FW
zVW)}P7jLja_7o0LvC&6+sph)r$0J-{Yv^9$NtMiZ<%s$I@R;=+-NPdg;2Zya{h?D!
zV}z;6c<<~2zOFZuVdjT3r<2vu8U`fJpAIj2gZvi{2XXX@{k^nrLG=}NaU$2irxxGr
z=0KCuad5m8cDE&Dmm-+Cw5RdXLH|cdGVEeFl~gRNQZSQJ_`Ym54ZM9FhZY#52?%yg
zn~Mm4h06TlAyK>SpuN{1J94|Efn3pR0%yJVg4AMAvDYS}ky&+}zagcWVKR4(ga4Iy
z+EbT@6Q*U!Yl(DwR}Tqh#e+ZJ3mLBr5@c^Z75}{|d0S`y;Gn=@k5DT7OofQj($k=r
zGsMKVVY~GM=L7kQ0X2d^Y*Tt9m7+`>1c6wCYWszLnWJ6swE&94LTER|jErv2ew0e&
zH`U!14XKUfe8+eB&RdPX>~s3*EcA&>D;QVxOV_Lt@wz*FPoCqY3*4D1%DaGIKje63
z>l_cb*+=5!tUP8Hrms;uE70@1<5bIjb14T;+V^a{9g#p#?l_M6pn}3oUVFPNssIn#
z<=xZKdH06_w+aFj9B_~YQcM-96oAvZa^!xgaUyWk5IvIt09QO9>@<McdkO=AceQQ1
zy#LGurqHw~1cXq`U^`7CquEz->&!?cZmf5!=MS=)iPd12+ZPMF?7gPh@rbY_HM>`N
ziGw_ZO`5k7Z;HAJ<eMhytr|Mv$qEn|r7qDSnw4CnuF%#e?zHAq|GxL^<6@9&F28B0
zp%=D$6o>z4Wk>RERes&Jx-K;6K?Mv@?p)hL+k-jkf8jD<BDwE~7?u8+DNx7WvcK7L
z1nqxl4B~+mkqPs<po(8vMWr1e_Pft2uM#W>Sf~Z<aoj8v!nV&p*;hPFuiNIEs1`7-
z+^HqSK{V^PU(KzM#3MZ<bZag>Yy$ZebQrGnkLJFJYpA0t4)UDD%&2nc$oz>z-ef>!
z>#Kwx7V)%%0zq!K7yrH)w=?%67cN|le%8>@)s+R^vcNPKysZLmR5a45^7n%IfO@Tc
zg?ju)V7Gz&P1^$qd~$fa2CD%%2Z6woN2QBLn59FlyKwGl+;vkM!q$Jdc`2uP%56Pn
zw^w4nyfNjNi|)ss7lKn}VXmPU6BjGS{bfd!`CtBdnK+syKwQS$ZrMT;eNSO6C)Z_T
z72j{uZFZn(hyoX5ROx4AVAv{BLyO>CQX#Xq!+HIezJ`<8>m|(}gjMQjt8z0ij=^@a
zxyi63YiHL0(j<bnLglYqF{o^XW4la?Gplcq@5P36RNQLX9yz(X3^yH%78lj4A`lw6
zmHW@)C^xngPTIn|eRrwutEE0|R8tQk)C(FT#vR&s?-xpNstHrma;HR~KX~eWWTg_R
zi00BCtu#$1{PAqwK`yAM=3vuYB2Ebt8I-`->g&(zQWh9}gWAfU8P8ci5$oKK^C6NJ
zxz@Sf%@JGs+rT!k^cJ}ENjg(^lYupHsilNL?qg!hXIBLQGMLkV9}u&-vGD;;d}==w
zV`KYJ%)td&B=^xOBA0|5&&%&kd`K4D5?TGGmU!}*{Pf-!Awz24boFxuh@~{|Ab1TI
zkTS8i@PB3e1Q#6EE-_XoiaIXzOdM$Mx26TWN(=wLEWk%uOi%((w=($|yA!v32R=@+
zp`QrvL$kOu_;;?l5(I1$$iDQ#t-A|S+-UXJ!BSHekRk5oI6zhaJb9gw9cnPjz{LN4
zEA6g5jz+1;E%Yoea{~9m_x$*2Ni+1QA{f{-4qE{i{r2xz%1YLjGj6^}{rL93EobX7
z?b#Yz!qp|~r8u_9@U{SnrrHZqwU>zF3YT0)jT+s%924>McTec}x+|K?)?>zfL-`$;
z5@>gRj>OGO4;VKUr;{(Ia<trC+Q($3NQDh7)oJWecedW;%iFOo#`j`TkZ_;Z&>2xx
zQgZz)N>B_ZAjT?UF9~5luF~LSRc9x{LA5!#>myzhK7=qpbc=2&fc#mz?He*Chc%0F
ziix6Fn;D8)iyO?9Y$q(F8R{fNMoU*-ASbaGTC2NE)Nq{jD9xHitNE&DJl!_F@Daz^
zt$mhzw0vm4pHv<4(UVBySG@$E>Q(1D8EffZS3ju47@mwIOyE{H+$d|J(@dBan=!@@
z`q<Vs?%M?IHWQeAMD;mH?t<=qY2+PugPy6$^2HnK#WC5H5bsk-7CPG&N)D$CZyGr&
zVDU(q#eWpLoxcAl0tZcVSu3x7DHdZbbx;VSk;XiflbFf$h`m)&l3nv^0e@L}Mw;PT
zqF(QHtER|5PmHfJci;S_b*V^z*zAkrF=DB;!CdbAyUD%AY5XfU`L6N|&gMpot0VhY
zgecB-@A?OW%Zej%-K=lttqUnwi?^&@uW>XHQZv)GXKSAI{9Ai?B0a_`DENJ4_|Z~v
zjWZa=j3Tbt?GE7F^9FpITUgyTiDbeEBsXpSEy(;{Vtjt`(H43j#>m%SLj#M35#ZD}
zFXJ0aknnT<^SHx1I~Uui8_RZl`fg??!Rh(8CjRy*jr{90%YRzfikGdc8|;t)MCzAP
z;L>>gxMI*=uZZ7~r7B|YbyR&8H*;+6bKzf-c-+yxW{39MWev?$H+)uth;)VTvlioH
z9n`6^PtCQWSsiQK)15zk@I5LOOfu&~dQ3I;`P-W+=js0MC_0?i<+SaB;3hbLIgZ1S
zXg4X3r4hpcB{@?`Ahkd%M`;hthH}pp15|Y;drJcVX}z6F9hLr*n4MIJ5lzE@;`(l%
zJlro|nV;!*+BCUgYmI`tL<#v?hcvHSU76S_eU3a-d#miVHH9NgMY7v}os26Quhp}i
zFZ(&Zh)A3Q(X80v$7z2R1D@{FtF~t6Y2ylxT?p*LO{Z8QPc^(L(-W}zy#!O$c(_^%
z=A)ONrU)z6;l;lo@!Y>Q^~~0DHG9xY70zIyJ`PH%C6E8cf78Lq%FGmiKMCM_o~F!O
z<kpX-gH1S+1*DfvQqr{F7}@N5n|los8AHYAVV<HVX3=~I9I-_I&<zJkXPS%Ja6C+q
zIbhEm4yAT-JbRHK&iDlThF+Vt?h1=cPup9Kb+fbGO(|6^b68m}PRziZL5Roel$psp
zLEra3%lzgs^5*Bnj16tL@)DOFk2pSPaX3JRE+9`l=F{4I<)wa2OZkL+IPk-XKSO-g
zCl?8}u^Sa#Y0be49!+F;^^O&>@?)vKAT{!U)wGAUC1w7Csq?qVghLyj3eXpVDLCY(
z!nsph0UVS=KJt)OiUdMfprN5id&%N++JOIku%{uQV!S-l!G)lty~_4wCZUA4>zq^X
z<RlBqJVAf3Z%G7Q6a<<Y>Rp#1U=Jl8MD2zG7@zGVw%kF>?r10cKXZ0okxr5ydX`@x
z4g7pQB`KemmU1ox-D{8=O=(HNYjsRDP10>?m`N1#TY6BO<M%t}6>jE@{;4>!Gw&bJ
zx<Usrtf3`%F~r_IL$E1|>!Zwi=~1`tuxZ?99JhS;GQm^+#M76Px#AJ5UA^Z*zU5}b
zI*E6^MdKG(4an4?{uo%DZNN>Pmw#L}YJPO?=g*((+uL&b`t+HZnW(4*KEDih)o`uH
zl4o3@#GvX7JaC68KNr`#A2j#jWXcCL#|wWPg<LTEr*i$vC@htie+ITG6V)YMdELSb
zvz5M#uOeO+y-i{5t^0gwbhhEjVFR^eGFhD1oux$)tG6kMtF`CiX^B4hVP21wyet-3
z@HAb`TZtX4GSNFR?)Q{V-`;o4NdM@2T;{P;R5spF(#3Xa7&kfDLQ4_h<wTfpKxs8e
zUt<@qy!QAiy-5H~?YoKRQwH}S!MP$n@E8)Rr1Sy^JXpuA4)@;CpWrByGKo@yqm+H2
zRmNew{-tQ(H0A1CY)Xj2^T7g+O}k;jY_+sITN5hG(=}hm4cFeS=>0ymgVA`NxJ-;9
zmSo6UiK&W}pCH6N)~O-Os+wkR$mq!^CE=2XoZ*6r$Op5j?wg0~lH3Sw1^?wSB=~kn
z;2V{_#OG>9m68PXo0+m)4g^yJ;ei9@(m}->b6WeRo!Ps5XG8SW=|dV-TdU*xJ;OBQ
zpXqs?AZWf&eEa)dkZo7lL`2R($gD|kj=c481u`%&AYjwS$|&ZkQa%-SO;)oV01JBb
zQN<+MW^DB)rCx4Pd+}*hNS$Y6Rr*<6)@!3HR}xQITx)o^F+oPEy+UbZhjTb_@rX~4
zu@cU#{~r77`3F8K>CPikCNFz`AMbb#l3?x2or%h3_t}@M<nE6XJr-#oy-X|F%HH~7
zEx6G>OR%)pp|q-GhyOwvAuIQd%}OM6JWgWv8-kxtfT<`pFQY|X43ULtU1cYj%G_n{
zZvxj|^wF1KkP%5i1CurwIgU;Dv~j(_!GT-ad~osW4ZqhwDrb&-)-DQ4e`h0j+4Z(P
zwN}CtqmtDuWmVXN#r>q{HSqNKhIO3URIo9(o-8G6bg0`8P7EU%7iM4!^N?&3hAGMX
z56UME@j)Ne^rR-<zVB8lCW`#2UQeqb?2haaSShb44&uHM{J~Gd{$5q;hZTKx@w3es
zWTE)K|B#uoVxvkfvY{Hg$V8e{DtOR9%48ExZf-P?3bJ#;fYzno5dTBN*KJuJ$x36o
z|G)S;s8Y3zjG8^b)zFMGSa+#W#N8#MjQP0S(`)3fW_IqDvaey5>L|u``1394avEHE
zjMZ^o`%|{AKF8}Geie^MnJ}^H4OZy<uHeLIiJ9?qZz&8_MRfOGwscTWAiQ!W9%)Ip
z-y^i5Gf`F&pEbq|MG{rZwho1l$_r)hUTUHn^}}UdJ5v_T=q%zV{VOT-?t}-<l%zkL
zv*6+30S`HJ;Q_|?4mdQpfCgID%35y8*x1Z_E2Le9LwgRR&p<Q)iqt^Kp(zDT4z)Yb
zlPnP75s%A}elYg%kW}k1THdO`I*!GJX>7`JRNDH~xO@4eL%0>M!P22_`(3p&lku;=
zNW5PARi6hbV>{#ANB0iZMh6-`-oUAT>b5z3%hT&}HG<#JV=Q&zz_EG#(@)5^nQ*AD
zUMDzBzl@jg`Nf~r-#hlo=h(dF%UVjt!WvIm5KEld8`0H!bw>fOukbBJ1sP-6Lwo5=
zaZHR<u3Wit7F=l)FO^1<Vv{BY2qh>41T<gg|Lp3ko($d-oOX8x!yFh~*U!Xw%1;oE
z01FdNVKo)D^YETqoe3@4^X#^rp!nHOY({{ay<sz|<lBQMz~^v3UbmjcGh#?BDx6Uz
zZt<70*V+&aj%MqYAH4zQtVM^*BG%QQ$bIxB;Bz*d{N(JF!D=VX8l+sfG>acrjsIjI
zEQC`G!C$x?M^1S#cjnPjsR+&|>yM=>)q*svX&f50t#O|X8GOt?epva2YqIBOG;3D9
z*)qUFO~o29K!$hNf0j#~%DL=&vXs?3rND2gsQ0P>`)15jT!423ERqmN1J+mawdJU;
zq`09o8qNuRjAN5AdibOk4row8G`bxmA;_e76S;Y--mhGK^5q>98$&RgmuCu{V|)dl
z4Zo3aSM7IAWsapW&s?L|cv5lk1R}&{o_B(_H!|Z9#|GtUb)4lwf=@a}t03bP6A?Aw
zKQ;@}p9+35dK>$7$QN%Y<aWXTqv@=pqWa!0erFh9=oz{hI;2~2DCrcxfFfNANQxje
zlnf=M0wSe|C`d|5w}gNo-3`(pCGp<*t@W<OpR6_a%$alUInT5AXT$h9`}1l3UAI14
zU`pa_oO|*qT+-Uw+!<YVWudix1w|C!I)iKm_wK1QO{e(*@RJz)TQeu{^N*zceFlIa
z`8qSGKx74#b&t5voH#W!2>!4PX}o(ExbX$8LpTp3xV!{ud<5^y1)YiBdC9zqjFQDx
zcZfTBeF`v}@!ukw*^-0TC6l2p@F&RL(Y>6VR!TGBe;5$a(D2oOm80fr`iUIiR~jX$
zXk!g%vfimt(k-hJvNs_MojwjT<u)>a0$R~{lMgMk9T!O7$g7mih=)HQjT%q6wIg<p
zW_49XAiSBBAWqZ<5-olx3fT9Z;Ql8))-4YYdiOf+E19zjC5<qj59$cRP<x~{)yiz5
ze|#c$rcv(%S#n0e5;o}6%_xYP)oUUWSriss{{&n=0`(g>p)%MU^)-HM?16J^fj(Y4
zu$TPNiTf7+{U^W8^OcV!#hIP~r$^BZdRf|yU%r|OMa&{<UB2tCf>WfhJ)l9r)01Us
z+o||7j+F>wV>Vzo^+)9EU`=!93k6Ex!6*K?sv*R$yQ|boH<N)!{`|2%!Iz)2K_Rf9
z=fb;oTclAnX5mHnosKv$Mi@Jm-b+9HZ7B&o4d>fh4`sCynU#7CeZ8elp|!W^*uqn~
z<}M02`!JKfk@2LXqUXue>XJRShxZ=NjwtrsmKdoVJtE4;&ffY`6WDd6@VCjMQA52E
zfGVyKx|c!|TolZPW^SRkVJ;JUN5-#ySF0XrTAa1go2JE4Zf;w6ngQcdChs|Q4`kr8
zf`=lzo&HVUg_w2ieP?ZR2bGAE%};gbDl0_qhxu58_Em7s=W(k*A+VFOQl+htU@rIq
zXLAP4DLc=siEcp(B0#MY3r=F++t(*C{P2f8SYG&_J$USa$LrCb@x=eByD|<*2MbRb
zT41zhwdgZ{VFq4l$Tg}22{wK8@_X&Kg}isvv7I&eZ1S(2V$x*u@H^tthVu-I8n#za
zglK%@h$>q`QAMQO;7IC}+CD#!+erD`xn+pbMB7%29qz?;&DZNXjlLX(t6)DXt3y$X
zc5uW=@2Nd853L|_Jt~jXiQl139_17m@(HVsXt=b?#fYy+#DK(+g)c=VI2D$7ePVog
zm=;$!=xwJ0u~7y*^{)Nt0Du8K<H(x>wwo}}x1{&f!uxFFLt+`&iU#|CRs(0c)T3rE
zO0+-a?c~>O$obJ07O0rE<8dKvIK5QeJ9q~DA2q;jegt#TAc6FqbJF{6CG8hHPdG4*
zH0*dWmlolu=Xkk7ukUDCB{e>T(VrNp=Hhegk3Yq@)K4%0zmAgASRSVs#Zo~oO|EOz
ztJ$QAE)J$N4`rR+wQl2Ks$F?|Lp{~*&p#7;Us6I2syLLI{(kkyD=6r4^@)WxHa3D?
zV0;k#_Uf~+#4S(`06u!xV91HYDuE8(q9;AhHT++xRRZW42ylNHt_i1Li8y&Qum0ya
z0DF%@I&}sXkb!hn=~d@(6;KDB-J@z_87Ckr;DMgS|HmUsh(tqF^E14NIa<nC3gB25
z^aE~}QtKIJ`~)h9Dk&8P_F<nwy2rZq2%ji(NAFaL*E743Vjqi7CvR6Ga*@=)=&jjs
zDOw%}e6YUxenS`59r9)+Q<wz?g}i$@W^r~>)0_Zai2U6RT0!3-9%#_-2JH%idVZM!
z5C8y$`mLOa3Mq6CR@WrnW@a9M-h$<t<|`pkLbFnJo0t_%@n4=#Z^nkKmvB9=-uf}V
zF@74=yKmG9gBJs<e=}$xUGZk#uDpk^33Z^wn;0%elorM8fPlI@gydGWt^B7|st3ac
zLH-j#7m>Cr7n0n`3K>i5{O?V<hyj}Ufzv^Mh|UU+oYstnf+a@`a8RBhVY{M$fMo|z
zI^K-jOt_V+j7Yxo{iR*I@jlLT>d~jq`3I6iqoa{bPii67LCFVODU(Q0`T-gc6;3AX
zLB+a*biIfRs2OD{Z8#*h3jTZV_~hg{I4y+mgm>{Lo9lV@Tg)3_#FZDttFOZ!+uiR^
z`HQN1M}-BZ4MMJv5P;3ld$Cdo6L6N}!NH}Dd6kObg|;c3-50>{=`uP=_Z<W;9uh{v
z_wPmL{q_w{EmK)YNl;J{8Q4Bg?|KaE<|e7Z3Q$QJRG~v{Bpka|7wLaXwbNi8Rs=hJ
zvqqjcxvpm`KAjEN77=h3Bs$rfPXv2iN)I&VD?kPqC;2g0H!IA7F_;E5e?u}EC6?GX
zhk;McuHaj&eHh<4f`lCQkEECq9?w&?IPLx9z_3&v@Bsr$Sqle#7BJ6D{%<GVE+7nV
zAUF~e76D(#12Ch$VW!bG9mniU9CbUBM+-;(NFK2++LeL-NU$&!=v^4vZ|^9?{e7E~
zl6iXWC#rk8!UUtC)BJhW)wH-yAU>UCu4)%K*c~Kn0u|05%FD$bs5zJc09s$44D6YZ
zG&j%RA}65~XtG`!3ff?hAY&P!eec{WxbgO29>V+dKj*Ie()c)FE(!TT1BR{_PKMjK
zqyCaTL!ugBZYO%^+`o^zij@gM$}8arPBA3fH))DBDHdC+oV-YJF6X1bjs|?HpoY@a
z!H5y6mK-KJ7^;F5@OQyzwQDa}VJn1kIQ&nE`SJ;~c|F0}ggtm%w8~7S!`}G-n&gD1
zrlu-x>)DT4)Ya6`y?t|-t)_uTGcV$<{wGm=J!W2goahL_VnouCa-ZNmQ@-$eidUkf
zwSh+y<uEJEZl|ekJ3DQh8xi9Zf5s;@yVND;U(J()%;7H2D&3*GdW0#7`{KV)q2fOj
zgR;+}p%L$va^o^)yZq`nRNohAm)F7N(n|uTJc1mc@p2<ZpGLqq7Iea<HTdI>T*uz4
zs~U&(Mq^4C>WG7s@t{7@%GWb|HrpGT8HI}+7#e&#8N(>4ek-fjo`DCuK)QZpyDiSV
z1rqZJKnX#?A<Sk)FTe7$p>^_82q-QuOQ8h7S*Xu-R5=cD<f%8fkIfbv8St)q*B|pL
zf`DFk+`>{$3fXcd&y7Sgs{>)iKJ$EpZn1#$-Sw(N#}t}>g!K0NNtgx8eKK!8J}Q33
z#L1epyyDm0{_e}3rFdRQ$XoLJ^JK3y2E02WF_;~u7VOl5@3oB-zk{u%8WC>@=8y|u
z;mAuSVKlyNtV6ltc-{Fky5FZID)o{TwI6&C;1^=f4b|blzCLYU-V42v$I0eBg8w{_
zU4Q3;ASGy&7Fr*YBm-}aonX<uLe5|ezh!^1y;4!#3f+0COP9QuI`s6{`G(RO^Uxu2
zYX9eBV)H@QF3Xfb)+`Oojt?{wZgVxE0pvj1i!C+zb$^W%cL)!@JNNI}HvjV5P_n$(
z&<)<xNQg<-XDR_$xVF>+e1QArRO4tEYkr1YqV0ZkyY;1<OEBHSIune6BEBLxG$6+M
zOU9|=^IO=Blp+%1m>G+7%v%`_N<4l;rB}`H6Nc~Fa6=fCWWyn9`01JQm03aPeeO80
zX}FXZ&DwU?P%#Q@$I^kCr7rNG+aP`G6TMQ9{~`&_P~j8^A4CvG?Sta7rH^S=ZQ#wK
zQCgEddZ=h?NPgALmqnRv*p{l_zgq7iMjhbYi{!v?At6ECay}e7@Z{Rp;U@ZmBOit)
zyA+BAg(WLzL^x%Hnc`g?k!V<0?BsVLF0^lW#Y>>~esI@Qr(*Pf#A{V<si;M>T%gx}
z=+ASYnd?pm{ad&fy)~577GO~ru!hrIYj_>lJ#zL%Wg{sFfwi<ww~rW8)eJ)3vy(Q{
zS6n;;11O<^jO&co3gG*q9DIde?mla7$7zT_b$gngVwj~~cBL>7EB3we<41h3y=HuH
zWr8=1Q1WK1|CAlQpDz&~sie{nbZ0~L`g1HW(FS{j1$yk^zrwkolG-pWb>TRmDHO<A
zKgyStUY4eUS)_*<e;xayrV+<>-`w7=gH$d3?@f&M36>60e#m!xVTB%9?fs6Bzc|<n
zn+60X^>$bTl9{yXVi(w<*OmZUMv<U_!lKYf;IA_kx<EudqS{rnAk>|h@_At3LAUZX
zGW2qp&8v-wcL6MLid-m!S(+O4*8`w5$fi2FhoRbI{v{|-MB*HYs(DG{YkVv4@~L6C
zen!IFa#M^;!s0Mxr4f?kMaR#RqiQp9Xp1n^hKkIF1D#rLs0PD^%eeJfalZJuw4etA
z4<-kgn$Fpubfd<}l{POJ%*EM%8x1dMT6{7WMp3`)c~}+)l+O%OL&~?{$11jdJ}<s5
zF^DGH#6sTmp@<MF{Xskw6OUn-hlGf86&)neAKErIr$JVtkD{vV)t;F06pZS0Q&p(4
zc+{)^c^}#-lsiE2jOVZhoh@j@*03<l<%6Nc`~mPd6G>;~4*?5*CgA*pH8U?BeEM)2
zc?8Z=JyxhsT{y62z$|*Qe&m+NpgLeqWMzg#@sjdTLfq^GmW~vz4FRJy$ik0M1$+#G
zo>@18ak%r=DhH;epA(}}5+<xHkST?j6^)ml7y8z(Kp3NrQ9{K}psM>5AEPeAu%a*;
ziKjliDx4iQvmcWNd+NSpzW=R@TwKxDLjsS5r=71%R4%1Y$sCX^n&L`Fq1RqKAy0`P
z*??Aff6yLuaFlcNKi3zC@JyVVx?eibOCPHWP+#0Zl$(>v%=%K<m75=S5#uLL3~7Ti
z6*na2lS}B@Q9QQv*6>6i+2);3iv|qNQG*5eiveC_OU)|&vQ*O+rq{}io&z%wlt=Ur
z)mat=2W(!QOGxb0X|W524bhDl{m#!T9{0R$)aE?bFhPz#9K+}AHnAfJ<%oEXC5KCx
ztWoML-+fX(GvrU(kC&TS60%q^{+XL1JW=gDLOO!6%ZKvxYfRJRCt5=Q$$?R%N}q$W
z%A>@HZ|EL~U+S7_(F_a>oOOzXgxy?}-n8Ks6>jEmBJ|AP9@J5Q>=Kr<LQ(y{;jyuT
zp5`8vK0=iE!5?^*C*(aD6-u=$2`+o@kgoLIwu4!SHxkg5MSnr>@j>%5B&Gi4p~yJ^
zr?L819^jG2e3%K!Sv1#A1|U8ZZXf2oj}p?RX1ZyihP=}Qw~yBM_#IqsMv<-`u>VEr
zCjyySM@uR%+yzHl2vR7|+3k)MsI2dwxCqBYBE0PIl^>XB#qj(#Td;mH;XPD8nrMO^
ziR8t6LSZP+$hRTS11k<jOttXxjNqXcBRM$#_~J^cVHemb1{>LnRTjZ_gli>Sp*A3t
z5tNKrw3_)nc6a|f1&eaSxL{w(5iKs$a)@8g1J)VZU9{qZU*Xt3qNHgq1SCn3To0Ch
z5W4?Epug%25K+<Nde1$izCB}p-??_Y?>Q!HK<TW_lncS=cQDz&4;7T@o*|B8q;k=T
z|M%x>9EveMmO=V=JVQ0Z^13vWEo8C})x90?5aOApI7n881*99-b+Cc#EsA`jmQ|=W
zF#<kU!*ndt3YqMpqT*LboO2G-;m0i{Q0ql~92*7-0heFO@3z<{D!!3o?X3k+kv5=1
z6gMd2j+@NP-@mf$!mVa88~Kx1=4SXs%Od~k_UaT>QVATuR^=l0H2to8%3GXkBJVp5
zM|!^h-Pwyr+@eWDAo-}!P3Fg(mh1}G<CtKrCDlW?76*Eq@A+1Hu8K6dPbt-G?W5ZY
zHb`g?->%xwXMar4@30=S+&d5yI=b98*%N|c^JI(Q=b2E{Iwyz>rc-FJ)22<jIP$oQ
zk2yqI2!F_=!daR?Pq!S-p$k?sc$ROwFwp$(hVZp!4o9qUs(4^H{Oi|J6%p}OR5NqA
zm<00ni9*L61DQWt?NRYrR*NX|3N9$x<{?MnG<=Q+igvexJjvO<AdGU{%-&YC5%aRw
zRQ9QUIE*(ci9EBLiE3#iuKp4c)Xr+>?G|K?L5oQASX0n*-8vNDkNa0yD_{E{TcmG!
zj#yZ<rIYlZ(Yo8f59WRYHPW(9lC@_)@kptcrX@RQnR5QBbS9*aXRJa3-0=283y6VL
z&R7)ycp-Czn~l2l>^M-+ZU+i@82-p}LQ(Xjb|Ct^7NqYP|M%aU7~vy=UOc1PA=hqn
zjwIbM|9qrXE9GMo_P}nl=<N^(D;VbVbBy*^vFax&+1mRrWC0r<%3izhRC%97CT&au
zBU}C@q*@0p<8*z^r=m}#p;05o$lX=-#-#O~q)?<g4Ql}$IL5r(y?`H!TTo*ZN&g#5
zKa^D6MJA2S#JwhUB5&%ULAVJkdZy3eA#2tH@Gli^R6Gr_o8&guu<x-X(1M@w>%Cnh
ze_L)o3P9f^@>TEefNUMyyBFtwIQv@~nw4yFbVUn*-j#NcqU8ySa89PvgVf6ldrTl?
zrfNB!w8!>8HQjp5;(da7uBbHt6B;~ib>KUp-2u>38OR@+gAoc`#((y%Bhq3r5xh%=
z?#l5ltYXehTDSbd-_jBb-9b;@IkmIgyrzl+?ADM*C=-b9Z_Nos`mTdAOzYluqksCE
z4#4prSGsn9CDf?tKD0naHDtkb9Y5kM7B~sAjTP#FhQ|R~bNJVdMn`e9zi;3R^Ob#C
zZ%ljSztz+Px~q19v+-gt<n;SlmrPSw=*?+pH`pq^_-&noj}8u21a<8%z%tNrA0|lC
zFtK-cAP_-zf#eM{cpEn{ArV&L9rs;{^-`p6ly7w$_UAIW0FJ)=`_5C412eem9(Um6
z{r_434or6k_egOzjEB+zX>%;H4y6x-!Z^@7>@2Ic{JX+$4sXW*2Kxpam_$wF=lqT0
zxR~gc)KmYUEE1}L!~OKU@T59=o0C3v=H20iJ8|l&N4I^dxOJeJ+Z0Mw>)`k_GCyY3
zZRLul!77r7_=2YIT`F4}yRiZcIEEQ$yT*AGaiZLWgoNNNUU$gC(Rmq2-n8@?kShH0
zWosli3Rd;On)O3H<l<~{h*t#mmBIF%59-PIq=J@0H!ruRIsJEQ4q)t06c2dsrxbzO
z)Xc6KV?KJ^g<&Q&GprwsgsHg0q=e%0Td6LK2g!q)40kv%WL<mO0=H)5G4H?sXQkR#
zvB@o?Kyi1YSe$)PrgiqbVJTNqK3aIkti}FDRDc<Ht9>EoXhjh7jo;&Qr9&u((_cHw
zbdEc|KX36Jiex-oo<DhH9a2Yp8?C7sJ<j96f-}v7zsdt}XUEw~wF7@VzYnzm2@<tC
z)zh9JVE&Vo7Q0#ia7fw&c&=>bT4&$|kD5US2z?mdGEMR#Ai*#H+#Mo~1#SnqBRP}i
zB#<_G*o+<FX(GInf81^-ZYSWrLHg)rD;v)*(k!Il;9**}(4J8VFJM7h79W^p;!6Ro
zCwxm2h($eKeiH8s6L30uF|pWph%JANR<LZkw!-V^x-+_+`3IUz??OzH{Eau|^ekd5
zH**rP;7WbI8?qJ)0}r0xvyFUmpg`E5wDYoANfHFSbCv4%5PkXb#S;Vq+k>8svxCIY
zc%cU-B08^A!0d{M+O01|o<F$LTGo&LP7bL?9s(;w1c?xyen^%q8=SnNYyNW}v%+_;
zD^e`*Luzk=fU*@YyeOVaC97^TMgxY8`EqOt+(o-k7rMsUqN9bi^gl%=EBb`?1>&VM
z_;Boc{I?!Q2YL9EdiI{_vGeQ$%w$^>#@xxd(JOlhp04e0*-HOGLJZaQS`pdb&R%DX
zy~=~?!8S~Y90U%z&SnqSThwTW{A27e-)hjVa!H@9YgJzuKmJ$69DF>C+dLAKuQm<;
zhdBNH`}OhLeCPt`hUf<O5gaET$w@+{1NdXnQauxum>3cadunl|<%E@l5Y&Xnn+}Ol
zAMdf`qO0(7!K*ZEX?uita6?=p-*2IWFQ^f2&i4DE+}2y)v;2f$*&oE?x0zmHzE3!Y
z^S1f4rY`c`(85(*6*UTDpXT)yk)B-yon(KX(|D7`MQ$#iFkfjTEqHF=4@mMTIf&V;
znWg{1mz0j=5<Tk$-m82HO2pf>#ZZ%pUVISMA&9d>4;fcKpaFWFU&RulUlcr&1*?xZ
z3z@?8*|IrEb8I^)f#N_MwX1I)h=OIWcqR)iBPgmH#i-R@j#~Z+$q*$RHQP0Kd6H2<
zy-6#v&Kv_AgZPXV-y&XA=s9!#b*mE9syot}3u^>xgZ<SvHa)I5Szz%}eSwmfpcpLf
zWaEXVyEklm_G=C)L~<~~ZvE?fMk0xQW6~?VovZ+TcQ!eYUPsW?|6u(Tr9gzR(^Vj{
zO|@tnukT2b`fXc(`qU~QiJylj(%+7&WzYKBmT^A0tAQECcqy;cH<W0_&cwIcJp1?W
z-`an>-@QPB;}Wm(IT2_LUY!s&0M3GxEd3@OYe52joOfKOuW_&Pd&_WBatMPw(^Ln3
z3x+dZxmPPf%U#0znW2iGI<P&?aqlo~$EotU#c0pUp!N9*U6+1_y|#w8zxD%S(#Lu9
zGprIblQs$GKF&LJf0$8keiJ&~Q{{o?pUKyVZH){`nraH72Fjii8=K`we16iOpU03z
zX~Dd2gnvq`Rr0*fDs1v)s#Fx8M337F!-c7H5s3{Ig~DLiDSx2$Sp<^8`Z)!9Jpd|)
zn7GisQ1*>_mq)D#_~C><ppUf+=Q&u<4ipyF9^wEVKYqNQnsW)`ednoakkIeU2T9U!
zaU8ny4(h&rd+6mmd>19L&DaML^Jd6}75<)ZIOb{!=H4mw(!ID3w%o&3#)EhGFKnAe
zRG4qCpwJ^WPp~apAm{jyOBo1vz0F_Y7+S)CnI<IOfF*n9)<LirQpi|Q__SrSA)h%m
z{A=3!gMSsZL=XxJqarhmBeADQMB^N0SmsY!sIjUq{ccc}cp@|q-Q{B+Y54I()zj!M
zY@hQ7iJhe;8lh%WGzFE-$-DMr;u8_+emedznnA(|2akC(C9MjaU4>j8e^Txg>t<e#
zNj}GdO##sH5#WAjSf%JTaZ|ZZUV<_mm+VCUe0Y}ZtOi({XI+~=a40==WT1qUS;uj$
z<P7PeI(r_%;<*_RqO;e)H+s=pp%)N$u@CI7oLGfq_`)ePUH2j#4p0%!q#GqIc}7sw
z4;~BBGe4nsj``Qev}@kvX0OfKeEaS(Jy}O!Iz{%rY(t5Jn9U^y+u)PC!cZ0~35VEO
z5voxmB4#um;%(+V@Mb|T$onGlzn`UL(1>#+W5;<`XbfZ*VgDNpNGwfokt9Zg1RLw1
za*j|YocP2$Bi|xoEjsi#W8bhIaevm~)@I+FWlAnZy8DdN!GQo&i;sL^%<MS_aN-Iv
z6H&K2T<6-zrn5m3RLenrD^geK%YCDF{C=YHww2QWmY)AaDKOcHe`!^{KRduSH(MvX
z{jZXdU9mbKRw6bwPDTIcfWbDdw)xWP;t;=GLJYuotm<kku^`7y4)9$H%5vp&@ocOS
zXNQXRs9taU4gqEU|Loz^yDB!-Mi`g12<a<m*X?=XdjQ{jtF}RF2RK0yAXbGQ{B07n
zTpyjD2i2~m=qgAFvgMsXdH^iNwbzlc)Xg)#950G*Q$M-_q>-<zW0r4KHANrmq&AxL
z1&)_n{>%Nj?mqs#CU4iBYNj$k@9XK_Xm-Lq+C2IYqwXX;u`|1E##w68!^ZnR=7K~k
zPB@m{Wrz)Gpt}LGguhBWOYx+E#tzYshgMnn(RmDWFqJLFK{D90^GuKUTD;#<oIjF;
z3}I3VD)k2DlQuE$EP7h8qGh%CtBZKjN~9DJI+a(ea3kqIG8ZHLO17qFAB)Qnj_(u1
z^C)LZz$3G~j{A@2Uy{;}TrtKApQ@|J?tVB#3cMIqc8O>X|Kf2;*}7R1W-85vI(H}?
zJy$S6;*A~zHLGKGo_D)yFm26@C0w#7e<)co<TDy6u^*kI7YOuSv`unHB<*Fz0gvZC
zJ>-HT(fY`t|32h>{?DGuR$5{$<7l+_jV6C?L@0SXUM`+OV#_|9KIg8E1zQ13%$rma
zP>(#jZG5-)r}2lw+(}+4yoD?AX+BT|kZZIk4oPo^1Q|m=_8Yt}R{~C)O%#-gV=KOX
z0gRd==yFWT-h%~f5H|^J37OPn_KN&OuzKrN_%`TLN)=Z7J=q*7y>Y9=AsvZKN}=y5
zgL`tg|10`PR#mMZcX{5Q)0IUM$$y6#o7cooK$+TQ<6bM|E&hFVZiE^#5J7aGpfXY+
zE7mo^LXuZozrSAPoILbUFFO!sv&IY;fo9rPb|{8qc@FE^q3Oa~vF_%bm|@<UxwCG3
zNc=;JPCQ#Ou0@!O9z9r8m5PKo2CLiiO@CDd&dL9tPP4o_lBi(uEN|O0OXLkkzzi)x
ziR^ke?`i8<s^Hkx-P-O}7VEo~41jFM-z*Y*l_uH~*A=sM(ooszsP?P!jPhmYg_%r;
zDopZFfw7HI=F6}hxzH6SPQ<nHkz7dsRIEebX5eCnh`@3AIvE0u$M{Fe_uj#3unC02
zZkGu~%u%iv*gMW{;==}MVnjO}S2`%Y&meWH>Ml#sp-3>J7(Jf~Y3q7zd2`rKRUYIO
z+C?`Ing%QTPl;>o&5ujwkC?6$;=Yq@Am$6KGAKHg5OYJu|J3MYK7s(i0sKbOgQ6&b
zO-|YK@9>xMY?x`c`)`vgT?I>pE0<p>LMRtME)i)B;Mx34TD5rIR$bjR@aOZ9v+$|y
zP4SmZyOk!s$5X!3dMpbgE+J$#u_STM7_Dxe-x*&pgbhSt27Kh?!$S`rAw){YHGQ9C
zdMOTnoV~yz+t+(B(4liDxnKQLmeYd@P}5$rq<&kLGWnsFqN|uPfZOgrL;W0lf6iS7
zQ3X;r+Cf#i2F2Iygh4i0x46~rZHemeqy>L=x`_hxN0xr_AIh|t)jR^qK(E{D{WVNQ
zg?OnxAK%%RM0Dq{F2KcU;w(-8Ua>N$AfKZlT$F}mUCEcLgD#iO<kdaF=XTU;<eM%o
z@vS1<GJT;xmzHkoeXY`_bTTLDOP)qw^F<k8@Y*joglb~A|B20K8Db%#*S}$#j6NQ_
zTkDHZXtD$E*xkb!poo4UQmBK7*HaZ{nA!2<rEbQ$ioe8!^6k%t>+jKmuNPcz=?{j{
zv%wsvM=x$vF~ktr4|R1GZuI$(uIHy<`L7kX#C3rD=$1kcpd$@>eq=`XzvU1Q$A0I*
zpT1i${rd9Ul{f%@yS84f8~M+!aMvkbI05-g&*r~Nyh!k+0(t9erT4<YtEDUc6>^(x
zO)bA4+fDVbzbK$CsIUAW7?I3`_Ro1mRiaOdwS<fiuoIkZXQg{R+pUmH#n0%JbG)KD
zcpP~VkbuW86IOSa;3cJN-KK^LB=%obZ6Zycyw`MPZPXJg8vsyaz$aEQg;5)BfY}%w
zYXbt6_g)Y~@(I6s*V?~-xHQh?@Yaa**cz6<2T3Y5Y|s;}6V+m-gsbztV2#gfvWTXw
zJh4@N5u}&zjAx#PSAc@5I>HE<f`)=SeE(Kn5@pNw3{st^@4e$~gA~+6;**nlC~?~F
z2IsbY9h6J!1jL#H0>*?_;KL}bcRAy?%a1}bc!7d-6)wIl#4VuX3x4`I6FXT#6cYIL
zJEj8fdtTBF90s+@OnNra5FmkLM;usP3V~fI9C=a+1mYNy_GyAg8P?;HGs~1$aJd*Q
zE%p2>8c6UF(6j!|`H-IkZ;h-h^(I%ErJbS!u`T617lWNwiio~+1L%<GWp%V6erp~<
z0?ltR7;&>R$E4Q85tW}$Ddwl2On%ob<aNMYv=B3Dl^ES|VlfK{#6S>_eq)B&USG%X
zwrk*7zwPlM^bP5rIcm{>oN|>Vh5u9}PXd?5s4#r{N|n`!J<-_0VzY`UAPR>z13Skx
z)LIp1T3|!XbN1=@BB(kwqS?=-cBqH%+$UlDv!iCI975|xM|edGF;EvSdENDlvG4Vz
zJ4deJiiZ-OYM6~kC-zE=^T(iY5;OYO?X@cgW>PZ2kBKpupO3=}?&lO%8FoBV6VeVj
zjGsdVnKwYYjznuXq~DPBp8h-`L`Zl^5DiJb9o&#29K_T$7|y(f)0E{a`z1yO0&w1E
z)r?_K1qGWm9?^kTESo~BQ6!1vtIsR|34snk506syUy9+yJ-5XP1aN}_qK6QiC*RU{
zSOcUss{M@b*EBUV1FH}!DtoshOPZAd9s6MHA6`0$mtD&*o+vp;^&ggQL-lLnD=vL<
zUn+tWvL<??X=b(dJo?`Ehc6^~W*UH)#Ls^leA(KB>3?6{C-@f`jlsHNH~EJ@|8`Y{
zBwspHJqW*q+$AkLsz?&ofKlNkbpXzeNb;mkAhSH;=EHmCG9};rEzI^@K$UV&zDNwz
zulch4;2uH60({r#;6_#D-o4l3JpM01voTxRLq7&^1e3K{0E7_IQVzPHXM9KW&sr%$
zFd&l5>32_%2Kev2T>4atjeEI1SKb?q`nVC%LSC{$`kXgo08QkQoreHBw7UV2IZRV3
z+I>$SBKl%Wcy`OmAai>;u{AsHqhX&jx(`M66;En}=W+8hj#*ArG(r5qQYtI}i{`>3
zHpE!mOFHGP<}B!_c#nzYLi>@_KO`;V4y0cAP1yOMN0%(aQGppP)U1HTU`;!);c3u<
z7uX>pP#9Um4>987bA;d+wljfyjpp^f{C<0WgBIFvdFr0b%31m^Mwx@$(+}Z%P9Wdr
zLUYtiopD}s`o=OoTj&NqGJ$2p1nk1aVw9rsC{vU@s6?P9oZwZhYGUoqwWG03Pagf_
zO#7ktJYgq^+h4oa+~(`&ay-8H)Xqi!6d0h^s`qVHP;S|zzf=l<w~!KI9iuM;V)qgP
zp;#`|SrLPHk{LDjYfu0y;5Y}#s&TwUTFcvF3S3s_QT;Pf)24<SMszV%#!2m0wD)tJ
z-6wAw&wHawM+{Ocx2uS5N0<D;;iA13qv&uka@y0Mz8Sm+JJ2|+c1i6LanQx1NABTb
zHZ1`7=Fl3_qI<3sLj2X0?)^WHQ%-LiP6P?wMl-kzOPA<}H~w#UYFX3u6WM$sEnlx%
z$XVLS?>tPoEPTCy4BduxR||7s!WTTVC=^xfxZTd_%U<AZcbhhuNrcXE1zj_L=0|ZE
zV!X2W3HY%4vgWQNTDDN9MnMA7J<MiX+9@=5yNUk@z#<~{x%M>&wAe%`3F`PT$?^aI
zxd#;Hdd_%tgMoSm2VmwKu5$XnP%f}m@Js5^$2t!Xg9`G$xN!jst|fH^Tu$9Oz%hm7
zRK(D(407s<XW^EnMY}KTP8QJ(b_9c#@`1DmMTt#|_s+?Ae7cp=wOo>H&C*MNcd#0|
zYNi!jk!mpBC(XGlw<%%dr`J(e0T->6A_(npa8i22`^KJMEh~YO?I_UT`SwuFE~iWJ
zc)ZlL>DJsq`c-o+@8&fhS}G>}+-Ln6s`^^$&L=r4u;lO<F%4&O9|)<{RC(o2!yT=G
zd~|f$SxP8{%`|#5%BQHEN2V8u{dg?WCp3hetUAW0vRmPKwP%WtAtw5`1licyYQxcp
zaHDh=37+~hV^<F9w$B|Ku1=<FL3)Om^Urs_-}(3o)mun8XjL6<o~xgf60$3uZM_T&
z9UV9F>kv%(^5UC1U>T(bMFKJ3veW^$4g>yw@wKVVnWAOyJ`DMWLs-O2pJpyXRE)Rf
z{&`I~<g|HpXnGaSMHl7_^GLyB`9eOm`}JqDWuoHjuN7{`9If~3^R5Lms$$*uKKLBU
zT!_y39M;5!$sVT7WiIJFPuV`TYf}C4yr)T5n7xA{e4ctb6=fjAI0wbNx8w$BsdZEU
zP<_P;0!r2G?d@|)_Ks9f3krB<z;3nwPSv<4Xm42p)hOGpW&sJHCiA(ws&V))`uEYw
zs>l198&}<fxn#@{6~ix_(M4J5rZ95_AgFpvYdZxF%=}PJMlZm|cn=8$p7Rk@cP}Jn
z<UoEph_J<x`HFKv+aL>`jcj82lzRP$FYPF0s2}O+vTRLwLucyW+t~FEHa;=1+wJ_!
z5Od&(jpGF>o`pp*#?J#){Y#&Zml2Dhw{u#T$nCNLcH;i|TQM5O<wf7xa-!mGM9oK2
zYjAu!ko&fKs?!)^R(}q{Z})dRLYY8XTPxUOzwf*1^BU+OJ3e87yN3|u4Gf}-7$G-3
z887Hv(uv=nFR7y+vjRnMbel903<?Cuv_`Io5D}^J6I9<dJrNDx8WEi5flfGX#$r5^
z7KUtc{#yJv?TZ(C%Ot}t8M8C7M1<(>IA)&sVI9<G$zx>Ci`JJ=gmCD!?WLseIOerB
z>t3&Jy!tJaB&}kHcfTW&zWbU*{@p79#_*V&mar_;V)kfAKXLX4ocfHaA{>;`fr2#F
z=Ig(u!_(8#d)MM7TP5H&g41x}c-2dwIIt5eyGjhZTiNs^v0G&tc@KR*VZWU0gNL4o
zYn`LcUWC$Ia~ec=bUZ>iw)!6$Za@~o!;&)<OFTGzx-Wr!FTUj%E_MhpOik|b6rW^`
zg;K<Fq}=WVHya9>@298|zIH!nvXtsvx0>m}xwp8}X*bcU!QA9C*_W5@*?<ll`?Fw4
zaMb3o=>VOOkKQF(u!W`Os*oMlbR11K-c2AuUQ@G&$Xv?P-b2)BLL0JyKM(G!nqPku
z08F(Ci;9k>BIB3YZq5k7T#Fb`XYWuv7(Z4&3#yGu8c*)`XUb53PI9oz6(K&^$m`<b
zvOg7>LO@o<QGcYb{)|yOvdMOYOic99H}}0XHw7lWRc8*<QGVl)<K-QDQ!Ge4`t1)q
z^0W3ODXmFbq)G)du$(@ilf2ZQ^Kk5;{*d^PGmUi8u7=W@#B+lcOSl$HDEo75HnQHa
zKqQc~P%05!OO3rfJq9ntHb+!BXG15cP|AqeJJ;S%fSSpZ%c$ruEmp|GU*wlQlbkJG
z6uU<M@~J6f`LE}vrebk1SfKtPY=ZihT91EupbkF{s$L9&%yA<E%?}ca>IQi*G%Gu;
zs@vZ4j*}9?fE!zvzujo2zfxzKIS}x&Z9p4&X%YJalvI)yvqLth@#^`$eD}T6#Pcs-
z^<+}(+O>3SNDLiE@_<X>joo#U)78)b4OvP|v6x^93CSeY2T76SDF(K3rm_6NDEi!#
z=^SO}5h`Hc5)#k?tAqTKcteV~4PUC^P><k(rk}xgFM4*&J|{)<(NeUymNve?4dLt8
zuNIriuHR?BRafJ1WG%1w@8aUv+{jX&79!9g;ag%IjLNFT2b}6kXAD{c^k<0*R8u`8
z=*PUByd-VAEL!Zh5kDfs4hjTeqrMya<#tLzZ~D@1AfJC8CP$9m)g>O~ACkuAemBu|
zU-M8d5H8phZGcj9ta%&|qqo|<bt$!vLa+y@_>W<JhwItEkG>WWho)fH5`ZM7CmYBX
zb+JgWk?OB!Y^9FBBw5oXtumtMJ#~L}%`ULQ9m`H=gVWK1X}=Y6cgAYIPlLX1mH&xv
zp1X&u66d<hBhJ?)T9k7jpIOQ0dqN|mw<KNEK7~`}1bU-@#Wp|Gg}N0)H4KtPP19Jv
zFA0dZKG48Wb*Rg%+DovtXv2)iTo{VkO`p)~)wUis$}&G7h!}`yOLU}w=oU*H!;gp&
zkJbkN*{G9it^E9_0Yb7koYr3PavDL~47^jMDS^-XvKU^1`%lOf@;zq0phATi^%lV!
z2n@b^&b(FtC62;?s8R4-+Fbt3<8t>)#+@;IbhRa2o$Ax4QUU@3Ln9x=F(mlke3aim
z2qAGh7t#tK`^M>niB}+NO8yjnaf=x~cUuI7JSS|Y#+%}o%<8?|(wbu4d;y(Fv<QFe
z&in<eXGlfjtvM4kANFE*UwBi*EQ{?~Z{1ap(RtSh70t<e$d^v_{KRu78(@`Q*kwBZ
zZmUa>@Ef9M;}z8s2Z$Zm43c4-A_-k)($ob{xnTHI3at+xUxnt`g5`Fr%ps4JaCuM=
zv^`Bh%fZOVSmrt|TsmO1f#*_4R=(o_OwXhHt;xmR>XAJ3!E#y}?py2-dakuZ6VmPc
zJ1J~TYWrA{2L+VG8?GiOWws-x6}G=rUM#4AUdS4ci~$c<ko@_PGs@}6^D`4F06)Kj
zBwLh0gdBTbw@n1lmmm2Q<KH|npAUMCakN0uapsPBVz`LGX2^L!EEf9RqW2AiQWY_C
zr5$dauB!B&9)=DK3>@n=V#QF4f}UD#AQq5hgw9s7US$78g$B|)^oR}J$tH-;#y61=
z@X`X%_vkd9)(ATdwmlR?#z+L5Dzc%KoPrpiF$;0Ju<GTy67}S0v4;6Z0>!LIA8C=Q
zWohrb{5Hj*uVya$JB3SVmJx)8z)e?ei>MOSZqW6WC?^rGzYZiTecAYNHC+*@+oPN6
zb*`>eq9{2H&rdplAQwUv$B``^*pTrS3;0<N^hCw}kj8~$G+*s_SY_rVsTe5|Jm2Ts
zAXJ7b`9mFs=#!E^sW2&0(R&MG3y2O+HTej9O+JJuqZGP+#LWA}pOs<aWe0;Omw0pG
zuaVzK$J{b@$yY?EzM-rISg17FZDf8f(E#e3Hp>~_h5(l#(2P<^2ReKkBe>-bA4eVD
z4^D`!_Lhab73-_vg2b*yQ!ljrJU-IR`5`^kOx7|!2eWp4^d#D<u&}gLGa#UD-07G}
zgB>7e6}-IhkFDx24=0+c$NTn_@OWS_j8qotaJ;#nAWwHMtQ>w~f`p1PwsVC{XiYDg
zTXGdNZ;}x3dJR!=xiGCzapr4YpV%we^U@wZYkVP>r06zoEL%*SJN6EER4rn8Tx?mk
zks3#u<@i@O8^DNDgni|~IBJABP=i5|U)chJtGLX=1Mi*Bt45^$vo0aH&j-RvL&v(c
z9?36U+kjB>Nmh<OM$p`EX!#S>n=@{8>t<q_tj6#UE6Qw3>Gf=J)uRg9%!8joXYS_Z
zHFoj-Jh(?hlo-G!IV?6kC8Hw$Pq}3u=BbGC;MMajVzI=d-{F5S@6qrWHPqq%${pgi
zU%8>_>=mk21>tkdVS4pb5fb@!nwaSd@quOaft0ShuU(zlE(3hqL>{1J1RW#{&q{`R
z*!U<Ro*<TW<GHO!9vChpsbbF_N#2}8J1I{UN}vH?ehP%YgeYVraBv@f;;G}Nf`()8
zRi>3wOO_o5wWmI_t##4uu*cvDOnbyahF`oL)Wwqard=UZJ8WZV+X?P$H;|o@wjdw{
z7+Wah#kfj*ySmQ#lY5Y|AyKD(`cnN38Bkhf(6DYn2hh;a;EMp@l8)sl$WKyw&NTk%
zcHiKf826p0&AU1SceeS7!(RPRCM!jo7y@3Wu$HrT%36Q6Gv5wcjO!<cZ)*U1)^jR|
zf<g>GqD2u>p$Qc9Andma8Y8#hA)jIBygYgsrsNMuVeG$<wV(l>K7ES2#4nsWEB;0m
zfih8$0ChM;icc{VXrsvYTgbtKJ>+=Re77G$Zf^|zMm9Rc#6_f~6o$}3pT+!84l`@n
zB|>u;0_ILRAk_~AXsfH3E-6Ba6Yj+5=7=Z%>6*x03m9gz%_fN1Z*7EcOJrPfBLPHF
z66BN*2vf5TKlbCfE}=do??eHhjbVTEuAyTib?_JrCs92Bd#3gv?{<=r<CBps=2s-^
z6P5e{EtswhA<7GjQsHZnerbRiV`SrSjOnpf@<Tv_Nae-)x;LNWZ?i*Z$9S95)NezU
zK%;Y?y^&~zlX^*?efh!DO)H3Wgma%TzjZ*1+cGNzeA^8o5j*i>c!9W*o*EcoWo!z8
zk+L6wpYQzi5LD#1kUi7s;xnc8zHJ|M%|27xD!U;uISp5$LAJbnO6F2}z`kXue)gpM
z9rN<+>C5qbuaQGy;0+>-yUQ?Z`p>W1yFxZMlIHUd{;?OJP`|)0MCuFP7Et&^36EbB
z4JW#-iHQSjYi!jPbYBDJF0xyNA95dAB)YAW;tcyZxhse&cKCP`ul)H#q7oyR#^x}*
z^IpblNxf9xXdkXfIL=h!oXh5r(*z$1hJB3)!d_gcUXR&x%$#bMXlGu2JpENXlk$2n
zCqr-RJ;mcqiu!UB5d-xNg^Z;1HkG7WLE4EctS5lZtt@})#L3(SakI$fGU;tH<;IYZ
zb;=qS6&1A)hF<$HKb!Gl*pvSNT>xF`;GaSmm}28tG2MWn1U|-T{gYPze$vkGm*Yo{
zj^#it5#A@HEaUKxao*MbVI5-F>975RZS0ijM~-U8jlSJF!__DwK@vWM>;2e(rrQ)M
zS)ov>9|eOnXTM#Cm{Y<&8{1$-7^vAvp@=sQ@P~BSFd@o2HaF`=e1bu%x2zAQB8zQW
zFc5!G2jSJr|H<Lod^`~bj3ro9zBy9%NvYew$E_o$#79xb!_&18j<CTse62t9KRQ)p
z(L-WJR1e7eDxK$q*%$k|OLl4zxi81rjoD&40Gk&OE)yB)-SQ~n+FIM!iEzit&^qhK
z+yO?6HOE8!6iKSEHqMsR%lvwX!my#B7?;;myxtRc$nb}k&G=E5onZQMqcpoKsABLx
zTZ|S1kE`*2GmsF`XS<dP$3tph0W)Jm*dwn2{L1FKPA@bswG+wSkfkxXUh=PGRD6@3
zi&=5+t|(&p<@}^OrUCjWxp|wYEVUNpkX}UOt39I?j!r#-cKD#2PMY<<VR+9hX3nJ(
zfm3Nr3{d^J#ZtVd^UZ<9`L&RCC>8NJzWzw;7+wn!4%;76qp$^~77UxE^H7`N_Zqce
zip1j4d5Vm%Cm+P99xio-CppERG6&>m!PB>Ed9{WtG>TzQZc9gD0-2(h!8==X;wiCt
ziEh;8?A){&d|z6@qlE`9Ir~|J-#F3iCN&a&aF@3}P7{3yGiowTdV3IR0Xw?~$qjD@
z^T^`H@Pyjej}}Y5@3wKLS^nB<y5I(cn=idV_T2lz3SlZ0A`B%#0*5cw9j?)N<H&_f
zqRcH)RWo$tIDAG4m5f;NxanV`*`PQlsfd0x<Lug=6aB>DFoFaceF3b|7r2x~;;p;|
zykCaZz7)b+(IwDel4unz(*&>Oj4zcgTtLAI1Dw5f@dXoz9IpuZJHorh6S?qj{wAcE
zP()Jit>h0^DryCF!{xvwbHC|Rd88<<TE4=)!x}bT1T>f@^juNu;mM)%Vb$j(<>szV
zDpbX(1yeaMP}JirEcNP*Wb9<~W*6Ne(B}Mat(eVw)3)t|YV>O#M1|;E3GLba6Lek~
zXqWodC(_JZGvlqB!@Ky%diChs6C~*^gFzoVBbcao@KpMtscFttf?7e<WBCq(QDV-s
zZL?3TxSM9Dk-of&XtnYA#cr^d8x_<qrHZ95$71R>5#B*|AifD5-p?nYpseEM5P#0V
z(P_u8W&~FSpJ(B18*RN;OV<_Yi>#13Y4qgv;7kaVI3OMePjnCGtz8Hw+5f<HRcL5?
z_6>%%uwY;X!AGEMQF$jU79SJ`gpc#^`NI@{g&7?wyXPBxv_IZVHzE!-@7{MGp!cuU
zERNW#MA$r-PH`CLV!!E7-$fCau!oAdrfrvhWlVA(%|F`B1IjWQErinp@okXI@t032
zoojmNP_XMpu&bEIPEY#A6yEX@1Trpz!f~&uz_ENm0JQ5JfI&3N{St$E)3tVBOvJ|o
z*6!cH6%|C`0ZT4@P#G23_o;<AttUIakr>o07f}R%QfRMx9evqgaaKw4pjVA@;(Q+~
z)ULYRl<?c>BV`XF!VOUp)Q^)*JABNhqF6DfoKdwQ?#EG}ml2L@HVy1k-<){dya1s^
zA78^WQUH2U8-O+R(ktk1k@ZfcS7$h=*90#(;n5rJmLe}>R;eBbX#2S#A*R;|xL=f*
zU7&<OecNUr#D>=^I#PwVBJsO0`15IAXT^5dq2KvT@nUkEPt*t{wGrlxL??ow>5G7!
zE<hbzK?BI4TjFl$?I5O_ldRkTG1=B$MOdnV98sdeAuc^M$>d)?G#6~Wf;&IgOU09k
z5GFHHTpBr;cd}8%K+MWMRYjNlGfOz~$veIDecp$h3uO<hX@3uweJ86Tl(QX-d?sI=
zlxr`){v7K0UD*AwCMUHM4OMA50^GpM6Zi3LS~@6-?zmjZb(g5@4N3K}n$4t25;)IC
zR!O^KwR>vp&3Q0P45-2V-y=MBbxp0-=K}<8-8ulBd$a>DLoxt%7?|DHFz&?Xk40FM
z+2s5<!aG+;A%Rj3-n<`#3@FmqSCTm{nwuONaw{bD+#2#Y)U1&H84gHKXZ=U)a@o*M
z@AO*vGljVZu&o_#5^4zpmCh$cV6%ZtDW}wd3YZlQx%5}K*!ZB`4k5yC0prGK&gIdo
zkXO>r8R!4_w6P&X;M?qgd~YBJef0+#8kR-Uq~@!Mhot%X*CpA2Oc>hM!mjZ9v7<7@
zbO14D%pkiSDl!a|b7P5lpqDxTH8XCTFf}#xcfT`d3m!Yb+WDh4=@MveQxhx5Gwdl;
zk^I3{uiC23o3#S!by+!PF2s(FbfFcWgx8l7&*NnozNNop51bM`v*DHGAO0G;vd2SE
zoP&488(Le1+{s@Js@4mcd@2$MJqs94R7*#%5Q!RM98b~NLHsG?M3;g0E}Mru!SG+4
zZZql8OUp7Fm9~$6N}vnhMhyD=|Kn!odX%Y(AObN|9Uui7%$RHCH2U)4lNTpO9hUPR
zp8MoF^ix<u61x58f3Gy`J|`<v2CZGpSz1%%YhPnMsGcQE-wv@#`(b%VS$1RzgL|*<
ze4K24l=>|c8025DKe&Ws2j*%nDi`_zf|AsCy`Kv(XOM%3GEmw@Iz9-ZhRps6IA1^<
z@ZJ{C{7y7r4?bpoKFB4w8C1`K){VHi4Q(_got+EsJ(=r(CBj(4sT*KU%(E7xTstBx
zhwICeDZtlteGv%zVTF<_T*Xo?!J;u(-d2}hWlE%Fyp{%gQg9Q+=l|l%7Xg|Z!*F%W
zT>(HRSl?0n-Se%_R++gA?9VA~$Rug~thc)7c&Q*<V={?p1$RexcF?m;<Vp0_dr!ER
zU;SX?hZCB2qPu=rvpz65sT883-udX=`fjGR5x<&-&?&=uIlQ)fV*NT;;M&?H9ZbKx
z3~3&BT9KmM`SnKtU}R#dv;$ch;5k$%h6O?MPQ|_vE^{LixGdft?fdH^i#{)G0n=M;
zMLPRC7R@J6*Ehly`u4IhN)n=*-r^+{*8bFM-4X_2mk#{s7=Ci})~%GAD2Zb((DpBE
zLIdN6z6XA{g)!#dTua_&kbRJb=G>WX*9x*EaH%EW9ey9N`IW$v7IL4!+p1SpOmh3N
z##5g}sVBQDGz-%CD%T}@LUwH$q_zHpltkgR)qYI*vZ2feYI1K_zw$GJ(pzC&*hfD3
zTuN}+e0t{{3yO#oDZT2709?Nmj9yHkiHOD534SA8&omy#AcOg)j==~wZ^~oINgr>k
z&d&L{hy}dHd^bb+tn6_Rh@;?w>pPWxK!Ztc)R}Ef=NQ<#dqL9W!nOr_H1#@pPnBIJ
zUDOr|a_M)g7y=S-jMyWmXSSJT<Sn2R0U4t%{=~E#W$gD+^?;LBF5dIsI=|3qWgH;!
zCW`^mVmyrO8p`_0w-@s^lFYdj-P{2rnUfxyA!@VMI|jv1rF7y4QhkfEiix&gLkB`K
zSZoe%x`Z~r_89FmgOQJiQ;`jKxF}n}Pok>U<^ymMDqvTI1#C<*NEMso07axs(*3x%
zsX9d|F}5iNNWuSgpkY^dQ$cobK=G&Wv0f~M&JexiqYYCLH(p4hFFg47Z3VI)sy=gT
zB}79OgP#7hbQASL;-_r8E7c(_=(Ye)z=Yr?>}BWrs}Z<9Olw{Mv+6snZ!X5;8O#dH
z#`(aki_2Z?$Cue%f5VG0O;}9-b3hjUk>0nE<mtbuyv}2o!yJX!!kue!_obiQ`-s{A
zD#7)quJc~(z<0Qf;j9qzf_&kB05v5peil6TgS(N{QfcVbt&)aAoy%2`Q0*z{kAJDG
zgAVYY)GiXlvnjKJumGG{?Cz9H?!<!WhlM}ZH*!|~i})19#yy0Q@=fS(>%b*VJNlfI
zI)08Ht@YmiZ8<X_1CwuenV5`yvxtW%;lq<KrhgP{`0=!3(Puhvney(;#59+jbMu?5
zPuq~r9Nxo^#drW?U_rxMwm;*Slr1thRIJbrMQ>tnqX2-I=<$h%hL4ZL-19#|pwEE-
zM3L#A%ZWewmH+JqdVUpxTf(xZGd^NIYyBxD3}}8_5;P8pT&i!p53kY`>BbC`=vytq
zoRyvSR+lTP$&*|p3IC(?9le)ZSxq_GTF|kly)^hQ@MYGsOSM-E4Z{>-_rmhU`Ft3R
zEMET@kFBQOP>65wSd&k9pY+Lp>+>g_5W_cMp&#V1EQ9otZjcL()W6x&vd<CVQ~zL$
zD;R?%Of}GL>ol010OtJJg853pn<cp_@Ky`wtSGQSFz0#~JcbSCor>Cws`inxRZkXX
znzcN-wXlt`L*JEw&KiFsFH-H_!%N1dLP4M0N;YJ;fNgzYo6J*zZ9MU-nphuiSJh>K
zZ$}K!OZ|4NaONf|5~MZ0IzBnh2|i)K1!dyGNZj4sueOTjxnF@IfPK&|w~V8bo*gXz
zPmlV}=O_PXMC*9-^;2#@hrV&(hD33SY`{9B8op2j@s6ta>C|z(PQKA?4V_2cx$UZQ
zJ>&S2x*g2*DFn#JCkJo;&FKyBT=GK_0EOiL378WTYRTN;N6tg|azFpQ!N<jSq*)@X
z*VddG&et+=xV;hY175WpRp1AxpvQ@NQ;3j8I^|$Y6fTVx_m#9IE$?Zr4oSqzNXsZM
zu#)q+K6yRpKvS-Di#+H#UE8cYM0Fv@pZ$_o7(ZxD0bM=vq-Z4Y&+R48pLtpT*VJ{#
zWBGsY+mrDaS=rf?k%a8Mse~liA}f1kMP%<0q3n=U$ci#DL$<QBLm8Q6Wc<$E=k<NP
ze*VMr-1GfD<2vVD*Uf;)@efsA2Yd?R$Xi0p@YHU*73%{zmt_MsvQ4OxJyC|b>D)A^
zHUc8@BK(IDmX+S3EDcKmeFXDwDtenid%^W^v)$&dcwbWs0-b|@#;Ne)``v%Y=$@8o
z8S7bJB)nrZy@<izpN@3d<)6nbh;Z7!xYKf?cxTa{b%<kd2Uol*cg|^b7SpkIXQfXR
ze|0Hyyw-nFV4f>k#x9G9HT;wZ)As~kZ#`}xxYig*IsuU>R2~pj$*{e5uX9=7U=yi9
z=f~KUwQt`}eQoX@1Zu_>n{#ad6wXjomOrBN|CEi)xnJKq<xrt3gCAh@VAwHQ#qjM(
zk`(#R{lQIl%9pBRoz+cV$?x+;o^mz*G~S|b2o7&7c6`3g^YDC@oXVkBQ>bE>sO=@Q
z#jnwd%yZA|OPWA>r%se(-qy~JlK&Wp5f<!5KV=Xhq}hGpfDlk`FZH#<)+4eYp3&W?
zU-u_FIb4$a7bB2lAB%q`U?D&{RS@KP`;2{G2@(-THrvSM#X6WSExo|<5qWe^?9l<H
zC^6s_MnN(=jx|Cmd-ZZ*+3IG%!?;LfYm8xLl3>zTr-OrBaRUtAOaw>V#&~i}piUI1
zKG2rd|6u?g=d{zb0Ybv(FXASjZnY3Z3!$*SFMyiFOemoNs>N6*s?en5!Q!j+_VEml
zoy<GG;r8Odn<~OzBaT>3xX*171pXM7d%j!z`cd2^6JG4qrPcK_nZaurw%3Y7BOKCc
z4aRGKJF^f77#|+i72io1RZP3opnU-$!Uyq;iwyAf`zyn<X!Q;h`s!H&5FTAjw<xMM
z3dtW`ujC3JZm<ICW3eU#(<1Zz>MFRF&V+aJZ7%%@@VoFlcW3$LkBiy4yRqjY*1Wqo
zeRqNnGqF;$KD0NG3jc2+ntu$g;#^zH&%})+&ACC1@KW*VziqTXBNPRv^>GZ^#oPfo
zG}m*U#MHNL-FhYLLdY>*L7VvN(oI?%gM%?O-#>Rw3adF7oR+`*79Nc44|_l{<t?Y4
zFXsL|Ubv5o5|4BWqh{VXAyA4S?;^?NpR?si*lg;BKD-0^C41u|4U1Lu^rs4_K;>;`
zoMatO{_b54n4|^IOAnQ=SI_l%@@idWko@zQ^0yS)H4g~>1Z*j_HuoI;y6|EC^iJJ-
z+{%UM?gY8(Q=(Qk0y&!-i_CZ!5hm8~YUJzLk=Kg8=x9G=UiG3JcSk?mzwnQ*f_{n^
zK~$a)2mqT^41>t$f4QkKb6_-9K%KjSKhR}FboJyrX)F8DYtr*d&eNe;C;QCLv+MaN
zoG>G`M;T{3YpbrGr}-x9PL3ZpCohH@q>8*e9Y}=Vws_nZJ|>sIg<&;gRy{9|1quh_
znSaU5*LU>3`4@|@2+8x$qcxdEWhY;xa@C}ShPeo!73^R-JJ)M6KG1~=`!d$jB!b?5
z1Ala!>%;k{0xs97zMiiAX$~nAPCJtq<EJ>L6?i%-4KAjp*gzotemN}?yG;mNMa{~p
z08Le(Bk6}konY49Ih_#iY<isjiDN=AV+1?4HmV2iN*;Z+KYX{P`pE(uI1Z@r6wLa-
zRJdfmzTG$#PCAnSr2|~5iI7)SRn#p0JBcIKNXHo*@>tcI<Fz%~+P7|@Q|crCp4dq4
zE}}g$_R;5C0Gy+No<O#i!1qn<w0{9+{5~=n&_FZW^HJ#4kEVNz>+D#@i5L7tIu!Ut
z5vR0~`inW4uROdO@^W)=&^QBLPoDQurkAwQ9~(7OEQ0L8<Sw+w(6@moL+(AFZEtF~
zh+i+R=agX|M+P2;As>w78k;We27U7VJES$9BN!qo7o7E54p-4}GbBqH0uaK-k(lbf
zZ|*qXCT0@cPG~XwH8YsKBZDISb^5Kym94N`aGy))89*i31)w%>$FLxRoHFK}%EMra
zkG0qzeY}BL!@C1}`%3-4wF5NPpyg&bZ>4x$QO>gFvWd-}Cwq8ODr+RSx=@~$>fs+z
zUBbXRH37O-pQX$tctL8iYgP%g7*yw^X7QOlYUXM{Evp{P1&0UALoN1WT=twx{?&)4
z3FHE>x@5b39VGJWPRb)vBNYkq-JB-*=do`pj&ZXv)hmOX50B{`bug^cuDudVIcUxQ
zvQXSgNiDy#a^Mmsr>>51chbx3hF<^Q<=Y>l^5P`_t!a5LSkxZf*rH1kh{^R8*NyEH
zGTnH~?%`u-(D0Reh(EbLg&p^&lgB*Pny-7X$66+!&P(b+RDWd+N$X<`p;}wCdnAuQ
z7g>PmSCI{4<eT?=ES=m#NQf=*p1qg_$G(f=>g1<I*uR<UK8-$uBcJ^a^Go`WpP^bd
z;|WIbseI*Tz`*`V0PTSP*<wo)+Q(i}*@JK7OzHCZNG1OShDF&7-4L``?0%|Jy`%LB
z7^7U~W5s+O!>Tc;bhmzuOKvL6i~;Eb>3{J!5p&MUhHtnpVvL)wHpdiu65KMOw{UUa
z{YNg1NAX9zdX{6Z2xhz)#b&1^6KPB*l=8KM_{c5n_RXf|rKb1e&=E8Ugk-IIo-Gue
z&LRv93&TfSSyU>h-=2lEX$zCg{eiUDtAqgIRTrSHWbr$7T`CLdfzBC)fxm5CKfIR=
ze=t4BOhP7=AGO%1Zy4}q8z~V5PHo-m%?eRGKoxHR&CoCH=^%9ac;qQ8EbJ}Xz=e_j
zBK*yNcT(l)%xnmRX1V`CVs0_o?Mo3m%#a-U+F4G$JGmvi=3O4xF|Ay=f5xNEAFtW0
zA(Nr0@F#`(Z}-|IR!@BxjH8DZ6#$AefO!aick00<KiO=q`3LL>f9<Le%*FIX=gKJf
z_(<?K>{+0W0hzq6+No8G&EaW1G1_g2Sv2{m_~AWfAD7{$^2m$Y{{7v*k8HUY3<3uG
zbTWRohm!1Y+pY{V%Hf6T3IY-4<2igp9Hft3VRFq|$g>x(5wKuaXjxnG)$c2VaYPbE
z@qVxeZZRdF?vt`1^4G-k3T>x;pRM%UH%=+;Vrs6PR{kq>TWNhXNtz7#m3{6EerM~W
zsY5*5?!OC3M7`XQu*X107=99$R_}g|1T|VPssY`jsFL!Vyf0tA+|XFy@ea=#CZix`
z0&*s&3rG=jbFQPD(!}xf(&yF;w&6c`<HzfiA)X%z^(lWR=u+jglju+o_*O)nEL}jM
zFkl~pHN~~@_Xs_%_Kh2fUtHaJk%t?>EXg~1?_vBzaCv#TPE?64JV!XHWg^S1<5a|L
zB)6n^bhmWjhxCpn>Ba7gwv}fyfrqDemj!uVACty|B_1}a_;d3Neo+*3t=cA`XM<jp
z@#k7ZS|K34J_~&}y+6|$4h{|;xC!<@waJP^w=AvF!o|afa^RH8K(Gpug$}l6lL_+W
zQB1%c0l#Agax-KgE0~otP<<T-j1g0h*)gr5r(CptrSNcJ`}jNd@^zEsA!ahOw={uN
zrKu-^vTw7v=IG+G+fU}#e8uGO82DptjMc?|<|l0g9QU1Uj+68WLRkeRI|5#Wt~M7F
zOBlB_=o7HBwQbz)lPk5D5%81+NqIq_eweS~Au@fmH?xgL5$);Y7`epS;HJy+;8c*B
z|Cc`skH4yo^c7!L=dCZurKzkt?x`y+(2n}YL;wTrz4n*4FqxT|HLK-aZ=pi!_1dA^
z7YpN#v(OHr{k?By_wOb|aec5_>TqLuwrq0B$R%YD3CG1INkgPaZp+-6ob2nITtASw
zus2Vx6Tvw8vO|sx@+%FMW6D>rU%S5(7FfZ|L|rIp1UZT9HFF}OX_x`tvc8PP3-yz?
zJ*l;QXhZnCCw;Orv+6qCl2-rux|34V$*dq^KUo&EO$c_S6l1{Qri1}S;w_wn*Xi8C
zw$Jpo_Q{EeJX?K9bN1_31}fI7fen#!m#9OEPty0a1%)!h$>LBkPYtRFr&3F+5s(<&
z={}4r&p$~Q8Ua&UGcd~f2kc<zVGy%I`=Z*who5@=F0bzsw8@fxOgmcNzigY|QZb<u
zp$2`nMB(QVvTQOs0ap9Fme-MQo)eCCXEHdU*W2gHu(GzcdRTwcX<Of2qL6f1w{yq3
zbr{uj?hmpLhPx(ixHLk%tZifj{@*7SwOhU`#Re;K7ch6=#fgK$R>i>m8|FZlxHnwg
zumE8Pkx!()7KfpzAB#!$34Z@?@i{GkT-pNVAN}gfR(o@;_(LZbqiZXLew}yOh&2^%
zuk2rk?kpLp3;s67=%^r{$p_&tlQb7gJ}mPV1W{8N%ikkm%08mJnC=ub^*}$tm$#LS
zD1^*OamnW6)($h(oGT<-9OPKY@0;#`qMZR@Ask2}Tb2o!dU`ynRic-d?VjMh&Pl+{
zZDGmT%xtrrIK2F0@^2EQT&}$B`h>0ji5e2?V_z492S^W5!=I{B7;;lE|Iwcdu$J$q
zzdbdG_+r{!p-HQOyTF)`CS(-_ArJR=5nH~HlFXCX;C17W6f!5ZzSL5-;rc%P-M(WA
znW&Cgvi_}VYTNzkS}22;_UI*$V{zR~f4$RBIPKKqjX#dIjlm(6z)1UT_n?EiIfXS^
zbwP@qL7)2FXH0e&y=jpgJp2~gH+Zq3<SP=`S8CFt+D)gY_j|q2F?wIPO7^qgp1G3A
ztA!ideWBHODg?2g%Omvas2F!#h}qXB$k)d6I^^O7-M*_EKipq1O~3KB1HanZ81XwO
z8h5HFMH`y|A(=(r91#(HJ7_M(Y;C!f_HgT41{+=G|HsC%xVWg{WkiY26T^rq*enq2
zWXnT&kx)z%{j9K<*j<?Lr(YMF$FNcn%|bVBuSfN{V054m_{1Qi13}XSimyXM=D>mt
zSJCf%@UxJD$VxU><U(j5N`{8=I-E60#dWINR7E+}VaLMHK`bbn{ug}^(V&7DppyIS
zNrOKOo9<fX%>ypMK@&YYdN=;og3}je2!(*i2o;+5c8mfIWyNgQKVvrYuzNSgV}g{q
zshZK@O*IyOs^r1%wE6M;D75lsr+c8kKM(~kP-Sr`&o|G;UOWQPSEhjD?QBT>(7Sac
zVGzcG(&zJ69?$R%4GrJ=|MjdpIsS{POrc<>gz?>Byg()(6m3Q$imx}+&`p7=qQyyX
zse?!UJ{S`uZ)9|qzkWxDQPQIWAOQFoYzEZL^%K1f3Qs*RE297z2b5~5>~1^h1Jgmu
z|Mdc(yx*V<BX4hSui4Y_9&u5E7OObPWo|Ys1n1EZeGx&4n}Chehd?C?)zu9<>(r4#
ztd3s#JUVZ@(ZX^JE>jw>fa>q=dOJubmcbn;?13DPvW-pQ$Rf@@C-Mzwu0pE=ACRKQ
z1om!AEB6q;R$v9#fXbQ=1gr2wbz<l*<M+X)?R>Kz-)1pd?VQcJ3%!vM2L8^@r6Y^y
z6px7k6T{%dFv~EY;!~%^zG;6o4btWgLHQF#8~kfWUI2qGcMUr^cINiS1M2e{X){$k
z25@Ds^@^JbSo~1wR}Mzf2aY;s{b^6E0^iGvGkyXsEmYJRZCH2BrcLUq`!4{^9+$ld
z_gD%l$%D^10=W2npg(wHV)~c{u(ON0TLcLOlF0jiGrP9Jb`rN8m{BnB4$y`Ew<c#I
zzGzCF1_rD@<1sNUz2_3uar>mVW7LK%X`l}X)%v0g4M$avDtaZm{#%lK&>7mo<n`@_
z$C*o9hd;FfnxO?5Vr>p?A{>OyG*HpAEk6pDkBMVp5iEK!=mvr0-s{SnU9wQcy&mU>
z^AM^l4PXO5efsp~$+d1ST|GUNk4sU2ZU;~p_%U|tJSV=8d=n1JwFko8*=uvs5-I~&
zq;UgddAIMoUkgf{G~rnN@0}<{qAAU7Gyf{U-*Ev3+Z!r<2&R}`<pyEk@UY$?psPFM
zF&XGaM59~OJa8v-Lp<>7<H_-3gUlW1&&aE<pM(HE>NzaA4Uk`+-q*3>SwY8vUT9@Q
zY7EBVTm&lj9dbq!_EJU;5H<$vwXmQ$2Dc;*cnBk*%}sgMz;Kp_bO5AoqjwTY*{niq
z5(3Jmu)KS<4Gba=4t&8MibnxYt!Z6N{yP>@uqjYK{}<_@TUL<}tr@iKemwDq5AuKy
z<*(aN{P&%!2%uM~4#s})^3o*SU;MidDnW?ZgMqCy$MTPPB8sp58<kO2y`hV_Gus>r
zq!rMIqXi(G3#d?|T`;EU&vSCLLtYjYH30>cu?J@wFAyk1IRzQKO~)CVg?J%c?hxnn
z>C>j^b3CMs;(_O`rR2PSKW2Xup|cVWC!r5AZwUh-Jsbch0LW6fc8wS|Y&f*1mtNNe
zXBq_N6P@fA2hzuS(YBkyqM~z$+kI-Bl$+zp8aZXQK?@Z&ef&NEv%rC7(MkCfev>F|
z?&R%F*xqRU0t~sz;WgoZ=)u&3bs4moe{Z#-&&{?dC`b&<Fd7^Sg7z_LPd8?okU;Qt
zvrx+d32HLgqn(?TRaHI?MK}Oy!FGE4y^}>?nK=Una^lYRQ?o}kp8}Ks@{huA)09(w
z+t<-t#9)%T40aS+6GLO|Zo&3DAh$p#XrY|_7j_a8s{4s*gwt2*C^S8QK0o_mK9rRQ
zb~yCS`3%}O9By6n14wah8d9BKo!#4NatAlASRHb;z|M6Yvr46IiK~c(Jp~%wkDxXT
zK6Yw$4CH{I{UtH60n0`w<6CKEEoa^w5>r~!f1l~&-^q1Us-<;p<7JL^gg7v_yY`5T
zptK!F%Uq14^Dy(=2y%&=phbQMRvg^BR@fVlPrD7fGRF6ZZW%D;k-I`>X8~Z6Y5IT}
zRXE}e*C*&WE)2`*+8f~CzXY~;eB?B<w0`&MzCC|Z06O}1xDhVboo<Ye7wQ4s9w@QK
zeBE|$*Ek*QESgJAP@K&GF&*Gl);-s5f>xgHLe%l^1PusU!~wol6UqtgKX}PH=;RQj
zuVTg%U=KlF`$qRF2;{~ja;Po#U$t4Ctfjqea{mb>4iR2B0NQsJK0krr;;LqQL9(GD
z0mz?T$yOu)q`%3;YZCAJg;${#^ld<Zx~AA?#OsIS0@C9sahhp*;s{Lcp`Q6I1o!Z2
z?7ngnk7;Fy3+9#hUA^}ScMMweFYy_@BLTix`kz_~Y!fd_N<LkBxJe8el*8z{&J6}Z
zO5+ex(3_kO$qfc4Sz$SHQ1}m5_nN$)3T=@Dp%)RLya}5=Io@3ke}+-aB|iqT5mc}n
zrK9`ww~zDZ1ggP--n79_BL%i3$bIxdL0%KutV*w6i5MOpuIX1$QzHQ3yh!M(Z|A;n
zVSBu_PK}SI1tm)ZqAG94t7bPwF*7gHolwj19qf()egPHOHW5@M1`-!-^$7ct{eZQ}
z2i_W9#{?U@Pp_P(CH(t6Ea7pqafmWEZ}BUYYqgWl*UI@P!Y9=xKj>wbSA9Ny_v+O|
zLGjlDTEpf~DLLke=YK^~UcnW-oCvjz7)$oYSI%F4D)CWHHzmrFe@Vz@aoaab`fJAa
z{=?51?y^f6>sF$$Y}q^+^zItaEG#U5B1gIk2UUj*4-b#dufUSTRbpmP8Dn@h$4(ap
zAv^KQYywwQ>ON`p86!zc4#<dkY*r6KHDaLP8g1E^w@)pJ1Hlh9c6D7_6^@VxO|-<c
zG;U9Z5b0rPzW<3?wvd*QIp@#8+li6S)kfF6MWF(&D7@LSo2>cQ!L6g)W%M371$5jH
z5``+R3OlfOVo<?g&G(|0?@d?q$*$;JlR5JfwlHq}bGI9yvWbQ^qxVLY-SChWfye%R
zs;l!WE73ra9Fd9777qlq`J+7K6xYG{JjToUP80~5Um;;(QJMG@gcsEn8Dk3zxu{?8
z^9u{>KK4)Myp2HOe|?oIA|fQqAT}WmM2Gr~Ih7xeoWDYiBqk=ps>nev@CJ@N<8{y=
zZ`FJx9tfV2T}Vi0Rrn2i5hie|f<jJC4rK03R)w+mR8)B0YuSx(!`DHC)uK?I5y^Ck
z<j7s;_}`zWrl$V)=RD8>m)F)#fHM%VRoN%!69rCGJ4a_?ToGM_TuotGWs9}QB#-kJ
z@_lLP-=B>ynQ256zdXh2lkm0V#$#SYNJt1+WLP~Jlr6Kevan=iv{I)Pe-I+~h9DY@
zi6Md46qQeeWNL<^n*(0csT`?G?4s|D<I>XT%D%9Y&Oss@u330S>hx>%S3o2U^cd!l
z?OGJhZh1&%zBKdvu+46<0?N(bCH*NLI!wGf4YCL5r>|_O*y-p{Mny$!0Ltz<b?SEM
zNDC;AfgZ^35oQ_Rn!~{s5CCj~KBh!a28Z$t{EHBoSzHVQopjXVgWMC<!S4E{j*L+_
z>q7l$#c>W*igCDbn3<A)J){T+1O<2*-yL~dTkam!JqR{b0Tw(3;yEr}Ud~5DU%n)L
z@f2n_4c0k)XU9Wxo+vajF3!45vsur{$%#(L5(|rxf}9))ZVH65){ox@!)CFn93GNP
z-PV_vS60kL(;;d`K(`penBnNdBmarH_4RnbI!Hl;5_7^5rB$pq57ByaXA;-Naan0;
zMri(M?9Wy5>FIJ1y$jLtSFVr<Yna&scu#tLjgACAzo5Vz<YBanbOq9T;vK%gUXg}s
zC)%MyNlEG5*O_=vn4xa-)7gHzD#wSvW@m9i6$cEdydOMJ;!j2ISLi7TXkjIETK<5!
zBm04w+1Y`E*NVCF5G)fB6QfGPm6es)!+;L@*nDDy4RqG-9v%GV|MK^nrI0!J33W|P
zr|pn0iQvMRL4|gqZth_}?8n5Uq!uGT#qlJN9|tYt4Vr8#1Gv^%xVs?LyfW{Pz)i;h
zcP9_(Y~EcxH|S$kA*DSFnu3&4)I9y_C1ip65J0^J>sa=MTp1#UW8l6vhsvp_$srD_
zj0_X_FC|CEi|u1aWcP77EjD*{ltDMfdGoig%<;j<M+<Nbdgw<lTp&iHE|<eS*Q|1P
zV@QZ{qd!u=MBbvJsAwU$?90p~O0xzUG_~`_A3O+AF>mMij+Y#)6vWvV5K$2k^W(#P
zPm@MCG+NSuf_HdJH{-<d(O*zw=k;WGtcVwgYSo4UydRy3?+h*`7{Uuznss;*`Vb1(
zY%(k3Ar!=BTG{$3ZRJ*7sM1vJ-KRa)hk&3fgL*W<Q;BznhkkEN>kU_hIm3yN3nGvo
zLS+wlW@x3TdxwUH*?D*(w`-;YPGqiLyCxBT?ZPR_vJDZUb0Q)`bEMTNAczi`Y0*uu
zl#3TGv;ZJ)4ym1{iW}Uif{6(e4Zrc;=#5i4zq3yc!&A?+9g&9m<rE^yB!1F3{Xacm
zYWmcYYn9=}cTSU^eT>y|MpjTg*ZE(QwHAf!S9FolA5hr>n2%iQwC1Kn%5MmH>KOCE
zaOC3Q<8PH??id;}z#5l`Cq^Ja`hM|U8jQ0*{K^B5M+Gl1mWl`u<n3EEgD;;ucdq8)
zk)-qH_48-S%ge>%ufd~XFpEElXO{VV&3I-i)6LUU)OoXQ5LElTy}ctc!z^#$+{tV3
z|0_8}s}*tU&7N(r9zLhy{QPDBtN<>ilX3UuuRNyn(F(cR{k|lgIhaP(&CN}V!p0(~
zSZz$<v&1jkTFJ8u%VtTMym!Mpp9Bw*Oo#VL-6z`Uip=OxWw^kMwQF3h&9cDaR@YiU
z_$Wf#Qi%SNS4Oq-^rH0QB?GD41YPlo_xkGaDCEy4p?dHZg-tx6ifm(|FIf<Zt6(%P
zK|xS3yDntujq`0kKWR&$56NRe$HNZfG&Et5KEl!{-1{-ar+c<ih?RoKtnCH)>sZN^
z!8Tc0**eXx)oyrIk1or)Ma9J}*2i{qsGH9HSso%r|J!>0yMiAz0>)|PTuHxUL>qly
zry|@Ye(#>uHFfowBlgcDluds1spr0@?(rh*?Cjnwx4w7#TV-r!@Zs_z4l^+;j<xUK
zqeDD(ZSfHiGizWRzj2Ap(d`-I^tZH}f+6$8bAS9HlOrkJZ2KOwWXYzDbEg1w%?P&|
zj7ctAch5L#90B6s9r=I-Hk{wQJDxm(4n_M!PeL3?LN63jy=Os8M5G8RAg!88=)xNe
z#5n~{ObjH`>oP)6gXI4K(Z-SAYu~;30(>Qa(g~@f5U<TvdAs8F`Z+BUQzLqAf4r{4
z?w+r_T@NaQQvoOby>l|8#U$!`=UZ))LWybJrf5-iQPiRr3Nj^DWT)@T!w$?iy0$nw
z`zT)Sn69a*$+I0q?$4ld;7z7a`)?x6Tx<tVl~q;Ik>`vyVp7sikauCj%*CUBzRWoK
z)=j{Ryy<`MZu6i2UI#IdGM{bhTFK#^)v+@m`xcv%xec%nj+T~I(>O;-a49u1A>{N;
zyzcj~k*Ai^m-+`@X#dH_gP~IK&)sFAVPTS!hkSlX1h}||*`rs~+aTFM6A&<GA*rcA
zeld#&R(KvXy9MY-Xx5f~{fe7D`sL*fIoCjy{q3v@KYed+ame%$2$PaiQ;CJ@1zjJ)
z3TT8tP)%7yg>cx~*qHJ8^XCbfnU0%fyEzakSU>>9|JyLeoDPr@C^#9f>gFr9gQ!l0
zg$>)kLOlr4v}r22c&$&hf&EJWkuZ?66RrL^RWAiYDUqOQ(ZhD0@!q|AO#^vqVBVs@
zD!t|N?}=Q1Fb!N0swu!BD0ri?$QrCg!~Wt~2+BvE7x@JT2Ma#<;{aI4r*nnvlkXf+
z0XA3%yu!MO{wy>fd+hIOpi1A+=?fHK2x9WVqX{yZ*?uLCE<o9V@qkg>1*xj4vM5wy
zOatxKhui7XGgTv|O6uwnqdzMLZG}5JI^;DqNu#2pjcEVe;HJWYyeGs-s9*rvZ&i@m
z&d<#~<KIzsCKuDFLlla6`t)fK-!r8>b72NoZ~*8DV7hzOfBzQyX_6LJetuF&XeiNl
z(YeDR_*6qvuCmV%RNwQ|;#J+<D@KddAAP!iP31z{r%!`zW^>;rCk1_XY*C!Xu$boO
z&!6HhGYG^at(vhBIco9DsN02tWjL^%M`gwh{g^x94pn>vu}_9vfa$6(=OZG7`29g%
zfX)2UQaCtyRL`56hettG6+ezq0__DZyU8JqN@zm4a|5s&c3Ih}b7Af8pY82=^CEm;
zr$S#ME~c}yvk-i>r#m-9K7LGTX>C2%k;uV)@glX9NHdO?mlteCTtME~p&Hlw_qmj^
z@hN<gMnF`!z!<|$2?hHA+Y&qTP!LT@VX2_)10W=IM(U!)IcH~Q&hzKzfM>M@vLoB~
zwzP^%c3n5P<cT{L+%hEZe?AvJL_V`T^cq!*PRz`Veg2$1t;f3TCc7i(2)D!ZjG#p;
zRvKi5zuL5`fRB^j?!NrBv-++uQKJqdbNOe89_hVqgK7_||DGZ9ASH}Cssl`rtE(%W
zqz88xDN_`L45K@m5Hl<j&nSa}H{1xnCxecB9>RA^M<)oLsKSIW9Z8Mn8bg-%9HFoC
zPgc-AG<*=3-edhzm-qYP;vBeM@qlA#7{qAR9JtqMDHIYOeismGG)|kFpO>I7SECL1
z_4Btc^xdM_M$okQljLOVcvdnvo80bhjVWTZ>Ie^K1`bu@GK)#RdJag^2f*0*0TN3p
zB1rh&OJRAU`qIIlwdkK;3R^6Na`W?XA-C@Ul_#)MIYV}Bnm5bq>gy@ao{g@l5#L##
zW;y!1Tj;e<>9RI1!e?AV{^ZG%jg1X?4Gj|5hXOz#0g`vy$IfX_pLW{&*(jDGeBVJA
z5ZZj$Sy=-s(imd#L7NiLD0u}1oD$RegVEhCbR$8ItzmC^Ek-p@!Q7k;u9V-bfuum^
ziWcE`jy5+rOrwBG9;!bKOWxevTzJ^TVrzT5%zM+~TRm`t_gM+iH#awvv#`X&O5^0@
zbdij<g%I%k^=HcMX;v@E0!6YQxdyp{;TLL#))n*x1qH>lf5A5B-nwN#-2!h9oyZ4_
z?Tu5mIDU#1aLq(QT%A){Nd^8M($*FbD!n7j(59(H4(h5{Vqzs-T`E|I{e@aAJHI9;
z3JTxe$47BiSXjlTbuU3l2lP&DFA^y#DLF2?I113c1*8gek$ac@O{l1mVFqDaa@oC^
zQ+xaSRkfK-cLH^aTH%=+viy`Q;e9s@IvjC;qBTxVW+r(n`<+iBgd`NML&?hOoYS|O
zN9khD?~Zw^imo3W9igu@BqW5Dlk<D-G)#;}XEM(w4A{0l6R}Tt_U!YOI&j|A4MGvo
z(MlQ`8sTClu=!EJC=k4s=xkB}KN$_$!?VDY*9Ps9_OQ^Da<$QvqClsrp#>1btV<A%
z=z}C6coiS};C~Ou#3UB_jcuz8zkdA+Xgxk0b7*J?!gRn&m7u={7A^!~5`9fyzMRRF
zydM-FueB1Noy~&5V94p{B64zA_x}FPgU7V7y`4ArRmE1AfzO~E7b57n;@H1O*k8MB
z5pi*0@D12MSFc`m`QAYR#l`fLlXuM2h|VHp9w3`Jz(nm6G3F4aS*Qf0ya3AsB{U|*
zipBTR_}8zvc>~y|8pGo}(dKF4lC~he-Q3lM#v{VGDbk9CUuMBL=f#x_s<a>lZ{QZh
zoTrq%y=z8`$O+h!I%if^h{1K0-DJ~Tg_Ox-GgbWAxaOSgLxf$0?;06%L0qrQpc-Ca
z>p-3XyNd9B+|IyzwS$*Pf;hjmB1bE;huHeFAKy6qbrE&OTeHdz|L=FY7J(h+IC6F(
zGBPsWW6n4tgfQ<^0y#U)2b@G%UW7A-R8}z}?FS>LBYc^T$uERla6m$R9F8p@xrcRS
zED>i2>Qxv#f2#k_K}GBAK$BX;yi41$xCiND;R=$#`}Sg#;R*ySY|0w&mrCpZf5dw|
zLdbOs8wCfY%dQlPtzeP!MLOxiau+f<qpauHLn0!HkSnhfab8kL5nG(~#mHkRpph&e
zo*)B#S9x`tX2@vRE9d{N?%t3PLjCVp|2r3didB~tQWBYoEsM=#_A3!*BVzM&`+E2D
zjXs6^yCf~ipXtKh^LnzkidrzCYZ_`g@kigNxs=&LwAPqzN@kLtPrB0Ra105=PYb#i
z8rGuePb|0;9XLD)7$GYMHA=K=_fp*k22EFhYhS^gHRRh(GqZS9h#oD!Kw|kgDJl2M
zPu!kIk~mjs>;>qOo$RVUh)YU-pa`rUrKecI-tr&$`t?p<mW=w9D?UGZ13-XX+;@i?
z1*rg`>7PW{F#RjPQDjxrc`ByXYaIh)*Z<OH=Z1ZJbg&s!D8$9X+sq<9t&;M_zOAjz
zYZ6IAs4#SVZi=l<RJ63H-XZE>z;jQ0dr?wC3M;)0P-9dMw(fAN3sQ1g@tcYn*|1N6
z&?*pgn`jtfU-US_8cuxtI0y<NXu_N(d7l@JhPxt7cdrbqATFnn6f1XlUl@4{XeNMQ
z_SZKFPA;x_$Vba-wi8wJn!o^Uu2oN??JnL6Pj3JCE{`RE1fG;dHm3CBF~dlyS+y-o
z-arJPdLPBTH&{`e7bQAHCuEl1Z{8<mKeRCTL$cwH(<q=p6ZrnQwelN1ef<stKFIt5
zB!RQ#y?oiRC=O^i3id%XvkB!lmlPJZl4Vd0YXfWJIG$={fC}0dYGtchT5^IuOc=yt
zkh8l#KAXD4%AS#3y1z?=AY<%{iVn$1NvC2}?~c?q0HnS;QB8(kn(NB&#a_3rzP=?s
z8nzNXF|pJnaTOI6v_3IhY8H=zlIZQtEG$^LOUJ4PXJjyHx^V;v@lr)GBDVgjXV09u
z*<J2X<1Im9gc6g3Y*y&d-&?nD-(Bj>RKI>*MM>$@k`E6R5lDc>Q~(ZSoY-mE47fN!
z@T0#fM*e<&0?^KYVr_t<>8*bR?alncLia4%S=z30t|7bM6$oqXNw{^z{#$Pz3ZsI;
z!n=S3(KwqK8b+b~?#&^DXe;0)+5iLsWEdO%eomCF<av4d<J4$51j>Ub6U0CC7??%|
z2X&%%(U{ZZu;BG?!+;ZNgf2`1yG+1(1%A+UbFnX*%*<?Bw7RpaOUcbmsJx;AFa6dV
z@K0LOn<1=@6mv0e-g8fUz9TRLd4W7+vy^AfpvX7mC~tclS5{UMlaoV$jb;n(fS^Sn
z{MSiC6#~ng9*{6E91ogv7c5fY-|QS5r(lv9a$PXg7*yP9Zq5QCwC6Q7`WqSOObY}@
zO%vx@4U(TcAsnXZD)0FGSy4}q239EwLxYevK%B(j3LuD3v$j6(taY03L_eii`}L5|
z?n!MG0#59Unwr`=fq+VKcf=(4iMJ3t!)w=C)kU!GyNVH)&#ch#^7GRyym+($h9?s-
zWWniTK1{G0JHcjAxEey%ZowiMhE46Z-rglU-c`a2jF0aNz;O|yiK(fCC=?CnzOX7k
z?zXPTDMcc_+=N~q8DXdGTnww2*hq&!%!0{h!h7MSrD(4N;EC*4U@gP50K_!|w?)8g
z?os<m<0V+0cMSg6BOVi~;tKHsgk`6hq(YQ@lR9@gdX6~o0<Qx9{R~}wN5uDmD>38~
z{bfqxmBj!t9Ha*9spBAs&{GGzhnp`0$&LD@G!z|_+DT`z7gD?A99M!xi35SbZs}Cc
zy{w2y2!nV%i9*yV;qV;yLPJASCk`5mi{)^UFmqW;gFkr3ZtNxUZ))iPmxJoJQh|>7
z_l`v9u_l3-QMofz{TjGFaNwb!SBXaPXfrAmQRs|M{~4qiXV^hBV55d?!sM+CFYhwk
zUCaBv$ePEMmBO`pe3g3l?(v{h_7Lk-9zQkaSA)DCT{yt$0B;hTLgwm+!jh<1CMf?x
zFxhA+RP}Hef*u$?#XwCgXd!RF7Hz&K9%gnmEaH8#Jk;(#>V(q|z{4zT4sW#yiovY>
zd`>9v>nFU^xp{LFN<jC;{dl>#v05^}snB5!6ig#gGIPD%T+WBy2-KuzAknLVdUfr@
z17BYY0NB&SU7xe=FMR)g2f(bLN|lV1CI``WT59Sd=4ypn`>H7@GfT6wvXaP4FBMUw
zQZO;ag0}hQxGI20DVNOR)+Va+AnI#byD!P~)lOva%a?)wLbvph!-%^Qu5-A+8HQVB
z7z^MgX|*$y`Cw6(7{3pKI!z-$rz3~xl|k`qdmP`@_eA&gkkrIPPLF0FnGi#4H1gFg
zh0;~RkIY8W>lY(x?m$U(qA~#XVLLsA+Ah=`M=Pg6kptb55Cz7~$1tlZA(1k$GZMNM
zE=Y}+v|w`b^Oai!x`mtu*-IkQI|zgkgg6i71t{&+0B30ya3pdJt?5d61EY*f@O+@4
zIV*6vS?obd<*;4V9&}(hOqt~kpbrR0#xFuJ-Qzm0gol)cYn(UI*4H1MEstfQL696>
zUNHd@_u=EphzoP`mU=gCJVHs=_m*FmGB3ZiA_hAT@ZbG9HdneoJ7eG@a#Ttq$6Lzz
zbaZskgbOl`QR>$hg)xDnY$ipzzsf9?qG7XGr&ujv1V*#YxZXnZWXFqM&WWg`9HbTi
z6NrYt8~+Z|TApjpeM~%MarFTse~yjhegJ@g&XU0g`wY6lqr;p+c!hUs!8eig9(TUU
z(LoHt`-C^uJniFn${E-D5RH4b1Mw0%#aL$1MkFjE;+imYlAN3@U*PLtGe$bVjhP+Y
z_A1sX65r>Sg-1kqLGKOvX~3>$Z;p_<X0o{QxI@y*m!<G|4uc@cR~Kv$KHp0Dj$jCg
z*Tz5Q<RH)$uL4P}8of+ZSFN~FRb{340_ErPNu9sie;LngPm6<<L_edT@W{k<RYotu
z-h$3L_-etp`H<|es1OX-oBjNKAdNKlL@97yf|U+9KY09VJ2`l^AklmmIF~#>uB@v=
zxQp^<ymtTo83f)@00N4~&mmU8l9H+d5Y=CBEj9e1@6L}|moxO#w6uBU<&?lYQ7i{f
zxCvCfT(%dlLkiP0F>w~4LO_tyxFr~3RqH@a1mf`dDki91pdC373?y_-Fx@-Cg6EGs
z!!<rs^rR*~8fxB3rDh+UhVpKtXBEILlcsc979v<Vx$}u{Aj6%5=AcUNzmROqfj(O8
zq?hh6s+B1Ky+uvqwd;Ttq>0$;g`XMx1}&oN65SfEfV}L@1h@B!9wan2%KL!=9^A>I
z#A`Js8DA<urc3Uu0S5n%V(Wv~y3?jCXg)PVP1mP8N<0_8VobWGo-ly9{lnIdjfjYd
z82F%9i1;V^2z8*s#QEU426^C1(&{6KtWbP+d$8q$45$=&AMY>WIaYl5z~H{r+Xl~t
zZ)&MIl-L_i?~|SIf&+b804Yml_-r;nS;W%H%KYog8ykQAEK1ad`$Lf%g{j}vLqY?y
zIxK*`0X(tp@)wLG%sa(NCR5s{>8E7Ex=*(1>J_C%5N#8aOj<fRTYT2THOfTJ6f4)c
zRzgUIT0eb)9AhQX5rD@~sCmyq9v9ZcdYF^+`SVqcG=bcnZ+kAgzf4djF%XZhu#>Ad
zjsNgLQX2Z|q^+!<LJ)>a%WwSFE*rwmx$dWzQ8O<sE$#hz)f_S`s0+~?&e;jjq1g~P
zU^Y=v8pvnj9c~&KMMKSs5uWDrXt^@{E`jcJu*K8w@ZZ+1xasPCH4HO9ws2;gGlYYo
zTtZO0YwYVIgM1tu4(RC49+?EF(eUX9!g%|}l;+KwXW*rTH#aM$|FNONKP&1W4-rB8
zQ-kwzax4INmhC^M2221z8pQ+)d(g5$n-#pB3uWBiGXfN=>fpc!twR7H<m&ReE_TyH
zw^;PEvx)fya8XJRFfM|gS7@lItAfqbt}wQ;D|-MUG+Ng3s<%?_GD9rdqrdtrkreU$
zy&MWLe^csf5r$Z>5+5d$q)$Uv7VM9OqbrS2@ws7a+--k01RH9ecKT|8TS>j^8wUJ6
zI%_epYB@x_TY*ne`L>P@rpmC#$Pcz2?51)5O@cr;z^3V&N-GG`GrBj@($k}@x>7a|
zzN!`LeQC=UPhz@S@HnY}{XI7VX44i7^hdmeW)*40)=vu#u4EPlH0aPm4>4^OeC;9{
z+wqyIp>G_<I9+Jgq3DZ>v^sCIh&LaShPXVk8vD)r#7+{?B&E?LLS{@Ua&(GbAo?x0
zG!$FifN#{4#@C?Mv$*HNfJ~feX**Z8U-P~0KTu2=pEEs4k%S-}ZSl~&i`g~3g$AL_
zspPq3e6@zfdVQw=1!|1DfyCd070FCT_mV(>=-ZAUtFnu4Ju}o~v8NZD8eT(x7@LH|
z(+Y30S1(`6L!D_oY1Puwa;A2@Vg8&aATChWf$l`{XdhU{ko4vE;@&ASEH>@Af2S9w
zSfF{Jmk5ik!MVd{=1ATw7TnZ0mVuz9oQAzQVoeK~ULYaZgz2V@VK(i;FXljz0X3Pr
zR)Sx#d>dO^ih%QSZH6%a)xx%WkhC0{7U*ocEj5l^2sG0v(lsmNOUE|Og%V<2ImgDv
z0739<zjEzb3);d!Dr9E{lZGH_)oOGYdsd7{NW~G#sDp!pt8sZlcCG-xkqWUZdy}+q
z<B(K%+%q%U(1Wt9VX^GU;Nas%f$m+ucS=|m=-zYr(a%<E!3ahOTFxjPf>I&DQYzAQ
zW4>LaYq9%lGNav*xT_q^XX2P;>~3d(1C(gRD2M1rTa7vX`t>XL7VnUX?8Iyp93GIa
z+N%XyUdR+K>)}_YkkO{B0mP;+s||b^Ugl_rrO+&p&CFF^m$fh)T!cTOWytiq8zPT`
z$(cpo@=2K#>zzQS67gZZ{a^ZZyheZ671zSd!$75$KN1L`XgMxj>RUeIH?50MiKdAZ
z$}GEDfR_8jqpN|h?4_<=>17Le34!p>**TRJXJ|m$vR#!+e3pmc7Y*4x^d+iRh%r4V
zPfJU?$JcdCEFXwnJ7e)AA_5Bp9&K~I_aR|TlX)Nt1uvi8)lJF!%OT0hRFKe)QL91x
z0H|)A=iy33Y3U`HO|#vk>;Om^DkwRaK=rnZU`Sr+@>b)JdkA6$eScIysE-Fo%u$$?
z!6hVEp#?AU)EB!dKy%w7C^#gIry)X^yA-fbyl&s?)e0r=SFeZwo_=?s7w!84>@}{u
zJhtghBlJHC*!HvH;^TYPtU-y<!PibHqR|lH1m~;4$IDxOWRl9HeD=8)?AaHP`YJtq
z_)v{5EE1obU5`J+Bmd1C5`e}Pz(%Lj=BA|3<iB`f0c~RtDv-0as69zZVFz2u#`ccM
z5Ej{JjVnjH!PpCk4hYDYL*Pas?_o=lIrsw$60NX+MWkR;QhehUVKp`a$(|SNwaO<s
zjElWeLPBmC#{4I8DOTYTnZ#`IEdnGcfC_v*Y~tc{;EZZ~fAeZ)Nq2T8D3st45OAD3
z*S6f|3D7Ir=miz|;KFW)B>>Q&*3ZGmN5ag^47ejc#2&8uTULgesp7&ZR+n)OVUgHG
zW)jcH!}@@Y+}E+NC0D^GMIjtX&gS_5dW;0TO70Vf7n^;|s-{1|x(Zq&CsuUU1v*8Q
z0eAwW62>?#W&roGRE!;Rg_%zw{kK;Au!+24Vq&1p+B7%zo8P!5P{Mt&pUzit)%|oM
z4cN>ch(}(LOFexj?f~6JU=hCEmz>lOGk@4#zUmA~q7;{6{tGCRqdl-tPaXN?314W2
z&c}<sT&jwkukhtxX`G+%frj6_8JAgRS#dv{jhw0a2M>IGe2$)3jg{3@_sX-Bxw9+t
zqP2+s8sG5XO_KS)7_viKVDt0yH_D0F0dr%ABo&fiMk*?gLy-G@?Bj912s4ukr=^Ac
zzeN&gPSQeRWgto;&sDa~-kR9C;09HtTwwJ_0wG{gEY>5I{KCRUd5d6%GVn4<OUC1_
zg)#L0D5ZFeu6#gjgZUt5{o2!WG0bXA0Ldk3k$&{x4C(&K;r!-ye078mr6NFWlHbx_
znUdu&$e(TzU;uQBK8)w`Q;pkJLQi!Hbe=>$JJ){9;;|5*LsN?L3xS_2Dw@hAig$wk
E55j<I7XSbN

literal 0
HcmV?d00001

diff --git a/media/logo.svg b/media/logo.svg
new file mode 100644
index 00000000..08a5a668
--- /dev/null
+++ b/media/logo.svg
@@ -0,0 +1,1907 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 1000.1765 1000.1688"
+   height="1000.1688mm"
+   width="1000.1688mm"
+   sodipodi:docname="logo-core_1.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07, custom)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="962"
+     inkscape:window-height="1171"
+     id="namedview1073"
+     showgrid="false"
+     inkscape:zoom="0.11313708"
+     inkscape:cx="1655.6808"
+     inkscape:cy="760.16546"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient1909"
+       x1="471.8"
+       y1="127.352"
+       x2="55.983"
+       y2="389.284"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-401.56541,423.90357)">
+      <stop
+         offset="0"
+         stop-color="#3fe1b0"
+         id="stop1899" />
+      <stop
+         offset="0.05751897"
+         stop-color="#00b3f4"
+         id="stop1901" />
+      <stop
+         offset="0.20113589"
+         stop-color="#03b0f4"
+         id="stop1903" />
+      <stop
+         offset="1"
+         stop-color="#5561e9"
+         id="stop1905" />
+      <stop
+         offset="1"
+         stop-color="#7542e5"
+         id="stop1907" />
+    </linearGradient>
+    <radialGradient
+       id="radialGradient2098"
+       cx="257.63312"
+       cy="346.10947"
+       r="1837.1556"
+       fx="323.34329"
+       fy="313.63162"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#FF980E"
+         id="stop2086" />
+      <stop
+         offset="0.295012"
+         style="stop-color:#FF7139"
+         id="stop2088" />
+      <stop
+         offset="0.4846462"
+         style="stop-color:#FF5B51"
+         id="stop2090" />
+      <stop
+         offset="0.6260016"
+         style="stop-color:#FF4F5E"
+         id="stop2092" />
+      <stop
+         offset="0.73652"
+         style="stop-color:#f6374e;stop-opacity:0.97254902"
+         id="stop2094" />
+      <stop
+         offset="0.8428285"
+         style="stop-color:#f52d44;stop-opacity:1"
+         id="stop2096" />
+    </radialGradient>
+    <radialGradient
+       id="radialGradient7778"
+       cx="624.28052"
+       cy="138.58418"
+       r="3105.1294"
+       gradientTransform="matrix(0.9588647 0 0 0.9588647 1293.9r906006 17.7235451)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0.0535657"
+         style="stop-color:#FFF44F"
+         id="stop7768" />
+      <stop
+         offset="0.4572717"
+         style="stop-color:#FF980E"
+         id="stop7770" />
+      <stop
+         offset="0.5210502"
+         style="stop-color:#FF8424"
+         id="stop7772" />
+      <stop
+         offset="0.5831793"
+         style="stop-color:#FF7634"
+         id="stop7774" />
+      <stop
+         offset="0.639343"
+         style="stop-color:#FF7139"
+         id="stop7776" />
+    </radialGradient>
+    <linearGradient
+       y2="180"
+       x2="100.008"
+       y1="40.007999"
+       x1="160.008"
+       id="linearGradient7176"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop7172"
+         offset="0"
+         stop-color="#37aee2"
+         style="stop-color:#ff3750;stop-opacity:0" />
+      <stop
+         id="stop7174"
+         offset="1"
+         stop-color="#1e96c8"
+         style="stop-color:#ffd865;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="b"
+       x1="160.008"
+       y1="40.007999"
+       x2="100.008"
+       y2="180">
+      <stop
+         style="stop-color:#37aee2;stop-opacity:0"
+         stop-color="#37aee2"
+         offset="0"
+         id="stop4892" />
+      <stop
+         style="stop-color:#1e96c8;stop-opacity:0"
+         stop-color="#1e96c8"
+         offset="1"
+         id="stop4894" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.0919081,0.91582798)"
+       id="w"
+       x1="140.86748"
+       y1="147.14627"
+       x2="88.524704"
+       y2="112.05341">
+      <stop
+         style="stop-color:#a047bf;stop-opacity:1"
+         stop-color="#eff7fc"
+         offset="0"
+         id="stop4897" />
+      <stop
+         style="stop-color:#ee7e40;stop-opacity:1"
+         stop-color="#fff"
+         offset="1"
+         id="stop4899" />
+    </linearGradient>
+    <linearGradient
+       y2="180"
+       x2="100.008"
+       y1="40.007999"
+       x1="160.008"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7166"
+       xlink:href="#b" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,116.95639,-406.02996)"
+       r="3105.1294"
+       cy="138.58418"
+       cx="624.28052"
+       id="SVGID_11_">
+      <stop
+         id="stop135"
+         style="stop-color:#FFF44F"
+         offset="0.0535657" />
+      <stop
+         id="stop137"
+         style="stop-color:#FF980E"
+         offset="0.4572717" />
+      <stop
+         id="stop139"
+         style="stop-color:#FF8424"
+         offset="0.5210502" />
+      <stop
+         id="stop141"
+         style="stop-color:#FF7634"
+         offset="0.587052" />
+      <stop
+         id="stop143"
+         style="stop-color:#FF7139"
+         offset="0.639343" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5019718,-0.03006094,0.02119768,2.4694388,-471.63851,-75.092252)"
+       r="65.246368"
+       fy="59.294704"
+       fx="186.85568"
+       cy="59.294704"
+       cx="186.85568"
+       id="radialGradient1819"
+       xlink:href="#a-9" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_">
+      <stop
+         id="stop85"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-232.53772,-527.76884)"
+       fy="-153.06329"
+       fx="389.09302"
+       r="1876.7874"
+       cy="-119.88482"
+       cx="321.9653"
+       id="SVGID_1_">
+      <stop
+         id="stop3"
+         style="stop-color:#FFF44F"
+         offset="0" />
+      <stop
+         id="stop5"
+         style="stop-color:#FF980E"
+         offset="0.2948518" />
+      <stop
+         id="stop7"
+         style="stop-color:#FF5D36"
+         offset="0.4315208" />
+      <stop
+         id="stop9"
+         style="stop-color:#FF3750"
+         offset="0.5302083" />
+      <stop
+         id="stop11"
+         style="stop-color:#F5156C"
+         offset="0.7493189" />
+      <stop
+         id="stop13"
+         style="stop-color:#F1136E"
+         offset="0.7647903" />
+      <stop
+         id="stop15"
+         style="stop-color:#DA057A"
+         offset="0.8800957" />
+      <stop
+         id="stop17"
+         style="stop-color:#D2007F"
+         offset="0.9527844" />
+    </radialGradient>
+    <linearGradient
+       gradientTransform="matrix(0.49700557,0,0,0.49700557,7.2354759,-1184.0654)"
+       y2="1708.0002"
+       x2="477.68073"
+       y1="246.00212"
+       x1="1321.7657"
+       gradientUnits="userSpaceOnUse"
+       id="SVGID_12_">
+      <stop
+         id="stop2743"
+         style="stop-color:#FFF44F;stop-opacity:0.8"
+         offset="0" />
+      <stop
+         id="stop2745"
+         style="stop-color:#FFF44F;stop-opacity:0"
+         offset="0.75" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_-2">
+      <stop
+         id="stop85-9"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87-1"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89-2"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91-7"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93-0"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95-9"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <linearGradient
+       gradientTransform="translate(-499.29869,64.905637)"
+       gradientUnits="userSpaceOnUse"
+       y2="220.18013"
+       x2="24.136377"
+       y1="-7.9157548"
+       x1="238.16116"
+       id="linearGradient1127"
+       xlink:href="#l-6" />
+    <radialGradient
+       id="b-3"
+       cx="-9227.187"
+       cy="-9815.121"
+       r="80.797"
+       gradientTransform="matrix(6.201,0,0,6.2,57190.317,61100.153)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".108"
+         stop-color="#3fe1b0"
+         id="stop1075" />
+      <stop
+         offset=".122"
+         stop-color="#3bdcb3"
+         id="stop1077" />
+      <stop
+         offset=".254"
+         stop-color="#1bb3d3"
+         id="stop1079" />
+      <stop
+         offset=".358"
+         stop-color="#0799e6"
+         id="stop1081" />
+      <stop
+         offset=".42"
+         stop-color="#0090ed"
+         id="stop1083" />
+      <stop
+         offset=".487"
+         stop-color="#2482f1"
+         id="stop1085" />
+      <stop
+         offset=".64"
+         stop-color="#7165fb"
+         id="stop1087" />
+      <stop
+         offset=".71"
+         stop-color="#9059ff"
+         id="stop1089" />
+      <stop
+         offset=".795"
+         stop-color="#7d49ed"
+         id="stop1091" />
+      <stop
+         offset=".86"
+         stop-color="#7542e5"
+         id="stop1093" />
+    </radialGradient>
+    <radialGradient
+       id="c"
+       cx="-9256.711"
+       cy="-9782.089"
+       r="80.797"
+       gradientTransform="matrix(6.201,0,0,6.2,57578.796,61319.204)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".3"
+         stop-color="#45278d"
+         id="stop1096" />
+      <stop
+         offset=".341"
+         stop-color="#562896"
+         stop-opacity=".787"
+         id="stop1098" />
+      <stop
+         offset=".43"
+         stop-color="#782aa9"
+         stop-opacity=".364"
+         id="stop1100" />
+      <stop
+         offset=".495"
+         stop-color="#8d2bb5"
+         stop-opacity=".1"
+         id="stop1102" />
+      <stop
+         offset=".53"
+         stop-color="#952bb9"
+         stop-opacity="0"
+         id="stop1104" />
+    </radialGradient>
+    <radialGradient
+       id="d"
+       cx="-9246.97"
+       cy="-9833.457"
+       r="58.534"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".132"
+         stop-color="#3fe1b0"
+         id="stop1107" />
+      <stop
+         offset=".289"
+         stop-color="#28d0c8"
+         id="stop1109" />
+      <stop
+         offset=".526"
+         stop-color="#00b3f4"
+         id="stop1111" />
+    </radialGradient>
+    <radialGradient
+       id="e"
+       cx="-9265.648"
+       cy="-9760.984"
+       r="38.471"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".287"
+         stop-color="#0060df"
+         id="stop1114" />
+      <stop
+         offset=".417"
+         stop-color="#2357e1"
+         id="stop1116" />
+      <stop
+         offset=".604"
+         stop-color="#4f4ce3"
+         id="stop1118" />
+      <stop
+         offset=".748"
+         stop-color="#6b45e4"
+         id="stop1120" />
+      <stop
+         offset=".833"
+         stop-color="#7542e5"
+         id="stop1122" />
+    </radialGradient>
+    <radialGradient
+       id="f"
+       cx="-9255.62"
+       cy="-9791.546"
+       r="20.397"
+       gradientTransform="matrix(6.027,-1.458,1.708,7.059,72758.651,55821.181)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".206"
+         stop-color="#45278d"
+         stop-opacity="0"
+         id="stop1125" />
+      <stop
+         offset=".251"
+         stop-color="#44268a"
+         stop-opacity=".055"
+         id="stop1127" />
+      <stop
+         offset=".725"
+         stop-color="#371f6f"
+         stop-opacity=".591"
+         id="stop1129" />
+      <stop
+         offset=".956"
+         stop-color="#321c64"
+         stop-opacity=".8"
+         id="stop1131" />
+    </radialGradient>
+    <radialGradient
+       id="g"
+       cx="-9257.731"
+       cy="-9818.427"
+       r="27.676"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#0df"
+         id="stop1134" />
+      <stop
+         offset=".235"
+         stop-color="#00d6fd"
+         id="stop1136" />
+      <stop
+         offset=".572"
+         stop-color="#00c3f8"
+         id="stop1138" />
+      <stop
+         offset=".792"
+         stop-color="#00b3f4"
+         id="stop1140" />
+    </radialGradient>
+    <radialGradient
+       id="h"
+       cx="-9235.977"
+       cy="-9835.981"
+       r="118.081"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".126"
+         stop-color="#3fe1b0"
+         id="stop1143" />
+      <stop
+         offset=".429"
+         stop-color="#0df"
+         id="stop1145" />
+      <stop
+         offset=".479"
+         stop-color="#1ec1ff"
+         id="stop1147" />
+      <stop
+         offset=".624"
+         stop-color="#7077ff"
+         id="stop1149" />
+      <stop
+         offset=".69"
+         stop-color="#9059ff"
+         id="stop1151" />
+      <stop
+         offset=".904"
+         stop-color="#b833e1"
+         id="stop1153" />
+    </radialGradient>
+    <radialGradient
+       id="i"
+       cx="-9247.165"
+       cy="-9822.859"
+       r="86.499"
+       gradientTransform="matrix(0.649,6.166,-4.046,0.426,-33440.427,61207.861)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#54ffbd"
+         id="stop1156" />
+      <stop
+         offset=".095"
+         stop-color="#4cf3b8"
+         id="stop1158" />
+      <stop
+         offset=".197"
+         stop-color="#3fe1b0"
+         id="stop1160" />
+      <stop
+         offset=".257"
+         stop-color="#33d8bd"
+         id="stop1162" />
+      <stop
+         offset=".369"
+         stop-color="#12c0e1"
+         id="stop1164" />
+      <stop
+         offset=".423"
+         stop-color="#00b3f4"
+         id="stop1166" />
+      <stop
+         offset=".737"
+         stop-color="#0060df"
+         id="stop1168" />
+    </radialGradient>
+    <radialGradient
+       id="j"
+       cx="-9258.383"
+       cy="-9808.176"
+       r="73.72"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".137"
+         stop-color="#3fe1b0"
+         id="stop1171" />
+      <stop
+         offset=".435"
+         stop-color="#0df"
+         id="stop1173" />
+      <stop
+         offset=".484"
+         stop-color="#1ec1ff"
+         id="stop1175" />
+      <stop
+         offset=".622"
+         stop-color="#7077ff"
+         id="stop1177" />
+      <stop
+         offset=".685"
+         stop-color="#9059ff"
+         id="stop1179" />
+    </radialGradient>
+    <radialGradient
+       id="k"
+       cx="-9238.923"
+       cy="-9803.861"
+       r="80.686"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".094"
+         stop-color="#54ffbd"
+         id="stop1182" />
+      <stop
+         offset=".242"
+         stop-color="#41f7cc"
+         id="stop1184" />
+      <stop
+         offset=".543"
+         stop-color="#0fe3f3"
+         id="stop1186" />
+      <stop
+         offset=".626"
+         stop-color="#0df"
+         id="stop1188" />
+    </radialGradient>
+    <linearGradient
+       id="a"
+       x1="471.8"
+       y1="127.352"
+       x2="55.983"
+       y2="389.284"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#3fe1b0"
+         id="stop1191" />
+      <stop
+         offset=".406"
+         stop-color="#00b3f4"
+         id="stop1193" />
+      <stop
+         offset=".421"
+         stop-color="#03b0f4"
+         id="stop1195" />
+      <stop
+         offset=".818"
+         stop-color="#5561e9"
+         id="stop1197" />
+      <stop
+         offset="1"
+         stop-color="#7542e5"
+         id="stop1199" />
+    </linearGradient>
+    <linearGradient
+       id="l"
+       x1="442.084"
+       y1="74.772"
+       x2="102.645"
+       y2="414.21"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(119.28182,544.78364)">
+      <stop
+         offset=".167"
+         stop-color="#54ffbd"
+         stop-opacity=".8"
+         id="stop1202" />
+      <stop
+         offset=".236"
+         stop-color="#43f8ca"
+         stop-opacity=".639"
+         id="stop1204" />
+      <stop
+         offset=".361"
+         stop-color="#27ede1"
+         stop-opacity=".368"
+         id="stop1206" />
+      <stop
+         offset=".466"
+         stop-color="#12e4f1"
+         stop-opacity=".169"
+         id="stop1208" />
+      <stop
+         offset=".545"
+         stop-color="#05dffb"
+         stop-opacity=".046"
+         id="stop1210" />
+      <stop
+         offset=".589"
+         stop-color="#0df"
+         stop-opacity="0"
+         id="stop1212" />
+    </linearGradient>
+    <rect
+       x="129.03102"
+       y="16.043243"
+       width="31.777713"
+       height="40.03656"
+       id="rect1065" />
+    <rect
+       x="78.197247"
+       y="25.384099"
+       width="105.83908"
+       height="98.630985"
+       id="rect1051" />
+    <linearGradient
+       gradientTransform="matrix(0.49700557,0,0,0.49700557,7.2354759,-1184.0654)"
+       y2="1708.0002"
+       x2="477.68073"
+       y1="246.00212"
+       x1="1321.7657"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3592">
+      <stop
+         id="stop3588"
+         style="stop-color:#FFF44F;stop-opacity:0.8"
+         offset="0" />
+      <stop
+         id="stop3590"
+         style="stop-color:#FFF44F;stop-opacity:0"
+         offset="0.90369266" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3548"
+       gradientUnits="userSpaceOnUse"
+       x1="1321.7657"
+       y1="246.00212"
+       x2="477.68073"
+       y2="1708.0002"
+       gradientTransform="matrix(0.49700557,0,0,0.49700557,7.2354759,-1184.0654)">
+      <stop
+         offset="0"
+         style="stop-color:#FFF44F;stop-opacity:0.8"
+         id="stop3544" />
+      <stop
+         offset="0.75070673"
+         style="stop-color:#FFF44F;stop-opacity:0"
+         id="stop3546" />
+    </linearGradient>
+    <radialGradient
+       id="radialGradient2098-5"
+       cx="257.63312"
+       cy="346.10947"
+       r="1837.1556"
+       fx="323.34329"
+       fy="313.63162"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#FF980E"
+         id="stop2086-3" />
+      <stop
+         offset="0.295012"
+         style="stop-color:#FF7139"
+         id="stop2088-5" />
+      <stop
+         offset="0.4846462"
+         style="stop-color:#FF5B51"
+         id="stop2090-6" />
+      <stop
+         offset="0.6260016"
+         style="stop-color:#FF4F5E"
+         id="stop2092-2" />
+      <stop
+         offset="0.73652"
+         style="stop-color:#f6374e;stop-opacity:0.97254902"
+         id="stop2094-9" />
+      <stop
+         offset="0.8428285"
+         style="stop-color:#f52d44;stop-opacity:1"
+         id="stop2096-1" />
+    </radialGradient>
+    <radialGradient
+       id="radialGradient7778-2"
+       cx="624.28052"
+       cy="138.58418"
+       r="3105.1294"
+       gradientTransform="matrix(0.9588647 0 0 0.9588647 1293.9r906006 17.7235451)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0.0535657"
+         style="stop-color:#FFF44F"
+         id="stop7768-7" />
+      <stop
+         offset="0.4572717"
+         style="stop-color:#FF980E"
+         id="stop7770-0" />
+      <stop
+         offset="0.5210502"
+         style="stop-color:#FF8424"
+         id="stop7772-9" />
+      <stop
+         offset="0.5831793"
+         style="stop-color:#FF7634"
+         id="stop7774-3" />
+      <stop
+         offset="0.639343"
+         style="stop-color:#FF7139"
+         id="stop7776-6" />
+    </radialGradient>
+    <linearGradient
+       y2="180"
+       x2="100.008"
+       y1="40.007999"
+       x1="160.008"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7166-7"
+       xlink:href="#b" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,116.95639,-406.02996)"
+       r="3105.1294"
+       cy="138.58418"
+       cx="624.28052"
+       id="SVGID_11_-9">
+      <stop
+         id="stop135-2"
+         style="stop-color:#FFF44F"
+         offset="0.0535657" />
+      <stop
+         id="stop137-0"
+         style="stop-color:#FF980E"
+         offset="0.4572717" />
+      <stop
+         id="stop139-2"
+         style="stop-color:#FF8424"
+         offset="0.5210502" />
+      <stop
+         id="stop141-3"
+         style="stop-color:#FF7634"
+         offset="0.587052" />
+      <stop
+         id="stop143-7"
+         style="stop-color:#FF7139"
+         offset="0.639343" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.4292543,-0.00937413,0.00863853,4.0816693,-654.99926,-176.9423)"
+       r="65.246368"
+       fy="60.625607"
+       fx="198.56102"
+       cy="60.625607"
+       cx="198.56102"
+       id="radialGradient1819-5"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_-9">
+      <stop
+         id="stop85-2"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87-2"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89-8"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91-9"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93-7"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95-36"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-232.53772,-527.76884)"
+       fy="-153.06329"
+       fx="389.09302"
+       r="1876.7874"
+       cy="-119.88482"
+       cx="321.9653"
+       id="SVGID_1_-1">
+      <stop
+         id="stop3-2"
+         style="stop-color:#FFF44F"
+         offset="0" />
+      <stop
+         id="stop5-9"
+         style="stop-color:#FF980E"
+         offset="0.2948518" />
+      <stop
+         id="stop7-3"
+         style="stop-color:#FF5D36"
+         offset="0.4315208" />
+      <stop
+         id="stop9-1"
+         style="stop-color:#FF3750"
+         offset="0.5302083" />
+      <stop
+         id="stop11-9"
+         style="stop-color:#F5156C"
+         offset="0.7493189" />
+      <stop
+         id="stop13-4"
+         style="stop-color:#F1136E"
+         offset="0.7647903" />
+      <stop
+         id="stop15-7"
+         style="stop-color:#DA057A"
+         offset="0.8800957" />
+      <stop
+         id="stop17-8"
+         style="stop-color:#D2007F"
+         offset="0.9527844" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_-2-0">
+      <stop
+         id="stop85-9-3"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87-1-6"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89-2-1"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91-7-0"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93-0-6"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95-9-3"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.3934655,0.01669018,-0.01854118,3.7698167,-290.33889,-84.915347)"
+       r="49.128685"
+       fy="17.314512"
+       fx="125.74741"
+       cy="17.314512"
+       cx="125.74741"
+       id="radialGradient3377"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.1424314,-0.03334111,0.03722059,5.7407794,-574.99219,-343.13552)"
+       r="23.311501"
+       fy="71.804993"
+       fx="139.59579"
+       cy="71.804993"
+       cx="139.59579"
+       id="radialGradient3407"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_-6">
+      <stop
+         id="stop85-7"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87-5"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89-3"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91-5"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93-6"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95-2"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="radialGradient3438">
+      <stop
+         id="stop3426"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop3428"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop3430"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop3432"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop3434"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop3436"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="198.10196"
+       x2="7.8398242"
+       y1="1.0558653"
+       x1="132.22115"
+       id="linearGradient3542"
+       xlink:href="#linearGradient3592" />
+    <linearGradient
+       y2="163.76793"
+       x2="23.069944"
+       y1="-22.960312"
+       x1="159.93211"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3550"
+       xlink:href="#linearGradient3548" />
+    <style
+       id="style3642">.cls-1{fill:#333;}</style>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       id="radialGradient3677"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="SVGID_7_-63">
+      <stop
+         id="stop85-94"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop87-8"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop89-1"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop91-2"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop93-9"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop95-3"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       id="radialGradient3697"
+       xlink:href="#SVGID_7_-63" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="radialGradient3711">
+      <stop
+         id="stop3699"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop3701"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop3703"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop3705"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop3707"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop3709"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       id="radialGradient3713"
+       xlink:href="#SVGID_7_-63" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="radialGradient3727">
+      <stop
+         id="stop3715"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop3717"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop3719"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop3721"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop3723"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop3725"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       id="radialGradient3729"
+       xlink:href="#SVGID_7_-63" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="radialGradient3743">
+      <stop
+         id="stop3731"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop3733"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop3735"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop3737"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop3739"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop3741"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       id="radialGradient3745"
+       xlink:href="#SVGID_7_-63" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25369962,0,0,0.25369962,-147.14212,-160.64302)"
+       fy="313.63162"
+       fx="323.34329"
+       r="1837.1556"
+       cy="346.10947"
+       cx="257.63312"
+       id="radialGradient3759">
+      <stop
+         id="stop3747"
+         style="stop-color:#FF980E"
+         offset="0" />
+      <stop
+         id="stop3749"
+         style="stop-color:#FF7139"
+         offset="0.295012" />
+      <stop
+         id="stop3751"
+         style="stop-color:#FF5B51"
+         offset="0.4846462" />
+      <stop
+         id="stop3753"
+         style="stop-color:#FF4F5E"
+         offset="0.6260016" />
+      <stop
+         id="stop3755"
+         style="stop-color:#FF4055"
+         offset="0.73652" />
+      <stop
+         id="stop3757"
+         style="stop-color:#FF3750"
+         offset="0.8428285" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="47.421032"
+       x2="32.572609"
+       y1="-6.2185812"
+       x1="50.918648"
+       id="linearGradient3908"
+       xlink:href="#linearGradient3548" />
+    <radialGradient
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3926"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3928"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3930"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       r="16.921047"
+       fy="19.827997"
+       fx="57.191738"
+       cy="19.827997"
+       cx="57.191738"
+       gradientTransform="matrix(3.5145226,0.00791587,-0.00463923,2.059739,-135.50088,-25.949891)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3932"
+       xlink:href="#SVGID_7_-9" />
+    <radialGradient
+       id="b-3-2"
+       cx="-9227.187"
+       cy="-9815.121"
+       r="80.797"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".108"
+         stop-color="#3fe1b0"
+         id="stop1069" />
+      <stop
+         offset=".122"
+         stop-color="#3bdcb3"
+         id="stop1071" />
+      <stop
+         offset=".254"
+         stop-color="#1bb3d3"
+         id="stop1073" />
+      <stop
+         offset=".358"
+         stop-color="#0799e6"
+         id="stop1075-0" />
+      <stop
+         offset=".42"
+         stop-color="#0090ed"
+         id="stop1077-6" />
+      <stop
+         offset=".487"
+         stop-color="#2482f1"
+         id="stop1079-1" />
+      <stop
+         offset=".64"
+         stop-color="#7165fb"
+         id="stop1081-5" />
+      <stop
+         offset=".71"
+         stop-color="#9059ff"
+         id="stop1083-5" />
+      <stop
+         offset=".795"
+         stop-color="#7d49ed"
+         id="stop1085-4" />
+      <stop
+         offset=".86"
+         stop-color="#7542e5"
+         id="stop1087-7" />
+    </radialGradient>
+    <radialGradient
+       id="c-6"
+       cx="-9256.711"
+       cy="-9782.089"
+       r="80.797"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".3"
+         stop-color="#45278d"
+         id="stop1090" />
+      <stop
+         offset=".341"
+         stop-color="#562896"
+         stop-opacity=".787"
+         id="stop1092" />
+      <stop
+         offset=".43"
+         stop-color="#782aa9"
+         stop-opacity=".364"
+         id="stop1094" />
+      <stop
+         offset=".495"
+         stop-color="#8d2bb5"
+         stop-opacity=".1"
+         id="stop1096-5" />
+      <stop
+         offset=".53"
+         stop-color="#952bb9"
+         stop-opacity="0"
+         id="stop1098-6" />
+    </radialGradient>
+    <radialGradient
+       id="d-9"
+       cx="-9246.97"
+       cy="-9833.457"
+       r="58.534"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".132"
+         stop-color="#3fe1b0"
+         id="stop1101" />
+      <stop
+         offset=".289"
+         stop-color="#28d0c8"
+         id="stop1103" />
+      <stop
+         offset=".526"
+         stop-color="#00b3f4"
+         id="stop1105" />
+    </radialGradient>
+    <radialGradient
+       id="e-3"
+       cx="-9265.648"
+       cy="-9760.984"
+       r="38.471"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".287"
+         stop-color="#0060df"
+         id="stop1108" />
+      <stop
+         offset=".417"
+         stop-color="#2357e1"
+         id="stop1110" />
+      <stop
+         offset=".604"
+         stop-color="#4f4ce3"
+         id="stop1112" />
+      <stop
+         offset=".748"
+         stop-color="#6b45e4"
+         id="stop1114-7" />
+      <stop
+         offset=".833"
+         stop-color="#7542e5"
+         id="stop1116-4" />
+    </radialGradient>
+    <radialGradient
+       id="f-5"
+       cx="-9255.62"
+       cy="-9791.546"
+       r="20.397"
+       gradientTransform="matrix(6.027,-1.458,1.708,7.059,72758.651,55821.181)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".206"
+         stop-color="#45278d"
+         stop-opacity="0"
+         id="stop1119" />
+      <stop
+         offset=".251"
+         stop-color="#44268a"
+         stop-opacity=".055"
+         id="stop1121" />
+      <stop
+         offset=".725"
+         stop-color="#371f6f"
+         stop-opacity=".591"
+         id="stop1123" />
+      <stop
+         offset=".956"
+         stop-color="#321c64"
+         stop-opacity=".8"
+         id="stop1125-2" />
+    </radialGradient>
+    <radialGradient
+       id="g-5"
+       cx="-9257.731"
+       cy="-9818.427"
+       r="27.676"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#0df"
+         id="stop1128" />
+      <stop
+         offset=".235"
+         stop-color="#00d6fd"
+         id="stop1130" />
+      <stop
+         offset=".572"
+         stop-color="#00c3f8"
+         id="stop1132" />
+      <stop
+         offset=".792"
+         stop-color="#00b3f4"
+         id="stop1134-4" />
+    </radialGradient>
+    <radialGradient
+       id="h-7"
+       cx="-9235.977"
+       cy="-9835.981"
+       r="118.081"
+       gradientTransform="matrix(6.201,0,0,6.2,57345.62,60532.793)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".126"
+         stop-color="#3fe1b0"
+         id="stop1137" />
+      <stop
+         offset=".429"
+         stop-color="#0df"
+         id="stop1139" />
+      <stop
+         offset=".479"
+         stop-color="#1ec1ff"
+         id="stop1141" />
+      <stop
+         offset=".624"
+         stop-color="#7077ff"
+         id="stop1143-4" />
+      <stop
+         offset=".69"
+         stop-color="#9059ff"
+         id="stop1145-4" />
+      <stop
+         offset=".904"
+         stop-color="#b833e1"
+         id="stop1147-3" />
+    </radialGradient>
+    <radialGradient
+       id="i-0"
+       cx="-9247.165"
+       cy="-9822.859"
+       r="86.499"
+       gradientTransform="matrix(0.649,6.166,-4.046,0.426,-33440.427,61207.861)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#54ffbd"
+         id="stop1150" />
+      <stop
+         offset=".095"
+         stop-color="#4cf3b8"
+         id="stop1152" />
+      <stop
+         offset=".197"
+         stop-color="#3fe1b0"
+         id="stop1154" />
+      <stop
+         offset=".257"
+         stop-color="#33d8bd"
+         id="stop1156-7" />
+      <stop
+         offset=".369"
+         stop-color="#12c0e1"
+         id="stop1158-8" />
+      <stop
+         offset=".423"
+         stop-color="#00b3f4"
+         id="stop1160-6" />
+      <stop
+         offset=".737"
+         stop-color="#0060df"
+         id="stop1162-8" />
+    </radialGradient>
+    <radialGradient
+       id="j-8"
+       cx="-9258.383"
+       cy="-9808.176"
+       r="73.72"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".137"
+         stop-color="#3fe1b0"
+         id="stop1165" />
+      <stop
+         offset=".435"
+         stop-color="#0df"
+         id="stop1167" />
+      <stop
+         offset=".484"
+         stop-color="#1ec1ff"
+         id="stop1169" />
+      <stop
+         offset=".622"
+         stop-color="#7077ff"
+         id="stop1171-4" />
+      <stop
+         offset=".685"
+         stop-color="#9059ff"
+         id="stop1173-3" />
+    </radialGradient>
+    <radialGradient
+       id="k-1"
+       cx="-9238.923"
+       cy="-9803.861"
+       r="80.686"
+       gradientTransform="matrix(6.201,0,0,6.2,57644.994,60908.8)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset=".094"
+         stop-color="#54ffbd"
+         id="stop1176" />
+      <stop
+         offset=".242"
+         stop-color="#41f7cc"
+         id="stop1178" />
+      <stop
+         offset=".543"
+         stop-color="#0fe3f3"
+         id="stop1180" />
+      <stop
+         offset=".626"
+         stop-color="#0df"
+         id="stop1182-4" />
+    </radialGradient>
+    <linearGradient
+       id="a-9"
+       x1="471.8"
+       y1="127.352"
+       x2="55.983"
+       y2="389.284"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-401.56541,423.90357)">
+      <stop
+         offset="0"
+         stop-color="#3fe1b0"
+         id="stop1185" />
+      <stop
+         offset=".406"
+         stop-color="#00b3f4"
+         id="stop1187" />
+      <stop
+         offset=".421"
+         stop-color="#03b0f4"
+         id="stop1189" />
+      <stop
+         offset=".818"
+         stop-color="#5561e9"
+         id="stop1191-2" />
+      <stop
+         offset="1"
+         stop-color="#7542e5"
+         id="stop1193-0" />
+    </linearGradient>
+    <linearGradient
+       id="l-6"
+       x1="442.084"
+       y1="74.772"
+       x2="102.645"
+       y2="414.21"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-818.90257,-23.926015)">
+      <stop
+         offset=".167"
+         stop-color="#54ffbd"
+         stop-opacity=".8"
+         id="stop1196" />
+      <stop
+         offset=".236"
+         stop-color="#43f8ca"
+         stop-opacity=".639"
+         id="stop1198" />
+      <stop
+         offset=".361"
+         stop-color="#27ede1"
+         stop-opacity=".368"
+         id="stop1200" />
+      <stop
+         offset=".466"
+         stop-color="#12e4f1"
+         stop-opacity=".169"
+         id="stop1202-8" />
+      <stop
+         offset=".545"
+         stop-color="#05dffb"
+         stop-opacity=".046"
+         id="stop1204-9" />
+      <stop
+         offset=".589"
+         stop-color="#0df"
+         stop-opacity="0"
+         id="stop1206-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-9"
+       id="linearGradient1370"
+       x1="79.371246"
+       y1="88.403816"
+       x2="126.82179"
+       y2="50.635471"
+       gradientUnits="userSpaceOnUse" />
+    <rect
+       x="78.19725"
+       y="25.384098"
+       width="105.83908"
+       height="98.630981"
+       id="rect1051-3" />
+    <rect
+       x="78.19725"
+       y="25.384098"
+       width="105.83908"
+       height="98.630981"
+       id="rect1388" />
+    <linearGradient
+       xlink:href="#a-9"
+       id="linearGradient1707"
+       x1="91.563797"
+       y1="72.824005"
+       x2="143.35655"
+       y2="19.400303"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#a-9"
+       id="linearGradient1711"
+       gradientUnits="userSpaceOnUse"
+       x1="91.563797"
+       y1="72.824005"
+       x2="143.35655"
+       y2="19.400303"
+       gradientTransform="matrix(1.0369686,0,0,1.0369686,-3.4347374,-0.99906893)" />
+    <linearGradient
+       xlink:href="#l-6"
+       id="linearGradient1941"
+       gradientUnits="userSpaceOnUse"
+       x1="81.196739"
+       y1="68.062531"
+       x2="160.6725"
+       y2="13.438729" />
+    <linearGradient
+       xlink:href="#l-6"
+       id="linearGradient1943"
+       gradientUnits="userSpaceOnUse"
+       x1="82.391953"
+       y1="83.369476"
+       x2="149.49139"
+       y2="23.218763" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(39.520088,-0.33924059,0.23921785,27.867854,-5874.5388,-1661.9844)"
+       r="65.246368"
+       fy="60.625607"
+       fx="198.56102"
+       cy="60.625607"
+       cx="198.56102"
+       id="radialGradient1819-1"
+       xlink:href="#a-9" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1909"
+       id="radialGradient1885"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3496867,-0.0110249,0.01106494,2.3582183,-248.62429,-115.47143)"
+       cx="185.03772"
+       cy="78.120659"
+       fx="185.03772"
+       fy="78.120659"
+       r="65.246368" />
+  </defs>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:inline"
+     transform="translate(-25.485081,874.03927)"
+     id="layer1">
+    <rect
+       ry="122.74884"
+       y="-873.87427"
+       x="25.485081"
+       height="1000.0077"
+       width="1000.0077"
+       id="rect99"
+       style="fill:#282828;fill-opacity:1;fill-rule:evenodd;stroke-width:0.24541904" />
+    <g
+       transform="matrix(3.4097882,0,0,3.4097882,-58.261564,-771.89541)"
+       id="g4557">
+      <path
+         transform="scale(0.26458333)"
+         style="fill:#f1f1f1;fill-opacity:1;stroke:#f1f1f1;stroke-width:10.54206085;stroke-opacity:1"
+         d="m 647.14258,-57.232422 c -274.72614,0 -498.32227,223.703512 -498.32227,498.324222 0,274.6207 223.70155,498.32226 498.32227,498.32226 274.6207,0 498.32422,-223.70156 498.32422,-498.32226 0,-274.62071 -223.70352,-498.324222 -498.32422,-498.324222 z m -0.74219,44.277344 a 32.785812,32.785812 0 0 1 0.004,0 32.680391,32.785812 0 0 1 31.83789,32.785156 32.786135,32.786135 0 0 1 -65.57227,0 32.785812,32.785812 0 0 1 33.73047,-32.785156 z m -74.10547,53.974609 50.4961,52.921875 c 11.38541,11.912534 30.25542,12.440064 42.16796,0.949219 l 56.50586,-53.871094 a 403.44469,403.44469 0 0 1 66.1543,18.777344 c 1.97576,0.407587 3.93673,0.970989 5.87695,1.730469 13.99934,5.479892 27.61358,11.724081 40.80079,18.671875 a 403.44469,403.44469 0 0 1 2.36523,1.269531 c 10.36827,5.551273 20.46754,11.537743 30.26953,17.943359 a 403.44469,403.44469 0 0 1 6.39844,4.269531 c 8.32464,5.66907 16.42445,11.64272 24.28711,17.90234 a 403.44469,403.44469 0 0 1 9.8125,8.05664 c 6.45209,5.47512 12.72445,11.15359 18.81836,17.01758 a 403.44469,403.44469 0 0 1 11.94922,11.9668 c 5.13237,5.3678 10.11852,10.87734 14.95117,16.52148 a 403.44469,403.44469 0 0 1 12.51172,15.37696 c 3.37107,4.35061 6.66483,8.76435 9.85937,13.2539 0.23859,0.33532 0.45279,0.6794 0.67383,1.02149 a 403.44469,403.44469 0 0 1 21.47266,32.93555 l -38.68946,87.28906 c -6.6415,15.07515 0.21195,32.78628 15.18164,39.5332 l 74.4258,32.99609 a 403.44469,403.44469 0 0 1 0.8437,69.99805 h -0.5 c -5.7455,78.10094 -33.7008,150.02515 -77.59567,209.47266 h 0.7168 a 403.44469,403.44469 0 0 1 -37.31836,43.2207 l -69.26172,-14.86328 c -16.12936,-3.47887 -32.04848,6.85115 -35.52734,22.98047 l -16.44532,76.74805 a 403.44469,403.44469 0 0 1 -36.45312,14.36328 c -0.0902,0.0369 -0.18261,0.0712 -0.27344,0.10742 a 403.44469,403.44469 0 0 1 -1.01367,0.375 c -0.24074,0.087 -0.47392,0.18338 -0.71875,0.26562 -40.39438,13.56934 -83.64335,20.92188 -128.60938,20.92188 -40.73374,0 -80.05693,-6.03481 -117.12695,-17.25781 -2.64112,-0.79961 -5.08556,-1.88567 -7.35742,-3.22071 A 403.44469,403.44469 0 0 1 477.09961,803.52734 L 460.6543,726.78125 c -3.47891,-16.12936 -19.29252,-26.46129 -35.42188,-22.98242 l -67.78515,14.54883 a 403.44469,403.44469 0 0 1 -21.21289,-24.19141 c -1.98,-1.33851 -3.76227,-2.94462 -5.30469,-4.875 -55.15082,-69.02256 -88.12305,-156.54162 -88.12305,-251.76172 0,-2.92892 0.34165,-5.66443 0.98047,-8.23242 a 403.44469,403.44469 0 0 1 2.23047,-35.21289 l 70.63086,-31.41602 c 15.07515,-6.74692 21.92856,-24.35258 15.18164,-39.42773 l -14.54883,-32.78516 h 0.26563 c -13.3252,-23.74604 -27.38086,-44.84375 -27.38086,-44.84375 10.41967,-18.87574 21.81773,-35.1234 34.7871,-52.17773 51.04777,-67.12628 122.64108,-117.779826 205.4043,-142.587892 2.17055,-0.650615 4.32668,-0.947976 6.47266,-0.953126 a 403.44469,403.44469 0 0 1 35.46484,-8.863281 z M 255.5,283.69727 a 32.785812,32.785812 0 0 1 0.006,0 32.785812,32.785812 0 0 1 31.83594,32.78711 32.785812,32.785812 0 0 1 -65.57032,0 A 32.785812,32.785812 0 0 1 255.5,283.69727 Z m 781.6934,1.47656 a 32.785812,32.785812 0 0 1 0.01,0 32.785812,32.785812 0 0 1 31.8379,32.78515 32.78615,32.78615 0 0 1 -65.5723,0 32.785812,32.785812 0 0 1 33.7286,-32.78515 z M 403.61523,745.33398 a 32.785812,32.785812 0 0 1 0.006,0.002 32.785812,32.785812 0 0 1 31.83789,32.78515 32.78613,32.78613 0 0 1 -65.57226,0 32.785812,32.785812 0 0 1 33.72851,-32.78711 z m 485.46289,1.47657 a 32.785812,32.785812 0 0 1 0.006,0 32.785812,32.785812 0 0 1 31.83594,32.78711 32.78613,32.78613 0 0 1 -65.57226,0 32.785812,32.785812 0 0 1 33.73046,-32.78711 z"
+         id="path4504" />
+      <path
+         style="fill:#f1f1f1;fill-opacity:1;fill-rule:evenodd;stroke:#f1f1f1;stroke-width:8.36776161;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="M 295.70761,116.70536 A 124.4844,124.4844 0 0 1 171.22322,241.18976 124.4844,124.4844 0 0 1 46.738819,116.70536 124.4844,124.4844 0 0 1 171.22322,-7.779039 124.4844,124.4844 0 0 1 295.70761,116.70536 Z m -2.34297,-12.02169 19.41321,12.02169 -19.41321,12.02168 16.67974,15.59193 -21.36569,8.00516 13.33264,18.54854 -22.56507,3.68181 9.48347,20.80784 -22.84399,-0.80889 5.2438,22.25825 -22.25825,-5.2438 0.80888,22.84399 -20.80783,-9.48346 -3.68181,22.56506 -18.54854,-13.33263 -8.00516,21.36568 -15.59193,-16.67974 -12.02168,19.41321 -12.02169,-19.41321 -15.59193,16.67974 -8.00515,-21.36568 -18.54854,13.33263 -3.68182,-22.56506 -20.807831,9.48346 0.808884,-22.84399 -22.258245,5.2438 5.243797,-22.25825 -22.843989,0.80889 9.483463,-20.80784 L 40.435106,170.87267 53.767739,152.32413 32.402055,144.31897 49.081793,128.72704 29.668586,116.70536 49.081793,104.68367 32.402055,89.091745 53.767739,81.086587 40.435106,62.538049 63.000169,58.856234 53.516706,38.048401 l 22.843989,0.808884 -5.243797,-22.258246 22.258245,5.243797 -0.808884,-22.8439882 20.807831,9.4834629 3.68182,-22.5650637 18.54854,13.33263359 8.00515,-21.36568459 15.59193,16.6797382 12.02169,-19.4132062 12.02168,19.4132062 15.59193,-16.6797382 8.00516,21.36568459 18.54854,-13.33263359 3.68181,22.5650637 20.80783,-9.4834629 -0.80888,22.8439882 22.25825,-5.243797 -5.2438,22.258246 22.84399,-0.808884 -9.48347,20.807833 22.56507,3.681815 -13.33264,18.548538 21.36569,8.005158 z"
+         id="path4506" />
+    </g>
+    <g
+       transform="matrix(2.9858713,0,0,2.9858713,167.26874,-732.2594)"
+       id="g4928"
+       style="stroke-width:1.00005081;stroke-miterlimit:4;stroke-dasharray:none">
+      <circle
+         style="fill:url(#linearGradient7166);fill-opacity:1;stroke-width:1.00005081;stroke-miterlimit:4;stroke-dasharray:none"
+         cx="120"
+         cy="120"
+         r="120"
+         id="circle4904" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#radialGradient1885);fill-opacity:1;stroke-width:1.00005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+         d="m 98,175 c -3.8876,0 -3.227,-1.4679 -4.5678,-5.1695 L 82,132.2059 170,80"
+         id="path4906" />
+      <path
+         style="fill:#4960da;fill-opacity:1;stroke-width:1.00005081;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 98,175 c 3,0 4.3255,-1.372 6,-3 l 16,-15.558 -19.958,-12.035"
+         id="path4908" />
+      <path
+         style="fill:url(#radialGradient1819);fill-opacity:1;stroke-width:1.00005081;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 100.04,144.41 48.36,35.729 c 5.5185,3.0449 9.5014,1.4684 10.876,-5.1235 l 19.685,-92.763 c 2.0154,-8.0802 -3.0801,-11.745 -8.3594,-9.3482 l -115.59,44.571 c -7.8901,3.1647 -7.8441,7.5666 -1.4382,9.528 l 29.663,9.2583 68.673,-43.325 c 3.2419,-1.9659 6.2173,-0.90899 3.7752,1.2584"
+         id="path4910" />
+    </g>
+    <rect
+       y="-44.385658"
+       x="34.240719"
+       height="159.17772"
+       width="164.35423"
+       id="rect2241"
+       style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke-width:0.25622422" />
+    <g
+       transform="matrix(0.53235487,0,0,0.53235487,-27.283341,10.578064)"
+       id="g4557-3"
+       style="display:inline">
+      <path
+         style="fill:#282828;fill-opacity:1;stroke:#282828;stroke-width:2.78925347;stroke-opacity:1"
+         d="m -136.20958,-18.218258 c -72.68796,0 -131.84776,59.18822 -131.84776,131.848288 0,72.66006 59.1877,131.84776 131.84776,131.84776 72.660061,0 131.8482833,-59.1877 131.8482833,-131.84776 0,-72.660068 -59.1882223,-131.848288 -131.8482833,-131.848288 z m -0.19637,11.7150471 a 8.6745793,8.6745793 0 0 1 10e-4,0 8.6466867,8.6745793 0 0 1 8.42377,8.6744058 8.674665,8.674665 0 0 1 -17.34933,0 8.6745793,8.6745793 0 0 1 8.92452,-8.6744058 z m -19.60707,14.2807817 13.36042,14.0022462 c 3.01239,3.151858 8.00508,3.291434 11.15694,0.251148 l 14.95051,-14.2533942 a 106.74474,106.74474 0 0 1 17.503328,4.9681722 c 0.522753,0.107841 1.041593,0.256908 1.554943,0.457854 3.703992,1.449888 7.306093,3.101996 10.795209,4.940266 a 106.74474,106.74474 0 0 1 0.6258,0.335897 c 2.743271,1.468774 5.41537,3.052695 8.008813,4.747514 a 106.74474,106.74474 0 0 1 1.692921,1.129647 c 2.202561,1.499941 4.345635,3.080469 6.425964,4.73666 a 106.74474,106.74474 0 0 1 2.596224,2.131653 c 1.707115,1.448625 3.366677,2.951054 4.979024,4.502568 a 106.74474,106.74474 0 0 1 3.161565,3.166216 c 1.357939,1.42023 2.677192,2.877963 3.95583,4.371308 a 106.74474,106.74474 0 0 1 3.310393,4.068487 c 0.891929,1.151099 1.763403,2.318901 2.608625,3.506761 0.06313,0.08872 0.1198,0.179758 0.178284,0.270269 a 106.74474,106.74474 0 0 1 5.681308,8.714198 l -10.236586,23.09523 c -1.757231,3.988633 0.05608,8.674703 4.016808,10.459826 l 19.691826,8.730223 a 106.74474,106.74474 0 0 1 0.223229,18.52031 h -0.132291 c -1.520164,20.66421 -8.91667,39.69416 -20.530521,55.42298 h 0.189653 a 106.74474,106.74474 0 0 1 -9.873816,11.43547 l -18.325496,-3.93257 c -4.26756,-0.92045 -8.479494,1.8127 -9.399942,6.08025 l -4.351158,20.30625 a 106.74474,106.74474 0 0 1 -9.644887,3.80029 c -0.0239,0.01 -0.0483,0.0188 -0.0724,0.0284 a 106.74474,106.74474 0 0 1 -0.2682,0.0992 c -0.0637,0.023 -0.12539,0.0485 -0.19017,0.0703 -10.68768,3.59023 -22.13063,5.53558 -34.0279,5.53558 -10.77746,0 -21.18172,-1.59671 -30.98983,-4.56612 -0.6988,-0.21157 -1.34556,-0.49892 -1.94665,-0.85215 a 106.74474,106.74474 0 0 1 -11.86491,-4.53409 l -4.35116,-20.30574 c -0.92046,-4.26756 -5.10448,-7.00121 -9.37204,-6.08076 l -17.93482,3.84938 a 106.74474,106.74474 0 0 1 -5.61258,-6.40065 c -0.52387,-0.35415 -0.99543,-0.7791 -1.40353,-1.28984 -14.59199,-18.26222 -23.31589,-41.4183 -23.31589,-66.61196 0,-0.77494 0.0904,-1.49871 0.25942,-2.17816 a 106.74474,106.74474 0 0 1 0.59014,-9.31674 l 18.68775,-8.312159 c 3.98863,-1.785122 5.80193,-6.443287 4.01681,-10.43192 l -3.84938,-8.674407 h 0.0703 c -3.52562,-6.282806 -7.24452,-11.864908 -7.24452,-11.864908 2.75688,-4.994207 5.77261,-9.293067 9.20409,-13.805358 13.50639,-17.760495 32.44879,-31.162579 54.34656,-37.726379 0.57429,-0.172142 1.14476,-0.250819 1.71255,-0.252181 a 106.74474,106.74474 0 0 1 9.38341,-2.3450772 z m -83.81866,64.2084842 a 8.6745793,8.6745793 0 0 1 0.002,0 8.6745793,8.6745793 0 0 1 8.42326,8.674923 8.6745793,8.6745793 0 0 1 -17.34881,0 8.6745793,8.6745793 0 0 1 8.92396,-8.674923 z m 206.823047,0.390674 a 8.6745793,8.6745793 0 0 1 0.0026,0 8.6745793,8.6745793 0 0 1 8.423778,8.674404 8.674669,8.674669 0 0 1 -17.349338,0 8.6745793,8.6745793 0 0 1 8.924026,-8.674404 z M -200.64286,194.12744 a 8.6745793,8.6745793 0 0 1 0.002,5.3e-4 8.6745793,8.6745793 0 0 1 8.42378,8.6744 8.674665,8.674665 0 0 1 -17.34933,0 8.6745793,8.6745793 0 0 1 8.924,-8.67492 z m 128.445393,0.39067 a 8.6745793,8.6745793 0 0 1 0.0016,0 8.6745793,8.6745793 0 0 1 8.423259,8.67492 8.6746635,8.6746635 0 0 1 -17.349327,0 8.6745793,8.6745793 0 0 1 8.924518,-8.67492 z"
+         id="path4504-6" />
+      <path
+         style="fill:#282828;fill-opacity:1;fill-rule:evenodd;stroke:#282828;stroke-width:8.36776161;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m -11.724928,113.62977 a 124.4844,124.4844 0 0 1 -124.484392,124.4844 124.4844,124.4844 0 0 1 -124.4844,-124.4844 124.4844,124.4844 0 0 1 124.4844,-124.484403 124.4844,124.4844 0 0 1 124.484392,124.484403 z m -2.34297,-12.02169 19.4132097,12.02169 -19.4132097,12.02168 16.6797397,15.59193 -21.3656897,8.00516 13.3326397,18.54854 -22.5650697,3.68181 9.48347,20.80784 -22.84399,-0.80889 5.2438,22.25825 -22.25825,-5.2438 0.80888,22.84399 -20.80783,-9.48346 -3.68181,22.56506 -18.548542,-13.33263 -8.00516,21.36568 -15.59193,-16.67974 -12.02168,19.41321 -12.02169,-19.41321 -15.59193,16.67974 -8.00515,-21.36568 -18.54854,13.33263 -3.68182,-22.56506 -20.80783,9.48346 0.80888,-22.84399 -22.25824,5.2438 5.2438,-22.25825 -22.84399,0.80889 9.48346,-20.80784 -22.56506,-3.68181 13.33263,-18.54854 -21.36568,-8.00516 16.67973,-15.59193 -19.4132,-12.02168 19.4132,-12.02169 -16.67973,-15.591929 21.36568,-8.005158 -13.33263,-18.548538 22.56506,-3.681815 -9.48346,-20.807833 22.84399,0.808884 -5.2438,-22.258246 22.25824,5.243797 -0.80888,-22.8439878 20.80783,9.4834629 3.68182,-22.5650641 18.54854,13.332634 8.00515,-21.365685 15.59193,16.6797386 12.02169,-19.4132066 12.02168,19.4132066 15.59193,-16.6797386 8.00516,21.365685 18.548542,-13.332634 3.68181,22.5650641 20.80783,-9.4834629 -0.80888,22.8439878 22.25825,-5.243797 -5.2438,22.258246 22.84399,-0.808884 -9.48347,20.807833 22.5650697,3.681815 -13.3326397,18.548538 21.3656897,8.005158 z"
+         id="path4506-7" />
+    </g>
+    <g
+       transform="matrix(2.9858713,0,0,2.9858713,1669.9748,-927.75556)"
+       id="g4928-3"
+       style="display:inline;stroke-width:1.00005;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         id="path4906-0"
+         d="m -329.76511,137.65739 c -0.93128,0.034 -1.91559,0.27115 -2.90546,0.72055 l -115.58979,44.57068 c -7.8901,3.1647 -7.84366,7.56642 -1.43777,9.52782 l 29.65763,9.25734 10.20069,33.56963 c 1.34081,3.70159 0.68066,5.17018 4.56826,5.17018 3,0 4.32487,-1.37279 5.99937,-3.00079 l 14.41311,-14.01404 29.98686,22.15398 c 5.51849,3.0449 9.5023,1.46827 10.87689,-5.12363 l 19.68418,-92.76294 c 1.63751,-6.56516 -1.41841,-10.21631 -5.45397,-10.06878 z"
+         style="fill:url(#linearGradient1127);fill-opacity:1;stroke-width:1.00005;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>

From 580f50e736cf7d237c5d824afd78881b55b3023b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Jan 2021 16:12:04 +0300
Subject: [PATCH 189/755] Add very basic example

---
 Cargo.toml            |  4 ++++
 examples/self_info.rs | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 examples/self_info.rs

diff --git a/Cargo.toml b/Cargo.toml
index 09993956..1cae30f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,3 +60,7 @@ full = ["throttle", "cache_me", "auto_send"]
 [package.metadata."docs.rs"]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs", "-Znormalize-docs"]
+
+[[example]]
+name = "self_info"
+required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send"]
diff --git a/examples/self_info.rs b/examples/self_info.rs
new file mode 100644
index 00000000..78678e9f
--- /dev/null
+++ b/examples/self_info.rs
@@ -0,0 +1,23 @@
+use teloxide_core::{
+    prelude::*,
+    types::{DiceEmoji, ParseMode},
+};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let chat_id = std::env::var("CHAT_ID")
+        .expect("Expected CHAT_ID env var")
+        .parse::<i64>()?;
+
+    let bot = Bot::from_env()
+        .parse_mode(ParseMode::MarkdownV2)
+        .auto_send();
+
+    let me = bot.get_me().await?;
+
+    bot.send_dice(chat_id, DiceEmoji::Dice).await?;
+    bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
+        .await?;
+
+    Ok(())
+}

From 2ee7bb22a1f4e3cf179b029b4c0b47e04232c1b6 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Jan 2021 16:14:02 +0300
Subject: [PATCH 190/755] Move `client_from_env` from root into `net`

---
 src/lib.rs     | 26 --------------------------
 src/net/mod.rs | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index d1105eaf..79f43df4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,29 +35,3 @@ mod errors;
 
 // implementation details
 mod serde_multipart;
-
-/// Constructs a client from the `TELOXIDE_PROXY` environmental variable.
-///
-/// This function passes the value of `TELOXIDE_PROXY` into
-/// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
-/// client.
-///
-/// # Note
-/// The created client will have safe settings, meaning that it will be able to
-/// work in long time durations, see the [issue 223].
-///
-/// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
-/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
-pub fn client_from_env() -> reqwest::Client {
-    use crate::bot::{sound_bot, TELOXIDE_PROXY};
-    use reqwest::Proxy;
-
-    let builder = sound_bot();
-
-    match std::env::var(TELOXIDE_PROXY).ok() {
-        Some(proxy) => builder.proxy(Proxy::all(&proxy).expect("creating reqwest::Proxy")),
-        None => builder,
-    }
-    .build()
-    .expect("creating reqwest::Client")
-}
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 944e1538..6c9665dc 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -14,6 +14,38 @@ mod telegram_response;
 /// The default Telegram API URL.
 pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 
+/// Constructs a network client from the `TELOXIDE_PROXY` environmental
+/// variable.
+///
+/// This function passes the value of `TELOXIDE_PROXY` into
+/// [`reqwest::Proxy::all`], if it exists, otherwise returns the default
+/// client.
+///
+/// ## Note
+///
+/// The created client will have safe settings, meaning that it will be able to
+/// work in long time durations, see the [issue 223].
+///
+/// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
+/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+///
+/// ## Panics
+///
+/// If `TELOXIDE_PROXY` exists, but isn't correct url.
+pub fn client_from_env() -> reqwest::Client {
+    use crate::bot::{sound_bot, TELOXIDE_PROXY};
+    use reqwest::Proxy;
+
+    let builder = sound_bot();
+
+    match std::env::var(TELOXIDE_PROXY).ok() {
+        Some(proxy) => builder.proxy(Proxy::all(&proxy).expect("creating reqwest::Proxy")),
+        None => builder,
+    }
+    .build()
+    .expect("creating reqwest::Client")
+}
+
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests

From 84df33dbefbc1da6b34bbe6cb81109bcb68854e4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 15 Jan 2021 21:51:15 +0300
Subject: [PATCH 191/755] improve docs

---
 README.md                 | 25 +++++++++++++++-
 src/adaptors.rs           | 15 ++++++++++
 src/adaptors/auto_send.rs | 19 ++++++++----
 src/bot/mod.rs            | 57 +++++++++++++++++++++++++++++++++--
 src/errors.rs             |  2 +-
 src/lib.rs                | 62 +++++++++++++++++++++++++++++++++++++--
 src/local_macros.rs       |  2 ++
 src/payloads/mod.rs       |  5 ++--
 src/prelude.rs            |  6 +++-
 src/requests/request.rs   |  8 +++--
 src/requests/requester.rs | 35 +++++++++++++++++++++-
 11 files changed, 217 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index e6ad7315..0e01f9b1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,30 @@
+<div align="center">
+  <img src="media/logo.svg" width="250"/>
+</div>
+
 # teloxide-core
 
 [![CI status](https://github.com/teloxide/teloxide-core/workflows/Continuous%20integration/badge.svg)](https://github.com/teloxide/teloxide-core/actions)
+[![documentation](https://docs.rs/teloxide_core/badge.svg)](https://docs.rs/teloxide_core/)
 [![documentation (master)](https://img.shields.io/badge/docs-master-blue)](https://teloxide-core.netlify.com)
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+[![Api Cov](https://img.shields.io/badge/API%20coverage-Up%20to%200.4.9%20(inclusively)-green.svg)](https://core.telegram.org/bots/api)
+[![crates.io](https://img.shields.io/crates/v/teloxide_core.svg)](https://crates.io/crates/teloxide_core)
+[![Official Chat](https://img.shields.io/badge/official%20chat-t.me%2Fteloxide-blueviolet)](https://t.me/teloxide)
 
-Core part of `teloxide` library.
+
+
+Core part of the [`teloxide`] library.
+
+This library provides tools for making requests to the [Telegram Bot API]
+(Currently, version `4.9` is supported) with ease. The library is fully
+asynchronouns and built using [`tokio`].
+
+```toml
+teloxide_core = "0.1"
+```
+_Compiler support: requires rustc 1.49+_
+
+[`teloxide`]: https://docs.rs/teloxide
+[Telegram Bot API]: https://core.telegram.org/bots/api
+[`tokio`]: https://tokio.rs
\ No newline at end of file
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 1a308c57..8692d43c 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -8,12 +8,27 @@
 //!
 //! [`Requester`]: crate::requests::Requester
 
+/// [`AutoSend`] bot adaptor which allows sending a request without calling
+/// [`send`].
+///
+/// [`AutoSend`]: auto_send::AutoSend
+/// [`send`]: crate::requests::Request::send
 #[cfg(feature = "auto_send")]
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
 pub mod auto_send;
+
+/// [`CacheMe`] bot adaptor which caches [`GetMe`] requests.
+///
+/// [`CacheMe`]: cache_me::CacheMe
+/// [`GetMe`]: crate::payloads::GetMe
 #[cfg(feature = "cache_me")]
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
 pub mod cache_me;
+
+/// [`Throttle`] bot adaptor which allows automatically throttle when hitting
+/// API limits.
+///
+/// [`Throttle`]: throttle::Throttle
 #[cfg(feature = "throttle")]
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
 pub mod throttle;
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 890979ac..77ce8e25 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -20,8 +20,8 @@ use crate::{
 /// Notes:
 /// 1. This wrapper should be the most outer i.e.: `AutoSend<CacheMe<Bot>>`
 ///    will automatically send requests, while `CacheMe<AutoSend<Bot>>` - won't.
-/// 2. After first call to `poll` on a request you will unable to access payload
-///    nor could you use [`send_ref`](Request::send_ref).
+/// 2. After first call to `poll` on a request you will be unable to access
+///    payload nor could you use [`send_ref`](Request::send_ref).
 ///
 /// ## Examples
 ///
@@ -74,7 +74,10 @@ macro_rules! fty {
     };
 }
 
-impl<B: Requester> Requester for AutoSend<B> {
+impl<B> Requester for AutoSend<B>
+where
+    B: Requester,
+{
     type Err = B::Err;
 
     requester_forward! {
@@ -112,7 +115,10 @@ download_forward! {
 #[pin_project::pin_project]
 pub struct AutoRequest<R: Request>(#[pin] Inner<R>);
 
-impl<R: Request> AutoRequest<R> {
+impl<R> AutoRequest<R>
+where
+    R: Request,
+{
     pub fn new(inner: R) -> Self {
         Self(Inner::Request(inner))
     }
@@ -133,7 +139,10 @@ enum Inner<R: Request> {
     Done,
 }
 
-impl<R: Request> Request for AutoRequest<R> {
+impl<R> Request for AutoRequest<R>
+where
+    R: Request,
+{
     type Err = R::Err;
     type Send = R::Send;
     type SendRef = R::SendRef;
diff --git a/src/bot/mod.rs b/src/bot/mod.rs
index 07c78829..06f6cea6 100644
--- a/src/bot/mod.rs
+++ b/src/bot/mod.rs
@@ -22,9 +22,41 @@ pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
 
 /// A requests sender.
 ///
-/// No need to put it into [`Arc`], because it's already in.
+/// This is the main type of the library, it allows to send requests to the
+/// [Telegram Bot API] and download files.
+///
+/// ## TBA methods
+///
+/// All TBA methods are located in the [`Requester`] [`impl for Bot`]. This
+/// allows for opt-in behaviours using requester [adaptors].
+///
+/// ```
+/// # async {
+/// use teloxide_core::prelude::*;
+///
+/// let bot = Bot::new("TOKEN");
+/// dbg!(bot.get_me().send().await?);
+/// # Ok::<_, teloxide_core::RequestError>(()) };
+/// ```
+///
+/// [`Requester`]: crate::requests::Requester
+/// [`impl for Bot`]: Bot#impl-Requester
+/// [adaptors]: crate::adaptors
+///
+/// ## File download
+///
+/// In the similar way as with TBA methods, file downloading methods are located
+/// in a trait — [`Download<'_>`]. See its documentation for more.
+///
+/// [`Download<'_>`]: crate::net::Download
+///
+/// ## Clone cost
+///
+/// `Bot::clone` is relatively cheap, so if you need to share `Bot`, it's
+/// recommended to clone it, instead of wrapping it in [`Arc<_>`].
 ///
 /// [`Arc`]: std::sync::Arc
+/// [Telegram Bot API]: https://core.telegram.org/bots/api
 #[derive(Debug, Clone)]
 pub struct Bot {
     token: Arc<str>,
@@ -32,6 +64,7 @@ pub struct Bot {
     client: Client,
 }
 
+/// Constructors
 impl Bot {
     /// Creates a new `Bot` with the specified token and the default
     /// [http-client](reqwest::Client).
@@ -81,7 +114,7 @@ impl Bot {
     /// [`reqwest::Client`]: https://docs.rs/reqwest/0.10.1/reqwest/struct.Client.html
     /// [`reqwest::Proxy::all`]: https://docs.rs/reqwest/latest/reqwest/struct.Proxy.html#method.all
     pub fn from_env() -> Self {
-        Self::from_env_with_client(crate::client_from_env())
+        Self::from_env_with_client(crate::net::client_from_env())
     }
 
     /// Creates a new `Bot` with the `TELOXIDE_TOKEN` environmental variable (a
@@ -122,11 +155,31 @@ impl Bot {
     /// bot.get_me().send().await
     /// # };
     /// ```
+    ///
+    /// ## Multi-instance behaviour
+    ///
+    /// This method only sets the url for one bot instace, older clones are
+    /// unaffected.
+    ///
+    /// ```
+    /// use teloxide_core::Bot;
+    ///
+    /// let bot = Bot::new("TOKEN");
+    /// let bot2 = bot.clone();
+    /// let bot = bot.set_api_url(reqwest::Url::parse("https://example.com/").unwrap());
+    ///
+    /// assert_eq!(bot.api_url().as_str(), "https://example.com/");
+    /// assert_eq!(bot.clone().api_url().as_str(), "https://example.com/");
+    /// assert_ne!(bot2.api_url().as_str(), "https://example.com/");
+    /// ```
     pub fn set_api_url(mut self, url: reqwest::Url) -> Self {
         self.api_url = ApiUrl::Custom(Arc::new(url));
         self
     }
+}
 
+/// Getters
+impl Bot {
     /// Returns currently used token.
     pub fn token(&self) -> &str {
         &self.token
diff --git a/src/errors.rs b/src/errors.rs
index 3476ceed..4efcae04 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -53,7 +53,7 @@ pub enum RequestError {
     #[error("An error while parsing JSON: {0}")]
     InvalidJson(#[source] serde_json::Error),
 
-    // Occurs when trying to send a file to Telegram.
+    /// Occurs when trying to send a file to Telegram.
     #[error("An I/O error: {0}")]
     Io(#[source] io::Error),
 }
diff --git a/src/lib.rs b/src/lib.rs
index 79f43df4..797c36a7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,13 +1,69 @@
-//! Core part of `teloxide` library.
-// TODO: expand docs
+//! Core part of the [`teloxide`] library.
+//!
+//! This library provides tools for making requests to the [Telegram Bot API]
+//! (Currently, version `4.9` is supported) with ease. The library is fully
+//! asynchronouns and built using [`tokio`].
+//!
+//!```toml
+//! teloxide_core = "0.1"
+//! ```
+//! _Compiler support: requires rustc 1.49+_
+//!
+//! ```
+//! # #[cfg(feature = "auto_send")]
+//! # async {
+//! # let chat_id = 0;
+//! use teloxide_core::{
+//!     prelude::*,
+//!     types::{DiceEmoji, ParseMode},
+//! };
+//!
+//! let bot = Bot::from_env()
+//!     .parse_mode(ParseMode::MarkdownV2)
+//!     .auto_send();
+//!
+//! let me = bot.get_me().await?;
+//!
+//! bot.send_dice(chat_id, DiceEmoji::Dice).await?;
+//! bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
+//!     .await?;
+//! # Ok::<_, Box<dyn std::error::Error>>(()) };
+//! ```
+//!
+//! <div align="center">
+//!     <img src=https://user-images.githubusercontent.com/38225716/103929465-6b91e100-512e-11eb-826d-39b096f16548.gif />
+//! </div>
+//!
+//! [`teloxide`]: https://docs.rs/teloxide
+//! [Telegram Bot API]: https://core.telegram.org/bots/api
+//! [`tokio`]: https://tokio.rs
+//!
+//! ## Cargo features
+//!
+//! - `auto_send` — enables [`AutoSend`] bot adaptor
+//! - `throttle` — enables [`Throttle`] bot adaptor
+//! - `cache_me` — enables [`CacheMe`] bot adaptor
+//! - `full` — enables all features except `nigthly`
+//! - `nightly` — enables nigthly-only features, currently:
+//!   - Removes some future boxing using `#![feature(type_alias_impl_trait)]`
+//!   - Used to built docs (`#![feature(doc_cfg, doc_spotlight)]`)
+//!
+//! [`AutoSend`]: adaptors::AutoSend
+//! [`Throttle`]: adaptors::Throttle
+//! [`CacheMe`]: adaptors::CacheMe
 
+#![doc(
+    // FIXME(waffle): use github
+    html_logo_url = "https://cdn.discordapp.com/attachments/224881373326999553/798598120760934410/logo.png",
+    html_favicon_url = "https://cdn.discordapp.com/attachments/224881373326999553/798598120760934410/logo.png"
+)]
+#![forbid(unsafe_code)]
 // we pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
 //
 // To properly build docs of this crate run
 // ```console
 // $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
 // ```
-#![forbid(unsafe_code)]
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![cfg_attr(feature = "full", deny(broken_intra_doc_links))]
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 25cffd7f..91f5623a 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -188,6 +188,8 @@ macro_rules! impl_payload {
             #[allow(clippy::too_many_arguments)]
             // It's just easier for macros to generate such code.
             #[allow(clippy::redundant_field_names)]
+            // It's obvious what this method does. (If you think it's not, feel free to open a PR)
+            #[allow(missing_docs)]
             $vi fn new($($($fields : impl_payload!(@convert? $FTy $([$conv])?)),*)?) -> Self {
                 Self {
                     $(
diff --git a/src/payloads/mod.rs b/src/payloads/mod.rs
index abfebc1b..cf31ea9d 100644
--- a/src/payloads/mod.rs
+++ b/src/payloads/mod.rs
@@ -1,7 +1,8 @@
 //! Request data sent to Telegram.
 
-/// This module re-exports all the setters traits as `_`. When used with a glob
-/// import:
+/// This module re-exports all the setters traits as `_`.
+///
+/// When used with a glob import:
 ///
 /// ```
 /// use teloxide_core::payloads::setters::*;
diff --git a/src/prelude.rs b/src/prelude.rs
index 3ea2b60c..ed53d1d7 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,3 +1,7 @@
 //! Commonly used items.
 
-pub use crate::requests::Requester;
+pub use crate::{
+    payloads::setters::*,
+    requests::{Request, Requester, RequesterExt},
+    Bot,
+};
diff --git a/src/requests/request.rs b/src/requests/request.rs
index b719abf5..8517daa2 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -13,7 +13,7 @@ use crate::requests::{HasPayload, Output};
 ///
 /// This is crucial for request wrappers which may want to cancel and/or never
 /// send the underlying request. E.g.: [`Throttle<B>`]'s `send_ref` calls
-/// `B::send_ref` while _not_ meaning to really send the request right now.
+/// `B::send_ref` while _not_ meaning to really send the request at the moment.
 ///
 /// [`Throttle<B>`]: crate::adaptors::Throttle
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
@@ -32,8 +32,8 @@ pub trait Request: HasPayload {
 
     /// A type of the future returned by the [`send_ref`](Request::send_ref)
     /// method.
-    // Note: it intentionally forbids borrowing from `self` though anyway we
-    // couldn't allow borrowing without GATs.
+    // Note: it intentionally forbids borrowing from `self` though we couldn't allow
+    // borrowing without GATs anyway.
     type SendRef: Future<Output = Result<Output<Self>, Self::Err>> + Send;
 
     /// Send this request.
@@ -49,6 +49,8 @@ pub trait Request: HasPayload {
     /// };
     ///
     /// let bot = Bot::new("TOKEN");
+    ///
+    /// // Note: it's recommended to `Requester` instead of creating requests directly
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
     /// let _: User = request.send().await.unwrap();
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 09ff0641..7e30be76 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -15,9 +15,42 @@ use crate::{
 ///
 /// This trait is implemented by all bots & bot adaptors.
 ///
-/// _This trait is included in the crate's [`prelude`](crate::prelude)_.
+/// ## Examples
+///
+/// Calling TBA methods:
+///
+/// ```
+/// # async {
+/// use teloxide_core::{prelude::*, types::ParseMode};
+///
+/// // Bot implements `Requester`
+/// let bot = Bot::new("TOKEN");
+///
+/// // Required parameters are supplied to the `Requester` methods:
+/// bot.send_message(0, "<b>Text</b>")
+///     // Optional parameters can be supplied by calling setters
+///     .parse_mode(ParseMode::HTML)
+///     // To send request to telegram you need to call `.send()` and await the resulting future
+///     .send()
+///     .await?;
+/// # Ok::<_, teloxide_core::RequestError>(()) };
+/// ```
+///
+/// Using `Requester` in a generic context:
+///
+/// ```
+/// use teloxide_core::{prelude::*, types::Message};
+///
+/// async fn send_hi<R>(bot: R, chat: i64) -> Message
+/// where
+///     R: Requester,
+/// {
+///     bot.send_message(chat, "hi").send().await.expect("error")
+/// }
+/// ```
 #[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
 pub trait Requester {
+    /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
     // This block is auto generated by `cg` <https://github.com/teloxide/cg> (de3765b).

From b93947c0ab2da8719605456609b0f541075c27b4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 15 Jan 2021 22:19:42 +0300
Subject: [PATCH 192/755] stop using serde internall module

---
 src/types/non_telegram_types/mime.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/types/non_telegram_types/mime.rs b/src/types/non_telegram_types/mime.rs
index c5655cc7..34422e34 100644
--- a/src/types/non_telegram_types/mime.rs
+++ b/src/types/non_telegram_types/mime.rs
@@ -70,10 +70,7 @@ struct MimeVisitor;
 impl<'a> Visitor<'a> for MimeVisitor {
     type Value = MimeDe;
 
-    fn expecting(
-        &self,
-        formatter: &mut fmt::Formatter<'_>,
-    ) -> Result<(), serde::export::fmt::Error> {
+    fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> Result<(), fmt::Error> {
         formatter.write_str("mime type")
     }
 

From cc9e3a56e6084f63fddfb3c11861a753bd4a4749 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Jan 2021 09:45:20 +0300
Subject: [PATCH 193/755] workaround rustc bug

---
 src/local_macros.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 91f5623a..eaf50554 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -47,7 +47,15 @@ macro_rules! req_future {
         $(where $($wh:tt)*)?
     ) => {
         #[pin_project::pin_project]
-        $v struct $i<$T>
+        pub
+        // FIXME(waffle):
+        // The `pub` above should ideally be `$v`, but we currently can't do
+        // this due to compiler bug, see:
+        // - pin_project bug report <https://github.com/taiki-e/pin-project/issues/312>
+        // - related rustc issue <https://github.com/rust-lang/rust/issues/81007>
+        // - original fix (closed) <https://github.com/rust-lang/rust/pull/81029>
+        // - second iteration of the fix <https://github.com/rust-lang/rust/pull/81177>
+        struct $i<$T>
         $(where $($wh)*)?
         {
             #[pin]

From 3aec4e5070fa92e95eea2068b8aec2b188819b3e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Jan 2021 10:15:02 +0300
Subject: [PATCH 194/755] fix test

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

diff --git a/src/lib.rs b/src/lib.rs
index 797c36a7..cca00141 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -24,7 +24,7 @@
 //!
 //! let me = bot.get_me().await?;
 //!
-//! bot.send_dice(chat_id, DiceEmoji::Dice).await?;
+//! bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
 //! bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
 //!     .await?;
 //! # Ok::<_, Box<dyn std::error::Error>>(()) };

From 6abf571c96d6b021f7696199adb27bd145d1e0be Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 12 Jan 2021 13:13:53 +0300
Subject: [PATCH 195/755] Remove git dependency

---
 Cargo.toml               |  5 ++---
 src/adaptors/throttle.rs | 47 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1cae30f1..5ba8c745 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,7 @@ thiserror = "1.0.20"
 once_cell = "1.5.0"
 never = "0.1.0"
 
-# FIXME(waffle): use crates.io once published
-vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8b75548c6ed387072ff235429b1" }
+vecrem = { version = "0.1", optional = true }
 
 [features]
 default = []
@@ -47,7 +46,7 @@ default = []
 nightly = []
 
 # Throttling bot adaptor
-throttle = []
+throttle = ["vecrem"]
 
 # CacheMe bot adaptor
 cache_me = []
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 75d79a80..de56338a 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -267,34 +267,33 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
             *hchats_s.entry(*chat).or_insert(0) += 1;
         }
 
-        let mut queue_rem = queue.removing();
-        while let Some(entry) = queue_rem.next() {
-            let chat = &entry.value().0;
-            let cond = {
-                hchats_s.get(chat).copied().unwrap_or(0) < limits.chat_s
-                    && hchats.get(chat).copied().unwrap_or(0) < limits.chat_m
-            };
+        {
+            let mut queue_rem = queue.removing();
+            while let Some(entry) = queue_rem.next() {
+                let chat = &entry.value().0;
+                let cond = {
+                    hchats_s.get(chat).copied().unwrap_or(0) < limits.chat_s
+                        && hchats.get(chat).copied().unwrap_or(0) < limits.chat_m
+                };
 
-            if cond {
-                {
-                    *hchats_s.entry(*chat).or_insert(0) += 1;
-                    *hchats.entry(*chat).or_insert(0) += 1;
-                    history.push_back((*chat, Instant::now()));
+                if cond {
+                    {
+                        *hchats_s.entry(*chat).or_insert(0) += 1;
+                        *hchats.entry(*chat).or_insert(0) += 1;
+                        history.push_back((*chat, Instant::now()));
+                    }
+
+                    // This will close the channel unlocking associated request
+                    drop(entry.remove());
+
+                    // We've "sent" 1 request, so now we can send 1 less
+                    allowed -= 1;
+                    if allowed == 0 {
+                        break;
+                    }
                 }
-
-                // This will close the channel unlocking associated request
-                drop(entry.remove());
-
-                // We've "sent" 1 request, so now we can send 1 less
-                allowed -= 1;
-                if allowed == 0 {
-                    break;
-                }
-            } else {
-                entry.skip();
             }
         }
-        drop(queue_rem);
 
         // It's easier to just recompute last second stats, instead of keeping
         // track of it alongside with minute stats, so we just throw this away.

From e2897290558850d98beeef35bc11a7db2e9aa7c7 Mon Sep 17 00:00:00 2001
From: Mikail Bagishov <bagishov.mikail@yandex.ru>
Date: Wed, 11 Nov 2020 20:16:08 +0300
Subject: [PATCH 196/755] Support rustls

This was teloxide-based applications can be easily compiled for musl
targets.
---
 Cargo.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 1cae30f1..5cd5b149 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,9 @@ vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8
 [features]
 default = []
 
+rustls = ["reqwest/rustls"]
+native-tls = ["reqwest/native-tls"]
+
 # Features which require nightly compiler.
 #
 # Currently the only used compiler feature is feature(type_alias_impl_trait)

From 56f0fc609dc26e84b21b4cad218b69a76d31e283 Mon Sep 17 00:00:00 2001
From: Mikail Bagishov <bagishov.mikail@yandex.ru>
Date: Thu, 12 Nov 2020 00:02:51 +0300
Subject: [PATCH 197/755] fixup

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5cd5b149..bb1cda78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8
 [features]
 default = []
 
-rustls = ["reqwest/rustls"]
+rustls = ["reqwest/rustls-tls"]
 native-tls = ["reqwest/native-tls"]
 
 # Features which require nightly compiler.

From 3c70ae5de04e8eec18f8cf375fbba6ecd1509cb4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Jan 2021 23:45:07 +0300
Subject: [PATCH 198/755] make native-tls default feature

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index bb1cda78..56986847 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ never = "0.1.0"
 vecrem = { git = "https://github.com/WaffleLapkin/vecrem", rev = "6b9b6f42342df8b75548c6ed387072ff235429b1" }
 
 [features]
-default = []
+default = ["native-tls"]
 
 rustls = ["reqwest/rustls-tls"]
 native-tls = ["reqwest/native-tls"]

From 55c02e3311221182db46219c93479c0097f778b3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 23 Jan 2021 15:45:58 +0300
Subject: [PATCH 199/755] Use edition-2018 style modules

Use `module_name.rs` instead of `module_name/mod.rs`.

Pros:
- It's easier to find the module file (especially for modules with lots of
  submodules like `types`)
- Module file name is not 'magical'
---
 src/{bot/mod.rs => bot.rs}           | 0
 src/{net/mod.rs => net.rs}           | 0
 src/{payloads/mod.rs => payloads.rs} | 0
 src/{requests/mod.rs => requests.rs} | 0
 src/{types/mod.rs => types.rs}       | 9 +++++++--
 src/types/non_telegram_types/mod.rs  | 9 ---------
 6 files changed, 7 insertions(+), 11 deletions(-)
 rename src/{bot/mod.rs => bot.rs} (100%)
 rename src/{net/mod.rs => net.rs} (100%)
 rename src/{payloads/mod.rs => payloads.rs} (100%)
 rename src/{requests/mod.rs => requests.rs} (100%)
 rename src/{types/mod.rs => types.rs} (95%)
 delete mode 100644 src/types/non_telegram_types/mod.rs

diff --git a/src/bot/mod.rs b/src/bot.rs
similarity index 100%
rename from src/bot/mod.rs
rename to src/bot.rs
diff --git a/src/net/mod.rs b/src/net.rs
similarity index 100%
rename from src/net/mod.rs
rename to src/net.rs
diff --git a/src/payloads/mod.rs b/src/payloads.rs
similarity index 100%
rename from src/payloads/mod.rs
rename to src/payloads.rs
diff --git a/src/requests/mod.rs b/src/requests.rs
similarity index 100%
rename from src/requests/mod.rs
rename to src/requests.rs
diff --git a/src/types/mod.rs b/src/types.rs
similarity index 95%
rename from src/types/mod.rs
rename to src/types.rs
index 52bf56a2..05430052 100644
--- a/src/types/mod.rs
+++ b/src/types.rs
@@ -190,5 +190,10 @@ mod passport_data;
 mod passport_element_error;
 mod passport_file;
 
-pub use non_telegram_types::*;
-mod non_telegram_types;
+pub use non_telegram_types::{country_code::*, currency::*, non_strict_vec::*};
+mod non_telegram_types {
+    pub(super) mod country_code;
+    pub(super) mod currency;
+    pub(crate) mod mime;
+    pub(super) mod non_strict_vec;
+}
diff --git a/src/types/non_telegram_types/mod.rs b/src/types/non_telegram_types/mod.rs
deleted file mode 100644
index 49360c4f..00000000
--- a/src/types/non_telegram_types/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub use country_code::*;
-pub use currency::*;
-pub use non_strict_vec::*;
-
-mod country_code;
-mod currency;
-mod non_strict_vec;
-
-pub(crate) mod mime;

From 1f4d29c547ccb61e9d0958079dd5cb82e62ff502 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 23 Jan 2021 15:59:59 +0300
Subject: [PATCH 200/755] Add note that serde_multipart is awful

---
 src/serde_multipart/mod.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index 814dc906..dcee7ef1 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -6,6 +6,9 @@
 //! ## How it works
 //!
 //! You better not know...
+//!
+//! This whole module is an awful hack and we'll probably stop using it in next
+//! versions (in favor of something less automatic, but more simple).
 
 mod serializers;
 mod unserializers;

From b16006ec9cc1d35389ede2571370a25d8d5d5156 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 11:56:42 +0300
Subject: [PATCH 201/755] document tls features

---
 src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index cca00141..77c18e96 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -40,6 +40,9 @@
 //!
 //! ## Cargo features
 //!
+//! - `native-tls` = use [`native-tls`] tls implementation (**enabled by
+//!   default**)
+//! - `rustls` — use [`rustls`] tls implementation
 //! - `auto_send` — enables [`AutoSend`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
 //! - `cache_me` — enables [`CacheMe`] bot adaptor
@@ -51,6 +54,8 @@
 //! [`AutoSend`]: adaptors::AutoSend
 //! [`Throttle`]: adaptors::Throttle
 //! [`CacheMe`]: adaptors::CacheMe
+//! [`native-tls`]: https://docs.rs/native-tls
+//! [`rustls`]: https://docs.rs/rustls
 
 #![doc(
     // FIXME(waffle): use github

From 5b328105fa306be3dcb803451cd802a615af4c52 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 13:20:08 +0300
Subject: [PATCH 202/755] Sticker related fixes

- Rename `sticker_type.rs` => `input_sticker.rs` (after the contained type)
- Make `create_new_sticker_set` multipart
- Replace CreateNewStickerSet::{png,tgs}_sticker with `<_>::sticker`
- Fix GetStickerSet return type
- Revert some previous InputSticker changes: make the variants tuple structsm
  remove constructors
---
 src/bot/api.rs                                |  5 ++--
 src/local_macros.rs                           |  4 +--
 src/payloads/create_new_sticker_set.rs        | 13 +++++----
 src/payloads/get_sticker_set.rs               |  4 +--
 src/requests/requester.rs                     |  1 +
 src/types.rs                                  |  4 +--
 .../{sticker_type.rs => input_sticker.rs}     | 27 +++----------------
 7 files changed, 20 insertions(+), 38 deletions(-)
 rename src/types/{sticker_type.rs => input_sticker.rs} (64%)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index e96f9216..86997994 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -765,13 +765,14 @@ impl Requester for Bot {
         )
     }
 
-    type CreateNewStickerSet = JsonRequest<payloads::CreateNewStickerSet>;
+    type CreateNewStickerSet = MultipartRequest<payloads::CreateNewStickerSet>;
 
     fn create_new_sticker_set<N, T, E>(
         &self,
         user_id: i32,
         name: N,
         title: T,
+        sticker: InputSticker,
         emojis: E,
     ) -> Self::CreateNewStickerSet
     where
@@ -781,7 +782,7 @@ impl Requester for Bot {
     {
         Self::CreateNewStickerSet::new(
             self.clone(),
-            payloads::CreateNewStickerSet::new(user_id, name, title, emojis),
+            payloads::CreateNewStickerSet::new(user_id, name, title, sticker, emojis),
         )
     }
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index fb528f5d..a2549a00 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -924,11 +924,11 @@ macro_rules! requester_forward {
     (@method create_new_sticker_set $body:ident $ty:ident) => {
         type CreateNewStickerSet = $ty![CreateNewStickerSet];
 
-        fn create_new_sticker_set<N, T, E>(&self, user_id: i32, name: N, title: T, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
+        fn create_new_sticker_set<N, T, E>(&self, user_id: i32, name: N, title: T, sticker: InputSticker, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
         T: Into<String>,
         E: Into<String> {
             let this = self;
-            $body!(create_new_sticker_set this (user_id: i32, name: N, title: T, emojis: E))
+            $body!(create_new_sticker_set this (user_id: i32, name: N, title: T, sticker: InputSticker, emojis: E))
         }
     };
     (@method add_sticker_to_set $body:ident $ty:ident) => {
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 2504ce00..ce2fc4bb 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{InputFile, MaskPosition, True};
+use crate::types::{InputSticker, MaskPosition, True};
 
 impl_payload! {
     /// Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\_sticker_ or _tgs\_sticker_. Returns _True_ on success.
@@ -16,16 +16,15 @@ impl_payload! {
             pub name: String [into],
             /// Sticker set title, 1-64 characters
             pub title: String [into],
+            /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            ///
+            /// [More info on Sending Files »]: crate::types::InputFile
+            #[serde(flatten)]
+            pub sticker: InputSticker,
             /// One or more emoji corresponding to the sticker
             pub emojis: String [into],
         }
         optional {
-            /// **PNG** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
-            ///
-            /// [More info on Sending Files »]: crate::types::InputFile
-            pub png_sticker: InputFile,
-            /// **TGS** animation with the sticker, uploaded using multipart/form-data. See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
-            pub tgs_sticker: InputFile,
             /// Pass _True_, if a set of mask stickers should be created
             pub contains_masks: bool,
             /// A JSON-serialized object for position where the mask should be placed on faces
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index a1b74857..96c96f7b 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -3,12 +3,12 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::True;
+use crate::types::StickerSet;
 
 impl_payload! {
     /// Use this method to get a sticker set. On success, a StickerSet object is returned.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub GetStickerSet (GetStickerSetSetters) => True {
+    pub GetStickerSet (GetStickerSetSetters) => StickerSet {
         required {
             /// Name of the sticker set
             pub name: String [into],
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index e8a32943..b8afc2e4 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -617,6 +617,7 @@ pub trait Requester {
         user_id: i32,
         name: N,
         title: T,
+        sticker: InputSticker,
         emojis: E,
     ) -> Self::CreateNewStickerSet
     where
diff --git a/src/types.rs b/src/types.rs
index 05430052..d352caac 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -50,6 +50,7 @@ pub use inline_query_result_voice::*;
 pub use input_file::*;
 pub use input_media::*;
 pub use input_message_content::*;
+pub use input_sticker::*;
 pub use invoice::*;
 pub use keyboard_button::*;
 pub use keyboard_button_poll_type::*;
@@ -80,7 +81,6 @@ pub use shipping_option::*;
 pub use shipping_query::*;
 pub use sticker::*;
 pub use sticker_set::*;
-pub use sticker_type::*;
 pub use successful_payment::*;
 pub use target_message::*;
 pub use unit_false::*;
@@ -120,6 +120,7 @@ mod inline_keyboard_markup;
 mod input_file;
 mod input_media;
 mod input_message_content;
+mod input_sticker;
 mod invoice;
 mod keyboard_button;
 mod keyboard_button_poll_type;
@@ -147,7 +148,6 @@ mod shipping_option;
 mod shipping_query;
 mod sticker;
 mod sticker_set;
-mod sticker_type;
 mod successful_payment;
 mod target_message;
 mod unit_false;
diff --git a/src/types/sticker_type.rs b/src/types/input_sticker.rs
similarity index 64%
rename from src/types/sticker_type.rs
rename to src/types/input_sticker.rs
index d15a4812..8f765495 100644
--- a/src/types/sticker_type.rs
+++ b/src/types/input_sticker.rs
@@ -4,7 +4,6 @@ use crate::types::InputFile;
 
 /// Sticker file that may be uploaded to telegram.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
-#[serde(untagged)]
 pub enum InputSticker {
     /// PNG image with the sticker, must be up to 512 kilobytes in size,
     /// dimensions must not exceed 512px, and either width or height must be
@@ -20,30 +19,12 @@ pub enum InputSticker {
     /// [`InputFile::FileId`]: crate::types::InputFile::FileId
     ///
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
-    Png { png_sticker: InputFile },
+    #[serde(rename = "png_sticker")]
+    Png(InputFile),
 
     /// TGS animation with the sticker, uploaded using multipart/form-data.
     ///
     /// See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
-    Tgs { tgs_sticker: InputFile },
-}
-
-impl InputSticker {
-    /// Create png-`InputSticker`.
-    ///
-    /// See [`InputSticker::Png`] for more
-    ///
-    /// [`InputSticker::Png`]: crate::types::InputSticker::Png
-    pub fn png(png_sticker: InputFile) -> Self {
-        Self::Png { png_sticker }
-    }
-
-    /// Create tgs-`InputSticker`.
-    ///
-    /// See [`InputSticker::Tgs`] for more
-    ///
-    /// [`InputSticker::Tgs`]: crate::types::InputSticker::Tgs
-    pub fn tgs(tgs_sticker: InputFile) -> Self {
-        Self::Tgs { tgs_sticker }
-    }
+    #[serde(rename = "tgs_sticker")]
+    Tgs(InputFile),
 }

From bfef7f3c5d45a366ab3aa1054e6543d1198791c5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 13:43:34 +0300
Subject: [PATCH 203/755] fix `self_info` example

---
 examples/self_info.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/self_info.rs b/examples/self_info.rs
index 78678e9f..78b2cec4 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -15,7 +15,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let me = bot.get_me().await?;
 
-    bot.send_dice(chat_id, DiceEmoji::Dice).await?;
+    bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
     bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
         .await?;
 

From a80ff92abac067fa7857c8ce70df41e35745dce0 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 13:58:51 +0300
Subject: [PATCH 204/755] make `get_me` return `Me`

---
 src/adaptors/cache_me.rs | 26 +++++++++++++-------------
 src/payloads/get_me.rs   |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 539004bd..541c9d42 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -11,7 +11,7 @@ use once_cell::sync::OnceCell;
 use crate::{
     payloads::GetMe,
     requests::{HasPayload, Request, Requester},
-    types::{ChatId, User, *},
+    types::{ChatId, Me, *},
 };
 
 /// `get_me` cache.
@@ -20,7 +20,7 @@ use crate::{
 /// response from `get_me` method.
 pub struct CacheMe<B> {
     bot: B,
-    me: Arc<OnceCell<User>>,
+    me: Arc<OnceCell<Me>>,
 }
 
 impl<B> CacheMe<B> {
@@ -52,7 +52,7 @@ impl<B> CacheMe<B> {
     ///
     /// Note: internally this uses [`Arc::make_mut`] so this will **not**
     /// clear cache of clones of self.
-    pub fn clear(&mut self) -> Option<User> {
+    pub fn clear(&mut self) -> Option<Me> {
         Arc::make_mut(&mut self.me).take()
     }
 }
@@ -79,7 +79,7 @@ where
 
     fn get_me(&self) -> Self::GetMe {
         match self.me.get() {
-            Some(user) => CachedMeRequest(Inner::Ready(user.clone()), GetMe::new()),
+            Some(me) => CachedMeRequest(Inner::Ready(me.clone()), GetMe::new()),
             None => CachedMeRequest(
                 Inner::Pending(self.bot.get_me(), Arc::clone(&self.me)),
                 GetMe::new(),
@@ -132,8 +132,8 @@ download_forward! {
 pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
 
 enum Inner<R: Request<Payload = GetMe>> {
-    Ready(User),
-    Pending(R, Arc<OnceCell<User>>),
+    Ready(Me),
+    Pending(R, Arc<OnceCell<Me>>),
 }
 
 impl<R> Request for CachedMeRequest<R>
@@ -146,7 +146,7 @@ where
 
     fn send(self) -> Self::Send {
         let fut = match self.0 {
-            Inner::Ready(user) => future::Either::Left(ok(user)),
+            Inner::Ready(me) => future::Either::Left(ok(me)),
             Inner::Pending(req, cell) => future::Either::Right(Init(req.send(), cell)),
         };
         Send(fut)
@@ -154,7 +154,7 @@ where
 
     fn send_ref(&self) -> Self::SendRef {
         let fut = match &self.0 {
-            Inner::Ready(user) => future::Either::Left(ok(user.clone())),
+            Inner::Ready(me) => future::Either::Left(ok(me.clone())),
             Inner::Pending(req, cell) => {
                 future::Either::Right(Init(req.send_ref(), Arc::clone(cell)))
             }
@@ -175,15 +175,15 @@ impl<R: Request<Payload = GetMe>> HasPayload for CachedMeRequest<R> {
     }
 }
 
-type ReadyUser<Err> = Ready<Result<User, Err>>;
+type ReadyMe<Err> = Ready<Result<Me, Err>>;
 
 #[pin_project::pin_project]
 pub struct Send<R: Request<Payload = GetMe>>(
-    #[pin] future::Either<ReadyUser<R::Err>, Init<R::Send, User>>,
+    #[pin] future::Either<ReadyMe<R::Err>, Init<R::Send, Me>>,
 );
 
 impl<R: Request<Payload = GetMe>> Future for Send<R> {
-    type Output = Result<User, R::Err>;
+    type Output = Result<Me, R::Err>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
@@ -193,11 +193,11 @@ impl<R: Request<Payload = GetMe>> Future for Send<R> {
 
 #[pin_project::pin_project]
 pub struct SendRef<R: Request<Payload = GetMe>>(
-    #[pin] future::Either<ReadyUser<R::Err>, Init<R::SendRef, User>>,
+    #[pin] future::Either<ReadyMe<R::Err>, Init<R::SendRef, Me>>,
 );
 
 impl<R: Request<Payload = GetMe>> Future for SendRef<R> {
-    type Output = Result<User, R::Err>;
+    type Output = Result<Me, R::Err>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 8794d5a6..a47285b7 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -3,14 +3,14 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::User;
+use crate::types::Me;
 
 impl_payload! {
     /// A simple method for testing your bot's auth token. Requires no parameters. Returns basic information about the bot in form of a [`User`] object.
     ///
     /// [`User`]: crate::types::User
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
-    pub GetMe (GetMeSetters) => User {
+    pub GetMe (GetMeSetters) => Me {
 
     }
 }

From 8807cd72282bc1a2a6d3932234392b3ca4ac7d8d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 14:10:37 +0300
Subject: [PATCH 205/755] fix examples (because get_me now returns Me)

---
 examples/self_info.rs   | 4 ++--
 src/lib.rs              | 7 +++++--
 src/requests/request.rs | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/self_info.rs b/examples/self_info.rs
index 78b2cec4..5735bbb3 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -1,6 +1,6 @@
 use teloxide_core::{
     prelude::*,
-    types::{DiceEmoji, ParseMode},
+    types::{DiceEmoji, Me, ParseMode},
 };
 
 #[tokio::main]
@@ -13,7 +13,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .parse_mode(ParseMode::MarkdownV2)
         .auto_send();
 
-    let me = bot.get_me().await?;
+    let Me { user: me, .. } = bot.get_me().await?;
 
     bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
     bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
diff --git a/src/lib.rs b/src/lib.rs
index cca00141..8c557789 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,8 +25,11 @@
 //! let me = bot.get_me().await?;
 //!
 //! bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
-//! bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
-//!     .await?;
+//! bot.send_message(
+//!     chat_id,
+//!     format!("Hi, my name is **{}** 👋", me.user.first_name),
+//! )
+//! .await?;
 //! # Ok::<_, Box<dyn std::error::Error>>(()) };
 //! ```
 //!
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 8517daa2..6ea6c5b4 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -44,7 +44,7 @@ pub trait Request: HasPayload {
     /// use teloxide_core::{
     ///     payloads::GetMe,
     ///     requests::{JsonRequest, Request},
-    ///     types::User,
+    ///     types::Me,
     ///     Bot,
     /// };
     ///
@@ -53,7 +53,7 @@ pub trait Request: HasPayload {
     /// // Note: it's recommended to `Requester` instead of creating requests directly
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
-    /// let _: User = request.send().await.unwrap();
+    /// let _: Me = request.send().await.unwrap();
     /// # };
     /// ```
     fn send(self) -> Self::Send;

From d663879423997eaecec08d8de3ff7566dd582b6e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 14:52:50 +0300
Subject: [PATCH 206/755] fix example and add --features full to ci

---
 .github/workflows/ci.yml  | 4 ++--
 src/adaptors/auto_send.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4790ad17..939b0930 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,9 +20,9 @@ jobs:
     
         include:
           - rust: stable
-            features: ""
+            features: "--features full"
           - rust: beta
-            features: ""
+            features: "--features full"
           - rust: nightly
             features: "--all-features"
 
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 77ce8e25..3cacee42 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -28,13 +28,13 @@ use crate::{
 /// ```rust
 /// use teloxide_core::{
 ///     requests::{Requester, RequesterExt},
-///     types::User,
+///     types::Me,
 ///     Bot,
 /// };
 ///
 /// # async {
 /// let bot = Bot::new("TOKEN").auto_send();
-/// let myself: User = bot.get_me().await?; // No .send()!
+/// let myself: Me = bot.get_me().await?; // No .send()!
 /// # Ok::<_, teloxide_core::RequestError>(()) };
 /// ```
 pub struct AutoSend<B> {

From 393f6ee7a40df6949fefa18009ff542fb7095389 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 15:35:08 +0300
Subject: [PATCH 207/755] Cleanup setters in types::*

- Remove useless setters for types which are only returned from telegam
- Add `const` on setters (where possible)
- Make `Poll::{open_period,close_date}` public
---
 src/types/animation.rs                  |  80 ---
 src/types/audio.rs                      |  71 ---
 src/types/callback_query.rs             |  68 ---
 src/types/chat.rs                       | 114 -----
 src/types/chat_permissions.rs           |  53 +-
 src/types/chat_photo.rs                 |  54 --
 src/types/chosen_inline_result.rs       |  50 --
 src/types/contact.rs                    |  53 --
 src/types/dice.rs                       |  16 -
 src/types/document.rs                   |  56 --
 src/types/encrypted_credentials.rs      |  39 --
 src/types/encrypted_passport_element.rs | 417 ---------------
 src/types/file.rs                       |  45 --
 src/types/force_reply.rs                |   9 +-
 src/types/game.rs                       |  63 ---
 src/types/game_high_score.rs            |  25 -
 src/types/input_media.rs                |  41 +-
 src/types/input_message_content.rs      |   8 +-
 src/types/invoice.rs                    |  61 ---
 src/types/keyboard_button.rs            |   4 +-
 src/types/location.rs                   |  19 -
 src/types/me.rs                         |  39 --
 src/types/message.rs                    | 652 ------------------------
 src/types/message_entity.rs             |   6 +-
 src/types/order_info.rs                 |  50 --
 src/types/passport_data.rs              |  25 -
 src/types/passport_file.rs              |  41 --
 src/types/photo_size.rs                 |  47 --
 src/types/poll.rs                       | 146 +-----
 src/types/poll_answer.rs                |  35 --
 src/types/pre_checkout_query.rs         |  68 ---
 src/types/reply_keyboard_remove.rs      |  14 +-
 src/types/shipping_address.rs           |  73 ---
 src/types/shipping_query.rs             |  46 --
 src/types/sticker.rs                    |  90 ----
 src/types/sticker_set.rs                |  59 ---
 src/types/successful_payment.rs         |  72 ---
 src/types/update.rs                     |  16 -
 src/types/user.rs                       |  59 ---
 src/types/user_profile_photos.rs        |  27 -
 src/types/venue.rs                      |  48 --
 src/types/video.rs                      |  71 ---
 src/types/video_note.rs                 |  53 --
 src/types/voice.rs                      |  47 --
 src/types/webhook_info.rs               |  63 ---
 45 files changed, 98 insertions(+), 3095 deletions(-)

diff --git a/src/types/animation.rs b/src/types/animation.rs
index ae0c9de5..e057aad5 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -41,86 +41,6 @@ pub struct Animation {
     pub file_size: Option<u32>,
 }
 
-impl Animation {
-    pub fn new<S1, S2>(
-        file_id: S1,
-        file_unique_id: S2,
-        width: u32,
-        height: u32,
-        duration: u32,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            width,
-            height,
-            duration,
-            thumb: None,
-            file_name: None,
-            mime_type: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn width(mut self, val: u32) -> Self {
-        self.width = val;
-        self
-    }
-
-    pub fn height(mut self, val: u32) -> Self {
-        self.height = val;
-        self
-    }
-
-    pub fn duration(mut self, val: u32) -> Self {
-        self.duration = val;
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    pub fn file_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_name = Some(val.into());
-        self
-    }
-
-    pub fn mime_type(mut self, val: Mime) -> Self {
-        self.mime_type = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/audio.rs b/src/types/audio.rs
index 23225eba..1bf3174f 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -38,77 +38,6 @@ pub struct Audio {
     pub thumb: Option<PhotoSize>,
 }
 
-impl Audio {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, duration: u32) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            duration,
-            performer: None,
-            title: None,
-            mime_type: None,
-            file_size: None,
-            thumb: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn duration(mut self, val: u32) -> Self {
-        self.duration = val;
-        self
-    }
-
-    pub fn performer<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.performer = Some(val.into());
-        self
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = Some(val.into());
-        self
-    }
-
-    pub fn mime_type(mut self, val: Mime) -> Self {
-        self.mime_type = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/callback_query.rs b/src/types/callback_query.rs
index 611c23c1..47cedb96 100644
--- a/src/types/callback_query.rs
+++ b/src/types/callback_query.rs
@@ -49,74 +49,6 @@ pub struct CallbackQuery {
     pub game_short_name: Option<String>,
 }
 
-impl CallbackQuery {
-    pub fn new<S1, S2>(id: S1, from: User, chat_instance: S2) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            id: id.into(),
-            from,
-            message: None,
-            inline_message_id: None,
-            chat_instance: chat_instance.into(),
-            data: None,
-            game_short_name: None,
-        }
-    }
-
-    pub fn id<S>(mut self, id: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.id = id.into();
-        self
-    }
-
-    pub fn from(mut self, val: User) -> Self {
-        self.from = val;
-        self
-    }
-
-    pub fn message(mut self, val: Message) -> Self {
-        self.message = Some(val);
-        self
-    }
-
-    pub fn inline_message_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.inline_message_id = Some(val.into());
-        self
-    }
-
-    pub fn chat_instance<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.chat_instance = val.into();
-        self
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = Some(val.into());
-        self
-    }
-
-    pub fn game_short_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.game_short_name = Some(val.into());
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 3ac14786..d0ce754e 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -24,31 +24,6 @@ pub struct Chat {
     pub photo: Option<ChatPhoto>,
 }
 
-impl Chat {
-    pub fn new(id: i64, kind: ChatKind) -> Self {
-        Self {
-            id,
-            kind,
-            photo: None,
-        }
-    }
-
-    pub fn id(mut self, val: i64) -> Self {
-        self.id = val;
-        self
-    }
-
-    pub fn kind(mut self, val: ChatKind) -> Self {
-        self.kind = val;
-        self
-    }
-
-    pub fn photo(mut self, val: ChatPhoto) -> Self {
-        self.photo = Some(val);
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -91,47 +66,6 @@ pub struct ChatPublic {
     pub pinned_message: Option<Box<Message>>,
 }
 
-impl ChatPublic {
-    pub fn new(kind: PublicChatKind) -> Self {
-        Self {
-            title: None,
-            kind,
-            description: None,
-            invite_link: None,
-            pinned_message: None,
-        }
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = Some(val.into());
-        self
-    }
-
-    pub fn description<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.description = Some(val.into());
-        self
-    }
-
-    pub fn invite_link<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.invite_link = Some(val.into());
-        self
-    }
-
-    pub fn pinned_message(mut self, val: Message) -> Self {
-        self.pinned_message = Some(Box::new(val));
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ChatPrivate {
@@ -152,36 +86,6 @@ pub struct ChatPrivate {
     pub last_name: Option<String>,
 }
 
-impl ChatPrivate {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn username<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.username = Some(val.into());
-        self
-    }
-
-    pub fn first_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.first_name = Some(val.into());
-        self
-    }
-
-    pub fn last_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.last_name = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -199,12 +103,6 @@ pub struct PublicChatChannel {
     pub username: Option<String>,
 }
 
-impl PublicChatChannel {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatGroup {
@@ -215,12 +113,6 @@ pub struct PublicChatGroup {
     pub permissions: Option<ChatPermissions>,
 }
 
-impl PublicChatGroup {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatSupergroup {
@@ -253,12 +145,6 @@ pub struct PublicChatSupergroup {
     pub slow_mode_delay: Option<i32>,
 }
 
-impl PublicChatSupergroup {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 struct PrivateChatKindVisitor;
 
 impl<'de> serde::de::Visitor<'de> for PrivateChatKindVisitor {
diff --git a/src/types/chat_permissions.rs b/src/types/chat_permissions.rs
index 139f261e..d95b6643 100644
--- a/src/types/chat_permissions.rs
+++ b/src/types/chat_permissions.rs
@@ -41,7 +41,56 @@ pub struct ChatPermissions {
 }
 
 impl ChatPermissions {
-    pub fn new() -> Self {
-        Self::default()
+    pub const fn new() -> Self {
+        Self {
+            can_send_messages: None,
+            can_send_media_messages: None,
+            can_send_polls: None,
+            can_send_other_messages: None,
+            can_add_web_page_previews: None,
+            can_change_info: None,
+            can_invite_users: None,
+            can_pin_messages: None,
+        }
+    }
+
+    pub const fn can_send_messages(mut self, val: bool) -> Self {
+        self.can_send_messages = Some(val);
+        self
+    }
+
+    pub const fn can_send_media_messages(mut self, val: bool) -> Self {
+        self.can_send_media_messages = Some(val);
+        self
+    }
+
+    pub const fn can_send_polls(mut self, val: bool) -> Self {
+        self.can_send_polls = Some(val);
+        self
+    }
+
+    pub const fn can_send_other_messages(mut self, val: bool) -> Self {
+        self.can_send_other_messages = Some(val);
+        self
+    }
+
+    pub const fn can_add_web_page_previews(mut self, val: bool) -> Self {
+        self.can_add_web_page_previews = Some(val);
+        self
+    }
+
+    pub const fn can_change_info(mut self, val: bool) -> Self {
+        self.can_change_info = Some(val);
+        self
+    }
+
+    pub const fn can_invite_users(mut self, val: bool) -> Self {
+        self.can_invite_users = Some(val);
+        self
+    }
+
+    pub const fn can_pin_messages(mut self, val: bool) -> Self {
+        self.can_pin_messages = Some(val);
+        self
     }
 }
diff --git a/src/types/chat_photo.rs b/src/types/chat_photo.rs
index dc19be54..3ebd2bb6 100644
--- a/src/types/chat_photo.rs
+++ b/src/types/chat_photo.rs
@@ -25,57 +25,3 @@ pub struct ChatPhoto {
     /// download or reuse the file.
     pub big_file_unique_id: String,
 }
-
-impl ChatPhoto {
-    pub fn new<S1, S2, S3, S4>(
-        small_file_id: S1,
-        small_file_unique_id: S2,
-        big_file_id: S3,
-        big_file_unique_id: S4,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-        S4: Into<String>,
-    {
-        Self {
-            small_file_id: small_file_id.into(),
-            small_file_unique_id: small_file_unique_id.into(),
-            big_file_id: big_file_id.into(),
-            big_file_unique_id: big_file_unique_id.into(),
-        }
-    }
-
-    pub fn small_file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.small_file_id = val.into();
-        self
-    }
-
-    pub fn small_file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.small_file_unique_id = val.into();
-        self
-    }
-
-    pub fn big_file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.big_file_id = val.into();
-        self
-    }
-
-    pub fn big_file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.big_file_unique_id = val.into();
-        self
-    }
-}
diff --git a/src/types/chosen_inline_result.rs b/src/types/chosen_inline_result.rs
index b3aed6ee..458ec465 100644
--- a/src/types/chosen_inline_result.rs
+++ b/src/types/chosen_inline_result.rs
@@ -32,53 +32,3 @@ pub struct ChosenInlineResult {
     /// The query that was used to obtain the result.
     pub query: String,
 }
-
-impl ChosenInlineResult {
-    pub fn new<S1, S2>(result_id: S1, from: User, query: S2) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            result_id: result_id.into(),
-            from,
-            location: None,
-            inline_message_id: None,
-            query: query.into(),
-        }
-    }
-
-    pub fn result_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.result_id = val.into();
-        self
-    }
-
-    pub fn from(mut self, val: User) -> Self {
-        self.from = val;
-        self
-    }
-
-    pub fn location<S>(mut self, val: Location) -> Self {
-        self.location = val.into();
-        self
-    }
-
-    pub fn inline_message_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.inline_message_id = Some(val.into());
-        self
-    }
-
-    pub fn query<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.query = val.into();
-        self
-    }
-}
diff --git a/src/types/contact.rs b/src/types/contact.rs
index 74661c50..147d31dd 100644
--- a/src/types/contact.rs
+++ b/src/types/contact.rs
@@ -23,56 +23,3 @@ pub struct Contact {
     /// [vCard]: https://en.wikipedia.org/wiki/VCard
     pub vcard: Option<String>,
 }
-
-impl Contact {
-    pub fn new<S1, S2>(phone_number: S1, first_name: S2) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            phone_number: phone_number.into(),
-            first_name: first_name.into(),
-            last_name: None,
-            user_id: None,
-            vcard: None,
-        }
-    }
-
-    pub fn phone_number<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.phone_number = val.into();
-        self
-    }
-
-    pub fn first_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.first_name = val.into();
-        self
-    }
-
-    pub fn last_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.last_name = Some(val.into());
-        self
-    }
-
-    pub fn user_id(mut self, val: i32) -> Self {
-        self.user_id = Some(val);
-        self
-    }
-
-    pub fn vcard<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.vcard = Some(val.into());
-        self
-    }
-}
diff --git a/src/types/dice.rs b/src/types/dice.rs
index c06c5050..404abd8e 100644
--- a/src/types/dice.rs
+++ b/src/types/dice.rs
@@ -19,19 +19,3 @@ pub struct Dice {
     /// [`DiceEmoji::Basketball`]:crate::types::DiceEmoji::Basketball
     value: i32,
 }
-
-impl Dice {
-    pub fn new(emoji: DiceEmoji, value: i32) -> Self {
-        Self { emoji, value }
-    }
-
-    pub fn emoji(mut self, val: DiceEmoji) -> Self {
-        self.emoji = val;
-        self
-    }
-
-    pub fn value<S>(mut self, val: i32) -> Self {
-        self.value = val;
-        self
-    }
-}
diff --git a/src/types/document.rs b/src/types/document.rs
index 75e28918..3ea3c861 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -35,59 +35,3 @@ pub struct Document {
     /// A size of a file.
     pub file_size: Option<u32>,
 }
-
-impl Document {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            thumb: None,
-            file_name: None,
-            mime_type: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    pub fn file_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_name = Some(val.into());
-        self
-    }
-
-    pub fn mime_type(mut self, val: Mime) -> Self {
-        self.mime_type = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
index 5e3562a5..583821e7 100644
--- a/src/types/encrypted_credentials.rs
+++ b/src/types/encrypted_credentials.rs
@@ -30,45 +30,6 @@ pub struct EncryptedCredentials {
     pub secret: String,
 }
 
-impl EncryptedCredentials {
-    pub fn new<S1, S2, S3>(data: S1, hash: S2, secret: S3) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-    {
-        Self {
-            data: data.into(),
-            hash: hash.into(),
-            secret: secret.into(),
-        }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn hash<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.hash = val.into();
-        self
-    }
-
-    pub fn secret<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.secret = val.into();
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/encrypted_passport_element.rs b/src/types/encrypted_passport_element.rs
index 584e9d9a..3d392f57 100644
--- a/src/types/encrypted_passport_element.rs
+++ b/src/types/encrypted_passport_element.rs
@@ -19,31 +19,6 @@ pub struct EncryptedPassportElement {
     pub kind: EncryptedPassportElementKind,
 }
 
-impl EncryptedPassportElement {
-    pub fn new<S>(hash: S, kind: EncryptedPassportElementKind) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            hash: hash.into(),
-            kind,
-        }
-    }
-
-    pub fn hash<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.hash = val.into();
-        self
-    }
-
-    pub fn kind(mut self, val: EncryptedPassportElementKind) -> Self {
-        self.kind = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[allow(clippy::large_enum_variant)]
@@ -77,23 +52,6 @@ pub struct EncryptedPassportElementPersonalDetails {
     pub data: String,
 }
 
-impl EncryptedPassportElementPersonalDetails {
-    pub fn new<S>(data: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self { data: data.into() }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementPassport {
@@ -138,46 +96,6 @@ pub struct EncryptedPassportElementPassport {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementPassport {
-    pub fn new<S>(data: S, front_side: PassportFile, selfie: PassportFile) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            data: data.into(),
-            front_side,
-            selfie,
-            translation: None,
-        }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn front_side(mut self, val: PassportFile) -> Self {
-        self.front_side = val;
-        self
-    }
-
-    pub fn selfie(mut self, val: PassportFile) -> Self {
-        self.selfie = val;
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementDriverLicense {
@@ -231,56 +149,6 @@ pub struct EncryptedPassportElementDriverLicense {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementDriverLicense {
-    pub fn new<S>(
-        data: S,
-        front_side: PassportFile,
-        reverse_side: PassportFile,
-        selfie: PassportFile,
-    ) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            data: data.into(),
-            front_side,
-            reverse_side,
-            selfie,
-            translation: None,
-        }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn front_side(mut self, val: PassportFile) -> Self {
-        self.front_side = val;
-        self
-    }
-
-    pub fn reverse_side(mut self, val: PassportFile) -> Self {
-        self.reverse_side = val;
-        self
-    }
-
-    pub fn selfie(mut self, val: PassportFile) -> Self {
-        self.selfie = val;
-        self
-    }
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementIdentityCard {
@@ -334,56 +202,6 @@ pub struct EncryptedPassportElementIdentityCard {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementIdentityCard {
-    pub fn new<S>(
-        data: S,
-        front_side: PassportFile,
-        reverse_side: PassportFile,
-        selfie: PassportFile,
-    ) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            data: data.into(),
-            front_side,
-            reverse_side,
-            selfie,
-            translation: None,
-        }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn front_side(mut self, val: PassportFile) -> Self {
-        self.front_side = val;
-        self
-    }
-
-    pub fn reverse_side(mut self, val: PassportFile) -> Self {
-        self.reverse_side = val;
-        self
-    }
-
-    pub fn selfie(mut self, val: PassportFile) -> Self {
-        self.selfie = val;
-        self
-    }
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementInternalPassport {
@@ -428,46 +246,6 @@ pub struct EncryptedPassportElementInternalPassport {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementInternalPassport {
-    pub fn new<S>(data: S, front_side: PassportFile, selfie: PassportFile) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            data: data.into(),
-            front_side,
-            selfie,
-            translation: None,
-        }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn front_side(mut self, val: PassportFile) -> Self {
-        self.front_side = val;
-        self
-    }
-
-    pub fn selfie(mut self, val: PassportFile) -> Self {
-        self.selfie = val;
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementAddress {
@@ -482,23 +260,6 @@ pub struct EncryptedPassportElementAddress {
     pub data: String,
 }
 
-impl EncryptedPassportElementAddress {
-    pub fn new<S>(data: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self { data: data.into() }
-    }
-
-    pub fn data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.data = val.into();
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementUtilityBill {
@@ -525,34 +286,6 @@ pub struct EncryptedPassportElementUtilityBill {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementUtilityBill {
-    pub fn new<F>(files: F) -> Self
-    where
-        F: Into<Vec<PassportFile>>,
-    {
-        Self {
-            files: files.into(),
-            translation: None,
-        }
-    }
-
-    pub fn files<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.files = val.into();
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementBankStatement {
@@ -579,34 +312,6 @@ pub struct EncryptedPassportElementBankStatement {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementBankStatement {
-    pub fn new<F>(files: F) -> Self
-    where
-        F: Into<Vec<PassportFile>>,
-    {
-        Self {
-            files: files.into(),
-            translation: None,
-        }
-    }
-
-    pub fn files<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.files = val.into();
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementRentalAgreement {
@@ -633,34 +338,6 @@ pub struct EncryptedPassportElementRentalAgreement {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementRentalAgreement {
-    pub fn new<F>(files: F) -> Self
-    where
-        F: Into<Vec<PassportFile>>,
-    {
-        Self {
-            files: files.into(),
-            translation: None,
-        }
-    }
-
-    pub fn files<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.files = val.into();
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementPassportRegistration {
@@ -687,34 +364,6 @@ pub struct EncryptedPassportElementPassportRegistration {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementPassportRegistration {
-    pub fn new<F>(files: F) -> Self
-    where
-        F: Into<Vec<PassportFile>>,
-    {
-        Self {
-            files: files.into(),
-            translation: None,
-        }
-    }
-
-    pub fn files<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.files = val.into();
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementTemporaryRegistration {
@@ -741,34 +390,6 @@ pub struct EncryptedPassportElementTemporaryRegistration {
     pub translation: Option<Vec<PassportFile>>,
 }
 
-impl EncryptedPassportElementTemporaryRegistration {
-    pub fn new<F>(files: F) -> Self
-    where
-        F: Into<Vec<PassportFile>>,
-    {
-        Self {
-            files: files.into(),
-            translation: None,
-        }
-    }
-
-    pub fn files<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.files = val.into();
-        self
-    }
-
-    pub fn translation<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PassportFile>>,
-    {
-        self.translation = Some(val.into());
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementPhoneNumber {
@@ -777,47 +398,9 @@ pub struct EncryptedPassportElementPhoneNumber {
     pub phone_number: String,
 }
 
-impl EncryptedPassportElementPhoneNumber {
-    pub fn new<S>(phone_number: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            phone_number: phone_number.into(),
-        }
-    }
-
-    pub fn phone_number<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.phone_number = val.into();
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct EncryptedPassportElementEmail {
     /// User's verified email address, available only for `email` type.
     pub email: String,
 }
-
-impl EncryptedPassportElementEmail {
-    pub fn new<S>(email: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            email: email.into(),
-        }
-    }
-
-    pub fn email<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.email = val.into();
-        self
-    }
-}
diff --git a/src/types/file.rs b/src/types/file.rs
index a1eeeb75..82aa237e 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -30,48 +30,3 @@ pub struct File {
     /// crate::net::Download::download_file
     pub file_path: String,
 }
-
-impl File {
-    pub fn new<S1, S2, S3>(file_id: S1, file_unique_id: S2, file_size: u32, file_path: S3) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            file_size,
-            file_path: file_path.into(),
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = val;
-        self
-    }
-
-    pub fn file_path<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-}
diff --git a/src/types/force_reply.rs b/src/types/force_reply.rs
index cb8ed997..462e47a5 100644
--- a/src/types/force_reply.rs
+++ b/src/types/force_reply.rs
@@ -29,11 +29,14 @@ pub struct ForceReply {
 }
 
 impl ForceReply {
-    pub fn new() -> Self {
-        Self::default()
+    pub const fn new() -> Self {
+        Self {
+            force_reply: True,
+            selective: None,
+        }
     }
 
-    pub fn selective(mut self, val: bool) -> Self {
+    pub const fn selective(mut self, val: bool) -> Self {
         self.selective = Some(val);
         self
     }
diff --git a/src/types/game.rs b/src/types/game.rs
index ca3f4e7d..fa9c5f33 100644
--- a/src/types/game.rs
+++ b/src/types/game.rs
@@ -39,66 +39,3 @@ pub struct Game {
     /// [@Botfather]: https://t.me/botfather
     pub animation: Option<Animation>,
 }
-
-impl Game {
-    pub fn new<S1, S2, P>(title: S1, description: S2, photo: P) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        P: Into<Vec<PhotoSize>>,
-    {
-        Self {
-            title: title.into(),
-            description: description.into(),
-            photo: photo.into(),
-            text: None,
-            text_entities: None,
-            animation: None,
-        }
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    pub fn description<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.description = val.into();
-        self
-    }
-
-    pub fn photo<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PhotoSize>>,
-    {
-        self.photo = val.into();
-        self
-    }
-
-    pub fn text<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.text = Some(val.into());
-        self
-    }
-
-    pub fn text_entities<T>(mut self, val: T) -> Self
-    where
-        T: Into<Vec<MessageEntity>>,
-    {
-        self.text_entities = Some(val.into());
-        self
-    }
-
-    pub fn animation(mut self, val: Animation) -> Self {
-        self.animation = Some(val);
-        self
-    }
-}
diff --git a/src/types/game_high_score.rs b/src/types/game_high_score.rs
index 57ac5719..059686c1 100644
--- a/src/types/game_high_score.rs
+++ b/src/types/game_high_score.rs
@@ -16,28 +16,3 @@ pub struct GameHighScore {
     /// Score.
     pub score: u32,
 }
-
-impl GameHighScore {
-    pub fn new(position: u32, user: User, score: u32) -> Self {
-        Self {
-            position,
-            user,
-            score,
-        }
-    }
-
-    pub fn position(mut self, val: u32) -> Self {
-        self.position = val;
-        self
-    }
-
-    pub fn user(mut self, val: User) -> Self {
-        self.user = val;
-        self
-    }
-
-    pub fn score(mut self, val: u32) -> Self {
-        self.score = val;
-        self
-    }
-}
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index a5d3dd84..2cdb4637 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -38,7 +38,7 @@ pub struct InputMediaPhoto {
 }
 
 impl InputMediaPhoto {
-    pub fn new(media: InputFile) -> Self {
+    pub const fn new(media: InputFile) -> Self {
         Self {
             media,
             caption: None,
@@ -59,7 +59,7 @@ impl InputMediaPhoto {
         self
     }
 
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+    pub const fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
@@ -106,7 +106,7 @@ pub struct InputMediaVideo {
 }
 
 impl InputMediaVideo {
-    pub fn new(media: InputFile) -> Self {
+    pub const fn new(media: InputFile) -> Self {
         Self {
             media,
             thumb: None,
@@ -137,27 +137,27 @@ impl InputMediaVideo {
         self
     }
 
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+    pub const fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
 
-    pub fn width(mut self, val: u16) -> Self {
+    pub const fn width(mut self, val: u16) -> Self {
         self.width = Some(val);
         self
     }
 
-    pub fn height(mut self, val: u16) -> Self {
+    pub const fn height(mut self, val: u16) -> Self {
         self.height = Some(val);
         self
     }
 
-    pub fn duration(mut self, val: u16) -> Self {
+    pub const fn duration(mut self, val: u16) -> Self {
         self.duration = Some(val);
         self
     }
 
-    pub fn supports_streaming(mut self, val: bool) -> Self {
+    pub const fn supports_streaming(mut self, val: bool) -> Self {
         self.supports_streaming = Some(val);
         self
     }
@@ -202,7 +202,7 @@ pub struct InputMediaAnimation {
 }
 
 impl InputMediaAnimation {
-    pub fn new(media: InputFile) -> Self {
+    pub const fn new(media: InputFile) -> Self {
         Self {
             media,
             thumb: None,
@@ -232,22 +232,22 @@ impl InputMediaAnimation {
         self
     }
 
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+    pub const fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
 
-    pub fn width(mut self, val: u16) -> Self {
+    pub const fn width(mut self, val: u16) -> Self {
         self.width = Some(val);
         self
     }
 
-    pub fn height(mut self, val: u16) -> Self {
+    pub const fn height(mut self, val: u16) -> Self {
         self.height = Some(val);
         self
     }
 
-    pub fn duration(mut self, val: u16) -> Self {
+    pub const fn duration(mut self, val: u16) -> Self {
         self.duration = Some(val);
         self
     }
@@ -291,7 +291,7 @@ pub struct InputMediaAudio {
 }
 
 impl InputMediaAudio {
-    pub fn new(media: InputFile) -> Self {
+    pub const fn new(media: InputFile) -> Self {
         Self {
             media,
             thumb: None,
@@ -321,12 +321,12 @@ impl InputMediaAudio {
         self
     }
 
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+    pub const fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
 
-    pub fn duration(mut self, val: u16) -> Self {
+    pub const fn duration(mut self, val: u16) -> Self {
         self.duration = Some(val);
         self
     }
@@ -377,7 +377,7 @@ pub struct InputMediaDocument {
 }
 
 impl InputMediaDocument {
-    pub fn new(media: InputFile) -> Self {
+    pub const fn new(media: InputFile) -> Self {
         Self {
             media,
             thumb: None,
@@ -386,6 +386,11 @@ impl InputMediaDocument {
         }
     }
 
+    pub fn media(mut self, val: InputFile) -> Self {
+        self.media = val;
+        self
+    }
+
     pub fn thumb(mut self, val: InputFile) -> Self {
         self.thumb = Some(val);
         self
@@ -399,7 +404,7 @@ impl InputMediaDocument {
         self
     }
 
-    pub fn parse_mode(mut self, val: ParseMode) -> Self {
+    pub const fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index 169fdd1c..f8cae294 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -82,7 +82,7 @@ pub struct InputMessageContentLocation {
 }
 
 impl InputMessageContentLocation {
-    pub fn new(latitude: f64, longitude: f64) -> Self {
+    pub const fn new(latitude: f64, longitude: f64) -> Self {
         Self {
             latitude,
             longitude,
@@ -90,17 +90,17 @@ impl InputMessageContentLocation {
         }
     }
 
-    pub fn latitude(mut self, val: f64) -> Self {
+    pub const fn latitude(mut self, val: f64) -> Self {
         self.latitude = val;
         self
     }
 
-    pub fn longitude(mut self, val: f64) -> Self {
+    pub const fn longitude(mut self, val: f64) -> Self {
         self.longitude = val;
         self
     }
 
-    pub fn live_period(mut self, val: u32) -> Self {
+    pub const fn live_period(mut self, val: u32) -> Self {
         self.live_period = Some(val);
         self
     }
diff --git a/src/types/invoice.rs b/src/types/invoice.rs
index cb4383e6..b9f2f5b6 100644
--- a/src/types/invoice.rs
+++ b/src/types/invoice.rs
@@ -27,64 +27,3 @@ pub struct Invoice {
     /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
     pub total_amount: i32,
 }
-
-impl Invoice {
-    pub fn new<S1, S2, S3, S4>(
-        title: S1,
-        description: S2,
-        start_parameter: S3,
-        currency: S4,
-        total_amount: i32,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-        S4: Into<String>,
-    {
-        Self {
-            title: title.into(),
-            description: description.into(),
-            start_parameter: start_parameter.into(),
-            currency: currency.into(),
-            total_amount,
-        }
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    pub fn description<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.description = val.into();
-        self
-    }
-
-    pub fn start_parameter<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.start_parameter = val.into();
-        self
-    }
-
-    pub fn currency<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.currency = val.into();
-        self
-    }
-
-    pub fn total_amount(mut self, val: i32) -> Self {
-        self.total_amount = val;
-        self
-    }
-}
diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index f25f4f52..2cefc957 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -37,9 +37,9 @@ impl KeyboardButton {
 
     pub fn request<T>(mut self, val: T) -> Self
     where
-        T: Into<Option<ButtonRequest>>,
+        T: Into<ButtonRequest>,
     {
-        self.request = val.into();
+        self.request = Some(val.into());
         self
     }
 }
diff --git a/src/types/location.rs b/src/types/location.rs
index 7fd1a71d..c624d638 100644
--- a/src/types/location.rs
+++ b/src/types/location.rs
@@ -9,22 +9,3 @@ pub struct Location {
     /// Latitude as defined by sender.
     pub latitude: f64,
 }
-
-impl Location {
-    pub fn new(longitude: f64, latitude: f64) -> Self {
-        Self {
-            longitude,
-            latitude,
-        }
-    }
-
-    pub fn latitude(mut self, val: f64) -> Self {
-        self.latitude = val;
-        self
-    }
-
-    pub fn longitude(mut self, val: f64) -> Self {
-        self.longitude = val;
-        self
-    }
-}
diff --git a/src/types/me.rs b/src/types/me.rs
index 3f7d1c32..ddb699dc 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -20,42 +20,3 @@ pub struct Me {
     /// `true`, if the bot supports inline queries.
     pub supports_inline_queries: bool,
 }
-
-impl Me {
-    pub fn new(
-        user: User,
-        can_join_groups: bool,
-        can_read_all_group_messages: bool,
-        supports_inline_queries: bool,
-    ) -> Self {
-        Self {
-            user,
-            can_join_groups,
-            can_read_all_group_messages,
-            supports_inline_queries,
-        }
-    }
-
-    pub fn user(mut self, val: User) -> Self {
-        self.user = val;
-        self
-    }
-
-    #[warn(clippy::wrong_self_convention)]
-    pub fn can_join_groups<S>(mut self, val: bool) -> Self {
-        self.can_join_groups = val;
-        self
-    }
-
-    #[warn(clippy::wrong_self_convention)]
-    pub fn can_read_all_group_messages<S>(mut self, val: bool) -> Self {
-        self.can_read_all_group_messages = val;
-        self
-    }
-
-    #[warn(clippy::wrong_self_convention)]
-    pub fn supports_inline_queries<S>(mut self, val: bool) -> Self {
-        self.supports_inline_queries = val;
-        self
-    }
-}
diff --git a/src/types/message.rs b/src/types/message.rs
index 1e13e158..bc8ddb32 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -31,43 +31,6 @@ pub struct Message {
     pub kind: MessageKind,
 }
 
-impl Message {
-    pub fn new(id: i32, date: i32, chat: Chat, kind: MessageKind) -> Self {
-        Self {
-            id,
-            date,
-            chat,
-            kind,
-            via_bot: None,
-        }
-    }
-
-    pub fn id(mut self, val: i32) -> Self {
-        self.id = val;
-        self
-    }
-
-    pub fn date(mut self, val: i32) -> Self {
-        self.date = val;
-        self
-    }
-
-    pub fn chat(mut self, val: Chat) -> Self {
-        self.chat = val;
-        self
-    }
-
-    pub fn kind(mut self, val: MessageKind) -> Self {
-        self.kind = val;
-        self
-    }
-
-    pub fn via_bot(mut self, val: User) -> Self {
-        self.via_bot = Some(val);
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum MessageKind {
@@ -109,43 +72,6 @@ pub struct MessageCommon {
     pub reply_markup: Option<InlineKeyboardMarkup>,
 }
 
-impl MessageCommon {
-    pub fn new(forward_kind: ForwardKind, media_kind: MediaKind) -> Self {
-        Self {
-            from: None,
-            forward_kind,
-            edit_date: None,
-            media_kind,
-            reply_markup: None,
-        }
-    }
-
-    pub fn from(mut self, val: User) -> Self {
-        self.from = Some(val);
-        self
-    }
-
-    pub fn forward_kind(mut self, val: ForwardKind) -> Self {
-        self.forward_kind = val;
-        self
-    }
-
-    pub fn edit_date(mut self, val: i32) -> Self {
-        self.edit_date = Some(val);
-        self
-    }
-
-    pub fn media_kind(mut self, val: MediaKind) -> Self {
-        self.media_kind = val;
-        self
-    }
-
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageNewChatMembers {
     /// New members that were added to the group or supergroup and
@@ -154,25 +80,6 @@ pub struct MessageNewChatMembers {
     pub new_chat_members: Vec<User>,
 }
 
-impl MessageNewChatMembers {
-    pub fn new<N>(new_chat_members: N) -> Self
-    where
-        N: Into<Vec<User>>,
-    {
-        Self {
-            new_chat_members: new_chat_members.into(),
-        }
-    }
-
-    pub fn new_chat_members<N>(mut self, val: N) -> Self
-    where
-        N: Into<Vec<User>>,
-    {
-        self.new_chat_members = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageLeftChatMember {
     /// A member was removed from the group, information about them (this
@@ -180,99 +87,30 @@ pub struct MessageLeftChatMember {
     pub left_chat_member: User,
 }
 
-impl MessageLeftChatMember {
-    pub fn new<N>(left_chat_member: N) -> Self
-    where
-        N: Into<User>,
-    {
-        Self {
-            left_chat_member: left_chat_member.into(),
-        }
-    }
-
-    pub fn left_chat_member<N>(mut self, val: N) -> Self
-    where
-        N: Into<User>,
-    {
-        self.left_chat_member = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageNewChatTitle {
     /// A chat title was changed to this value.
     pub new_chat_title: String,
 }
 
-impl MessageNewChatTitle {
-    pub fn new<N>(new_chat_title: N) -> Self
-    where
-        N: Into<String>,
-    {
-        Self {
-            new_chat_title: new_chat_title.into(),
-        }
-    }
-
-    pub fn new_chat_title<N>(mut self, val: N) -> Self
-    where
-        N: Into<String>,
-    {
-        self.new_chat_title = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageNewChatPhoto {
     /// A chat photo was change to this value.
     pub new_chat_photo: Vec<PhotoSize>,
 }
 
-impl MessageNewChatPhoto {
-    pub fn new<N>(new_chat_photo: N) -> Self
-    where
-        N: Into<Vec<PhotoSize>>,
-    {
-        Self {
-            new_chat_photo: new_chat_photo.into(),
-        }
-    }
-
-    pub fn new_chat_photo<N>(mut self, val: N) -> Self
-    where
-        N: Into<Vec<PhotoSize>>,
-    {
-        self.new_chat_photo = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct MessageDeleteChatPhoto {
     /// Service message: the chat photo was deleted.
     pub delete_chat_photo: True,
 }
 
-impl MessageDeleteChatPhoto {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct MessageGroupChatCreated {
     /// Service message: the group has been created.
     pub group_chat_created: True,
 }
 
-impl MessageGroupChatCreated {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct MessageSupergroupChatCreated {
     /// Service message: the supergroup has been created. This field can‘t
@@ -283,12 +121,6 @@ pub struct MessageSupergroupChatCreated {
     pub supergroup_chat_created: True,
 }
 
-impl MessageSupergroupChatCreated {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct MessageChannelChatCreated {
     /// Service message: the channel has been created. This field can‘t be
@@ -299,12 +131,6 @@ pub struct MessageChannelChatCreated {
     pub channel_chat_created: True,
 }
 
-impl MessageChannelChatCreated {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageMigrate {
     /// The group has been migrated to a supergroup with the specified
@@ -324,25 +150,6 @@ pub struct MessageMigrate {
     pub migrate_from_chat_id: i64,
 }
 
-impl MessageMigrate {
-    pub fn new(migrate_to_chat_id: i64, migrate_from_chat_id: i64) -> Self {
-        Self {
-            migrate_to_chat_id,
-            migrate_from_chat_id,
-        }
-    }
-
-    pub fn migrate_to_chat_id(mut self, val: i64) -> Self {
-        self.migrate_to_chat_id = val;
-        self
-    }
-
-    pub fn migrate_from_chat_id(mut self, val: i64) -> Self {
-        self.migrate_from_chat_id = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessagePinned {
     /// Specified message was pinned. Note that the Message object in this
@@ -352,19 +159,6 @@ pub struct MessagePinned {
     pub pinned: Box<Message>,
 }
 
-impl MessagePinned {
-    pub fn new(pinned: Message) -> Self {
-        Self {
-            pinned: Box::new(pinned),
-        }
-    }
-
-    pub fn pinned(mut self, val: Message) -> Self {
-        self.pinned = Box::new(val);
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageInvoice {
     /// Message is an invoice for a [payment], information about the
@@ -375,17 +169,6 @@ pub struct MessageInvoice {
     pub invoice: Invoice,
 }
 
-impl MessageInvoice {
-    pub fn new(invoice: Invoice) -> Self {
-        Self { invoice }
-    }
-
-    pub fn invoice(mut self, val: Invoice) -> Self {
-        self.invoice = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageSuccessfulPayment {
     /// Message is a service message about a successful payment,
@@ -395,17 +178,6 @@ pub struct MessageSuccessfulPayment {
     pub successful_payment: SuccessfulPayment,
 }
 
-impl MessageSuccessfulPayment {
-    pub fn new(successful_payment: SuccessfulPayment) -> Self {
-        Self { successful_payment }
-    }
-
-    pub fn successful_payment(mut self, val: SuccessfulPayment) -> Self {
-        self.successful_payment = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageConnectedWebsite {
     /// The domain name of the website on which the user has logged in.
@@ -415,42 +187,12 @@ pub struct MessageConnectedWebsite {
     pub connected_website: String,
 }
 
-impl MessageConnectedWebsite {
-    pub fn new<S>(connected_website: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            connected_website: connected_website.into(),
-        }
-    }
-
-    pub fn connected_website<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.connected_website = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessagePassportData {
     /// Telegram Passport data.
     pub passport_data: PassportData,
 }
 
-impl MessagePassportData {
-    pub fn new(passport_data: PassportData) -> Self {
-        Self { passport_data }
-    }
-
-    pub fn passport_data(mut self, val: PassportData) -> Self {
-        self.passport_data = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum ForwardedFrom {
     #[serde(rename = "forward_from")]
@@ -482,40 +224,6 @@ pub struct ForwardChannel {
     pub signature: Option<String>,
 }
 
-impl ForwardChannel {
-    pub fn new(date: i32, chat: Chat, message_id: i32) -> Self {
-        Self {
-            date,
-            chat,
-            message_id,
-            signature: None,
-        }
-    }
-
-    pub fn date(mut self, val: i32) -> Self {
-        self.date = val;
-        self
-    }
-
-    pub fn chat(mut self, val: Chat) -> Self {
-        self.chat = val;
-        self
-    }
-
-    pub fn message_id(mut self, val: i32) -> Self {
-        self.message_id = val;
-        self
-    }
-
-    pub fn signature<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.signature = Some(val.into());
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ForwardNonChannel {
     #[serde(rename = "forward_date")]
@@ -525,38 +233,11 @@ pub struct ForwardNonChannel {
     pub from: ForwardedFrom,
 }
 
-impl ForwardNonChannel {
-    pub fn new(date: i32, from: ForwardedFrom) -> Self {
-        Self { date, from }
-    }
-
-    pub fn date(mut self, val: i32) -> Self {
-        self.date = val;
-        self
-    }
-
-    pub fn from(mut self, val: ForwardedFrom) -> Self {
-        self.from = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct ForwardOrigin {
     pub reply_to_message: Option<Box<Message>>,
 }
 
-impl ForwardOrigin {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn reply_to_message(mut self, val: Message) -> Self {
-        self.reply_to_message = Some(Box::new(val));
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum MediaKind {
@@ -597,41 +278,6 @@ pub struct MediaAnimation {
     pub caption_entities: Vec<MessageEntity>,
 }
 
-impl MediaAnimation {
-    pub fn new<CE>(animation: Animation, caption_entities: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            animation,
-            document: (),
-            caption: None,
-            caption_entities: caption_entities.into(),
-        }
-    }
-
-    pub fn animation(mut self, val: Animation) -> Self {
-        self.animation = val;
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaAudio {
@@ -647,57 +293,12 @@ pub struct MediaAudio {
     pub caption_entities: Vec<MessageEntity>,
 }
 
-impl MediaAudio {
-    pub fn new<CE>(audio: Audio, caption_entities: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            audio,
-            caption: None,
-            caption_entities: caption_entities.into(),
-        }
-    }
-
-    pub fn audio(mut self, val: Audio) -> Self {
-        self.audio = val;
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaContact {
     /// Message is a shared contact, information about the contact.
     contact: Contact,
 }
 
-impl MediaContact {
-    pub fn new(contact: Contact) -> Self {
-        Self { contact }
-    }
-
-    pub fn contact(mut self, val: Contact) -> Self {
-        self.contact = val;
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaDocument {
@@ -713,40 +314,6 @@ pub struct MediaDocument {
     pub caption_entities: Vec<MessageEntity>,
 }
 
-impl MediaDocument {
-    pub fn new<CE>(document: Document, caption_entities: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            document,
-            caption: None,
-            caption_entities: caption_entities.into(),
-        }
-    }
-
-    pub fn document(mut self, val: Document) -> Self {
-        self.document = val;
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaGame {
     /// Message is a game, information about the game. [More
@@ -756,34 +323,12 @@ pub struct MediaGame {
     pub game: Game,
 }
 
-impl MediaGame {
-    pub fn new(game: Game) -> Self {
-        Self { game }
-    }
-
-    pub fn game(mut self, val: Game) -> Self {
-        self.game = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaLocation {
     /// Message is a shared location, information about the location.
     pub location: Location,
 }
 
-impl MediaLocation {
-    pub fn new(location: Location) -> Self {
-        Self { location }
-    }
-
-    pub fn location(mut self, val: Location) -> Self {
-        self.location = val;
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaPhoto {
@@ -803,87 +348,18 @@ pub struct MediaPhoto {
     pub media_group_id: Option<String>,
 }
 
-impl MediaPhoto {
-    pub fn new<P, CE>(photo: P, caption_entities: CE) -> Self
-    where
-        P: Into<Vec<PhotoSize>>,
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            photo: photo.into(),
-            caption: None,
-            caption_entities: caption_entities.into(),
-            media_group_id: None,
-        }
-    }
-
-    pub fn photo<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PhotoSize>>,
-    {
-        self.photo = val.into();
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-
-    pub fn media_group_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.media_group_id = Some(val.into());
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaPoll {
     /// Message is a native poll, information about the poll.
     pub poll: Poll,
 }
 
-impl MediaPoll {
-    pub fn new(poll: Poll) -> Self {
-        Self { poll }
-    }
-
-    pub fn poll(mut self, val: Poll) -> Self {
-        self.poll = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaSticker {
     /// Message is a sticker, information about the sticker.
     pub sticker: Sticker,
 }
 
-impl MediaSticker {
-    pub fn new(sticker: Sticker) -> Self {
-        Self { sticker }
-    }
-
-    pub fn poll(mut self, val: Sticker) -> Self {
-        self.sticker = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaText {
     /// For text messages, the actual UTF-8 text of the message, 0-4096
@@ -896,35 +372,6 @@ pub struct MediaText {
     pub entities: Vec<MessageEntity>,
 }
 
-impl MediaText {
-    pub fn new<S, E>(text: S, entities: E) -> Self
-    where
-        S: Into<String>,
-        E: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            text: text.into(),
-            entities: entities.into(),
-        }
-    }
-
-    pub fn text<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.text = val.into();
-        self
-    }
-
-    pub fn entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.entities = val.into();
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaVideo {
@@ -944,49 +391,6 @@ pub struct MediaVideo {
     pub media_group_id: Option<String>,
 }
 
-impl MediaVideo {
-    pub fn new<CE>(video: Video, caption_entities: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            video,
-            caption: None,
-            caption_entities: caption_entities.into(),
-            media_group_id: None,
-        }
-    }
-
-    pub fn video(mut self, val: Video) -> Self {
-        self.video = val;
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-
-    pub fn media_group_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.media_group_id = Some(val.into());
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaVideoNote {
     /// Message is a [video note], information about the video message.
@@ -995,17 +399,6 @@ pub struct MediaVideoNote {
     pub video_note: VideoNote,
 }
 
-impl MediaVideoNote {
-    pub fn new(video_note: VideoNote) -> Self {
-        Self { video_note }
-    }
-
-    pub fn video_note(mut self, val: VideoNote) -> Self {
-        self.video_note = val;
-        self
-    }
-}
-
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaVoice {
@@ -1021,57 +414,12 @@ pub struct MediaVoice {
     pub caption_entities: Vec<MessageEntity>,
 }
 
-impl MediaVoice {
-    pub fn new<CE>(voice: Voice, caption_entities: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        Self {
-            voice,
-            caption: None,
-            caption_entities: caption_entities.into(),
-        }
-    }
-
-    pub fn voice(mut self, val: Voice) -> Self {
-        self.voice = val;
-        self
-    }
-
-    pub fn caption<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.caption = Some(val.into());
-        self
-    }
-
-    pub fn caption_entities<CE>(mut self, val: CE) -> Self
-    where
-        CE: Into<Vec<MessageEntity>>,
-    {
-        self.caption_entities = val.into();
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaVenue {
     /// Message is a venue, information about the venue.
     pub venue: Venue,
 }
 
-impl MediaVenue {
-    pub fn new(venue: Venue) -> Self {
-        Self { venue }
-    }
-
-    pub fn venue(mut self, val: Venue) -> Self {
-        self.venue = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageDice {
     /// Message is a dice with random value from 1 to 6.
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 79876cf0..fbd57216 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -20,7 +20,7 @@ pub struct MessageEntity {
 }
 
 impl MessageEntity {
-    pub fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
+    pub const fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
         Self {
             kind,
             offset,
@@ -33,12 +33,12 @@ impl MessageEntity {
         self
     }
 
-    pub fn offset(mut self, val: usize) -> Self {
+    pub const fn offset(mut self, val: usize) -> Self {
         self.offset = val;
         self
     }
 
-    pub fn length(mut self, val: usize) -> Self {
+    pub const fn length(mut self, val: usize) -> Self {
         self.length = val;
         self
     }
diff --git a/src/types/order_info.rs b/src/types/order_info.rs
index 5dca09d7..e5b35bbc 100644
--- a/src/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -19,53 +19,3 @@ pub struct OrderInfo {
     /// User's shipping address.
     pub shipping_address: ShippingAddress,
 }
-
-impl OrderInfo {
-    pub fn new<S1, S2, S3>(
-        name: S1,
-        phone_number: S2,
-        email: S3,
-        shipping_address: ShippingAddress,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-    {
-        Self {
-            name: name.into(),
-            phone_number: phone_number.into(),
-            email: email.into(),
-            shipping_address,
-        }
-    }
-
-    pub fn name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-
-    pub fn phone_number<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.phone_number = val.into();
-        self
-    }
-
-    pub fn email<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.email = val.into();
-        self
-    }
-
-    pub fn shipping_address(mut self, val: ShippingAddress) -> Self {
-        self.shipping_address = val;
-        self
-    }
-}
diff --git a/src/types/passport_data.rs b/src/types/passport_data.rs
index c34f97ea..5e548f57 100644
--- a/src/types/passport_data.rs
+++ b/src/types/passport_data.rs
@@ -15,28 +15,3 @@ pub struct PassportData {
     /// Encrypted credentials required to decrypt the data.
     pub credentials: EncryptedCredentials,
 }
-
-impl PassportData {
-    pub fn new<E>(data: E, credentials: EncryptedCredentials) -> Self
-    where
-        E: Into<Vec<EncryptedPassportElement>>,
-    {
-        Self {
-            data: data.into(),
-            credentials,
-        }
-    }
-
-    pub fn data<E>(mut self, val: E) -> Self
-    where
-        E: Into<Vec<EncryptedPassportElement>>,
-    {
-        self.data = val.into();
-        self
-    }
-
-    pub fn credentials(mut self, val: EncryptedCredentials) -> Self {
-        self.credentials = val;
-        self
-    }
-}
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index f5c68741..18f1a5d4 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -22,44 +22,3 @@ pub struct PassportFile {
     /// Unix time when the file was uploaded.
     pub file_date: u64,
 }
-
-impl PassportFile {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, file_size: u64, file_date: u64) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            file_size,
-            file_date,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn file_size(mut self, val: u64) -> Self {
-        self.file_size = val;
-        self
-    }
-
-    pub fn file_date(mut self, val: u64) -> Self {
-        self.file_date = val;
-        self
-    }
-}
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 91e05639..44ddfe32 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -25,53 +25,6 @@ pub struct PhotoSize {
     pub file_size: Option<u32>,
 }
 
-impl PhotoSize {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, width: i32, height: i32) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            width,
-            height,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn width(mut self, val: i32) -> Self {
-        self.width = val;
-        self
-    }
-
-    pub fn height(mut self, val: i32) -> Self {
-        self.height = val;
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/poll.rs b/src/types/poll.rs
index 8176aa5b..23bb9409 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -46,128 +46,11 @@ pub struct Poll {
     pub explanation_entities: Option<Vec<MessageEntity>>,
 
     /// Amount of time in seconds the poll will be active after creation.
-    open_period: Option<i32>,
+    pub open_period: Option<i32>,
 
     /// Point in time (Unix timestamp) when the poll will be automatically
     /// closed.
-    close_date: Option<i32>,
-}
-
-impl Poll {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new<S1, S2, O>(
-        id: S1,
-        question: S2,
-        options: O,
-        is_closed: bool,
-        total_voter_count: i32,
-        is_anonymous: bool,
-        poll_type: PollType,
-        allows_multiple_answers: bool,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        O: Into<Vec<PollOption>>,
-    {
-        Self {
-            id: id.into(),
-            question: question.into(),
-            options: options.into(),
-            is_closed,
-            total_voter_count,
-            is_anonymous,
-            poll_type,
-            allows_multiple_answers,
-            correct_option_id: None,
-            explanation: None,
-            explanation_entities: None,
-            open_period: None,
-            close_date: None,
-        }
-    }
-
-    pub fn id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.id = val.into();
-        self
-    }
-
-    pub fn question<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.question = val.into();
-        self
-    }
-
-    pub fn options<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<PollOption>>,
-    {
-        self.options = val.into();
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_closed(mut self, val: bool) -> Self {
-        self.is_closed = val;
-        self
-    }
-
-    pub fn total_voter_count(mut self, val: i32) -> Self {
-        self.total_voter_count = val;
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_anonymous(mut self, val: bool) -> Self {
-        self.is_anonymous = val;
-        self
-    }
-
-    pub fn poll_type(mut self, val: PollType) -> Self {
-        self.poll_type = val;
-        self
-    }
-
-    pub fn allows_multiple_answers(mut self, val: bool) -> Self {
-        self.allows_multiple_answers = val;
-        self
-    }
-
-    pub fn correct_option_id(mut self, val: i32) -> Self {
-        self.correct_option_id = Some(val);
-        self
-    }
-
-    pub fn explanation<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.explanation = Some(val.into());
-        self
-    }
-
-    pub fn explanation_entities<S>(mut self, val: S) -> Self
-    where
-        S: Into<Vec<MessageEntity>>,
-    {
-        self.explanation_entities = Some(val.into());
-        self
-    }
-
-    pub fn open_period(mut self, val: i32) -> Self {
-        self.open_period = Some(val);
-        self
-    }
-
-    pub fn close_date(mut self, val: i32) -> Self {
-        self.close_date = Some(val);
-        self
-    }
+    pub close_date: Option<i32>,
 }
 
 /// This object contains information about one answer option in a poll.
@@ -182,31 +65,6 @@ pub struct PollOption {
     pub voter_count: i32,
 }
 
-impl PollOption {
-    pub fn new<S>(text: S, voter_count: i32) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            text: text.into(),
-            voter_count,
-        }
-    }
-
-    pub fn text<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.text = val.into();
-        self
-    }
-
-    pub fn voter_count(mut self, val: i32) -> Self {
-        self.voter_count = val;
-        self
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/poll_answer.rs b/src/types/poll_answer.rs
index befeb420..b8f26968 100644
--- a/src/types/poll_answer.rs
+++ b/src/types/poll_answer.rs
@@ -14,38 +14,3 @@ pub struct PollAnswer {
     /// May be empty if the user retracted their vote.
     pub option_ids: Vec<i32>,
 }
-
-impl PollAnswer {
-    pub fn new<S, O>(poll_id: S, user: User, option_ids: O) -> Self
-    where
-        S: Into<String>,
-        O: Into<Vec<i32>>,
-    {
-        Self {
-            poll_id: poll_id.into(),
-            user,
-            option_ids: option_ids.into(),
-        }
-    }
-
-    pub fn poll_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.poll_id = val.into();
-        self
-    }
-
-    pub fn user(mut self, val: User) -> Self {
-        self.user = val;
-        self
-    }
-
-    pub fn option_ids<S>(mut self, val: S) -> Self
-    where
-        S: Into<Vec<i32>>,
-    {
-        self.option_ids = val.into();
-        self
-    }
-}
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
index 6b03f084..172e5e8f 100644
--- a/src/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -37,71 +37,3 @@ pub struct PreCheckoutQuery {
     /// Order info provided by the user.
     pub order_info: Option<OrderInfo>,
 }
-
-impl PreCheckoutQuery {
-    pub fn new<S1, S2>(
-        id: S1,
-        from: User,
-        currency: Currency,
-        total_amount: i32,
-        invoice_payload: S2,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            id: id.into(),
-            from,
-            currency,
-            total_amount,
-            invoice_payload: invoice_payload.into(),
-            shipping_option_id: None,
-            order_info: None,
-        }
-    }
-
-    pub fn id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.id = val.into();
-        self
-    }
-
-    pub fn from(mut self, val: User) -> Self {
-        self.from = val;
-        self
-    }
-
-    pub fn currency<S>(mut self, val: Currency) -> Self {
-        self.currency = val;
-        self
-    }
-
-    pub fn total_amount(mut self, val: i32) -> Self {
-        self.total_amount = val;
-        self
-    }
-
-    pub fn invoice_payload<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.invoice_payload = val.into();
-        self
-    }
-
-    pub fn shipping_option_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.shipping_option_id = Some(val.into());
-        self
-    }
-
-    pub fn order_info(mut self, val: OrderInfo) -> Self {
-        self.order_info = Some(val);
-        self
-    }
-}
diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
index 7a4d1643..2e9c81f6 100644
--- a/src/types/reply_keyboard_remove.rs
+++ b/src/types/reply_keyboard_remove.rs
@@ -37,15 +37,15 @@ pub struct ReplyKeyboardRemove {
 }
 
 impl ReplyKeyboardRemove {
-    pub fn new() -> Self {
-        Self::default()
+    pub const fn new() -> Self {
+        Self {
+            remove_keyboard: True,
+            selective: None,
+        }
     }
 
-    pub fn selective<T>(mut self, val: T) -> Self
-    where
-        T: Into<bool>,
-    {
-        self.selective = Some(val.into());
+    pub const fn selective(mut self, val: bool) -> Self {
+        self.selective = Some(val);
         self
     }
 }
diff --git a/src/types/shipping_address.rs b/src/types/shipping_address.rs
index 95ae4825..478ad714 100644
--- a/src/types/shipping_address.rs
+++ b/src/types/shipping_address.rs
@@ -24,76 +24,3 @@ pub struct ShippingAddress {
     /// Address post code.
     pub post_code: String,
 }
-
-impl ShippingAddress {
-    pub fn new<S1, S2, S3, S4, S5>(
-        country_code: CountryCode,
-
-        state: S1,
-        city: S2,
-        street_line1: S3,
-        street_line2: S4,
-        post_code: S5,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-        S4: Into<String>,
-        S5: Into<String>,
-    {
-        Self {
-            country_code,
-            state: state.into(),
-            city: city.into(),
-            street_line1: street_line1.into(),
-            street_line2: street_line2.into(),
-            post_code: post_code.into(),
-        }
-    }
-
-    pub fn country_code(mut self, val: CountryCode) -> Self {
-        self.country_code = val;
-        self
-    }
-
-    pub fn state<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.state = val.into();
-        self
-    }
-
-    pub fn city<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.city = val.into();
-        self
-    }
-
-    pub fn street_line1<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.street_line1 = val.into();
-        self
-    }
-
-    pub fn street_line2<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.street_line2 = val.into();
-        self
-    }
-
-    pub fn post_code<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.post_code = val.into();
-        self
-    }
-}
diff --git a/src/types/shipping_query.rs b/src/types/shipping_query.rs
index 97b0fd27..f8df55d4 100644
--- a/src/types/shipping_query.rs
+++ b/src/types/shipping_query.rs
@@ -19,49 +19,3 @@ pub struct ShippingQuery {
     /// User specified shipping address.
     pub shipping_address: ShippingAddress,
 }
-
-impl ShippingQuery {
-    pub fn new<S1, S2>(
-        id: S1,
-        from: User,
-        invoice_payload: S2,
-        shipping_address: ShippingAddress,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            id: id.into(),
-            from,
-            invoice_payload: invoice_payload.into(),
-            shipping_address,
-        }
-    }
-
-    pub fn id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.id = val.into();
-        self
-    }
-
-    pub fn from<S>(mut self, val: User) -> Self {
-        self.from = val;
-        self
-    }
-
-    pub fn invoice_payload<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.invoice_payload = val.into();
-        self
-    }
-
-    pub fn shipping_address<S>(mut self, val: ShippingAddress) -> Self {
-        self.shipping_address = val;
-        self
-    }
-}
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 8851e8ef..235f774d 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -42,93 +42,3 @@ pub struct Sticker {
     /// File size.
     pub file_size: Option<u32>,
 }
-
-impl Sticker {
-    pub fn new<S1, S2>(
-        file_id: S1,
-        file_unique_id: S2,
-        width: u16,
-        height: u16,
-        is_animated: bool,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            width,
-            height,
-            is_animated,
-            thumb: None,
-            emoji: None,
-            set_name: None,
-            mask_position: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn height(mut self, val: u16) -> Self {
-        self.height = val;
-        self
-    }
-
-    pub fn width(mut self, val: u16) -> Self {
-        self.width = val;
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_animated(mut self, val: bool) -> Self {
-        self.is_animated = val;
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    pub fn emoji<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.emoji = Some(val.into());
-        self
-    }
-
-    pub fn set_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.set_name = Some(val.into());
-        self
-    }
-
-    pub fn mask_position(mut self, val: MaskPosition) -> Self {
-        self.mask_position = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index 0ffb4762..9fea1621 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -27,62 +27,3 @@ pub struct StickerSet {
     /// Sticker set thumbnail in the .WEBP or .TGS format.
     thumb: Option<PhotoSize>,
 }
-
-impl StickerSet {
-    pub fn new<S1, S2, St>(
-        name: S1,
-        title: S2,
-        is_animated: bool,
-        contains_masks: bool,
-        stickers: St,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        St: Into<Vec<Sticker>>,
-    {
-        Self {
-            name: name.into(),
-            title: title.into(),
-            is_animated,
-            contains_masks,
-            stickers: stickers.into(),
-            thumb: None,
-        }
-    }
-
-    pub fn name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.name = val.into();
-        self
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_animated(mut self, val: bool) -> Self {
-        self.is_animated = val;
-        self
-    }
-
-    pub fn contains_masks(mut self, val: bool) -> Self {
-        self.contains_masks = val;
-        self
-    }
-
-    pub fn stickers<S>(mut self, val: S) -> Self
-    where
-        S: Into<Vec<Sticker>>,
-    {
-        self.stickers = val.into();
-        self
-    }
-}
diff --git a/src/types/successful_payment.rs b/src/types/successful_payment.rs
index 4f7e43b5..d38a36b5 100644
--- a/src/types/successful_payment.rs
+++ b/src/types/successful_payment.rs
@@ -37,75 +37,3 @@ pub struct SuccessfulPayment {
     /// Provider payment identifier.
     pub provider_payment_charge_id: String,
 }
-
-impl SuccessfulPayment {
-    pub fn new<S1, S2, S3>(
-        currency: Currency,
-        total_amount: i32,
-        invoice_payload: S1,
-        telegram_payment_charge_id: S2,
-        provider_payment_charge_id: S3,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-    {
-        Self {
-            currency,
-            total_amount,
-            invoice_payload: invoice_payload.into(),
-            shipping_option_id: None,
-            order_info: None,
-            telegram_payment_charge_id: telegram_payment_charge_id.into(),
-            provider_payment_charge_id: provider_payment_charge_id.into(),
-        }
-    }
-
-    pub fn currency<S>(mut self, val: Currency) -> Self {
-        self.currency = val;
-        self
-    }
-
-    pub fn total_amount(mut self, val: i32) -> Self {
-        self.total_amount = val;
-        self
-    }
-
-    pub fn invoice_payload<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.invoice_payload = val.into();
-        self
-    }
-
-    pub fn shipping_option_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.shipping_option_id = Some(val.into());
-        self
-    }
-
-    pub fn order_info(mut self, val: OrderInfo) -> Self {
-        self.order_info = Some(val);
-        self
-    }
-
-    pub fn telegram_payment_charge_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.telegram_payment_charge_id = val.into();
-        self
-    }
-
-    pub fn provider_payment_charge_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.provider_payment_charge_id = val.into();
-        self
-    }
-}
diff --git a/src/types/update.rs b/src/types/update.rs
index 51caf7ba..4ebc5710 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -28,22 +28,6 @@ pub struct Update {
     pub kind: UpdateKind,
 }
 
-impl Update {
-    pub fn new(id: i32, kind: UpdateKind) -> Self {
-        Self { id, kind }
-    }
-
-    pub fn id<S>(mut self, val: i32) -> Self {
-        self.id = val;
-        self
-    }
-
-    pub fn kind<S>(mut self, val: UpdateKind) -> Self {
-        self.kind = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum UpdateKind {
diff --git a/src/types/user.rs b/src/types/user.rs
index 7db4c14c..b575ef04 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -27,65 +27,6 @@ pub struct User {
     pub language_code: Option<String>,
 }
 
-impl User {
-    pub fn new<S>(id: i32, is_bot: bool, first_name: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            id,
-            is_bot,
-            first_name: first_name.into(),
-            last_name: None,
-            username: None,
-            language_code: None,
-        }
-    }
-
-    pub fn id<S>(mut self, val: i32) -> Self {
-        self.id = val;
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_bot<S>(mut self, val: bool) -> Self {
-        self.is_bot = val;
-        self
-    }
-
-    pub fn first_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.first_name = val.into();
-        self
-    }
-
-    pub fn last_name<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.last_name = Some(val.into());
-        self
-    }
-
-    pub fn username<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.username = Some(val.into());
-        self
-    }
-
-    pub fn language_code<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.language_code = Some(val.into());
-        self
-    }
-}
-
 impl User {
     pub fn full_name(&self) -> String {
         match &self.last_name {
diff --git a/src/types/user_profile_photos.rs b/src/types/user_profile_photos.rs
index 05dec195..ac0a9b5d 100644
--- a/src/types/user_profile_photos.rs
+++ b/src/types/user_profile_photos.rs
@@ -13,30 +13,3 @@ pub struct UserProfilePhotos {
     /// Requested profile pictures (in up to 4 sizes each).
     pub photos: Vec<Vec<PhotoSize>>,
 }
-
-impl UserProfilePhotos {
-    pub fn new<P1, P2>(total_count: u32, photos: P1) -> Self
-    where
-        P1: Into<Vec<P2>>,
-        P2: Into<Vec<PhotoSize>>,
-    {
-        Self {
-            total_count,
-            photos: photos.into().into_iter().map(Into::into).collect(),
-        }
-    }
-
-    pub fn total_count(mut self, val: u32) -> Self {
-        self.total_count = val;
-        self
-    }
-
-    pub fn photos<P1, P2>(mut self, val: P1) -> Self
-    where
-        P1: Into<Vec<P2>>,
-        P2: Into<Vec<PhotoSize>>,
-    {
-        self.photos = val.into().into_iter().map(Into::into).collect();
-        self
-    }
-}
diff --git a/src/types/venue.rs b/src/types/venue.rs
index d8891a44..afb0cc90 100644
--- a/src/types/venue.rs
+++ b/src/types/venue.rs
@@ -23,51 +23,3 @@ pub struct Venue {
     /// `food/icecream`.)
     pub foursquare_type: Option<String>,
 }
-
-impl Venue {
-    pub fn new<S1, S2>(location: Location, title: S1, address: S2) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            location,
-            title: title.into(),
-            address: address.into(),
-            foursquare_id: None,
-            foursquare_type: None,
-        }
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    pub fn address<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.address = val.into();
-        self
-    }
-
-    pub fn foursquare_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.foursquare_id = Some(val.into());
-        self
-    }
-
-    pub fn foursquare_type<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.foursquare_type = Some(val.into());
-        self
-    }
-}
diff --git a/src/types/video.rs b/src/types/video.rs
index 1db5737f..bc8611ec 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -36,74 +36,3 @@ pub struct Video {
     /// File size.
     pub file_size: Option<u32>,
 }
-
-impl Video {
-    pub fn new<S1, S2>(
-        file_id: S1,
-        file_unique_id: S2,
-        width: u32,
-        height: u32,
-        duration: u32,
-    ) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            width,
-            height,
-            duration,
-            thumb: None,
-            mime_type: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn width(mut self, val: u32) -> Self {
-        self.width = val;
-        self
-    }
-
-    pub fn height(mut self, val: u32) -> Self {
-        self.height = val;
-        self
-    }
-
-    pub fn duration(mut self, val: u32) -> Self {
-        self.duration = val;
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    pub fn mime_type(mut self, val: Mime) -> Self {
-        self.mime_type = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index d8c9ab3f..9a751e20 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -33,56 +33,3 @@ pub struct VideoNote {
     /// File size.
     pub file_size: Option<u32>,
 }
-
-impl VideoNote {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, length: u32, duration: u32) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            length,
-            duration,
-            thumb: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn length(mut self, val: u32) -> Self {
-        self.length = val;
-        self
-    }
-
-    pub fn duration(mut self, val: u32) -> Self {
-        self.duration = val;
-        self
-    }
-
-    pub fn thumb(mut self, val: PhotoSize) -> Self {
-        self.thumb = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u32) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
diff --git a/src/types/voice.rs b/src/types/voice.rs
index 2fc7a5b9..7264b0c4 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -25,50 +25,3 @@ pub struct Voice {
     /// File size.
     pub file_size: Option<u64>,
 }
-
-impl Voice {
-    pub fn new<S1, S2>(file_id: S1, file_unique_id: S2, duration: u32) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-    {
-        Self {
-            file_id: file_id.into(),
-            file_unique_id: file_unique_id.into(),
-            duration,
-            mime_type: None,
-            file_size: None,
-        }
-    }
-
-    pub fn file_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_id = val.into();
-        self
-    }
-
-    pub fn file_unique_id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.file_unique_id = val.into();
-        self
-    }
-
-    pub fn duration(mut self, val: u32) -> Self {
-        self.duration = val;
-        self
-    }
-
-    pub fn mime_type(mut self, val: Mime) -> Self {
-        self.mime_type = Some(val);
-        self
-    }
-
-    pub fn file_size(mut self, val: u64) -> Self {
-        self.file_size = Some(val);
-        self
-    }
-}
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index aad1cefb..e7658381 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -32,66 +32,3 @@ pub struct WebhookInfo {
     /// types.
     pub allowed_updates: Option<Vec<String>>,
 }
-
-impl WebhookInfo {
-    pub fn new<S>(url: S, has_custom_certificate: bool, pending_update_count: u32) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            url: url.into(),
-            has_custom_certificate,
-            pending_update_count,
-            last_error_date: None,
-
-            last_error_message: None,
-            max_connections: None,
-            allowed_updates: None,
-        }
-    }
-
-    pub fn url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.url = val.into();
-        self
-    }
-
-    pub fn has_custom_certificate(mut self, val: bool) -> Self {
-        self.has_custom_certificate = val;
-        self
-    }
-
-    pub fn pending_update_count(mut self, val: u32) -> Self {
-        self.pending_update_count = val;
-        self
-    }
-
-    pub fn last_error_date(mut self, val: u64) -> Self {
-        self.last_error_date = Some(val);
-        self
-    }
-
-    pub fn last_error_message<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.last_error_message = Some(val.into());
-        self
-    }
-
-    pub fn max_connections(mut self, val: u32) -> Self {
-        self.max_connections = Some(val);
-        self
-    }
-
-    pub fn allowed_updates<A, S>(mut self, val: A) -> Self
-    where
-        A: Into<Vec<S>>,
-        S: Into<String>,
-    {
-        self.allowed_updates = Some(val.into().into_iter().map(Into::into).collect());
-        self
-    }
-}

From 09d0d886fa612b96c10dce94dfe334ab80e5e981 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:02:05 +0300
Subject: [PATCH 208/755] Refactor `KeyboardButtonPollType`

- Make it enum
- Rename `ButtonRequest::KeyboardButtonPollType` => `<_>::poll`
---
 src/types/keyboard_button.rs           |  6 ++---
 src/types/keyboard_button_poll_type.rs | 35 +++++++++++---------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index 2cefc957..aef83a28 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -49,7 +49,7 @@ impl KeyboardButton {
 pub enum ButtonRequest {
     Location,
     Contact,
-    KeyboardButtonPollType(KeyboardButtonPollType),
+    Poll(KeyboardButtonPollType),
 }
 
 /// Helper struct for (de)serializing [`ButtonRequest`](ButtonRequest)
@@ -97,7 +97,7 @@ impl<'de> Deserialize<'de> for ButtonRequest {
             RawRequest {
                 poll: Some(poll_type),
                 ..
-            } => Ok(Self::KeyboardButtonPollType(poll_type)),
+            } => Ok(Self::Poll(poll_type)),
             _ => Err(D::Error::custom(
                 "Either one of `request_contact` and `request_location` fields is required",
             )),
@@ -123,7 +123,7 @@ impl Serialize for ButtonRequest {
                 poll: None,
             }
             .serialize(serializer),
-            Self::KeyboardButtonPollType(poll_type) => RawRequest {
+            Self::Poll(poll_type) => RawRequest {
                 contact: None,
                 location: None,
                 poll: Some(poll_type.clone()),
diff --git a/src/types/keyboard_button_poll_type.rs b/src/types/keyboard_button_poll_type.rs
index 07c7ddc6..6994fa72 100644
--- a/src/types/keyboard_button_poll_type.rs
+++ b/src/types/keyboard_button_poll_type.rs
@@ -1,25 +1,18 @@
 use serde::{Deserialize, Serialize};
 
+/// This object represents type of a poll, which is allowed to be created and
+/// sent when the corresponding button is pressed.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct KeyboardButtonPollType {
-    poll_type: String,
-}
-
-impl KeyboardButtonPollType {
-    pub fn new<S>(poll_type: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            poll_type: poll_type.into(),
-        }
-    }
-
-    pub fn poll_type<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.poll_type = val.into();
-        self
-    }
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+pub enum KeyboardButtonPollType {
+    /// If [`Quiz`] is passed, the user will be allowed to create only polls in
+    /// the quiz mode.
+    Quiz,
+    /// If [`Regular`] is passed, only regular polls will be allowed.
+    Regular,
+    /// If [`Any`] is passed, the user will be allowed to create a poll of any
+    /// type.
+    #[serde(rename = "")]
+    Any,
 }

From bd4dba3bf11964886270d0e3fc578a9312c25b5b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:21:47 +0300
Subject: [PATCH 209/755] Remove `MessageEntity::text_from` because it's wrong

(the method assumes UTF-8 indices, but the indices are UTF-16)
(fuck you, telegram)
---
 src/types/message_entity.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index fbd57216..872a1cb7 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -65,13 +65,6 @@ pub enum MessageEntityKind {
     Strikethrough,
 }
 
-impl MessageEntity {
-    pub fn text_from(&self, message: &Message) -> Option<String> {
-        let text = message.text();
-        Some(String::from(&text?[self.offset..self.offset + self.length]))
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

From 0ef05267438a5a092f582be24ee3c056f6b30915 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:34:22 +0300
Subject: [PATCH 210/755] Replace `Into<Vec<_>>` by `IntoIterator<Item = _>`

---
 src/types/inline_keyboard_markup.rs | 27 +++++++++++++++++++--------
 src/types/message_entity.rs         |  2 +-
 src/types/passport_element_error.rs | 16 ++++++++--------
 src/types/reply_keyboard_markup.rs  | 10 +++++++---
 src/types/shipping_option.rs        |  8 ++++----
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index 25618524..76294ddd 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -32,25 +32,36 @@ pub struct InlineKeyboardMarkup {
 impl InlineKeyboardMarkup {
     pub fn new<I1, I2>(inline_keyboard: I1) -> Self
     where
-        I1: Into<Vec<I2>>,
-        I2: Into<Vec<InlineKeyboardButton>>,
+        I1: IntoIterator<Item = I2>,
+        I2: IntoIterator<Item = InlineKeyboardButton>,
     {
         Self {
-            inline_keyboard: inline_keyboard.into().into_iter().map(Into::into).collect(),
+            inline_keyboard: inline_keyboard
+                .into_iter()
+                .map(<_>::into_iter)
+                .map(<_>::collect)
+                .collect(),
         }
     }
 
     pub fn inline_keyboard<I1, I2>(mut self, val: I1) -> Self
     where
-        I1: Into<Vec<I2>>,
-        I2: Into<Vec<InlineKeyboardButton>>,
+        I1: IntoIterator<Item = I2>,
+        I2: IntoIterator<Item = InlineKeyboardButton>,
     {
-        self.inline_keyboard = val.into().into_iter().map(Into::into).collect();
+        self.inline_keyboard = val
+            .into_iter()
+            .map(<_>::into_iter)
+            .map(<_>::collect)
+            .collect();
         self
     }
 
-    pub fn append_row(mut self, buttons: Vec<InlineKeyboardButton>) -> Self {
-        self.inline_keyboard.push(buttons);
+    pub fn append_row<R>(mut self, buttons: R) -> Self
+    where
+        R: IntoIterator<Item = InlineKeyboardButton>,
+    {
+        self.inline_keyboard.push(buttons.into_iter().collect());
         self
     }
 
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 872a1cb7..e9742921 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{Message, User};
+use crate::types::User;
 
 /// This object represents one special entity in a text message.
 ///
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index da96fba1..c94b6cf2 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -305,11 +305,11 @@ pub struct PassportElementErrorFiles {
 impl PassportElementErrorFiles {
     pub fn new<S>(r#type: PassportElementErrorFilesType, file_hashes: S) -> Self
     where
-        S: Into<Vec<String>>,
+        S: IntoIterator<Item = String>,
     {
         Self {
             r#type,
-            file_hashes: file_hashes.into(),
+            file_hashes: file_hashes.into_iter().collect(),
         }
     }
 
@@ -320,9 +320,9 @@ impl PassportElementErrorFiles {
 
     pub fn file_hashes<S>(mut self, val: S) -> Self
     where
-        S: Into<Vec<String>>,
+        S: IntoIterator<Item = String>,
     {
-        self.file_hashes = val.into();
+        self.file_hashes = val.into_iter().collect();
         self
     }
 }
@@ -386,11 +386,11 @@ pub struct PassportElementErrorTranslationFiles {
 impl PassportElementErrorTranslationFiles {
     pub fn new<S>(r#type: PassportElementErrorTranslationFilesType, file_hashes: S) -> Self
     where
-        S: Into<Vec<String>>,
+        S: IntoIterator<Item = String>,
     {
         Self {
             r#type,
-            file_hashes: file_hashes.into(),
+            file_hashes: file_hashes.into_iter().collect(),
         }
     }
 
@@ -401,9 +401,9 @@ impl PassportElementErrorTranslationFiles {
 
     pub fn file_hashes<S>(mut self, val: S) -> Self
     where
-        S: Into<Vec<String>>,
+        S: IntoIterator<Item = String>,
     {
-        self.file_hashes = val.into();
+        self.file_hashes = val.into_iter().collect();
         self
     }
 }
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index 9289329e..b2e8d3b1 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -47,11 +47,15 @@ pub struct ReplyKeyboardMarkup {
 impl ReplyKeyboardMarkup {
     pub fn new<K1, K2>(keyboard: K1) -> Self
     where
-        K1: Into<Vec<K2>>,
-        K2: Into<Vec<KeyboardButton>>,
+        K1: IntoIterator<Item = K2>,
+        K2: IntoIterator<Item = KeyboardButton>,
     {
         Self {
-            keyboard: keyboard.into().into_iter().map(Into::into).collect(),
+            keyboard: keyboard
+                .into_iter()
+                .map(<_>::into_iter)
+                .map(<_>::collect)
+                .collect(),
             resize_keyboard: None,
             one_time_keyboard: None,
             selective: None,
diff --git a/src/types/shipping_option.rs b/src/types/shipping_option.rs
index af154d6b..ec6e8a3e 100644
--- a/src/types/shipping_option.rs
+++ b/src/types/shipping_option.rs
@@ -22,12 +22,12 @@ impl ShippingOption {
     where
         S1: Into<String>,
         S2: Into<String>,
-        P: Into<Vec<LabeledPrice>>,
+        P: IntoIterator<Item = LabeledPrice>,
     {
         Self {
             id: id.into(),
             title: title.into(),
-            prices: prices.into(),
+            prices: prices.into_iter().collect(),
         }
     }
 
@@ -49,9 +49,9 @@ impl ShippingOption {
 
     pub fn prices<P>(mut self, val: P) -> Self
     where
-        P: Into<Vec<LabeledPrice>>,
+        P: IntoIterator<Item = LabeledPrice>,
     {
-        self.prices = val.into();
+        self.prices = val.into_iter().collect();
         self
     }
 }

From a26935d51a56f5f3fc77303d8cd367c8593b6090 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:46:34 +0300
Subject: [PATCH 211/755] remove SendInvoice from types

- It's a method not a telegram type
- We already have SendInvoice ~at home~ in payloads

Existence of the file was an accident
---
 src/types.rs                |   1 -
 src/types/message_entity.rs |  11 +-
 src/types/send_invoice.rs   | 228 ------------------------------------
 3 files changed, 1 insertion(+), 239 deletions(-)
 delete mode 100644 src/types/send_invoice.rs

diff --git a/src/types.rs b/src/types.rs
index d352caac..3b69e827 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -142,7 +142,6 @@ mod reply_keyboard_markup;
 mod reply_keyboard_remove;
 mod reply_markup;
 mod response_parameters;
-mod send_invoice;
 mod shipping_address;
 mod shipping_option;
 mod shipping_query;
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index e9742921..444f45ec 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -69,7 +69,7 @@ pub enum MessageEntityKind {
 mod tests {
     use super::*;
     use crate::types::{
-        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText,
+        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText, Message,
         MessageCommon, MessageKind,
     };
 
@@ -111,15 +111,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn text_from() {
-        let message = message();
-        let expected = Some("yes".to_string());
-        let entity = message.entities().unwrap()[0].clone();
-        let actual = entity.text_from(&message);
-        assert_eq!(actual, expected);
-    }
-
     fn message() -> Message {
         Message {
             via_bot: None,
diff --git a/src/types/send_invoice.rs b/src/types/send_invoice.rs
deleted file mode 100644
index c2aedb61..00000000
--- a/src/types/send_invoice.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice};
-
-// TODO: missing docs
-#[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct SendInvoice {
-    pub chat_id: ChatId,
-    pub title: String,
-    pub description: String,
-    pub payload: String,
-    pub provider_token: String,
-    pub start_parameter: String,
-    pub currency: String,
-    pub prices: Vec<LabeledPrice>,
-    pub provider_data: Option<String>,
-    pub photo_url: Option<String>,
-    pub photo_size: Option<i32>,
-    pub photo_width: Option<i32>,
-    pub photo_height: Option<i32>,
-    pub need_name: Option<bool>,
-    pub need_phone_number: Option<bool>,
-    pub need_email: Option<bool>,
-    pub need_shipping_address: Option<bool>,
-    pub send_phone_number_to_provider: Option<bool>,
-    pub send_email_to_provider: Option<bool>,
-    pub is_flexible: Option<bool>,
-    pub disable_notification: Option<bool>,
-    pub reply_to_message_id: Option<i32>,
-    pub reply_markup: Option<InlineKeyboardMarkup>,
-}
-
-impl SendInvoice {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new<C, S1, S2, S3, S4, S5, S6, P>(
-        chat_id: C,
-        title: S1,
-        description: S2,
-        payload: S3,
-        provider_token: S4,
-        start_parameter: S5,
-        currency: S6,
-        prices: P,
-    ) -> Self
-    where
-        C: Into<ChatId>,
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-        S4: Into<String>,
-        S5: Into<String>,
-        S6: Into<String>,
-        P: Into<Vec<LabeledPrice>>,
-    {
-        Self {
-            chat_id: chat_id.into(),
-            title: title.into(),
-            description: description.into(),
-            payload: payload.into(),
-            provider_token: provider_token.into(),
-            start_parameter: start_parameter.into(),
-            currency: currency.into(),
-            prices: prices.into(),
-            provider_data: None,
-            photo_url: None,
-            photo_size: None,
-            photo_width: None,
-            photo_height: None,
-            need_name: None,
-            need_phone_number: None,
-            need_email: None,
-            need_shipping_address: None,
-            send_phone_number_to_provider: None,
-            send_email_to_provider: None,
-            is_flexible: None,
-            disable_notification: None,
-            reply_to_message_id: None,
-            reply_markup: None,
-        }
-    }
-
-    pub fn chat_id<C>(mut self, val: C) -> Self
-    where
-        C: Into<ChatId>,
-    {
-        self.chat_id = val.into();
-        self
-    }
-
-    pub fn title<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.title = val.into();
-        self
-    }
-
-    pub fn description<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.description = val.into();
-        self
-    }
-
-    pub fn payload<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.payload = val.into();
-        self
-    }
-
-    pub fn provider_token<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.provider_token = val.into();
-        self
-    }
-
-    pub fn start_parameter<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.start_parameter = val.into();
-        self
-    }
-
-    pub fn currency<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.currency = val.into();
-        self
-    }
-
-    pub fn prices<P>(mut self, val: P) -> Self
-    where
-        P: Into<Vec<LabeledPrice>>,
-    {
-        self.prices = val.into();
-        self
-    }
-
-    pub fn provider_data<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.provider_data = Some(val.into());
-        self
-    }
-
-    pub fn photo_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.photo_url = Some(val.into());
-        self
-    }
-
-    pub fn photo_size(mut self, val: i32) -> Self {
-        self.photo_size = Some(val);
-        self
-    }
-
-    pub fn photo_width(mut self, val: i32) -> Self {
-        self.photo_width = Some(val);
-        self
-    }
-
-    pub fn photo_height(mut self, val: i32) -> Self {
-        self.photo_height = Some(val);
-        self
-    }
-
-    pub fn need_name(mut self, val: bool) -> Self {
-        self.need_name = Some(val);
-        self
-    }
-
-    pub fn need_phone_number(mut self, val: bool) -> Self {
-        self.need_phone_number = Some(val);
-        self
-    }
-
-    pub fn need_email(mut self, val: bool) -> Self {
-        self.need_email = Some(val);
-        self
-    }
-
-    pub fn need_shipping_address(mut self, val: bool) -> Self {
-        self.need_shipping_address = Some(val);
-        self
-    }
-
-    pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
-        self.send_phone_number_to_provider = Some(val);
-        self
-    }
-
-    pub fn send_email_to_provider(mut self, val: bool) -> Self {
-        self.send_email_to_provider = Some(val);
-        self
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    pub fn is_flexible(mut self, val: bool) -> Self {
-        self.is_flexible = Some(val);
-        self
-    }
-
-    pub fn disable_notification(mut self, val: bool) -> Self {
-        self.disable_notification = Some(val);
-        self
-    }
-
-    pub fn reply_to_message_id(mut self, value: i32) -> Self {
-        self.reply_to_message_id = Some(value);
-        self
-    }
-
-    pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
-        self.reply_markup = Some(val);
-        self
-    }
-}

From cf4330d892d65c0a427c37798826a33f8d6ba83f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:52:33 +0300
Subject: [PATCH 212/755] fix 1584 line error

---
 src/types.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types.rs b/src/types.rs
index 3b69e827..87e45a62 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -75,7 +75,6 @@ pub use reply_keyboard_markup::*;
 pub use reply_keyboard_remove::*;
 pub use reply_markup::*;
 pub use response_parameters::*;
-pub use send_invoice::*;
 pub use shipping_address::*;
 pub use shipping_option::*;
 pub use shipping_query::*;

From eaf72bd97d7c0139fcc529e2bf81aa4ae3b9fdfc Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 16:53:49 +0300
Subject: [PATCH 213/755] remove unused function

---
 src/types/message_entity.rs | 41 -------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 444f45ec..4bff8ea4 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -110,45 +110,4 @@ mod tests {
             .unwrap()
         );
     }
-
-    fn message() -> Message {
-        Message {
-            via_bot: None,
-            id: 0,
-            date: 0,
-            chat: Chat {
-                id: 0,
-                kind: ChatKind::Private(ChatPrivate {
-                    type_: (),
-                    username: None,
-                    first_name: None,
-                    last_name: None,
-                }),
-                photo: None,
-            },
-            kind: MessageKind::Common(MessageCommon {
-                from: Some(User {
-                    id: 0,
-                    is_bot: false,
-                    first_name: "".to_string(),
-                    last_name: None,
-                    username: None,
-                    language_code: None,
-                }),
-                forward_kind: ForwardKind::Origin(ForwardOrigin {
-                    reply_to_message: None,
-                }),
-                edit_date: None,
-                media_kind: MediaKind::Text(MediaText {
-                    text: "no yes no".to_string(),
-                    entities: vec![MessageEntity {
-                        kind: MessageEntityKind::Mention,
-                        offset: 3,
-                        length: 3,
-                    }],
-                }),
-                reply_markup: None,
-            }),
-        }
-    }
 }

From 0e43c32b82496a17d5f5987f1f242ef40cddb0af Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 18:31:15 +0300
Subject: [PATCH 214/755] clippy

---
 src/types/message_entity.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 4bff8ea4..a74fe6b1 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -68,10 +68,6 @@ pub enum MessageEntityKind {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::types::{
-        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText, Message,
-        MessageCommon, MessageKind,
-    };
 
     #[test]
     fn recursive_kind() {

From 311a5b18fe4590126f04648e14028856df6f51b8 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 26 Jan 2021 18:39:10 +0300
Subject: [PATCH 215/755] fix docs

---
 src/types/keyboard_button_poll_type.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types/keyboard_button_poll_type.rs b/src/types/keyboard_button_poll_type.rs
index 6994fa72..1d9a7980 100644
--- a/src/types/keyboard_button_poll_type.rs
+++ b/src/types/keyboard_button_poll_type.rs
@@ -6,12 +6,12 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
 pub enum KeyboardButtonPollType {
-    /// If [`Quiz`] is passed, the user will be allowed to create only polls in
+    /// If `Quiz` is passed, the user will be allowed to create only polls in
     /// the quiz mode.
     Quiz,
-    /// If [`Regular`] is passed, only regular polls will be allowed.
+    /// If `Regular` is passed, only regular polls will be allowed.
     Regular,
-    /// If [`Any`] is passed, the user will be allowed to create a poll of any
+    /// If `Any` is passed, the user will be allowed to create a poll of any
     /// type.
     #[serde(rename = "")]
     Any,

From ec58a59903e3d94ef8fec05121eb6b4d15f703b7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 5 Feb 2021 21:32:21 +0300
Subject: [PATCH 216/755] Fix SendMediaGroup return type

Message -> Vec<Message>
---
 src/payloads/send_media_group.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 2241744a..2b7eb24f 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -10,7 +10,7 @@ impl_payload! {
     ///
     /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SendMediaGroup (SendMediaGroupSetters) => Message {
+    pub SendMediaGroup (SendMediaGroupSetters) => Vec<Message> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],

From 8befcffe269daaeefad35fa6f3712f0edf0ce9e4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Feb 2021 19:23:16 +0300
Subject: [PATCH 217/755] Fix naming that triggers clippy::upper_case_acronyms
 lint

Rename
- ParseMode::{HTML => Html}
- ApiError::{
    InvalidQueryID => InvalidQueryId,
    ButtonURLInvalid => ButtonUrlInvalid,
    WrongFileID => WrongFileId,
    WebhookRequireHTTPS => WebhookRequireHttps,
    WrongHTTPurl => WrongHttpUrl,
  }
---
 src/errors.rs                    | 10 +++++-----
 src/types/inline_query_result.rs |  2 +-
 src/types/parse_mode.rs          |  7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index 4efcae04..41c8e8e4 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -299,7 +299,7 @@ pub enum ApiError {
         rename = "Bad Request: query is too old and response timeout expired or query id is \
                   invalid"
     )]
-    InvalidQueryID,
+    InvalidQueryId,
 
     /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
     /// url.
@@ -309,7 +309,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
-    ButtonURLInvalid,
+    ButtonUrlInvalid,
 
     /// Occurs when bot tries to send button with data size more than 64 bytes.
     ///
@@ -339,7 +339,7 @@ pub enum ApiError {
     ///
     /// [`GetFile`]: crate::payloads::GetFile
     #[serde(rename = "Bad Request: wrong file id")]
-    WrongFileID,
+    WrongFileId,
 
     /// Occurs when bot tries to do some with group which was deactivated.
     #[serde(rename = "Bad Request: group is deactivated")]
@@ -413,7 +413,7 @@ pub enum ApiError {
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
-    WebhookRequireHTTPS,
+    WebhookRequireHttps,
 
     /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
     /// 8443.
@@ -509,7 +509,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: wrong HTTP URL")]
-    WrongHTTPurl,
+    WrongHttpUrl,
 
     /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
     /// one Updater is running.
diff --git a/src/types/inline_query_result.rs b/src/types/inline_query_result.rs
index e295bd15..e45f2e44 100644
--- a/src/types/inline_query_result.rs
+++ b/src/types/inline_query_result.rs
@@ -82,7 +82,7 @@ mod tests {
             id: String::from("id"),
             audio_file_id: String::from("audio_file_id"),
             caption: Some(String::from("caption")),
-            parse_mode: Some(ParseMode::HTML),
+            parse_mode: Some(ParseMode::Html),
             reply_markup: Some(InlineKeyboardMarkup::default()),
             input_message_content: Some(InputMessageContent::Text(InputMessageContentText {
                 message_text: String::from("message_text"),
diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
index 989b2f24..ac985af9 100644
--- a/src/types/parse_mode.rs
+++ b/src/types/parse_mode.rs
@@ -128,7 +128,8 @@ use serde::{Deserialize, Serialize};
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum ParseMode {
     MarkdownV2,
-    HTML,
+    #[serde(rename = "HTML")]
+    Html,
     #[deprecated = "This is a legacy mode, retained for backward compatibility. Use `MarkdownV2` \
                     instead."]
     Markdown,
@@ -140,7 +141,7 @@ impl TryFrom<&str> for ParseMode {
     fn try_from(value: &str) -> Result<Self, Self::Error> {
         let normalized = value.to_lowercase();
         match normalized.as_ref() {
-            "html" => Ok(ParseMode::HTML),
+            "html" => Ok(ParseMode::Html),
             "markdown" => Ok(ParseMode::Markdown),
             "markdownv2" => Ok(ParseMode::MarkdownV2),
             _ => Err(()),
@@ -173,7 +174,7 @@ mod tests {
     #[test]
     fn html_serialization() {
         let expected_json = String::from(r#""HTML""#);
-        let actual_json = serde_json::to_string(&ParseMode::HTML).unwrap();
+        let actual_json = serde_json::to_string(&ParseMode::Html).unwrap();
 
         assert_eq!(expected_json, actual_json)
     }

From fc88c72a261a2eadaa37f78eef8ef183ab3600b4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Feb 2021 19:25:36 +0300
Subject: [PATCH 218/755] Suppress clippy::upper_case_acronyms for Currency and
 CountryCode

---
 src/types/non_telegram_types/country_code.rs | 1 +
 src/types/non_telegram_types/currency.rs     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/types/non_telegram_types/country_code.rs b/src/types/non_telegram_types/country_code.rs
index ddb4154e..459e7f35 100644
--- a/src/types/non_telegram_types/country_code.rs
+++ b/src/types/non_telegram_types/country_code.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 /// ISO 3166-1 alpha-2 language code.
+#[allow(clippy::upper_case_acronyms)]
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum CountryCode {
     /// Andorra
diff --git a/src/types/non_telegram_types/currency.rs b/src/types/non_telegram_types/currency.rs
index dcdec729..a252b48b 100644
--- a/src/types/non_telegram_types/currency.rs
+++ b/src/types/non_telegram_types/currency.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 /// ISO 4217 currency.
+#[allow(clippy::upper_case_acronyms)]
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum Currency {
     /// United Arab Emirates dirham

From 21ecc39dc78aa56f7d011cbdce8311961ba0fa7a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 7 Feb 2021 01:50:53 +0300
Subject: [PATCH 219/755] fix test

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

diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index b8afc2e4..68ea02b9 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -29,7 +29,7 @@ use crate::{
 /// // Required parameters are supplied to the `Requester` methods:
 /// bot.send_message(0, "<b>Text</b>")
 ///     // Optional parameters can be supplied by calling setters
-///     .parse_mode(ParseMode::HTML)
+///     .parse_mode(ParseMode::Html)
 ///     // To send request to telegram you need to call `.send()` and await the resulting future
 ///     .send()
 ///     .await?;

From ab76ec07f277fccf3a9815b183b339c69fd32d2b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 7 Feb 2021 02:41:29 +0300
Subject: [PATCH 220/755] fix docs

---
 src/types/inline_query_result_cached_gif.rs | 4 ++--
 src/types/parse_mode.rs                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
index 6712ccdf..6c0b8069 100644
--- a/src/types/inline_query_result_cached_gif.rs
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -24,12 +24,12 @@ pub struct InlineQueryResultCachedGif {
     /// Caption of the GIF file to be sent, 0-1024 characters.
     pub caption: Option<String>,
 
-    /// Send [`ParseMode::Markdown`] or [`ParseMode::HTML`], if you want
+    /// Send [`ParseMode::Markdown`] or [`ParseMode::Html`], if you want
     /// Telegram apps to show [bold, italic, fixed-width text or inline
     /// URLs] in the media caption.
     ///
     /// [`ParseMode::Markdown`]: crate::types::ParseMode::Markdown
-    /// [`ParseMode::HTML`]: crate::types::ParseMode::HTML
+    /// [`ParseMode::Html`]: crate::types::ParseMode::Html
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
index ac985af9..7f0fba9a 100644
--- a/src/types/parse_mode.rs
+++ b/src/types/parse_mode.rs
@@ -69,7 +69,7 @@ use serde::{Deserialize, Serialize};
 ///   ignored.
 ///
 /// ## HTML style
-/// To use this mode, pass [`HTML`] in the `parse_mode` field.
+/// To use this mode, pass [`Html`] in the `parse_mode` field.
 /// The following tags are currently supported:
 /// ````text
 /// <b>bold</b>, <strong>bold</strong>
@@ -123,7 +123,7 @@ use serde::{Deserialize, Serialize};
 ///   `*2*\**2=4*` for bold `2*2=4`.
 ///
 /// [`MarkdownV2`]: ParseMode::MarkdownV2
-/// [`HTML`]: ParseMode::HTML
+/// [`Html`]: ParseMode::Html
 /// [`Markdown`]: ParseMode::Markdown
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub enum ParseMode {

From d8c16d420dd395014a6452dff8467978570efa91 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 6 Feb 2021 19:07:10 +0600
Subject: [PATCH 221/755] refactor(throttle): small renamings

---
 src/adaptors/throttle.rs | 54 +++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index de56338a..63bbc842 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -86,12 +86,14 @@ const DELAY: Duration = Duration::from_millis(250);
 /// [@BotSupport]: https://t.me/botsupport
 #[derive(Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Limits {
-    /// Allowed messages in one chat per second
-    pub chat_s: u32,
-    /// Allowed messages per second
-    pub overall_s: u32,
-    /// Allowed messages in one chat per minute
-    pub chat_m: u32,
+    /// Allowed messages in one chat per second.
+    pub messages_per_sec_chat: u32,
+
+    /// Allowed messages in one chat per minute.
+    pub messages_per_min_chat: u32,
+
+    /// Allowed messages per second.
+    pub messages_per_sec_overall: u32,
 }
 
 /// Defaults are taken from [telegram documentation][tgdoc].
@@ -100,9 +102,9 @@ pub struct Limits {
 impl Default for Limits {
     fn default() -> Self {
         Self {
-            chat_s: 1,
-            overall_s: 30,
-            chat_m: 20,
+            messages_per_sec_chat: 1,
+            messages_per_sec_overall: 30,
+            messages_per_min_chat: 20,
         }
     }
 }
@@ -152,29 +154,28 @@ pub struct Throttle<B> {
     queue: mpsc::Sender<(Id, Sender<Never>)>,
 }
 
-async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)>) {
+async fn worker(limits: Limits, mut rx: mpsc::Receiver<(Id, Sender<Never>)>) {
     // +- Same idea as in `Throttle::new`
-    let cap = limits.overall_s + (limits.overall_s / 4);
+    let capacity = limits.messages_per_sec_overall + (limits.messages_per_sec_overall / 4);
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(Id, Sender<Never>)> = Vec::with_capacity(cap as usize);
+    let mut queue: Vec<(Id, Sender<Never>)> = Vec::with_capacity(capacity as usize);
 
     // I wish there was special data structure for history which removed the
     // need in 2 hashmaps
     // (waffle)
     let mut history: VecDeque<(Id, Instant)> = VecDeque::new();
-    // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
     let mut hchats: HashMap<Id, u32> = HashMap::new();
     let mut hchats_s = HashMap::new();
 
-    // set to true when `queue_rx` is closed
+    // set to true when `rx` is closed
     let mut close = false;
 
     while !close || !queue.is_empty() {
         // If there are no pending requests we are just waiting
         if queue.is_empty() {
-            match queue_rx.recv().await {
+            match rx.recv().await {
                 Some(req) => queue.push(req),
                 None => close = true,
             }
@@ -183,7 +184,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
         // update local queue with latest requests
         loop {
             // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-            match queue_rx.recv().now_or_never() {
+            match rx.recv().now_or_never() {
                 Some(Some(req)) => queue.push(req),
                 // There are no items in queue
                 None => break,
@@ -255,7 +256,7 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
             .iter()
             .take_while(|(_, time)| time > &sec_back)
             .count() as u32;
-        let mut allowed = limits.overall_s.saturating_sub(used);
+        let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
 
         if allowed == 0 {
             hchats_s.clear();
@@ -272,8 +273,8 @@ async fn worker(limits: Limits, mut queue_rx: mpsc::Receiver<(Id, Sender<Never>)
             while let Some(entry) = queue_rem.next() {
                 let chat = &entry.value().0;
                 let cond = {
-                    hchats_s.get(chat).copied().unwrap_or(0) < limits.chat_s
-                        && hchats.get(chat).copied().unwrap_or(0) < limits.chat_m
+                    hchats_s.get(chat).copied().unwrap_or(0) < limits.messages_per_sec_chat
+                        && hchats.get(chat).copied().unwrap_or(0) < limits.messages_per_min_chat
                 };
 
                 if cond {
@@ -312,14 +313,11 @@ impl<B> Throttle<B> {
         // so we won't lose performance when hitting limits.
         //
         // (I hope this makes sense) (waffle)
-        let buffer = limits.overall_s + (limits.overall_s / 8);
-        let (queue_tx, queue_rx) = mpsc::channel(buffer as usize);
+        let buffer_size = limits.messages_per_sec_overall + (limits.messages_per_sec_overall / 8);
+        let (tx, rx) = mpsc::channel(buffer_size as usize);
 
-        let worker = worker(limits, queue_rx);
-        let this = Self {
-            bot,
-            queue: queue_tx,
-        };
+        let worker = worker(limits, rx);
+        let this = Self { bot, queue: tx };
 
         (this, worker)
     }
@@ -491,7 +489,7 @@ download_forward! {
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
 enum Id {
     Id(i64),
-    Ch(u64),
+    ChannelUsernameHash(u64),
 }
 
 impl From<&ChatId> for Id {
@@ -502,7 +500,7 @@ impl From<&ChatId> for Id {
                 let mut hasher = std::collections::hash_map::DefaultHasher::new();
                 username.hash(&mut hasher);
                 let hash = hasher.finish();
-                Id::Ch(hash)
+                Id::ChannelUsernameHash(hash)
             }
         }
     }

From 781371cb171a2990b6e966192b06e7c3504f572c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 15 Feb 2021 00:28:52 +0300
Subject: [PATCH 222/755] update changelog

---
 CHANGELOG.md | 63 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc5baac2..4ff203ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,18 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `throttle`, `cache_me`, `auto_send` and `full` crate features
+- Support for `rustls` ([#24][pr24])
+- `#[must_use]` attr to payloads implemented by macro ([#22][pr22])
+- forward-to-deref `Requester` impls ([#39][pr39])
+- `Bot::{set_,}api_url` methods ([#26][pr26], [#35][pr35])
 - `payloads` module
 - `RequesterExt` trait which is implemented for all `Requester`s and allows easily wrapping them in adaptors
-- `adaptors` module
-  - Request throttling - opt-in feature represented by `Throttle` bot adapter which allows automatically checking telegram limits ([#10][pr10])
+- `adaptors` module ([#14][pr14])
+  - `throttle`, `cache_me`, `auto_send` and `full` crate features
+  - Request throttling - opt-in feature represented by `Throttle` bot adapter which allows automatically checking telegram limits ([#10][pr10], [#46][pr46])
   - Request auto sending - ability to `.await` requests without need to call `.send()` (opt-in feature represented by `AutoSend` bot adapter, [#8][pr8])
   - `get_me` caching (opt-in feature represented by `CacheMe` bot adapter)
-- `Requester` trait which represents bot-clients ([#7][pr7])
+- `Requester` trait which represents bot-clients ([#7][pr7], [#12][pr12], [#27][pr27])
 - `{Json,Multipart}Request` the `Bot` requests types ([#6][pr6])
 - `Output<T>` alias to `<<T as HasPayload>::Payload as Payload>::Output`
 - `Payload`, `HasPayload` and `Request` traits which represent different parts of the request ([#5][pr5])
-- `GetUpdatesNonStrict` - fail proof version of `GetUpdates`
+- `GetUpdatesNonStrict` 'telegram' method, that behaves just like `GetUpdates` but doesn't [#2][pr2]
+  fail if one of updates fails to be deserialized 
 - Move core code here from the [`teloxide`] main repo, for older changes see it's [`CHANGELOG.md`].
   - Following modules were moved:
     - `bot`
@@ -31,18 +36,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `client_from_env` was moved from `teloxide::utils` to crate root of `teloxide-core`
   - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>` 
     (instead of `Vec<Result<Update, (Value, serde_json::Error)>>`)
-- `GetUpdatesNonStrict` 'telegram' method, that behaves just like `GetUpdates` but doesn't 
-  fail if one of updates fails to be deserialized 
 
+[pr2]: https://github.com/teloxide/teloxide-core/pull/2
 [pr5]: https://github.com/teloxide/teloxide-core/pull/5
 [pr6]: https://github.com/teloxide/teloxide-core/pull/6
 [pr7]: https://github.com/teloxide/teloxide-core/pull/7
 [pr8]: https://github.com/teloxide/teloxide-core/pull/8
 [pr10]: https://github.com/teloxide/teloxide-core/pull/10
+[pr12]: https://github.com/teloxide/teloxide-core/pull/10
+[pr14]: https://github.com/teloxide/teloxide-core/pull/10
+[pr22]: https://github.com/teloxide/teloxide-core/pull/22
+[pr24]: https://github.com/teloxide/teloxide-core/pull/24
+[pr26]: https://github.com/teloxide/teloxide-core/pull/26
+[pr27]: https://github.com/teloxide/teloxide-core/pull/27
+[pr35]: https://github.com/teloxide/teloxide-core/pull/35
+[pr39]: https://github.com/teloxide/teloxide-core/pull/39
+[pr46]: https://github.com/teloxide/teloxide-core/pull/46
 
 ### Changed
 
-- Rename `StickerType` => `InputSticker`, `{CreateNewStickerSet,AddStickerToSet}::sticker_type}` => `sticker` ([#23][pr23])
+- Cleanup setters in `types::*` (remove most of them) ([#44][pr44])
+- Refactor `KeyboardButtonPollType` ([#44][pr44])
+- Replace `Into<Vec<_>>` by `IntoIterator<Item = _>` in function arguments ([#44][pr44])
+- Update dependencies (including tokio 1.0) ([#37][pr37])
+- Refactor file downloading ([#30][pr30]):
+  - Make `net` module public
+  - Move `Bot::download_file{,_stream}` methods to a new `Download` trait
+    - Impl `Download` for all bot adaptors & the `Bot` itself
+  - Change return type of `download_file_stream` — return `Stream<Result<Bytes>>``,
+    instead of `Future<Result<Stream<Result<Bytes>>>>``
+  - Add `api_url` param to standalone versions of `download_file{,_stream}`
+  - Make `net::{TELEGRAM_API_URL, download_file{,_stream}}` pub
+- Refactor `Bot` ([#29][pr29]):
+  - Move default parse mode to an adaptor (`DefaultParseMode`)
+  - Remove bot builder (it's not usefull anymore, since parse_mode is moved away)
+  - Undeprecate bot constructors (`Bot::{new, with_client, from_env_with_client}`)
+- Rename `StickerType` => `InputSticker`, `{CreateNewStickerSet,AddStickerToSet}::sticker_type}` => `sticker` ([#23][pr23], [#43][pr43])
 - Use `_: IntoIterator<Item = T>` bound instead of `_: Into<Vec<T>>` in telegram methods which accept collections ([#21][pr21])
 - Make `MessageDice::dice` pub ([#20][pr20])
 - Merge `ApiErrorKind` and `KnownApiErrorKind` into `ApiError` ([#13][pr13])
@@ -50,24 +79,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Replace a bunch of `Option<_>` fields with `ChatMemberKind`
   - Remove setters (users are not expected to create this struct)
   - Add getters
-- Changed internal mechanism of sending multipart requests
+- Changed internal mechanism of sending multipart requests ([#1][pr1])
 - Added `RequestError::Io(io::Error)` to wrap I/O error those can happen while sending files to telegram
-- Change `StickerType`: instead of newtypes (`Png(InputFile)`) use structs (`Png { png_sticker: InputFile }`), add 
-  `StickerType::{png,tgs}` constructors
-- Make all fields of all methods `pub`
+- Make all fields of all methods `pub` ([#3][pr3])
 
+[pr1]: https://github.com/teloxide/teloxide-core/pull/1
+[pr3]: https://github.com/teloxide/teloxide-core/pull/3
 [pr9]: https://github.com/teloxide/teloxide-core/pull/9
 [pr13]: https://github.com/teloxide/teloxide-core/pull/13
 [pr20]: https://github.com/teloxide/teloxide-core/pull/20
 [pr21]: https://github.com/teloxide/teloxide-core/pull/21
 [pr23]: https://github.com/teloxide/teloxide-core/pull/23
+[pr29]: https://github.com/teloxide/teloxide-core/pull/29
+[pr30]: https://github.com/teloxide/teloxide-core/pull/30
+[pr37]: https://github.com/teloxide/teloxide-core/pull/37
+[pr43]: https://github.com/teloxide/teloxide-core/pull/43
 
 ### Removed
 
 - `unstable-stream` feature (now `Bot::download_file_stream` is accesable by default)
 - old `Request` trait
 - `RequestWithFile`, now multipart requests use `Request`
-- Remove all `#[non_exhaustive]` annotations
+- Remove all `#[non_exhaustive]` annotations ([#4][pr4])
+- Remove `MessageEntity::text_from` because it's wrong ([#44][pr44])
+
+[pr4]: https://github.com/teloxide/teloxide-core/pull/4
+[pr44]: https://github.com/teloxide/teloxide-core/pull/44
   
 
 [`teloxide`]: https://github.com/teloxide/teloxide

From 91220befb68524cd20f302ee9aa5d989ea609b78 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 15 Feb 2021 00:35:53 +0300
Subject: [PATCH 223/755] fix warning

---
 src/types/passport_element_error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index da96fba1..981d1232 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -38,8 +38,8 @@ impl PassportElementError {
     }
 }
 
-#[serde(tag = "source")]
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "source")]
 pub enum PassportElementErrorKind {
     #[serde(rename = "data")]
     DataField(PassportElementErrorDataField),

From 3129d709fead5bff61de11ded40db2cea3cae6ee Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 15 Feb 2021 16:46:31 +0600
Subject: [PATCH 224/755] Small enhancements

---
 rustfmt.toml               | 2 +-
 src/types/input_sticker.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 60b85bac..9b0523d1 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,5 +1,5 @@
 format_code_in_doc_comments = true
 wrap_comments = true
 format_strings = true
-merge_imports = true
+imports_granularity = "Crate"
 use_field_init_shorthand = true
diff --git a/src/types/input_sticker.rs b/src/types/input_sticker.rs
index 8f765495..4e82f0ba 100644
--- a/src/types/input_sticker.rs
+++ b/src/types/input_sticker.rs
@@ -24,7 +24,7 @@ pub enum InputSticker {
 
     /// TGS animation with the sticker, uploaded using multipart/form-data.
     ///
-    /// See https://core.telegram.org/animated_stickers#technical-requirements for technical requirements
+    /// See <https://core.telegram.org/animated_stickers#technical-requirements> for technical requirements
     #[serde(rename = "tgs_sticker")]
     Tgs(InputFile),
 }

From d58b21c42f532ffe77c554c881ed8e029f663998 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 16 Feb 2021 00:50:46 +0600
Subject: [PATCH 225/755] Refactoring

---
 src/adaptors/throttle.rs | 239 ++++++++++++++++++++-------------------
 1 file changed, 125 insertions(+), 114 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 63bbc842..6aca69d5 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -23,49 +23,48 @@ use crate::{
     types::*,
 };
 
-// Throttling is quite complicated this comment describes the algorithm of
-// current implementation. NOTE: this only describes CURRENT implementation.
-// Implementation may change at any time.
+// Throttling is quite complicated. This comment describes the algorithm of the
+// current implementation.
 //
 // ### Request
 //
-// When throttling request is sent, it sends a tuple of `ChatId` (more
-// accurately, just local `Id`) and `Sender<()>` to the worker. Then the request
-// waits for notification from worker. When notification is received it sends
-// underlying request.
+// When a throttling request is sent, it sends a tuple of `ChatId` and
+// `Sender<()>` to the worker. Then the request waits for a notification from
+// the worker. When notification is received, it sends the underlying request.
 //
 // ### Worker
 //
-// Worker does the most important job - it checks for limit exceed.
+// The worker does the most important job -- it ensures that the limits are
+// never exceeded.
 //
-// The worker stores "history" of requests sent in last minute (and to which
-// chats the were sent) and queue of pending updates.
+// The worker stores a history of requests sent in the last minute (and to which
+// chats they were sent) and a queue of pending updates.
 //
 // The worker does the following algorithm loop:
 //
-// 1. If queue is empty wait for the first message in incoming channel (and adds
-//    it to queue).
+// 1. If the queue is empty, wait for the first message in incoming channel (and
+// add it to the queue).
 //
-// 2. Read all present messages from incoming channel and transfer them to
-//    queue.
+// 2. Read all present messages from an incoming channel and transfer them to
+// the queue.
 //
-// 3. Record current time.
+// 3. Record the current time.
 //
-// 4. Clear history from records which time < (current - minute)
+// 4. Clear the history from records whose time < (current time - minute).
 //
-// 5. Count all requests in which were sent last second,
-//    `allowed = limit.overall_s - count`
+// 5. Count all requests which were sent last second, `allowed = limit.overall_s
+// - count`.
 //
-// 6. If `allowed == 0` wait a bit and `continue` to the next iteration
+// 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
 //
 // 7. Count how many requests were sent to which chats (i.e.: create
-//    `Map<ChatId, Count>`)    (note: the same map, but for last minute also
-//    exists, but it's updated, instead of recreation)
+// `Map<ChatId, Count>`). (Note: the same map, but for last minute also exists,
+// but it's updated, instead of recreation.)
 //
-// 8. While `allowed >= 0` search for requests which chat hasn't exceed limits
-//    (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
-//    request that it can be now executed, increase counts, add record to
-//    history.
+// 8. While `allowed >= 0` search for requests which chat haven't exceed the
+// limits (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
+// the request that it can be now executed, increase counts, add record to the
+// history.
 
 const MINUTE: Duration = Duration::from_secs(60);
 const SECOND: Duration = Duration::from_secs(1);
@@ -151,47 +150,34 @@ impl Default for Limits {
 pub struct Throttle<B> {
     bot: B,
     // Sender<Never> is used to pass the signal to unlock by closing the channel.
-    queue: mpsc::Sender<(Id, Sender<Never>)>,
+    queue: mpsc::Sender<(FastChatId, Sender<Never>)>,
 }
 
-async fn worker(limits: Limits, mut rx: mpsc::Receiver<(Id, Sender<Never>)>) {
-    // +- Same idea as in `Throttle::new`
-    let capacity = limits.messages_per_sec_overall + (limits.messages_per_sec_overall / 4);
+type RequestsSent = u32;
+
+// I wish there was special data structure for history which removed the
+// need in 2 hashmaps
+// (waffle)
+#[derive(Default)]
+struct RequestsSentToChats {
+    per_min: HashMap<FastChatId, RequestsSent>,
+    per_sec: HashMap<FastChatId, RequestsSent>,
+}
+
+async fn worker(limits: Limits, mut rx: mpsc::Receiver<(FastChatId, Sender<Never>)>) {
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(Id, Sender<Never>)> = Vec::with_capacity(capacity as usize);
+    let mut queue: Vec<(FastChatId, Sender<Never>)> =
+        Vec::with_capacity(limits.messages_per_sec_overall as usize);
 
-    // I wish there was special data structure for history which removed the
-    // need in 2 hashmaps
-    // (waffle)
-    let mut history: VecDeque<(Id, Instant)> = VecDeque::new();
-    let mut hchats: HashMap<Id, u32> = HashMap::new();
-    let mut hchats_s = HashMap::new();
+    let mut when_requests_were_sent: VecDeque<(FastChatId, Instant)> = VecDeque::new();
+    let mut requests_sent_to_chats = RequestsSentToChats::default();
 
-    // set to true when `rx` is closed
-    let mut close = false;
+    let mut rx_is_closed = false;
 
-    while !close || !queue.is_empty() {
-        // If there are no pending requests we are just waiting
-        if queue.is_empty() {
-            match rx.recv().await {
-                Some(req) => queue.push(req),
-                None => close = true,
-            }
-        }
-
-        // update local queue with latest requests
-        loop {
-            // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-            match rx.recv().now_or_never() {
-                Some(Some(req)) => queue.push(req),
-                // There are no items in queue
-                None => break,
-                // The queue was closed
-                Some(None) => close = true,
-            }
-        }
+    while !rx_is_closed || !queue.is_empty() {
+        read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
 
         // _Maybe_ we need to use `spawn_blocking` here, because there is
         // decent amount of blocking work. However _for now_ I've decided not
@@ -231,18 +217,21 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(Id, Sender<Never>)>) {
         let sec_back = now - SECOND;
 
         // make history and hchats up-to-date
-        while let Some((_, time)) = history.front() {
+        while let Some((_, time)) = when_requests_were_sent.front() {
             // history is sorted, we found first up-to-date thing
             if time >= &min_back {
                 break;
             }
 
-            if let Some((chat, _)) = history.pop_front() {
-                let ent = hchats.entry(chat).and_modify(|count| {
-                    *count -= 1;
-                });
+            if let Some((chat, _)) = when_requests_were_sent.pop_front() {
+                let entry = requests_sent_to_chats
+                    .per_min
+                    .entry(chat)
+                    .and_modify(|count| {
+                        *count -= 1;
+                    });
 
-                if let Entry::Occupied(entry) = ent {
+                if let Entry::Occupied(entry) = entry {
                     if *entry.get() == 0 {
                         entry.remove_entry();
                     }
@@ -252,69 +241,90 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(Id, Sender<Never>)>) {
 
         // as truncates which is ok since in case of truncation it would always be >=
         // limits.overall_s
-        let used = history
+        let used = when_requests_were_sent
             .iter()
             .take_while(|(_, time)| time > &sec_back)
             .count() as u32;
         let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
 
         if allowed == 0 {
-            hchats_s.clear();
+            requests_sent_to_chats.per_sec.clear();
             tokio::time::sleep(DELAY).await;
             continue;
         }
 
-        for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
-            *hchats_s.entry(*chat).or_insert(0) += 1;
+        for (chat, _) in when_requests_were_sent
+            .iter()
+            .take_while(|(_, time)| time > &sec_back)
+        {
+            *requests_sent_to_chats.per_sec.entry(*chat).or_insert(0) += 1;
         }
 
-        {
-            let mut queue_rem = queue.removing();
-            while let Some(entry) = queue_rem.next() {
-                let chat = &entry.value().0;
-                let cond = {
-                    hchats_s.get(chat).copied().unwrap_or(0) < limits.messages_per_sec_chat
-                        && hchats.get(chat).copied().unwrap_or(0) < limits.messages_per_min_chat
-                };
+        let mut queue_removing_iter = queue.removing();
 
-                if cond {
-                    {
-                        *hchats_s.entry(*chat).or_insert(0) += 1;
-                        *hchats.entry(*chat).or_insert(0) += 1;
-                        history.push_back((*chat, Instant::now()));
-                    }
+        while let Some(entry) = queue_removing_iter.next() {
+            let chat = &entry.value().0;
+            let messages_sent = requests_sent_to_chats
+                .per_sec
+                .get(chat)
+                .copied()
+                .unwrap_or(0);
+            let limits_not_exceeded = messages_sent < limits.messages_per_sec_chat
+                && messages_sent < limits.messages_per_min_chat;
 
-                    // This will close the channel unlocking associated request
-                    drop(entry.remove());
+            if limits_not_exceeded {
+                *requests_sent_to_chats.per_sec.entry(*chat).or_insert(0) += 1;
+                *requests_sent_to_chats.per_min.entry(*chat).or_insert(0) += 1;
+                when_requests_were_sent.push_back((*chat, Instant::now()));
 
-                    // We've "sent" 1 request, so now we can send 1 less
-                    allowed -= 1;
-                    if allowed == 0 {
-                        break;
-                    }
+                // Close the channel and unlock the associated request.
+                drop(entry.remove());
+
+                // We have "sent" one request, so now we can send one less.
+                allowed -= 1;
+                if allowed == 0 {
+                    break;
                 }
             }
         }
 
         // It's easier to just recompute last second stats, instead of keeping
         // track of it alongside with minute stats, so we just throw this away.
-        hchats_s.clear();
+        requests_sent_to_chats.per_sec.clear();
         tokio::time::sleep(DELAY).await;
     }
 }
 
+async fn read_from_rx(
+    rx: &mut mpsc::Receiver<(FastChatId, Sender<Never>)>,
+    queue: &mut Vec<(FastChatId, Sender<Never>)>,
+    rx_is_closed: &mut bool,
+) {
+    if queue.is_empty() {
+        match rx.recv().await {
+            Some(req) => queue.push(req),
+            None => *rx_is_closed = true,
+        }
+    }
+
+    loop {
+        // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
+        match rx.recv().now_or_never() {
+            Some(Some(req)) => queue.push(req),
+            Some(None) => *rx_is_closed = true,
+            // There are no items in queue.
+            None => break,
+        }
+    }
+}
+
 impl<B> Throttle<B> {
     /// Creates new [`Throttle`] alongside with worker future.
     ///
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
-        // A buffer made slightly bigger (112.5%) than overall limit
-        // so we won't lose performance when hitting limits.
-        //
-        // (I hope this makes sense) (waffle)
-        let buffer_size = limits.messages_per_sec_overall + (limits.messages_per_sec_overall / 8);
-        let (tx, rx) = mpsc::channel(buffer_size as usize);
+        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
 
         let worker = worker(limits, rx);
         let this = Self { bot, queue: tx };
@@ -448,7 +458,7 @@ where
                 prices,
             ),
             self.queue.clone(),
-            |p| Id::Id(p.payload_ref().chat_id as _),
+            |p| FastChatId::Id(p.payload_ref().chat_id as _),
         )
     }
 
@@ -482,25 +492,25 @@ download_forward! {
     { this => this.inner() }
 }
 
-/// Id used in worker.
+/// An ID used in the worker.
 ///
 /// It is used instead of `ChatId` to make copying cheap even in case of
-/// usernames. (It just hashes username)
+/// usernames. (It is just a hashed username.)
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
-enum Id {
+enum FastChatId {
     Id(i64),
     ChannelUsernameHash(u64),
 }
 
-impl From<&ChatId> for Id {
+impl From<&ChatId> for FastChatId {
     fn from(value: &ChatId) -> Self {
         match value {
-            ChatId::Id(id) => Id::Id(*id),
+            ChatId::Id(id) => FastChatId::Id(*id),
             ChatId::ChannelUsername(username) => {
                 let mut hasher = std::collections::hash_map::DefaultHasher::new();
                 username.hash(&mut hasher);
                 let hash = hasher.finish();
-                Id::ChannelUsernameHash(hash)
+                FastChatId::ChannelUsernameHash(hash)
             }
         }
     }
@@ -508,8 +518,8 @@ impl From<&ChatId> for Id {
 
 pub struct ThrottlingRequest<R: HasPayload>(
     R,
-    mpsc::Sender<(Id, Sender<Never>)>,
-    fn(&R::Payload) -> Id,
+    mpsc::Sender<(FastChatId, Sender<Never>)>,
+    fn(&R::Payload) -> FastChatId,
 );
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
@@ -743,29 +753,30 @@ mod chan_send {
     use never::Never;
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
-    use crate::adaptors::throttle::Id;
+    use crate::adaptors::throttle::FastChatId;
 
     pub(super) trait SendTy {
-        fn send_t(self, val: (Id, Sender<Never>)) -> ChanSend;
+        fn send_t(self, val: (FastChatId, Sender<Never>)) -> ChanSend;
     }
 
     #[pin_project::pin_project]
     pub(super) struct ChanSend(#[pin] Inner);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner = Pin<Box<dyn Future<Output = Result<(), SendError<(Id, Sender<Never>)>>> + Send>>;
+    type Inner =
+        Pin<Box<dyn Future<Output = Result<(), SendError<(FastChatId, Sender<Never>)>>> + Send>>;
     #[cfg(feature = "nightly")]
-    type Inner = impl Future<Output = Result<(), SendError<(Id, Sender<Never>)>>>;
+    type Inner = impl Future<Output = Result<(), SendError<(FastChatId, Sender<Never>)>>>;
 
-    impl SendTy for mpsc::Sender<(Id, Sender<Never>)> {
+    impl SendTy for mpsc::Sender<(FastChatId, Sender<Never>)> {
         // `return`s trick IDEA not to show errors
         #[allow(clippy::needless_return)]
-        fn send_t(self, val: (Id, Sender<Never>)) -> ChanSend {
+        fn send_t(self, val: (FastChatId, Sender<Never>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
                 fn def(
-                    sender: mpsc::Sender<(Id, Sender<Never>)>,
-                    val: (Id, Sender<Never>),
+                    sender: mpsc::Sender<(FastChatId, Sender<Never>)>,
+                    val: (FastChatId, Sender<Never>),
                 ) -> Inner {
                     async move { sender.send(val).await }
                 }
@@ -780,7 +791,7 @@ mod chan_send {
     }
 
     impl Future for ChanSend {
-        type Output = Result<(), SendError<(Id, Sender<Never>)>>;
+        type Output = Result<(), SendError<(FastChatId, Sender<Never>)>>;
 
         fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
             self.project().0.poll(cx)

From 916a774c88bb33905abe6e73a15382b4cbd6adff Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 15 Feb 2021 22:44:19 +0300
Subject: [PATCH 226/755] Update src/adaptors/throttle.rs

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
---
 src/adaptors/throttle.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 6aca69d5..789eda62 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -52,7 +52,7 @@ use crate::{
 //
 // 4. Clear the history from records whose time < (current time - minute).
 //
-// 5. Count all requests which were sent last second, `allowed = limit.overall_s
+// 5. Count all requests which were sent last second, `allowed = limit.messages_per_sec_overall
 // - count`.
 //
 // 6. If `allowed == 0` wait a bit and `continue` to the next iteration.

From 65c98741db4e98211470a1515bf74889fe2eb9e9 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 16 Feb 2021 01:57:59 +0600
Subject: [PATCH 227/755] Apply suggestions from the review

---
 src/adaptors/throttle.rs | 99 ++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 54 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 789eda62..3a4b0cd1 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -52,7 +52,8 @@ use crate::{
 //
 // 4. Clear the history from records whose time < (current time - minute).
 //
-// 5. Count all requests which were sent last second, `allowed = limit.messages_per_sec_overall
+// 5. Count all requests which were sent last second, `allowed =
+// limit.messages_per_sec_overall
 // - count`.
 //
 // 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
@@ -150,7 +151,7 @@ impl Default for Limits {
 pub struct Throttle<B> {
     bot: B,
     // Sender<Never> is used to pass the signal to unlock by closing the channel.
-    queue: mpsc::Sender<(FastChatId, Sender<Never>)>,
+    queue: mpsc::Sender<(ChatIdHash, Sender<Never>)>,
 }
 
 type RequestsSent = u32;
@@ -160,19 +161,19 @@ type RequestsSent = u32;
 // (waffle)
 #[derive(Default)]
 struct RequestsSentToChats {
-    per_min: HashMap<FastChatId, RequestsSent>,
-    per_sec: HashMap<FastChatId, RequestsSent>,
+    per_min: HashMap<ChatIdHash, RequestsSent>,
+    per_sec: HashMap<ChatIdHash, RequestsSent>,
 }
 
-async fn worker(limits: Limits, mut rx: mpsc::Receiver<(FastChatId, Sender<Never>)>) {
+async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, Sender<Never>)>) {
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(FastChatId, Sender<Never>)> =
+    let mut queue: Vec<(ChatIdHash, Sender<Never>)> =
         Vec::with_capacity(limits.messages_per_sec_overall as usize);
 
-    let mut when_requests_were_sent: VecDeque<(FastChatId, Instant)> = VecDeque::new();
-    let mut requests_sent_to_chats = RequestsSentToChats::default();
+    let mut history: VecDeque<(ChatIdHash, Instant)> = VecDeque::new();
+    let mut requests_sent = RequestsSentToChats::default();
 
     let mut rx_is_closed = false;
 
@@ -217,19 +218,16 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(FastChatId, Sender<Never
         let sec_back = now - SECOND;
 
         // make history and hchats up-to-date
-        while let Some((_, time)) = when_requests_were_sent.front() {
+        while let Some((_, time)) = history.front() {
             // history is sorted, we found first up-to-date thing
             if time >= &min_back {
                 break;
             }
 
-            if let Some((chat, _)) = when_requests_were_sent.pop_front() {
-                let entry = requests_sent_to_chats
-                    .per_min
-                    .entry(chat)
-                    .and_modify(|count| {
-                        *count -= 1;
-                    });
+            if let Some((chat, _)) = history.pop_front() {
+                let entry = requests_sent.per_min.entry(chat).and_modify(|count| {
+                    *count -= 1;
+                });
 
                 if let Entry::Occupied(entry) = entry {
                     if *entry.get() == 0 {
@@ -241,41 +239,34 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(FastChatId, Sender<Never
 
         // as truncates which is ok since in case of truncation it would always be >=
         // limits.overall_s
-        let used = when_requests_were_sent
+        let used = history
             .iter()
             .take_while(|(_, time)| time > &sec_back)
             .count() as u32;
         let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
 
         if allowed == 0 {
-            requests_sent_to_chats.per_sec.clear();
+            requests_sent.per_sec.clear();
             tokio::time::sleep(DELAY).await;
             continue;
         }
 
-        for (chat, _) in when_requests_were_sent
-            .iter()
-            .take_while(|(_, time)| time > &sec_back)
-        {
-            *requests_sent_to_chats.per_sec.entry(*chat).or_insert(0) += 1;
+        for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
+            *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
         }
 
-        let mut queue_removing_iter = queue.removing();
+        let mut queue_removing = queue.removing();
 
-        while let Some(entry) = queue_removing_iter.next() {
+        while let Some(entry) = queue_removing.next() {
             let chat = &entry.value().0;
-            let messages_sent = requests_sent_to_chats
-                .per_sec
-                .get(chat)
-                .copied()
-                .unwrap_or(0);
-            let limits_not_exceeded = messages_sent < limits.messages_per_sec_chat
-                && messages_sent < limits.messages_per_min_chat;
+            let requests_sent = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
+            let limits_not_exceeded = requests_sent < limits.messages_per_sec_chat
+                && requests_sent < limits.messages_per_min_chat;
 
             if limits_not_exceeded {
-                *requests_sent_to_chats.per_sec.entry(*chat).or_insert(0) += 1;
-                *requests_sent_to_chats.per_min.entry(*chat).or_insert(0) += 1;
-                when_requests_were_sent.push_back((*chat, Instant::now()));
+                *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
+                *requests_sent.per_min.entry(*chat).or_insert(0) += 1;
+                history.push_back((*chat, Instant::now()));
 
                 // Close the channel and unlock the associated request.
                 drop(entry.remove());
@@ -290,14 +281,14 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(FastChatId, Sender<Never
 
         // It's easier to just recompute last second stats, instead of keeping
         // track of it alongside with minute stats, so we just throw this away.
-        requests_sent_to_chats.per_sec.clear();
+        requests_sent.per_sec.clear();
         tokio::time::sleep(DELAY).await;
     }
 }
 
 async fn read_from_rx(
-    rx: &mut mpsc::Receiver<(FastChatId, Sender<Never>)>,
-    queue: &mut Vec<(FastChatId, Sender<Never>)>,
+    rx: &mut mpsc::Receiver<(ChatIdHash, Sender<Never>)>,
+    queue: &mut Vec<(ChatIdHash, Sender<Never>)>,
     rx_is_closed: &mut bool,
 ) {
     if queue.is_empty() {
@@ -458,7 +449,7 @@ where
                 prices,
             ),
             self.queue.clone(),
-            |p| FastChatId::Id(p.payload_ref().chat_id as _),
+            |p| ChatIdHash::Id(p.payload_ref().chat_id as _),
         )
     }
 
@@ -497,20 +488,20 @@ download_forward! {
 /// It is used instead of `ChatId` to make copying cheap even in case of
 /// usernames. (It is just a hashed username.)
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
-enum FastChatId {
+enum ChatIdHash {
     Id(i64),
     ChannelUsernameHash(u64),
 }
 
-impl From<&ChatId> for FastChatId {
+impl From<&ChatId> for ChatIdHash {
     fn from(value: &ChatId) -> Self {
         match value {
-            ChatId::Id(id) => FastChatId::Id(*id),
+            ChatId::Id(id) => ChatIdHash::Id(*id),
             ChatId::ChannelUsername(username) => {
                 let mut hasher = std::collections::hash_map::DefaultHasher::new();
                 username.hash(&mut hasher);
                 let hash = hasher.finish();
-                FastChatId::ChannelUsernameHash(hash)
+                ChatIdHash::ChannelUsernameHash(hash)
             }
         }
     }
@@ -518,8 +509,8 @@ impl From<&ChatId> for FastChatId {
 
 pub struct ThrottlingRequest<R: HasPayload>(
     R,
-    mpsc::Sender<(FastChatId, Sender<Never>)>,
-    fn(&R::Payload) -> FastChatId,
+    mpsc::Sender<(ChatIdHash, Sender<Never>)>,
+    fn(&R::Payload) -> ChatIdHash,
 );
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
@@ -753,10 +744,10 @@ mod chan_send {
     use never::Never;
     use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
 
-    use crate::adaptors::throttle::FastChatId;
+    use crate::adaptors::throttle::ChatIdHash;
 
     pub(super) trait SendTy {
-        fn send_t(self, val: (FastChatId, Sender<Never>)) -> ChanSend;
+        fn send_t(self, val: (ChatIdHash, Sender<Never>)) -> ChanSend;
     }
 
     #[pin_project::pin_project]
@@ -764,19 +755,19 @@ mod chan_send {
 
     #[cfg(not(feature = "nightly"))]
     type Inner =
-        Pin<Box<dyn Future<Output = Result<(), SendError<(FastChatId, Sender<Never>)>>> + Send>>;
+        Pin<Box<dyn Future<Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>> + Send>>;
     #[cfg(feature = "nightly")]
-    type Inner = impl Future<Output = Result<(), SendError<(FastChatId, Sender<Never>)>>>;
+    type Inner = impl Future<Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>>;
 
-    impl SendTy for mpsc::Sender<(FastChatId, Sender<Never>)> {
+    impl SendTy for mpsc::Sender<(ChatIdHash, Sender<Never>)> {
         // `return`s trick IDEA not to show errors
         #[allow(clippy::needless_return)]
-        fn send_t(self, val: (FastChatId, Sender<Never>)) -> ChanSend {
+        fn send_t(self, val: (ChatIdHash, Sender<Never>)) -> ChanSend {
             #[cfg(feature = "nightly")]
             {
                 fn def(
-                    sender: mpsc::Sender<(FastChatId, Sender<Never>)>,
-                    val: (FastChatId, Sender<Never>),
+                    sender: mpsc::Sender<(ChatIdHash, Sender<Never>)>,
+                    val: (ChatIdHash, Sender<Never>),
                 ) -> Inner {
                     async move { sender.send(val).await }
                 }
@@ -791,7 +782,7 @@ mod chan_send {
     }
 
     impl Future for ChanSend {
-        type Output = Result<(), SendError<(FastChatId, Sender<Never>)>>;
+        type Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>;
 
         fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
             self.project().0.poll(cx)

From 8deaac04fad405d4905db74c7cffb243f6861541 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 16 Feb 2021 02:03:04 +0600
Subject: [PATCH 228/755] Fix Clippy

---
 src/adaptors/throttle.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 3a4b0cd1..6d866a25 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -259,9 +259,9 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, Sender<Never
 
         while let Some(entry) = queue_removing.next() {
             let chat = &entry.value().0;
-            let requests_sent = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
-            let limits_not_exceeded = requests_sent < limits.messages_per_sec_chat
-                && requests_sent < limits.messages_per_min_chat;
+            let requests_sent_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
+            let limits_not_exceeded = requests_sent_count < limits.messages_per_sec_chat
+                && requests_sent_count < limits.messages_per_min_chat;
 
             if limits_not_exceeded {
                 *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;

From 0d25d357d90153c3568d6fd1a90abef45a993ee2 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 16 Feb 2021 02:09:06 +0600
Subject: [PATCH 229/755] Reformat throttle.rs

---
 src/adaptors/throttle.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 6d866a25..86651891 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -53,8 +53,7 @@ use crate::{
 // 4. Clear the history from records whose time < (current time - minute).
 //
 // 5. Count all requests which were sent last second, `allowed =
-// limit.messages_per_sec_overall
-// - count`.
+// limit.messages_per_sec_overall - count`.
 //
 // 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
 //

From 8abf3863e5856ad850ac5053abd1ed6a76fde59a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Feb 2021 16:55:27 +0300
Subject: [PATCH 230/755] Future proof multipart requests

---
 CHANGELOG.md                                  |  2 ++
 src/bot.rs                                    |  4 ++--
 src/local_macros.rs                           | 12 +++++++++++-
 src/net/request.rs                            |  7 ++++---
 src/payloads/add_sticker_to_set.rs            |  3 ++-
 src/payloads/answer_callback_query.rs         |  2 +-
 src/payloads/answer_inline_query.rs           |  2 +-
 src/payloads/answer_pre_checkout_query.rs     |  2 +-
 src/payloads/answer_shipping_query.rs         |  2 +-
 src/payloads/create_new_sticker_set.rs        |  3 ++-
 src/payloads/delete_chat_photo.rs             |  2 +-
 src/payloads/delete_chat_sticker_set.rs       |  2 +-
 src/payloads/delete_message.rs                |  2 +-
 src/payloads/delete_sticker_from_set.rs       |  2 +-
 src/payloads/delete_webhook.rs                |  2 +-
 src/payloads/edit_message_caption.rs          |  2 +-
 src/payloads/edit_message_caption_inline.rs   |  2 +-
 src/payloads/edit_message_live_location.rs    |  2 +-
 .../edit_message_live_location_inline.rs      |  2 +-
 src/payloads/edit_message_media.rs            |  2 +-
 src/payloads/edit_message_media_inline.rs     |  2 +-
 src/payloads/edit_message_reply_markup.rs     |  2 +-
 .../edit_message_reply_markup_inline.rs       |  2 +-
 src/payloads/edit_message_text.rs             |  2 +-
 src/payloads/edit_message_text_inline.rs      |  2 +-
 src/payloads/export_chat_invite_link.rs       |  2 +-
 src/payloads/forward_message.rs               |  2 +-
 src/payloads/get_chat.rs                      |  2 +-
 src/payloads/get_chat_administrators.rs       |  2 +-
 src/payloads/get_chat_member.rs               |  2 +-
 src/payloads/get_chat_members_count.rs        |  2 +-
 src/payloads/get_file.rs                      |  2 +-
 src/payloads/get_game_high_scores.rs          |  2 +-
 src/payloads/get_me.rs                        |  2 +-
 src/payloads/get_my_commands.rs               |  2 +-
 src/payloads/get_sticker_set.rs               |  2 +-
 src/payloads/get_updates.rs                   |  2 +-
 src/payloads/get_user_profile_photos.rs       |  2 +-
 src/payloads/get_webhook_info.rs              |  2 +-
 src/payloads/kick_chat_member.rs              |  2 +-
 src/payloads/leave_chat.rs                    |  2 +-
 src/payloads/pin_chat_message.rs              |  2 +-
 src/payloads/promote_chat_member.rs           |  2 +-
 src/payloads/restrict_chat_member.rs          |  2 +-
 src/payloads/send_animation.rs                |  3 ++-
 src/payloads/send_audio.rs                    |  3 ++-
 src/payloads/send_chat_action.rs              |  2 +-
 src/payloads/send_contact.rs                  |  2 +-
 src/payloads/send_dice.rs                     |  2 +-
 src/payloads/send_document.rs                 |  3 ++-
 src/payloads/send_game.rs                     |  2 +-
 src/payloads/send_invoice.rs                  |  2 +-
 src/payloads/send_location.rs                 |  2 +-
 src/payloads/send_media_group.rs              |  2 +-
 src/payloads/send_message.rs                  |  2 +-
 src/payloads/send_photo.rs                    |  3 ++-
 src/payloads/send_poll.rs                     |  2 +-
 src/payloads/send_sticker.rs                  |  3 ++-
 src/payloads/send_venue.rs                    |  2 +-
 src/payloads/send_video.rs                    |  3 ++-
 src/payloads/send_video_note.rs               |  3 ++-
 src/payloads/send_voice.rs                    |  3 ++-
 .../set_chat_administrator_custom_title.rs    |  2 +-
 src/payloads/set_chat_description.rs          |  2 +-
 src/payloads/set_chat_permissions.rs          |  2 +-
 src/payloads/set_chat_photo.rs                |  3 ++-
 src/payloads/set_chat_sticker_set.rs          |  2 +-
 src/payloads/set_chat_title.rs                |  2 +-
 src/payloads/set_game_score.rs                |  2 +-
 src/payloads/set_game_score_inline.rs         |  2 +-
 src/payloads/set_my_commands.rs               |  2 +-
 src/payloads/set_passport_data_errors.rs      |  2 +-
 src/payloads/set_sticker_position_in_set.rs   |  2 +-
 src/payloads/set_sticker_set_thumb.rs         |  3 ++-
 src/payloads/set_webhook.rs                   |  3 ++-
 src/payloads/stop_message_live_location.rs    |  2 +-
 .../stop_message_live_location_inline.rs      |  2 +-
 src/payloads/stop_poll.rs                     |  2 +-
 src/payloads/unban_chat_member.rs             |  2 +-
 src/payloads/unpin_chat_message.rs            |  2 +-
 src/payloads/upload_sticker_file.rs           |  3 ++-
 src/requests.rs                               |  6 ++++--
 src/requests/multipart.rs                     | 12 ++++++------
 src/requests/multipart_payload.rs             | 19 +++++++++++++++++++
 src/types/input_media.rs                      | 13 +++++++------
 85 files changed, 146 insertions(+), 97 deletions(-)
 create mode 100644 src/requests/multipart_payload.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ff203ba..07cda31b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `MultipartPayload` for future proofing ([#49][pr49])
 - Support for `rustls` ([#24][pr24])
 - `#[must_use]` attr to payloads implemented by macro ([#22][pr22])
 - forward-to-deref `Requester` impls ([#39][pr39])
@@ -52,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr35]: https://github.com/teloxide/teloxide-core/pull/35
 [pr39]: https://github.com/teloxide/teloxide-core/pull/39
 [pr46]: https://github.com/teloxide/teloxide-core/pull/46
+[pr49]: https://github.com/teloxide/teloxide-core/pull/49
 
 ### Changed
 
diff --git a/src/bot.rs b/src/bot.rs
index 06f6cea6..132bbaaa 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -9,7 +9,7 @@ use serde::{de::DeserializeOwned, Serialize};
 use crate::{
     bot::api_url::ApiUrl,
     net,
-    requests::{Payload, ResponseResult},
+    requests::{MultipartPayload, Payload, ResponseResult},
     serde_multipart,
 };
 
@@ -222,7 +222,7 @@ impl Bot {
         payload: &P,
     ) -> impl Future<Output = ResponseResult<P::Output>>
     where
-        P: Payload + Serialize,
+        P: MultipartPayload + Serialize,
         P::Output: DeserializeOwned,
     {
         let client = self.client.clone();
diff --git a/src/local_macros.rs b/src/local_macros.rs
index a2549a00..1129e983 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -133,11 +133,14 @@ macro_rules! calculated_doc {
     );
 }
 
-/// Declare payload type, implement `Payload` trait amd ::new method for it,
+/// Declare payload type, implement `Payload` trait and ::new method for it,
 /// declare setters trait and implement it for all type which have payload.
 #[macro_use]
 macro_rules! impl_payload {
     (
+        $(
+            @[$multipart_attr:ident]
+        )?
         $(
             #[ $($method_meta:tt)* ]
         )*
@@ -241,6 +244,8 @@ macro_rules! impl_payload {
         }
 
         impl<P> $Setters for P where P: crate::requests::HasPayload<Payload = $Method> {}
+
+        impl_payload! { @[$($multipart_attr)?] $Method req { $($($fields),*)? } opt { $($($opt_fields),*)? } }
     };
     (@setter_opt $Method:ident $field:ident : $FTy:ty [into]) => {
         calculated_doc! {
@@ -380,6 +385,11 @@ macro_rules! impl_payload {
     (@convert_map ($e:expr)) => {
         $e
     };
+    (@[multipart] $Method:ident req { $($reqf:ident),* } opt { $($optf:ident),*} ) => {
+        impl crate::requests::MultipartPayload for $Method {}
+        impl crate::requests::multipart_payload::sealed::Sealed for $Method {}
+    };
+    (@[] $($ignored:tt)*) => {}
 }
 
 #[macro_use]
diff --git a/src/net/request.rs b/src/net/request.rs
index b8726001..1ab76873 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -59,9 +59,10 @@ where
         tokio::time::sleep(DELAY_ON_SERVER_ERROR).await;
     }
 
-    serde_json::from_str::<TelegramResponse<T>>(
-        &response.text().await.map_err(RequestError::NetworkError)?,
-    )
+    serde_json::from_str::<TelegramResponse<T>>(dbg!(&response
+        .text()
+        .await
+        .map_err(RequestError::NetworkError)?))
     .map_err(RequestError::InvalidJson)?
     .into()
 }
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index e0eabc79..2541b79d 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{InputSticker, MaskPosition, True};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to add a new sticker to a set created by the bot. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns _True_ on success.
     #[derive(Debug, PartialEq, Clone, Serialize)]
     pub AddStickerToSet (AddStickerToSetSetters) => True {
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 7cb28587..f5c3a849 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index 8abddc59..ffc4f8ee 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index a168b72b..356757c7 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index 5572c136..c9d2b511 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index ce2fc4bb..5c716a20 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{InputSticker, MaskPosition, True};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\_sticker_ or _tgs\_sticker_. Returns _True_ on success.
     #[derive(Debug, PartialEq, Clone, Serialize)]
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index b27666aa..a6a5906e 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index 1eaf60be..5070cff5 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 22be46fc..3bf206f4 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index f4c4dc22..78d4f0c1 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index cf741a3d..6a2cf0d5 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 58608b40..ddcdd6b9 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 1d9d75cf..819d6b83 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 47d1f047..322e40e0 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 99a477fd..1d650933 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index ebf88244..958d147d 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index f1c2a823..8462873d 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 54f7344f..70d17489 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index ef3f0c9e..40af6ab8 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index f49aa53a..5d8e72b5 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 4ecdbfc3..90f08afc 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index 86b861c2..1e8fc54e 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 2afb7845..f1248b0f 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index c04619d0..2abd7787 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 63af85dd..b950cbeb 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index b29f05ed..e78ac0f4 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index dd48952b..4a363da0 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index b5e29fd6..921ed5a7 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index 565a607d..b61320a4 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index a47285b7..d84ccbe5 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 8d75475a..29193161 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index 96c96f7b..a30bfd2b 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 12965cc2..beaec909 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 02cc174e..2bc88808 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index daf89088..bd3414e5 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index a51d6c6c..d456192d 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index ad7b1e84..c96dc435 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 831d7fc6..feb81b30 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 9d4bc68c..b16b2a47 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 10a1d685..10ba222c 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 6e69e562..cd6d010e 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). On success, the sent [`Message`] is returned. Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 9ae5a396..95bc7f21 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send audio files, if you want Telegram clients to display them in the music player. Your audio must be in the .MP3 or .M4A format. On success, the sent [`Message`] is returned. Bots can currently send audio files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// For sending voice messages, use the [`SendVoice`] method instead.
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 90cf1661..8b614607 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index e97d6148..215cd02f 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 759a6146..7f885f91 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index de5854df..828b7314 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send general files. On success, the sent [`Message`] is returned. Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index b16536d9..e62e557f 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index e6b6dd06..db8740af 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 712072bb..f95cc19e 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 2b7eb24f..9593a330 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index e8757285..609bfb28 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index b1ea5ae4..6d9b8fe1 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send photos. On success, the sent [`Message`] is returned.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 870c8c0b..cbe48b33 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index f2d7254e..3992ab53 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send static .WEBP or [animated] .TGS stickers. On success, the sent Message is returned.
     ///
     /// [animated]: https://telegram.org/blog/animated-stickers
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 7d47446c..361db666 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index db789a09..49b585d5 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send video files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Document`]: crate::types::Document
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index c53c00bc..49f6ac29 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
     ///
     /// [v.4.0]: https://core.telegram.org/bots/api#document
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 77605534..9b7a7698 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Document`]: crate::types::Document
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 8eb39719..bf9ea9f4 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index 9e0650f7..f5239b2e 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 8aa73f8c..c41b0a77 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 7578ae27..4d4d4d3b 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SetChatPhoto (SetChatPhotoSetters) => String {
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 353f12f3..4ce833b9 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 06c77581..bdd605b6 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 75a32821..a0cda56f 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 4adbc8ac..c1f699c3 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 854fa351..2919a13b 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 021ce4b9..05321a36 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 30abb8a1..45804e7e 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index 62e7af35..a515e230 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{InputFile, True};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SetStickerSetThumb (SetStickerSetThumbSetters) => True {
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 65ee07e1..f584b6de 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{AllowedUpdate, InputFile, True};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized [`Update`]. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
     ///
     /// If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. `https://www.example.com/<token>`. Since nobody else knows your bot's token, you can be pretty sure it's us.
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index e93caada..ae251505 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index b51a3572..09519515 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index 1d50c4bf..708e920f 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 05c46665..4b7ae1ba 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index d01945e2..04471d8c 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index c303f05b..e8777d76 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -6,6 +6,7 @@ use serde::Serialize;
 use crate::types::{File, InputFile};
 
 impl_payload! {
+    @[multipart]
     /// Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub UploadStickerFile (UploadStickerFileSetters) => File {
diff --git a/src/requests.rs b/src/requests.rs
index 84e933e6..4ed846f3 100644
--- a/src/requests.rs
+++ b/src/requests.rs
@@ -1,8 +1,9 @@
 //! Telegram API requests.
 
 pub use self::{
-    has_payload::HasPayload, json::JsonRequest, multipart::MultipartRequest, payload::Payload,
-    request::Request, requester::Requester, requester_ext::RequesterExt,
+    has_payload::HasPayload, json::JsonRequest, multipart::MultipartRequest,
+    multipart_payload::MultipartPayload, payload::Payload, request::Request, requester::Requester,
+    requester_ext::RequesterExt,
 };
 
 /// A type that is returned after making a request to Telegram.
@@ -14,6 +15,7 @@ pub type Output<T> = <<T as HasPayload>::Payload as Payload>::Output;
 mod has_payload;
 mod json;
 mod multipart;
+pub(crate) mod multipart_payload;
 mod payload;
 mod request;
 mod requester;
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 5b2ea867..87d5f884 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -2,7 +2,7 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
     bot::Bot,
-    requests::{HasPayload, Payload, Request, ResponseResult},
+    requests::{HasPayload, MultipartPayload, Payload, Request, ResponseResult},
     RequestError,
 };
 
@@ -33,7 +33,7 @@ where
     // (though critically, currently we have no
     // non-'static payloads)
     P: 'static,
-    P: Payload + Serialize,
+    P: Payload + MultipartPayload + Serialize,
     P::Output: DeserializeOwned,
 {
     type Err = RequestError;
@@ -67,7 +67,7 @@ where
 impl<P> core::ops::Deref for MultipartRequest<P>
 where
     P: 'static,
-    P: Payload + Serialize,
+    P: Payload + MultipartPayload,
     P::Output: DeserializeOwned,
 {
     type Target = P;
@@ -80,7 +80,7 @@ where
 impl<P> core::ops::DerefMut for MultipartRequest<P>
 where
     P: 'static,
-    P: Payload + Serialize,
+    P: Payload + MultipartPayload,
     P::Output: DeserializeOwned,
 {
     fn deref_mut(&mut self) -> &mut Self::Target {
@@ -95,7 +95,7 @@ req_future! {
     pub Send<U> (inner0) -> ResponseResult<U::Output>
     where
         U: 'static,
-        U: Payload + Serialize,
+        U: Payload + MultipartPayload + Serialize,
         U::Output: DeserializeOwned,
 }
 
@@ -106,6 +106,6 @@ req_future! {
     pub SendRef<U> (inner1) -> ResponseResult<U::Output>
     where
         U: 'static,
-        U: Payload + Serialize,
+        U: Payload + MultipartPayload + Serialize,
         U::Output: DeserializeOwned,
 }
diff --git a/src/requests/multipart_payload.rs b/src/requests/multipart_payload.rs
new file mode 100644
index 00000000..49c5d63d
--- /dev/null
+++ b/src/requests/multipart_payload.rs
@@ -0,0 +1,19 @@
+use crate::{payloads, requests::Payload};
+
+/// This is a future proof trait. It is `sealed` and can change at any time.
+pub trait MultipartPayload: Payload + sealed::Sealed {}
+
+// HACK(waffle): Sealed trait allows us to change `MultipartPayload` without
+//               breaking changes & refactor multipart requests later.
+pub(crate) mod sealed {
+    pub trait Sealed {}
+}
+
+impl sealed::Sealed for payloads::SendMediaGroup {}
+impl MultipartPayload for payloads::SendMediaGroup {}
+
+impl sealed::Sealed for payloads::EditMessageMedia {}
+impl MultipartPayload for payloads::EditMessageMedia {}
+
+impl sealed::Sealed for payloads::EditMessageMediaInline {}
+impl MultipartPayload for payloads::EditMessageMediaInline {}
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 2cdb4637..6726c0f5 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -410,9 +410,9 @@ impl InputMediaDocument {
     }
 }
 
-impl InputMedia {
-    pub fn media(&self) -> &InputFile {
-        match self {
+impl From<InputMedia> for InputFile {
+    fn from(media: InputMedia) -> InputFile {
+        match media {
             InputMedia::Photo(InputMediaPhoto { media, .. })
             | InputMedia::Document(InputMediaDocument { media, .. })
             | InputMedia::Audio(InputMediaAudio { media, .. })
@@ -422,9 +422,10 @@ impl InputMedia {
     }
 }
 
-impl From<InputMedia> for InputFile {
-    fn from(media: InputMedia) -> InputFile {
-        match media {
+impl InputMedia {
+    #[allow(dead_code)]
+    pub(crate) fn media(&self) -> &InputFile {
+        match self {
             InputMedia::Photo(InputMediaPhoto { media, .. })
             | InputMedia::Document(InputMediaDocument { media, .. })
             | InputMedia::Audio(InputMediaAudio { media, .. })

From 417b8eb1e175a9deb91f2b9b37591a7a00756dde Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Feb 2021 17:10:02 +0300
Subject: [PATCH 231/755] Add `#[non_exhaustive]` on `InputFile`

---
 CHANGELOG.md            | 1 +
 src/types/input_file.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07cda31b..51452b94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `#[non_exhaustive]` on `InputFile` since we may want to add new ways to send files in the future ([#49][pr49])
 - `MultipartPayload` for future proofing ([#49][pr49])
 - Support for `rustls` ([#24][pr24])
 - `#[must_use]` attr to payloads implemented by macro ([#22][pr22])
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index eb9bd600..4ace6e85 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -6,6 +6,7 @@ use std::{borrow::Cow, path::PathBuf};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputfile).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub enum InputFile {
     File(PathBuf),
     Memory {

From 669d6c95bed566a2c47ec67cbd647c71692053f2 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Feb 2021 18:29:29 +0300
Subject: [PATCH 232/755] Make some cleanup of throttle

---
 CHANGELOG.md             |   3 +-
 src/adaptors/throttle.rs | 145 +++++++++++++++++++++++----------------
 2 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51452b94..3d64b17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `RequesterExt` trait which is implemented for all `Requester`s and allows easily wrapping them in adaptors
 - `adaptors` module ([#14][pr14])
   - `throttle`, `cache_me`, `auto_send` and `full` crate features
-  - Request throttling - opt-in feature represented by `Throttle` bot adapter which allows automatically checking telegram limits ([#10][pr10], [#46][pr46])
+  - Request throttling - opt-in feature represented by `Throttle` bot adapter which allows automatically checking telegram limits ([#10][pr10], [#46][pr46], [#50][pr50])
   - Request auto sending - ability to `.await` requests without need to call `.send()` (opt-in feature represented by `AutoSend` bot adapter, [#8][pr8])
   - `get_me` caching (opt-in feature represented by `CacheMe` bot adapter)
 - `Requester` trait which represents bot-clients ([#7][pr7], [#12][pr12], [#27][pr27])
@@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr39]: https://github.com/teloxide/teloxide-core/pull/39
 [pr46]: https://github.com/teloxide/teloxide-core/pull/46
 [pr49]: https://github.com/teloxide/teloxide-core/pull/49
+[pr50]: https://github.com/teloxide/teloxide-core/pull/50
 
 ### Changed
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 86651891..ac27b177 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -18,7 +18,7 @@ use tokio::sync::{
 use vecrem::VecExt;
 
 use crate::{
-    adaptors::throttle::chan_send::{ChanSend, SendTy},
+    adaptors::throttle::chan_send::{ChanSend, MpscSend},
     requests::{HasPayload, Output, Request, Requester},
     types::*,
 };
@@ -150,7 +150,7 @@ impl Default for Limits {
 pub struct Throttle<B> {
     bot: B,
     // Sender<Never> is used to pass the signal to unlock by closing the channel.
-    queue: mpsc::Sender<(ChatIdHash, Sender<Never>)>,
+    queue: mpsc::Sender<(ChatIdHash, RequestLock)>,
 }
 
 type RequestsSent = u32;
@@ -164,11 +164,11 @@ struct RequestsSentToChats {
     per_sec: HashMap<ChatIdHash, RequestsSent>,
 }
 
-async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, Sender<Never>)>) {
+async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>) {
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(ChatIdHash, Sender<Never>)> =
+    let mut queue: Vec<(ChatIdHash, RequestLock)> =
         Vec::with_capacity(limits.messages_per_sec_overall as usize);
 
     let mut history: VecDeque<(ChatIdHash, Instant)> = VecDeque::new();
@@ -268,7 +268,8 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, Sender<Never
                 history.push_back((*chat, Instant::now()));
 
                 // Close the channel and unlock the associated request.
-                drop(entry.remove());
+                let (_, lock) = entry.remove();
+                lock.unlock();
 
                 // We have "sent" one request, so now we can send one less.
                 allowed -= 1;
@@ -285,11 +286,7 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, Sender<Never
     }
 }
 
-async fn read_from_rx(
-    rx: &mut mpsc::Receiver<(ChatIdHash, Sender<Never>)>,
-    queue: &mut Vec<(ChatIdHash, Sender<Never>)>,
-    rx_is_closed: &mut bool,
-) {
+async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
     if queue.is_empty() {
         match rx.recv().await {
             Some(req) => queue.push(req),
@@ -359,11 +356,11 @@ impl<B> Throttle<B> {
 
 macro_rules! f {
     ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
-        ThrottlingRequest(
-            $this.inner().$m($($arg),*),
-            $this.queue.clone(),
-            |p| (&p.payload_ref().chat_id).into(),
-        )
+        ThrottlingRequest {
+            request: $this.inner().$m($($arg),*),
+            chat_id: |p| (&p.payload_ref().chat_id).into(),
+            worker: $this.queue.clone(),
+        }
     };
 }
 
@@ -436,8 +433,8 @@ where
         C: Into<String>,
         Pri: IntoIterator<Item = LabeledPrice>,
     {
-        ThrottlingRequest(
-            self.inner().send_invoice(
+        ThrottlingRequest {
+            request: self.inner().send_invoice(
                 chat_id,
                 title,
                 description,
@@ -447,9 +444,9 @@ where
                 currency,
                 prices,
             ),
-            self.queue.clone(),
-            |p| ChatIdHash::Id(p.payload_ref().chat_id as _),
-        )
+            chat_id: |p| ChatIdHash::Id(p.payload_ref().chat_id as _),
+            worker: self.queue.clone(),
+        }
     }
 
     requester_forward! {
@@ -506,21 +503,21 @@ impl From<&ChatId> for ChatIdHash {
     }
 }
 
-pub struct ThrottlingRequest<R: HasPayload>(
-    R,
-    mpsc::Sender<(ChatIdHash, Sender<Never>)>,
-    fn(&R::Payload) -> ChatIdHash,
-);
+pub struct ThrottlingRequest<R: HasPayload> {
+    request: R,
+    chat_id: fn(&R::Payload) -> ChatIdHash,
+    worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
+}
 
 impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
 
     fn payload_mut(&mut self) -> &mut Self::Payload {
-        self.0.payload_mut()
+        self.request.payload_mut()
     }
 
     fn payload_ref(&self) -> &Self::Payload {
-        self.0.payload_ref()
+        self.request.payload_ref()
     }
 }
 
@@ -534,18 +531,27 @@ where
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
-        let id = self.2(self.payload_ref());
-        let send = self.1.send_t((id, tx));
-        ThrottlingSend(ThrottlingSendInner::Registering {
-            request: self.0,
+        let tx = RequestLock(tx);
+        let rx = RequestWaiter(rx);
+
+        let chat_id = (self.chat_id)(self.payload_ref());
+        let send = self.worker.send1((chat_id, tx));
+
+        let inner = ThrottlingSendInner::Registering {
+            request: self.request,
             send,
             wait: rx,
-        })
+        };
+        ThrottlingSend(inner)
     }
 
     fn send_ref(&self) -> Self::SendRef {
         let (tx, rx) = channel();
-        let send = self.1.clone().send_t((self.2(self.payload_ref()), tx));
+        let tx = RequestLock(tx);
+        let rx = RequestWaiter(rx);
+
+        let chat_id = (self.chat_id)(self.payload_ref());
+        let send = self.worker.clone().send1((chat_id, tx));
 
         // As we can't move self.0 (request) out, as we do in `send` we are
         // forced to call `send_ref()`. This may have overhead and/or lead to
@@ -553,13 +559,14 @@ where
         //
         // However `Request` documentation explicitly notes that `send{,_ref}`
         // should **not** do any kind of work, so it's ok.
-        let request = self.0.send_ref();
+        let request = self.request.send_ref();
 
-        ThrottlingSendRef(ThrottlingSendRefInner::Registering {
+        let inner = ThrottlingSendRefInner::Registering {
             request,
             send,
             wait: rx,
-        })
+        };
+        ThrottlingSendRef(inner)
     }
 }
 
@@ -571,13 +578,13 @@ enum ThrottlingSendInner<R: Request> {
     Registering {
         request: R,
         #[pin]
-        send: ChanSend,
-        wait: Receiver<Never>,
+        send: ChanSend<(ChatIdHash, RequestLock)>,
+        wait: RequestWaiter,
     },
     Pending {
         request: R,
         #[pin]
-        wait: Receiver<Never>,
+        wait: RequestWaiter,
     },
     Sent {
         #[pin]
@@ -658,13 +665,13 @@ enum ThrottlingSendRefInner<R: Request> {
     Registering {
         request: R::SendRef,
         #[pin]
-        send: ChanSend,
-        wait: Receiver<Never>,
+        send: ChanSend<(ChatIdHash, RequestLock)>,
+        wait: RequestWaiter,
     },
     Pending {
         request: R::SendRef,
         #[pin]
-        wait: Receiver<Never>,
+        wait: RequestWaiter,
     },
     Sent {
         #[pin]
@@ -736,38 +743,56 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
     }
 }
 
+#[must_use]
+struct RequestLock(Sender<Never>);
+
+impl RequestLock {
+    fn unlock(self) {
+        // Unlock request by closing oneshot channel
+    }
+}
+
+#[must_use]
+#[pin_project::pin_project]
+struct RequestWaiter(#[pin] Receiver<Never>);
+
+impl Future for RequestWaiter {
+    type Output = ();
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+        let this = self.project();
+        match this.0.poll(cx) {
+            Poll::Ready(_) => Poll::Ready(()),
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
+
 mod chan_send {
     use std::{future::Future, pin::Pin};
 
     use futures::task::{Context, Poll};
-    use never::Never;
-    use tokio::sync::{mpsc, mpsc::error::SendError, oneshot::Sender};
+    use tokio::sync::{mpsc, mpsc::error::SendError};
 
-    use crate::adaptors::throttle::ChatIdHash;
-
-    pub(super) trait SendTy {
-        fn send_t(self, val: (ChatIdHash, Sender<Never>)) -> ChanSend;
+    pub(super) trait MpscSend<T> {
+        fn send1(self, val: T) -> ChanSend<T>;
     }
 
     #[pin_project::pin_project]
-    pub(super) struct ChanSend(#[pin] Inner);
+    pub(super) struct ChanSend<T>(#[pin] Inner<T>);
 
     #[cfg(not(feature = "nightly"))]
-    type Inner =
-        Pin<Box<dyn Future<Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>> + Send>>;
+    type Inner<T> = Pin<Box<dyn Future<Output = Result<(), SendError<T>>> + Send>>;
     #[cfg(feature = "nightly")]
-    type Inner = impl Future<Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>>;
+    type Inner<T> = impl Future<Output = Result<(), SendError<T>>>;
 
-    impl SendTy for mpsc::Sender<(ChatIdHash, Sender<Never>)> {
+    impl<T: Send + 'static> MpscSend<T> for mpsc::Sender<T> {
         // `return`s trick IDEA not to show errors
         #[allow(clippy::needless_return)]
-        fn send_t(self, val: (ChatIdHash, Sender<Never>)) -> ChanSend {
+        fn send1(self, val: T) -> ChanSend<T> {
             #[cfg(feature = "nightly")]
             {
-                fn def(
-                    sender: mpsc::Sender<(ChatIdHash, Sender<Never>)>,
-                    val: (ChatIdHash, Sender<Never>),
-                ) -> Inner {
+                fn def<T>(sender: mpsc::Sender<T>, val: T) -> Inner<T> {
                     async move { sender.send(val).await }
                 }
                 return ChanSend(def(self, val));
@@ -780,8 +805,8 @@ mod chan_send {
         }
     }
 
-    impl Future for ChanSend {
-        type Output = Result<(), SendError<(ChatIdHash, Sender<Never>)>>;
+    impl<T> Future for ChanSend<T> {
+        type Output = Result<(), SendError<T>>;
 
         fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
             self.project().0.poll(cx)

From 72306c39d977baca503547670fd9b6b470cb1730 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Feb 2021 18:49:18 +0300
Subject: [PATCH 233/755] Limit queue growth in throttle

---
 src/adaptors/throttle.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index ac27b177..26bdee77 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -178,6 +178,7 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)
 
     while !rx_is_closed || !queue.is_empty() {
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
+        debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
 
         // _Maybe_ we need to use `spawn_blocking` here, because there is
         // decent amount of blocking work. However _for now_ I've decided not
@@ -294,7 +295,8 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
         }
     }
 
-    loop {
+    // Don't grow queue bigger than the capacity to limit DOS posibility
+    while queue.len() < queue.capacity() {
         // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
         match rx.recv().now_or_never() {
             Some(Some(req)) => queue.push(req),

From 80329f8a1ee08fb8efc1ec1a72ad304b39a2226b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Feb 2021 19:07:50 +0300
Subject: [PATCH 234/755] Throttle: make comment up to date & add channel fn

---
 src/adaptors/throttle.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 26bdee77..c431611d 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -13,7 +13,7 @@ use futures::{
 use never::Never;
 use tokio::sync::{
     mpsc,
-    oneshot::{channel, Receiver, Sender},
+    oneshot::{self, Receiver, Sender},
 };
 use vecrem::VecExt;
 
@@ -129,7 +129,6 @@ impl Default for Limits {
 /// ```no_run (throttle fails to spawn task without tokio runtime)
 /// use teloxide_core::{adaptors::throttle::Limits, requests::RequesterExt, Bot};
 ///
-/// # #[allow(deprecated)]
 /// let bot = Bot::new("TOKEN").throttle(Limits::default());
 ///
 /// /* send many requests here */
@@ -149,7 +148,7 @@ impl Default for Limits {
 /// wrapper.
 pub struct Throttle<B> {
     bot: B,
-    // Sender<Never> is used to pass the signal to unlock by closing the channel.
+    // `RequestLock` allows to unlock requests (allowing them to be sent).
     queue: mpsc::Sender<(ChatIdHash, RequestLock)>,
 }
 
@@ -533,8 +532,6 @@ where
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
-        let tx = RequestLock(tx);
-        let rx = RequestWaiter(rx);
 
         let chat_id = (self.chat_id)(self.payload_ref());
         let send = self.worker.send1((chat_id, tx));
@@ -549,8 +546,6 @@ where
 
     fn send_ref(&self) -> Self::SendRef {
         let (tx, rx) = channel();
-        let tx = RequestLock(tx);
-        let rx = RequestWaiter(rx);
 
         let chat_id = (self.chat_id)(self.payload_ref());
         let send = self.worker.clone().send1((chat_id, tx));
@@ -745,6 +740,13 @@ impl<R: Request> Future for ThrottlingSendRef<R> {
     }
 }
 
+fn channel() -> (RequestLock, RequestWaiter) {
+    let (tx, rx) = oneshot::channel();
+    let tx = RequestLock(tx);
+    let rx = RequestWaiter(rx);
+    (tx, rx)
+}
+
 #[must_use]
 struct RequestLock(Sender<Never>);
 

From 2f78da091ad57d9f291535639b2b2f1718b82c80 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 17 Feb 2021 00:06:37 +0300
Subject: [PATCH 235/755] fill fields in Cargo.toml before releasing the lib

---
 Cargo.toml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 2e6240fc..ebe550c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "teloxide-core"
+description = "Core part of the `teloxide` library - telegram bot API client"
 version = "0.1.0"
 edition = "2018"
 authors = [
@@ -13,6 +14,20 @@ authors = [
     "Alexey Fedechkin <aleksey-fedechkin@rambler.ru>"
 ]
 
+license = "MIT"
+repository = "https://github.com/teloxide/teloxide-core/"
+homepage = "https://github.com/teloxide/teloxide-core/"
+documentation = "https://docs.rs/teloxide-core/"
+readme = "README.md"
+
+keywords = ["telegram", "bot", "tba"]
+categories = ["API bindings", "Asynchronous"]
+
+exclude = [
+    ".github/*",
+    "netlify.toml",
+]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

From 6b9e278578d0f90eca52c8d04e8aa8caa8133916 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 17 Feb 2021 00:17:14 +0300
Subject: [PATCH 236/755] fix crates.io categories

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ebe550c5..db36dd25 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ documentation = "https://docs.rs/teloxide-core/"
 readme = "README.md"
 
 keywords = ["telegram", "bot", "tba"]
-categories = ["API bindings", "Asynchronous"]
+categories = ["api-bindings", "asynchronous"]
 
 exclude = [
     ".github/*",

From 7c18750a8f15b30d8fedec6f30a61c1ce5b2015a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 17 Feb 2021 14:23:13 +0300
Subject: [PATCH 237/755] Remove dbg! print

---
 Cargo.toml         | 2 +-
 src/net/request.rs | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ebe550c5..ea38f146 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
diff --git a/src/net/request.rs b/src/net/request.rs
index 1ab76873..b8726001 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -59,10 +59,9 @@ where
         tokio::time::sleep(DELAY_ON_SERVER_ERROR).await;
     }
 
-    serde_json::from_str::<TelegramResponse<T>>(dbg!(&response
-        .text()
-        .await
-        .map_err(RequestError::NetworkError)?))
+    serde_json::from_str::<TelegramResponse<T>>(
+        &response.text().await.map_err(RequestError::NetworkError)?,
+    )
     .map_err(RequestError::InvalidJson)?
     .into()
 }

From a61d81d829d4770ad58df4f63d804279f06c037b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 17 Feb 2021 16:04:04 +0300
Subject: [PATCH 238/755] Update changelog

---
 CHANGELOG.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d64b17f..62aebd43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+
+## [0.1.1] - 2020-02-17
+
+### Fixed
+
+- Remove `dbg!` call from internals ([#53][pr53])
+
+[pr53]: https://github.com/teloxide/teloxide-core/pull/53
+
+## [0.1.0] - 2020-02-17
+
 ### Added
 
 - `#[non_exhaustive]` on `InputFile` since we may want to add new ways to send files in the future ([#49][pr49])
@@ -45,8 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr7]: https://github.com/teloxide/teloxide-core/pull/7
 [pr8]: https://github.com/teloxide/teloxide-core/pull/8
 [pr10]: https://github.com/teloxide/teloxide-core/pull/10
-[pr12]: https://github.com/teloxide/teloxide-core/pull/10
-[pr14]: https://github.com/teloxide/teloxide-core/pull/10
+[pr12]: https://github.com/teloxide/teloxide-core/pull/12
+[pr14]: https://github.com/teloxide/teloxide-core/pull/14
 [pr22]: https://github.com/teloxide/teloxide-core/pull/22
 [pr24]: https://github.com/teloxide/teloxide-core/pull/24
 [pr26]: https://github.com/teloxide/teloxide-core/pull/26

From 539d7758f57045e493f2a0d01ef20fcb6c5276d6 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 22 Feb 2021 07:41:33 +0600
Subject: [PATCH 239/755] Centralise README.md

---
 README.md | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 0e01f9b1..88a49a07 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,37 @@
 <div align="center">
   <img src="media/logo.svg" width="250"/>
+
+  <h1>teloxide-core</h1>
+  <a href="https://github.com/teloxide/teloxide-core/actions">
+    <img src="https://github.com/teloxide/teloxide-core/workflows/Continuous%20integration/badge.svg">
+  </a>
+  <a href="https://docs.rs/teloxide_core/">
+    <img src="https://docs.rs/teloxide_core/badge.svg">
+  </a>
+  <a href="https://teloxide-core.netlify.com">
+    <img src="https://img.shields.io/badge/docs-master-blue">
+  </a>
+  <a href="LICENSE">
+    <img src="https://img.shields.io/badge/license-MIT-blue.svg">
+  </a>
+  <a href="https://core.telegram.org/bots/api">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.4.9%20(inclusively)-green.svg">
+  </a>
+  <a href="https://crates.io/crates/teloxide_core">
+    <img src="https://img.shields.io/crates/v/teloxide_core.svg">
+  </a>
+  <a href="https://t.me/teloxide">
+    <img src="https://img.shields.io/badge/official%20chat-t.me%2Fteloxide-blueviolet">
+  </a>
+
+  The core part of [teloxide] providing tools for making requests to the [Telegram Bot API] with ease. This library is fully asynchronous and built using [tokio].
 </div>
 
-# teloxide-core
-
-[![CI status](https://github.com/teloxide/teloxide-core/workflows/Continuous%20integration/badge.svg)](https://github.com/teloxide/teloxide-core/actions)
-[![documentation](https://docs.rs/teloxide_core/badge.svg)](https://docs.rs/teloxide_core/)
-[![documentation (master)](https://img.shields.io/badge/docs-master-blue)](https://teloxide-core.netlify.com)
-[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
-[![Api Cov](https://img.shields.io/badge/API%20coverage-Up%20to%200.4.9%20(inclusively)-green.svg)](https://core.telegram.org/bots/api)
-[![crates.io](https://img.shields.io/crates/v/teloxide_core.svg)](https://crates.io/crates/teloxide_core)
-[![Official Chat](https://img.shields.io/badge/official%20chat-t.me%2Fteloxide-blueviolet)](https://t.me/teloxide)
-
-
-
-Core part of the [`teloxide`] library.
-
-This library provides tools for making requests to the [Telegram Bot API]
-(Currently, version `4.9` is supported) with ease. The library is fully
-asynchronouns and built using [`tokio`].
-
 ```toml
 teloxide_core = "0.1"
 ```
-_Compiler support: requires rustc 1.49+_
+_Compiler support: requires rustc 1.49+_.
 
-[`teloxide`]: https://docs.rs/teloxide
+[teloxide]: https://docs.rs/teloxide
 [Telegram Bot API]: https://core.telegram.org/bots/api
-[`tokio`]: https://tokio.rs
\ No newline at end of file
+[tokio]: https://tokio.rs

From dcdba782856ddb88558b782392dd26d3cdf2910c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Feb 2021 08:47:50 +0300
Subject: [PATCH 240/755] Fix send_contact singnature

- `phone_number: f64` -> `phone_number: String`
- `first_name: f64` -> `first_name: String`
---
 CHANGELOG.md                 |  5 +++++
 src/bot/api.rs               |  4 +++-
 src/local_macros.rs          |  8 +++++---
 src/payloads/send_contact.rs |  6 +++---
 src/requests/requester.rs    | 13 ++++++++++---
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62aebd43..a6479ddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Fixed
+
+- `send_contact` signature (`phone_number` and `first_name` `f64` => `String`) ([#56][pr56])
+
+[pr56]: https://github.com/teloxide/teloxide-core/pull/56
 
 ## [0.1.1] - 2020-02-17
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 86997994..0cbcf24f 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -267,9 +267,11 @@ impl Requester for Bot {
 
     type SendContact = JsonRequest<payloads::SendContact>;
 
-    fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact
+    fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> Self::SendContact
     where
         C: Into<ChatId>,
+        P: Into<String>,
+        F: Into<String>,
     {
         Self::SendContact::new(
             self.clone(),
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 1129e983..357e17b9 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -393,7 +393,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -582,9 +582,11 @@ macro_rules! requester_forward {
     (@method send_contact $body:ident $ty:ident) => {
         type SendContact = $ty![SendContact];
 
-        fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact where C: Into<ChatId> {
+        fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> Self::SendContact where C: Into<ChatId>,
+        P: Into<String>,
+        F: Into<String> {
             let this = self;
-            $body!(send_contact this (chat_id: C, phone_number: f64, first_name: f64))
+            $body!(send_contact this (chat_id: C, phone_number: P, first_name: F))
         }
     };
     (@method send_poll $body:ident $ty:ident) => {
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 215cd02f..f6b464fc 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -9,15 +9,15 @@ impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
     ///
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Clone, Serialize)]
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendContact (SendContactSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Contact's phone number
-            pub phone_number: f64,
+            pub phone_number: String [into],
             /// Contact's first name
-            pub first_name: f64,
+            pub first_name: String [into],
         }
         optional {
             /// Contact's last name
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 68ea02b9..0335ca02 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -53,7 +53,7 @@ pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (be02d84).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -251,9 +251,16 @@ pub trait Requester {
     type SendContact: Request<Payload = SendContact, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendContact`].
-    fn send_contact<C>(&self, chat_id: C, phone_number: f64, first_name: f64) -> Self::SendContact
+    fn send_contact<C, P, F>(
+        &self,
+        chat_id: C,
+        phone_number: P,
+        first_name: F,
+    ) -> Self::SendContact
     where
-        C: Into<ChatId>;
+        C: Into<ChatId>,
+        P: Into<String>,
+        F: Into<String>;
 
     type SendPoll: Request<Payload = SendPoll, Err = Self::Err>;
 

From 7025de58f56357283280aec0e6fcdb648bf46034 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Feb 2021 11:30:13 +0300
Subject: [PATCH 241/755] Fix typos in payloads

- `get_updates`: `offset` `i64` -> `i32`
- `send_location`: make `live_period` optional
---
 CHANGELOG.md                  |  4 ++++
 src/bot/api.rs                | 10 ++--------
 src/local_macros.rs           |  4 ++--
 src/payloads/get_updates.rs   |  2 +-
 src/payloads/send_location.rs |  4 ++--
 src/requests/requester.rs     |  8 +-------
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6479ddc..5cf4b84a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix typos in payloads ([#57][pr57]):
+  - `get_updates`: `offset` `i64` -> `i32`
+  - `send_location`: make `live_period` optional
 - `send_contact` signature (`phone_number` and `first_name` `f64` => `String`) ([#56][pr56])
 
 [pr56]: https://github.com/teloxide/teloxide-core/pull/56
+[pr57]: https://github.com/teloxide/teloxide-core/pull/57
 
 ## [0.1.1] - 2020-02-17
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 0cbcf24f..6ee44da9 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -158,19 +158,13 @@ impl Requester for Bot {
 
     type SendLocation = JsonRequest<payloads::SendLocation>;
 
-    fn send_location<C>(
-        &self,
-        chat_id: C,
-        latitude: f64,
-        longitude: f64,
-        live_period: u32,
-    ) -> Self::SendLocation
+    fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation
     where
         C: Into<ChatId>,
     {
         Self::SendLocation::new(
             self.clone(),
-            payloads::SendLocation::new(chat_id, latitude, longitude, live_period),
+            payloads::SendLocation::new(chat_id, latitude, longitude),
         )
     }
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 357e17b9..bf743779 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -532,9 +532,9 @@ macro_rules! requester_forward {
     (@method send_location $body:ident $ty:ident) => {
         type SendLocation = $ty![SendLocation];
 
-        fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64, live_period: u32) -> Self::SendLocation where C: Into<ChatId> {
+        fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation where C: Into<ChatId> {
             let this = self;
-            $body!(send_location this (chat_id: C, latitude: f64, longitude: f64, live_period: u32))
+            $body!(send_location this (chat_id: C, latitude: f64, longitude: f64))
         }
     };
     (@method edit_message_live_location $body:ident $ty:ident) => {
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index beaec909..df63aa63 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -17,7 +17,7 @@ impl_payload! {
             /// Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as [`GetUpdates`] is called with an offset higher than its update_id. The negative offset can be specified to retrieve updates starting from -offset update from the end of the updates queue. All previous updates will forgotten.
             ///
             /// [`GetUpdates`]: crate::payloads::GetUpdates
-            pub offset: i64,
+            pub offset: i32,
             /// Limits the number of updates to be retrieved. Values between 1-100 are accepted. Defaults to 100.
             pub limit: u8,
             /// Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. Should be positive, short polling should be used for testing purposes only.
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index f95cc19e..d9cbbd6e 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -18,12 +18,12 @@ impl_payload! {
             pub latitude: f64,
             /// Longitude of the location
             pub longitude: f64,
+        }
+        optional {
             /// Period in seconds for which the location will be updated (see [Live Locations], should be between 60 and 86400.
             ///
             /// [Live Locations]: https://telegram.org/blog/live-locations
             pub live_period: u32,
-        }
-        optional {
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 0335ca02..69a79199 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -166,13 +166,7 @@ pub trait Requester {
     type SendLocation: Request<Payload = SendLocation, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendLocation`].
-    fn send_location<C>(
-        &self,
-        chat_id: C,
-        latitude: f64,
-        longitude: f64,
-        live_period: u32,
-    ) -> Self::SendLocation
+    fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation
     where
         C: Into<ChatId>;
 

From a00678b81c51814d6c269cab6a16ed841f274359 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Mon, 22 Feb 2021 14:36:30 +0600
Subject: [PATCH 242/755] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 88a49a07..472a36ac 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@
     <img src="https://img.shields.io/badge/official%20chat-t.me%2Fteloxide-blueviolet">
   </a>
 
-  The core part of [teloxide] providing tools for making requests to the [Telegram Bot API] with ease. This library is fully asynchronous and built using [tokio].
+  The core part of [`teloxide`] providing tools for making requests to the [Telegram Bot API] with ease. This library is fully asynchronous and built using [`tokio`].
 </div>
 
 ```toml
@@ -32,6 +32,6 @@ teloxide_core = "0.1"
 ```
 _Compiler support: requires rustc 1.49+_.
 
-[teloxide]: https://docs.rs/teloxide
+[`teloxide`]: https://docs.rs/teloxide
 [Telegram Bot API]: https://core.telegram.org/bots/api
-[tokio]: https://tokio.rs
+[`tokio`]: https://tokio.rs

From 7e43c4d32168aa7b34086e17f9df3b612533f103 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 27 Feb 2021 01:07:57 +0300
Subject: [PATCH 243/755] Add GetUpdatesFaultTolerant

---
 CHANGELOG.md                               |  6 ++++++
 src/adaptors/auto_send.rs                  |  3 ++-
 src/adaptors/cache_me.rs                   |  2 +-
 src/adaptors/parse_mode.rs                 |  2 +-
 src/adaptors/throttle.rs                   |  2 +-
 src/bot/api.rs                             |  9 +++++++++
 src/local_macros.rs                        | 12 +++++++++---
 src/payloads.rs                            |  6 ++++++
 src/payloads/get_updates_fault_tolerant.rs | 18 ++++++++++++++++++
 src/requests/requester.rs                  | 10 ++++++++--
 10 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 src/payloads/get_updates_fault_tolerant.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cf4b84a..ad248230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- `GetUpdatesFaultTolerant` - fault toletant version of `GetUpdates` ([#58][pr58]) (**BC**)
+
+[pr58]: https://github.com/teloxide/teloxide-core/pull/58
+
 ### Fixed
 
 - Fix typos in payloads ([#57][pr57]):
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 3cacee42..f091eae8 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -101,7 +101,8 @@ where
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores => f, fty
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => f, fty
     }
 }
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 541c9d42..f964f6a4 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -118,7 +118,7 @@ where
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores => f, fty
+        set_game_score, set_game_score_inline, get_game_high_scores, get_updates_fault_tolerant => f, fty
     }
 }
 
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index f5802d2d..f35cd3b2 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -112,7 +112,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game, set_game_score,
-        set_game_score_inline, get_game_high_scores => fid, fty
+        set_game_score_inline, get_game_high_scores, get_updates_fault_tolerant => fid, fty
     }
 }
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index c431611d..efdda09f 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -469,7 +469,7 @@ where
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
         set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
-        get_game_high_scores => fid, ftyid
+        get_game_high_scores, get_updates_fault_tolerant => fid, ftyid
     }
 }
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 6ee44da9..7abb02ff 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -970,4 +970,13 @@ impl Requester for Bot {
             payloads::GetGameHighScores::new(user_id, target),
         )
     }
+
+    type GetUpdatesFaultTolerant = JsonRequest<payloads::GetUpdatesFaultTolerant>;
+
+    fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant {
+        Self::GetUpdatesFaultTolerant::new(
+            self.clone(),
+            payloads::GetUpdatesFaultTolerant(payloads::GetUpdates::new()),
+        )
+    }
 }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index bf743779..9c7fd33f 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -393,7 +393,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -403,8 +403,6 @@ macro_rules! requester_forward {
             requester_forward!(@method $rest $body $ty);
         )*
     };
-
-
     (@method get_updates $body:ident $ty:ident) => {
         type GetUpdates = $ty![GetUpdates];
 
@@ -1046,6 +1044,14 @@ macro_rules! requester_forward {
             $body!(get_game_high_scores this (user_id: u32, target: T))
         }
     };
+    (@method get_updates_fault_tolerant $body:ident $ty:ident) => {
+        type GetUpdatesFaultTolerant = $ty![GetUpdatesFaultTolerant];
+
+        fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant {
+            let this = self;
+            $body!(get_updates_fault_tolerant this ())
+        }
+    };
 }
 
 #[macro_use]
diff --git a/src/payloads.rs b/src/payloads.rs
index cf31ea9d..685fafba 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -178,3 +178,9 @@ pub use stop_poll::{StopPoll, StopPollSetters};
 pub use unban_chat_member::{UnbanChatMember, UnbanChatMemberSetters};
 pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
+
+// end of auto generated block
+
+mod get_updates_fault_tolerant;
+
+pub use get_updates_fault_tolerant::GetUpdatesFaultTolerant;
diff --git a/src/payloads/get_updates_fault_tolerant.rs b/src/payloads/get_updates_fault_tolerant.rs
new file mode 100644
index 00000000..6473815c
--- /dev/null
+++ b/src/payloads/get_updates_fault_tolerant.rs
@@ -0,0 +1,18 @@
+use serde::Serialize;
+
+use crate::{
+    payloads::GetUpdates,
+    requests::Payload,
+    types::{NonStrictVec, Update},
+};
+
+/// Fault tollerant version of [`GetUpdates`].
+#[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+#[serde(transparent)]
+pub struct GetUpdatesFaultTolerant(pub GetUpdates);
+
+impl Payload for GetUpdatesFaultTolerant {
+    type Output = NonStrictVec<Update>;
+
+    const NAME: &'static str = GetUpdates::NAME;
+}
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 69a79199..336f2c3c 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -53,7 +53,7 @@ pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (dec2d73).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -749,6 +749,11 @@ pub trait Requester {
     fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;
+
+    type GetUpdatesFaultTolerant: Request<Payload = GetUpdatesFaultTolerant, Err = Self::Err>;
+
+    /// For Telegram documentation see [`GetUpdatesFaultTolerant`].
+    fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant;
 }
 
 macro_rules! fty {
@@ -786,7 +791,8 @@ macro_rules! forward_all {
             add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
             set_sticker_set_thumb, send_invoice, answer_shipping_query,
             answer_pre_checkout_query, set_passport_data_errors, send_game,
-            set_game_score, set_game_score_inline, get_game_high_scores => fwd_deref, fty
+            set_game_score, set_game_score_inline, get_game_high_scores,
+            get_updates_fault_tolerant => fwd_deref, fty
         }
     };
 }

From 466dbe6f8dcd6200d241da4508390a060c6717c7 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 27 Feb 2021 18:38:02 +0600
Subject: [PATCH 244/755] Fix a documentation typo

---
 src/payloads/get_updates_fault_tolerant.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/payloads/get_updates_fault_tolerant.rs b/src/payloads/get_updates_fault_tolerant.rs
index 6473815c..b32d6f00 100644
--- a/src/payloads/get_updates_fault_tolerant.rs
+++ b/src/payloads/get_updates_fault_tolerant.rs
@@ -6,7 +6,7 @@ use crate::{
     types::{NonStrictVec, Update},
 };
 
-/// Fault tollerant version of [`GetUpdates`].
+/// The fault tolerant version of [`GetUpdates`].
 #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
 #[serde(transparent)]
 pub struct GetUpdatesFaultTolerant(pub GetUpdates);

From c2aaa724f4fc6512e93edec12860907540eeefce Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 27 Feb 2021 18:52:11 +0600
Subject: [PATCH 245/755] NonStrictVec -> SemiparsedVec

---
 CHANGELOG.md                                   |  4 ++++
 src/payloads/get_updates_fault_tolerant.rs     |  4 ++--
 src/types/non_telegram_types/non_strict_vec.rs | 10 ++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad248230..85f6ba61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr56]: https://github.com/teloxide/teloxide-core/pull/56
 [pr57]: https://github.com/teloxide/teloxide-core/pull/57
 
+### Changed
+
+ - `NonStrictVec` -> `SemiparsedVec`.
+
 ## [0.1.1] - 2020-02-17
 
 ### Fixed
diff --git a/src/payloads/get_updates_fault_tolerant.rs b/src/payloads/get_updates_fault_tolerant.rs
index b32d6f00..1d3276e0 100644
--- a/src/payloads/get_updates_fault_tolerant.rs
+++ b/src/payloads/get_updates_fault_tolerant.rs
@@ -3,7 +3,7 @@ use serde::Serialize;
 use crate::{
     payloads::GetUpdates,
     requests::Payload,
-    types::{NonStrictVec, Update},
+    types::{SemiparsedVec, Update},
 };
 
 /// The fault tolerant version of [`GetUpdates`].
@@ -12,7 +12,7 @@ use crate::{
 pub struct GetUpdatesFaultTolerant(pub GetUpdates);
 
 impl Payload for GetUpdatesFaultTolerant {
-    type Output = NonStrictVec<Update>;
+    type Output = SemiparsedVec<Update>;
 
     const NAME: &'static str = GetUpdates::NAME;
 }
diff --git a/src/types/non_telegram_types/non_strict_vec.rs b/src/types/non_telegram_types/non_strict_vec.rs
index 37bc46d7..6d2e5916 100644
--- a/src/types/non_telegram_types/non_strict_vec.rs
+++ b/src/types/non_telegram_types/non_strict_vec.rs
@@ -1,14 +1,16 @@
 use serde::de::DeserializeOwned;
 use serde_json::{from_value, Value};
 
+/// A vector of possibly unparsed JSON objects.
+///
 /// Similar to `Vec<T>` but if it fails to deserialize element, it just saves
-/// `Err((value, err))`
+/// `Err((serde_json::Value, serde_json::Error))`.
 #[derive(Debug, serde::Deserialize)]
 #[serde(from = "Vec<serde_json::Value>")]
 #[serde(bound = "T: DeserializeOwned")]
-pub struct NonStrictVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Error)>>);
+pub struct SemiparsedVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Error)>>);
 
-impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for NonStrictVec<T> {
+impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for SemiparsedVec<T> {
     fn from(vec: Vec<Value>) -> Self {
         Self(
             vec.into_iter()
@@ -22,7 +24,7 @@ impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for NonStrictVec<T> {
 fn test() {
     use crate::types::Update;
 
-    let x: NonStrictVec<Update> = serde_json::from_str(
+    let x: SemiparsedVec<Update> = serde_json::from_str(
         r#"[{
          "update_id": 923808447,
          "message": {

From b465da5f1650893cc033d995343858371505eaf1 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sun, 28 Feb 2021 22:32:50 +0600
Subject: [PATCH 246/755] Derive Clone for AutoSend

---
 CHANGELOG.md              | 1 +
 src/adaptors/auto_send.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85f6ba61..77610d3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `GetUpdatesFaultTolerant` - fault toletant version of `GetUpdates` ([#58][pr58]) (**BC**)
+- Derive `Clone` for `AutoSend`.
 
 [pr58]: https://github.com/teloxide/teloxide-core/pull/58
 
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index f091eae8..d6a7f44c 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -37,6 +37,7 @@ use crate::{
 /// let myself: Me = bot.get_me().await?; // No .send()!
 /// # Ok::<_, teloxide_core::RequestError>(()) };
 /// ```
+#[derive(Clone)]
 pub struct AutoSend<B> {
     bot: B,
 }

From 6fc7e7d80403d08d2705aec40fe8104d67755972 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 6 Mar 2021 03:07:35 +0600
Subject: [PATCH 247/755] Adjust with the latest teloxide

---
 rustfmt.toml |  2 +-
 src/lib.rs   | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 1907f64f..aba42ed2 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -2,6 +2,6 @@ format_code_in_doc_comments = true
 wrap_comments = true
 format_strings = true
 max_width = 80
-merge_imports = true
+imports_granularity = "Crate"
 use_small_heuristics = "Max"
 use_field_init_shorthand = true
diff --git a/src/lib.rs b/src/lib.rs
index 5744c436..f636d6fb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -77,6 +77,13 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
                      type>"
                 ),
             };
+            let requester_param_type = match params
+                .get(1)
+                .expect("A requester parameter must be specified")
+            {
+                FnArg::Typed(typed) => typed.ty.clone(),
+                _ => unreachable!(),
+            };
             let aux_param_type = match params.get(2) {
                 Some(data_param_type) => match *data_param_type {
                     FnArg::Typed(typed) => typed.ty.clone(),
@@ -101,8 +108,9 @@ pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
                     type Aux = #aux_param_type;
                     type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Output;
                     type Error = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Error;
+                    type Requester = <#requester_param_type as teloxide::dispatching::UpdateWithCxRequesterType>::Requester;
 
-                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: #aux_param_type)
+                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn<Self::Requester>, aux: #aux_param_type)
                         -> futures::future::BoxFuture<'static, #fn_return_type> {
                                 #item
                                 futures::future::FutureExt::boxed(#call_fn)
@@ -152,8 +160,11 @@ pub fn derive_transition(item: TokenStream) -> TokenStream {
         "impl teloxide::dispatching::dialogue::Transition for {1} {{type Aux \
          = <{0} as teloxide::dispatching::dialogue::Subtransition>::Aux;type \
          Error = <{0} as \
-         teloxide::dispatching::dialogue::Subtransition>::Error;fn \
-         react(self, cx: teloxide::dispatching::dialogue::TransitionIn, aux: \
+         teloxide::dispatching::dialogue::Subtransition>::Error;type \
+         Requester = <{0} as \
+         teloxide::dispatching::dialogue::Subtransition>::Requester;fn \
+         react(self, cx: \
+         teloxide::dispatching::dialogue::TransitionIn<Self::Requester>, aux: \
          Self::Aux) -> futures::future::BoxFuture<'static, \
          teloxide::dispatching::dialogue::TransitionOut<Self, Self::Error>> \
          {{ futures::future::FutureExt::boxed(async move {{ match self {{",

From 7600a88312c49d4235275a5225993ecc2e98a791 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Mar 2021 00:39:19 +0300
Subject: [PATCH 248/755] Fix SetWebhook

Make `GetUpdates::allowed_updates` optional
---
 CHANGELOG.md                                       |  2 ++
 src/bot/api.rs                                     |  8 ++------
 src/local_macros.rs                                |  9 +++------
 src/payloads/add_sticker_to_set.rs                 |  2 +-
 src/payloads/answer_callback_query.rs              |  2 +-
 src/payloads/answer_inline_query.rs                |  2 +-
 src/payloads/answer_pre_checkout_query.rs          |  2 +-
 src/payloads/answer_shipping_query.rs              |  2 +-
 src/payloads/create_new_sticker_set.rs             |  2 +-
 src/payloads/delete_chat_photo.rs                  |  2 +-
 src/payloads/delete_chat_sticker_set.rs            |  2 +-
 src/payloads/delete_message.rs                     |  2 +-
 src/payloads/delete_sticker_from_set.rs            |  2 +-
 src/payloads/delete_webhook.rs                     |  2 +-
 src/payloads/edit_message_caption.rs               |  2 +-
 src/payloads/edit_message_caption_inline.rs        |  2 +-
 src/payloads/edit_message_live_location.rs         |  2 +-
 src/payloads/edit_message_live_location_inline.rs  |  2 +-
 src/payloads/edit_message_media.rs                 |  2 +-
 src/payloads/edit_message_media_inline.rs          |  2 +-
 src/payloads/edit_message_reply_markup.rs          |  2 +-
 src/payloads/edit_message_reply_markup_inline.rs   |  2 +-
 src/payloads/edit_message_text.rs                  |  2 +-
 src/payloads/edit_message_text_inline.rs           |  2 +-
 src/payloads/export_chat_invite_link.rs            |  2 +-
 src/payloads/forward_message.rs                    |  2 +-
 src/payloads/get_chat.rs                           |  2 +-
 src/payloads/get_chat_administrators.rs            |  2 +-
 src/payloads/get_chat_member.rs                    |  2 +-
 src/payloads/get_chat_members_count.rs             |  2 +-
 src/payloads/get_file.rs                           |  2 +-
 src/payloads/get_game_high_scores.rs               |  2 +-
 src/payloads/get_me.rs                             |  2 +-
 src/payloads/get_my_commands.rs                    |  2 +-
 src/payloads/get_sticker_set.rs                    |  2 +-
 src/payloads/get_updates.rs                        |  2 +-
 src/payloads/get_user_profile_photos.rs            |  2 +-
 src/payloads/get_webhook_info.rs                   |  2 +-
 src/payloads/kick_chat_member.rs                   |  2 +-
 src/payloads/leave_chat.rs                         |  2 +-
 src/payloads/pin_chat_message.rs                   |  2 +-
 src/payloads/promote_chat_member.rs                |  2 +-
 src/payloads/restrict_chat_member.rs               |  2 +-
 src/payloads/send_animation.rs                     |  2 +-
 src/payloads/send_audio.rs                         |  2 +-
 src/payloads/send_chat_action.rs                   |  2 +-
 src/payloads/send_contact.rs                       |  2 +-
 src/payloads/send_dice.rs                          |  2 +-
 src/payloads/send_document.rs                      |  2 +-
 src/payloads/send_game.rs                          |  2 +-
 src/payloads/send_invoice.rs                       |  2 +-
 src/payloads/send_location.rs                      |  2 +-
 src/payloads/send_media_group.rs                   |  2 +-
 src/payloads/send_message.rs                       |  2 +-
 src/payloads/send_photo.rs                         |  2 +-
 src/payloads/send_poll.rs                          |  2 +-
 src/payloads/send_sticker.rs                       |  2 +-
 src/payloads/send_venue.rs                         |  2 +-
 src/payloads/send_video.rs                         |  2 +-
 src/payloads/send_video_note.rs                    |  2 +-
 src/payloads/send_voice.rs                         |  2 +-
 .../set_chat_administrator_custom_title.rs         |  2 +-
 src/payloads/set_chat_description.rs               |  2 +-
 src/payloads/set_chat_permissions.rs               |  2 +-
 src/payloads/set_chat_photo.rs                     |  2 +-
 src/payloads/set_chat_sticker_set.rs               |  2 +-
 src/payloads/set_chat_title.rs                     |  2 +-
 src/payloads/set_game_score.rs                     |  2 +-
 src/payloads/set_game_score_inline.rs              |  2 +-
 src/payloads/set_my_commands.rs                    |  2 +-
 src/payloads/set_passport_data_errors.rs           |  2 +-
 src/payloads/set_sticker_position_in_set.rs        |  2 +-
 src/payloads/set_sticker_set_thumb.rs              |  2 +-
 src/payloads/set_webhook.rs                        | 14 +++++++-------
 src/payloads/stop_message_live_location.rs         |  2 +-
 src/payloads/stop_message_live_location_inline.rs  |  2 +-
 src/payloads/stop_poll.rs                          |  2 +-
 src/payloads/unban_chat_member.rs                  |  2 +-
 src/payloads/unpin_chat_message.rs                 |  2 +-
 src/payloads/upload_sticker_file.rs                |  2 +-
 src/requests/requester.rs                          |  7 +++----
 81 files changed, 93 insertions(+), 99 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cf4b84a..68ddd40f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `set_webhook` signature (make `allowed_updates` optional) ([#59][pr59])
 - Fix typos in payloads ([#57][pr57]):
   - `get_updates`: `offset` `i64` -> `i32`
   - `send_location`: make `live_period` optional
@@ -16,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr56]: https://github.com/teloxide/teloxide-core/pull/56
 [pr57]: https://github.com/teloxide/teloxide-core/pull/57
+[pr59]: https://github.com/teloxide/teloxide-core/pull/59
 
 ## [0.1.1] - 2020-02-17
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 6ee44da9..c0801ad1 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -20,15 +20,11 @@ impl Requester for Bot {
 
     type SetWebhook = JsonRequest<payloads::SetWebhook>;
 
-    fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook
+    fn set_webhook<U>(&self, url: U) -> Self::SetWebhook
     where
         U: Into<String>,
-        A: IntoIterator<Item = crate::types::AllowedUpdate>,
     {
-        Self::SetWebhook::new(
-            self.clone(),
-            payloads::SetWebhook::new(url, allowed_updates),
-        )
+        Self::SetWebhook::new(self.clone(), payloads::SetWebhook::new(url))
     }
 
     type DeleteWebhook = JsonRequest<payloads::DeleteWebhook>;
diff --git a/src/local_macros.rs b/src/local_macros.rs
index bf743779..760bc558 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -393,7 +393,7 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS MACRO**,
 // edit `cg` instead.
 macro_rules! requester_forward {
@@ -403,8 +403,6 @@ macro_rules! requester_forward {
             requester_forward!(@method $rest $body $ty);
         )*
     };
-
-
     (@method get_updates $body:ident $ty:ident) => {
         type GetUpdates = $ty![GetUpdates];
 
@@ -416,10 +414,9 @@ macro_rules! requester_forward {
     (@method set_webhook $body:ident $ty:ident) => {
         type SetWebhook = $ty![SetWebhook];
 
-        fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook where U: Into<String>,
-        A: IntoIterator<Item = AllowedUpdate> {
+        fn set_webhook<U>(&self, url: U) -> Self::SetWebhook where U: Into<String> {
             let this = self;
-            $body!(set_webhook this (url: U, allowed_updates: A))
+            $body!(set_webhook this (url: U))
         }
     };
     (@method delete_webhook $body:ident $ty:ident) => {
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 2541b79d..4366de42 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index f5c3a849..8c636ac7 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index ffc4f8ee..b81e0892 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index 356757c7..375180b0 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index c9d2b511..46cd48a1 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 5c716a20..a763e61b 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index a6a5906e..db346e4e 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index 5070cff5..c8b66e32 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 3bf206f4..3e113023 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index 78d4f0c1..c3f30b59 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index 6a2cf0d5..2822e14a 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index ddcdd6b9..8216f859 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 819d6b83..661d7fd9 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 322e40e0..5e7aaba4 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 1d650933..348fa138 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 958d147d..c0c3388c 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index 8462873d..47bd4600 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 70d17489..b580cfe2 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 40af6ab8..0cfbf92e 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index 5d8e72b5..a9d5dcce 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 90f08afc..9e51eca3 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index 1e8fc54e..0cfd1b10 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index f1248b0f..fd33171d 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index 2abd7787..403629f3 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index b950cbeb..49c05bf6 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index e78ac0f4..4f91f285 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 4a363da0..237c4d33 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 921ed5a7..0535b768 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index b61320a4..0aaa6e27 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index d84ccbe5..66b6c48a 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 29193161..f5591f29 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index a30bfd2b..e9e35f5a 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index df63aa63..053bca02 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 2bc88808..5da97186 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index bd3414e5..e3e9d050 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index d456192d..e4eb968b 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index c96dc435..3c237c7e 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index feb81b30..6ad729cc 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index b16b2a47..7af9050b 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 10ba222c..648b92fc 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index cd6d010e..1cd351a4 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 95bc7f21..9caf22ad 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 8b614607..1d5cd378 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index f6b464fc..ed08f42f 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 7f885f91..0aa5e59f 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 828b7314..fca931ef 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index e62e557f..6b657a55 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index db8740af..ede44d1a 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index d9cbbd6e..28c8c329 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 9593a330..fba6ac81 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 609bfb28..07815164 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 6d9b8fe1..d35cec82 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index cbe48b33..a141e7e7 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 3992ab53..1434cd55 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 361db666..4805199b 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 49b585d5..3321f5ef 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 49f6ac29..3001ad53 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 9b7a7698..8f7edb15 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index bf9ea9f4..aeab4408 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index f5239b2e..e964a799 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index c41b0a77..334c53cd 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 4d4d4d3b..46723c03 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 4ce833b9..3a6d3fe6 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index bdd605b6..9df76f55 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index a0cda56f..54ead85f 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index c1f699c3..0e7aeb55 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 2919a13b..951cf160 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 05321a36..ecfb1cbc 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 45804e7e..b264b2bc 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index a515e230..c4a2cb11 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index f584b6de..401d3f4b 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
@@ -17,12 +17,6 @@ impl_payload! {
         required {
             /// HTTPS url to send updates to. Use an empty string to remove webhook integration
             pub url: String [into],
-            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
-            ///
-            /// Please note that this parameter doesn't affect updates created before the call to the setWebhook, so unwanted updates may be received for a short period of time.
-            ///
-            /// [`Update`]: crate::types::Update
-            pub allowed_updates: Vec<AllowedUpdate> [collect],
         }
         optional {
             /// Upload your public key certificate so that the root certificate in use can be checked. See our [self-signed guide] for details.
@@ -31,6 +25,12 @@ impl_payload! {
             pub certificate: InputFile,
             /// Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery, 1-100. Defaults to 40. Use lower values to limit the load on your bot's server, and higher values to increase your bot's throughput.
             pub max_connections: u8,
+            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
+            ///
+            /// Please note that this parameter doesn't affect updates created before the call to the setWebhook, so unwanted updates may be received for a short period of time.
+            ///
+            /// [`Update`]: crate::types::Update
+            pub allowed_updates: Vec<AllowedUpdate> [collect],
         }
     }
 }
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index ae251505..cd7a2dc2 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index 09519515..802d51cf 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index 708e920f..3446b9c7 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 4b7ae1ba..54768eac 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index 04471d8c..9815c7e5 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index e8777d76..74c9c346 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,4 +1,4 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 use serde::Serialize;
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 69a79199..bd35b7d4 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -53,7 +53,7 @@ pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (8ee7ef2).
+    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
     // **DO NOT EDIT THIS BLOCK**,
     // edit `cg` instead.
 
@@ -65,10 +65,9 @@ pub trait Requester {
     type SetWebhook: Request<Payload = SetWebhook, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetWebhook`].
-    fn set_webhook<U, A>(&self, url: U, allowed_updates: A) -> Self::SetWebhook
+    fn set_webhook<U>(&self, url: U) -> Self::SetWebhook
     where
-        U: Into<String>,
-        A: IntoIterator<Item = AllowedUpdate>;
+        U: Into<String>;
 
     type DeleteWebhook: Request<Payload = DeleteWebhook, Err = Self::Err>;
 

From b3d8d70a7c7caacfcc238be21b26a7e392ebbf2d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Mar 2021 10:58:18 +0300
Subject: [PATCH 249/755] remove unused use

---
 src/requests/requester.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index bd35b7d4..6df4d047 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -5,9 +5,8 @@ use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
     types::{
-        AllowedUpdate, BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult,
-        InputFile, InputMedia, InputSticker, LabeledPrice, PassportElementError, PollType,
-        TargetMessage,
+        BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        InputSticker, LabeledPrice, PassportElementError, PollType, TargetMessage,
     },
 };
 

From 201a60b38a7a5ff3383bb00ff17cd1b8056ef60e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Mar 2021 10:58:54 +0300
Subject: [PATCH 250/755] Temporary switch clippy CI to beta b/c of ICE

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 939b0930..4ab0617b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: beta #nightly
           override: true
           components: clippy
 
@@ -64,7 +64,8 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets --all-features -- -D warnings
+          args: --all-targets --features full -- -D warnings
+          #args: --all-targets --all-features -- -D warnings
 
   style:
     runs-on: ubuntu-latest

From 61eed38c32476ae09a0b9981f95e086c9d324692 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 13 Mar 2021 17:46:16 +0600
Subject: [PATCH 251/755] Fix SemiparsedVec

---
 Cargo.toml                                            |  1 +
 src/types.rs                                          |  4 ++--
 .../{non_strict_vec.rs => semiparsed_vec.rs}          | 11 +++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename src/types/non_telegram_types/{non_strict_vec.rs => semiparsed_vec.rs} (74%)

diff --git a/Cargo.toml b/Cargo.toml
index 640df040..06a14ebd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,7 @@ tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
 reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"] }
+log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
diff --git a/src/types.rs b/src/types.rs
index 87e45a62..5231bf96 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -188,10 +188,10 @@ mod passport_data;
 mod passport_element_error;
 mod passport_file;
 
-pub use non_telegram_types::{country_code::*, currency::*, non_strict_vec::*};
+pub use non_telegram_types::{country_code::*, currency::*, semiparsed_vec::*};
 mod non_telegram_types {
     pub(super) mod country_code;
     pub(super) mod currency;
     pub(crate) mod mime;
-    pub(super) mod non_strict_vec;
+    pub(super) mod semiparsed_vec;
 }
diff --git a/src/types/non_telegram_types/non_strict_vec.rs b/src/types/non_telegram_types/semiparsed_vec.rs
similarity index 74%
rename from src/types/non_telegram_types/non_strict_vec.rs
rename to src/types/non_telegram_types/semiparsed_vec.rs
index 6d2e5916..e40e4dfc 100644
--- a/src/types/non_telegram_types/non_strict_vec.rs
+++ b/src/types/non_telegram_types/semiparsed_vec.rs
@@ -4,7 +4,7 @@ use serde_json::{from_value, Value};
 /// A vector of possibly unparsed JSON objects.
 ///
 /// Similar to `Vec<T>` but if it fails to deserialize element, it just saves
-/// `Err((serde_json::Value, serde_json::Error))`.
+/// `Err((serde_json::Value, serde_json::Error))` and logs an error.
 #[derive(Debug, serde::Deserialize)]
 #[serde(from = "Vec<serde_json::Value>")]
 #[serde(bound = "T: DeserializeOwned")]
@@ -14,7 +14,14 @@ impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for SemiparsedVec<T> {
     fn from(vec: Vec<Value>) -> Self {
         Self(
             vec.into_iter()
-                .map(|val| from_value(val.clone()).map_err(|e| (val, e)))
+                .map(|val| {
+                    from_value(val.clone()).map_err(|e| {
+                        log::error!("Cannot parse a JSON object.\nError: {:?}\nValue: {}\n\
+                        This is a bug in teloxide-core, please open an issue here: \
+                        https://github.com/teloxide/teloxide-core/issues.", e, val);
+                        (val, e)
+                    })
+                })
                 .collect(),
         )
     }

From 32b446d26c7157276039ef814cfdecab6a3ce306 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 13 Mar 2021 21:05:45 +0600
Subject: [PATCH 252/755] Move log::error! on update parsing failure to
 Update::try_parse

---
 .../non_telegram_types/semiparsed_vec.rs      | 15 ++-----------
 src/types/update.rs                           | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/types/non_telegram_types/semiparsed_vec.rs b/src/types/non_telegram_types/semiparsed_vec.rs
index e40e4dfc..4edce6c3 100644
--- a/src/types/non_telegram_types/semiparsed_vec.rs
+++ b/src/types/non_telegram_types/semiparsed_vec.rs
@@ -4,7 +4,7 @@ use serde_json::{from_value, Value};
 /// A vector of possibly unparsed JSON objects.
 ///
 /// Similar to `Vec<T>` but if it fails to deserialize element, it just saves
-/// `Err((serde_json::Value, serde_json::Error))` and logs an error.
+/// `Err((serde_json::Value, serde_json::Error))`.
 #[derive(Debug, serde::Deserialize)]
 #[serde(from = "Vec<serde_json::Value>")]
 #[serde(bound = "T: DeserializeOwned")]
@@ -12,18 +12,7 @@ pub struct SemiparsedVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Er
 
 impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for SemiparsedVec<T> {
     fn from(vec: Vec<Value>) -> Self {
-        Self(
-            vec.into_iter()
-                .map(|val| {
-                    from_value(val.clone()).map_err(|e| {
-                        log::error!("Cannot parse a JSON object.\nError: {:?}\nValue: {}\n\
-                        This is a bug in teloxide-core, please open an issue here: \
-                        https://github.com/teloxide/teloxide-core/issues.", e, val);
-                        (val, e)
-                    })
-                })
-                .collect(),
-        )
+        Self(vec.into_iter().map(|val| (val, e)).collect())
     }
 }
 
diff --git a/src/types/update.rs b/src/types/update.rs
index 4ebc5710..c1d7e10f 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -6,6 +6,7 @@ use crate::types::{
     CallbackQuery, Chat, ChosenInlineResult, InlineQuery, Message, Poll, PollAnswer,
     PreCheckoutQuery, ShippingQuery, User,
 };
+use serde_json::Value;
 
 /// This [object] represents an incoming update.
 ///
@@ -28,6 +29,27 @@ pub struct Update {
     pub kind: UpdateKind,
 }
 
+impl Update {
+    /// Tries to parse `value` into `Update`, logging an error on failure.
+    ///
+    /// It is used to implement update listeners.
+    pub fn try_parse(value: &Value) -> Result<Self, serde_json::Error> {
+        match serde_json::from_str(&value.to_string()) {
+            Ok(update) => Ok(update),
+            Err(error) => {
+                log::error!(
+                    "Cannot parse an update.\nError: {:?}\nValue: {}\n\
+                    This is a bug in teloxide-core, please open an issue here: \
+                    https://github.com/teloxide/teloxide-core/issues.",
+                    error,
+                    value
+                );
+                Err(error)
+            }
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum UpdateKind {

From cd9a98163c976b8433a38f8cc898590bfcf5b068 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 13 Mar 2021 21:11:54 +0600
Subject: [PATCH 253/755] Fix SemiparsedVec::from

---
 src/types/non_telegram_types/semiparsed_vec.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/types/non_telegram_types/semiparsed_vec.rs b/src/types/non_telegram_types/semiparsed_vec.rs
index 4edce6c3..6d2e5916 100644
--- a/src/types/non_telegram_types/semiparsed_vec.rs
+++ b/src/types/non_telegram_types/semiparsed_vec.rs
@@ -12,7 +12,11 @@ pub struct SemiparsedVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Er
 
 impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for SemiparsedVec<T> {
     fn from(vec: Vec<Value>) -> Self {
-        Self(vec.into_iter().map(|val| (val, e)).collect())
+        Self(
+            vec.into_iter()
+                .map(|val| from_value(val.clone()).map_err(|e| (val, e)))
+                .collect(),
+        )
     }
 }
 

From e400fb16e7add288f7958cf0cc873e477fa1d875 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Sat, 13 Mar 2021 21:38:05 +0600
Subject: [PATCH 254/755] Use serde_json::from_value in Update::try_parse

---
 src/types/update.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/update.rs b/src/types/update.rs
index c1d7e10f..b4f8aecd 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -34,7 +34,7 @@ impl Update {
     ///
     /// It is used to implement update listeners.
     pub fn try_parse(value: &Value) -> Result<Self, serde_json::Error> {
-        match serde_json::from_str(&value.to_string()) {
+        match serde_json::from_value(value.clone()) {
             Ok(update) => Ok(update),
             Err(error) => {
                 log::error!(

From 20c67a18c5ad6ac01fa3aff537e0713647f1d20d Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 14 Mar 2021 17:10:06 +0300
Subject: [PATCH 255/755] Update types (tba API 5.0)

See more: https://core.telegram.org/bots/api#november-4-2020
---
 src/types.rs                                  |  6 ++
 src/types/audio.rs                            |  4 +
 src/types/chat.rs                             | 52 +++++++++---
 src/types/chat_location.rs                    | 13 +++
 src/types/chat_member.rs                      | 10 ++-
 src/types/dice_emoji.rs                       |  8 ++
 src/types/inline_query_result.rs              |  3 +
 src/types/inline_query_result_audio.rs        | 15 +++-
 src/types/inline_query_result_cached_audio.rs | 15 +++-
 .../inline_query_result_cached_document.rs    | 15 +++-
 src/types/inline_query_result_cached_gif.rs   | 15 +++-
 .../inline_query_result_cached_mpeg4_gif.rs   | 15 +++-
 src/types/inline_query_result_cached_photo.rs | 15 +++-
 src/types/inline_query_result_cached_video.rs | 15 +++-
 src/types/inline_query_result_cached_voice.rs | 15 +++-
 src/types/inline_query_result_document.rs     | 14 +++-
 src/types/inline_query_result_gif.rs          | 15 +++-
 src/types/inline_query_result_location.rs     | 38 ++++++++-
 src/types/inline_query_result_mpeg4_gif.rs    | 15 +++-
 src/types/inline_query_result_photo.rs        | 15 +++-
 src/types/inline_query_result_venue.rs        | 26 ++++++
 src/types/inline_query_result_video.rs        | 15 +++-
 src/types/inline_query_result_voice.rs        | 15 +++-
 src/types/input_media.rs                      | 71 ++++++++++++++++-
 src/types/input_message_content.rs            | 46 ++++++++++-
 src/types/location.rs                         | 15 ++++
 src/types/message.rs                          | 79 ++++++++++++++-----
 src/types/message_id.rs                       |  5 ++
 src/types/proximity_alert_triggered.rs        | 17 ++++
 src/types/update.rs                           |  4 +
 src/types/venue.rs                            |  8 ++
 src/types/video.rs                            |  3 +
 src/types/webhook_info.rs                     |  3 +
 33 files changed, 567 insertions(+), 53 deletions(-)
 create mode 100644 src/types/chat_location.rs
 create mode 100644 src/types/message_id.rs
 create mode 100644 src/types/proximity_alert_triggered.rs

diff --git a/src/types.rs b/src/types.rs
index 5231bf96..5e3936d8 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -9,6 +9,7 @@ pub use callback_query::*;
 pub use chat::*;
 pub use chat_action::*;
 pub use chat_id::*;
+pub use chat_location::*;
 pub use chat_member::*;
 pub use chat_permissions::*;
 pub use chat_photo::*;
@@ -61,6 +62,7 @@ pub use mask_position::*;
 pub use me::*;
 pub use message::*;
 pub use message_entity::*;
+pub use message_id::*;
 pub use order_info::*;
 pub use parse_mode::*;
 pub use passport_data::*;
@@ -71,6 +73,7 @@ pub use poll::*;
 pub use poll_answer::*;
 pub use poll_type::*;
 pub use pre_checkout_query::*;
+pub use proximity_alert_triggered::*;
 pub use reply_keyboard_markup::*;
 pub use reply_keyboard_remove::*;
 pub use reply_markup::*;
@@ -102,6 +105,7 @@ mod callback_query;
 mod chat;
 mod chat_action;
 mod chat_id;
+mod chat_location;
 mod chat_member;
 mod chat_permissions;
 mod chat_photo;
@@ -130,6 +134,7 @@ mod mask_position;
 mod me;
 mod message;
 mod message_entity;
+mod message_id;
 mod order_info;
 mod parse_mode;
 mod photo_size;
@@ -137,6 +142,7 @@ mod poll;
 mod poll_answer;
 mod poll_type;
 mod pre_checkout_query;
+mod proximity_alert_triggered;
 mod reply_keyboard_markup;
 mod reply_keyboard_remove;
 mod reply_markup;
diff --git a/src/types/audio.rs b/src/types/audio.rs
index 1bf3174f..ac7a1f3b 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -27,6 +27,9 @@ pub struct Audio {
     /// A title of the audio as defined by sender or by audio tags.
     pub title: Option<String>,
 
+    /// Original filename as defined by sender
+    pub file_name: Option<String>,
+
     /// A MIME type of the file as defined by a sender.
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
@@ -75,6 +78,7 @@ mod tests {
                 height: 320,
                 file_size: Some(3452),
             }),
+            file_name: None,
         };
         let actual = serde_json::from_str::<Audio>(&json).unwrap();
         assert_eq!(actual, expected)
diff --git a/src/types/chat.rs b/src/types/chat.rs
index d0ce754e..aedd6e90 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{ChatPermissions, ChatPhoto, Message};
+use crate::types::{ChatLocation, ChatPermissions, ChatPhoto, Message};
 
 /// This object represents a chat.
 ///
@@ -22,6 +22,12 @@ pub struct Chat {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub photo: Option<ChatPhoto>,
+
+    /// The most recent pinned message (by sending date). Returned only in
+    /// [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub pinned_message: Option<Box<Message>>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -58,16 +64,10 @@ pub struct ChatPublic {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub invite_link: Option<String>,
-
-    /// Pinned message, for groups, supergroups and channels. Returned only
-    /// in [`GetChat`].
-    ///
-    /// [`GetChat`]: crate::payloads::GetChat
-    pub pinned_message: Option<Box<Message>>,
 }
 
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ChatPrivate {
     /// A dummy field. Used to ensure that the `type` field is equal to
     /// `private`.
@@ -84,10 +84,15 @@ pub struct ChatPrivate {
 
     /// A last name of the other party in a private chat.
     pub last_name: Option<String>,
+
+    /// Bio of the other party in a private chat. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub bio: Option<String>,
 }
 
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
 pub enum PublicChatKind {
@@ -97,14 +102,20 @@ pub enum PublicChatKind {
 }
 
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatChannel {
     /// A username, for private chats, supergroups and channels if available.
     pub username: Option<String>,
+
+    /// Unique identifier for the linked chat, i.e. the discussion group
+    /// identifier for a channel and vice versa. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub linked_chat_id: Option<i64>,
 }
 
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatGroup {
     /// A default chat member permissions, for groups and supergroups. Returned
     /// only from [`GetChat`].
@@ -114,7 +125,7 @@ pub struct PublicChatGroup {
 }
 
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct PublicChatSupergroup {
     /// A username, for private chats, supergroups and channels if
     /// available.
@@ -143,6 +154,18 @@ pub struct PublicChatSupergroup {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub slow_mode_delay: Option<i32>,
+
+    /// Unique identifier for the linked chat, i.e. the discussion group
+    /// identifier for a channel and vice versa. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub linked_chat_id: Option<i64>,
+
+    /// The location to which the supergroup is connected. Returned only in
+    /// [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub location: ChatLocation,
 }
 
 struct PrivateChatKindVisitor;
@@ -223,12 +246,13 @@ mod tests {
                 title: None,
                 kind: PublicChatKind::Channel(PublicChatChannel {
                     username: Some("channelname".into()),
+                    linked_chat_id: None,
                 }),
                 description: None,
                 invite_link: None,
-                pinned_message: None,
             }),
             photo: None,
+            pinned_message: None,
         };
         let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
         assert_eq!(expected, actual);
@@ -244,8 +268,10 @@ mod tests {
                     username: Some("username".into()),
                     first_name: Some("Anon".into()),
                     last_name: None,
+                    bio: None,
                 }),
                 photo: None,
+                pinned_message: None,
             },
             from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
                 .unwrap()
diff --git a/src/types/chat_location.rs b/src/types/chat_location.rs
new file mode 100644
index 00000000..fbd2b412
--- /dev/null
+++ b/src/types/chat_location.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::Location;
+
+/// Represents a location to which a chat is connected.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct ChatLocation {
+    /// The location to which the supergroup is connected. Can't be a live
+    /// location.
+    pub location: Location,
+    /// Location address; 1-64 characters, as defined by the chat owner.
+    pub address: String,
+}
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 9aa5101c..0ad0dca0 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -32,6 +32,9 @@ pub enum ChatMemberKind {
 pub struct Creator {
     /// Custom title for this user.
     pub custom_title: Option<String>,
+
+    /// True, if the user's presence in the chat is hidden
+    pub is_anonymous: bool,
 }
 
 /// Administrator of the group. This struct is part of the [`ChatMemberKind`]
@@ -41,6 +44,9 @@ pub struct Administrator {
     /// Custom title for this user.
     pub custom_title: Option<String>,
 
+    /// True, if the user's presence in the chat is hidden
+    pub is_anonymous: bool,
+
     /// `true`, if the bot is allowed to edit
     /// administrator privileges of that user.
     pub can_be_edited: bool,
@@ -368,7 +374,8 @@ mod tests {
             "can_invite_users":true,
             "can_restrict_members":true,
             "can_pin_messages":true,
-            "can_promote_members":true
+            "can_promote_members":true,
+            "is_anonymous":false,
         }"#;
         let expected = ChatMember {
             user: User {
@@ -390,6 +397,7 @@ mod tests {
                 can_restrict_members: true,
                 can_pin_messages: Some(true),
                 can_promote_members: true,
+                is_anonymous: false,
             }),
         };
         let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
diff --git a/src/types/dice_emoji.rs b/src/types/dice_emoji.rs
index e503c7fa..46525699 100644
--- a/src/types/dice_emoji.rs
+++ b/src/types/dice_emoji.rs
@@ -13,4 +13,12 @@ pub enum DiceEmoji {
     /// Values from 1-5.
     #[serde(rename = "🏀")]
     Basketball,
+
+    /// Values 1-5
+    #[serde(rename = "⚽")]
+    Football,
+
+    /// Values 1-64
+    #[serde(rename = "🎰")]
+    SlotMachine,
 }
diff --git a/src/types/inline_query_result.rs b/src/types/inline_query_result.rs
index e45f2e44..43a23985 100644
--- a/src/types/inline_query_result.rs
+++ b/src/types/inline_query_result.rs
@@ -66,6 +66,7 @@ mod tests {
             audio_file_id: String::from("audio_file_id"),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         });
@@ -88,7 +89,9 @@ mod tests {
                 message_text: String::from("message_text"),
                 parse_mode: Some(ParseMode::MarkdownV2),
                 disable_web_page_preview: Some(true),
+                entities: None,
             })),
+            caption_entities: None,
         });
 
         let expected_json = r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id","caption":"caption","parse_mode":"HTML","reply_markup":{"inline_keyboard":[]},"input_message_content":{"message_text":"message_text","parse_mode":"MarkdownV2","disable_web_page_preview":true}}"#;
diff --git a/src/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
index 9e541f22..a1712079 100644
--- a/src/types/inline_query_result_audio.rs
+++ b/src/types/inline_query_result_audio.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to an MP3 audio file. By default, this audio file will be
 /// sent by the user.
@@ -32,6 +32,10 @@ pub struct InlineQueryResultAudio {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Performer.
     pub performer: Option<String>,
 
@@ -60,6 +64,7 @@ impl InlineQueryResultAudio {
             title: title.into(),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             performer: None,
             audio_duration: None,
             reply_markup: None,
@@ -104,6 +109,14 @@ impl InlineQueryResultAudio {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn performer<S>(mut self, val: S) -> Self
     where
         S: Into<String>,
diff --git a/src/types/inline_query_result_cached_audio.rs b/src/types/inline_query_result_cached_audio.rs
index 8dcfa47c..e74c3954 100644
--- a/src/types/inline_query_result_cached_audio.rs
+++ b/src/types/inline_query_result_cached_audio.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to an MP3 audio file stored on the Telegram servers.
 ///
@@ -29,6 +29,10 @@ pub struct InlineQueryResultCachedAudio {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -50,6 +54,7 @@ impl InlineQueryResultCachedAudio {
             caption: None,
             parse_mode: None,
             reply_markup: None,
+            caption_entities: None,
             input_message_content: None,
         }
     }
@@ -83,6 +88,14 @@ impl InlineQueryResultCachedAudio {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
index 0f119d4d..5b630f66 100644
--- a/src/types/inline_query_result_cached_document.rs
+++ b/src/types/inline_query_result_cached_document.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a file stored on the Telegram servers.
 ///
@@ -35,6 +35,10 @@ pub struct InlineQueryResultCachedDocument {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -58,6 +62,7 @@ impl InlineQueryResultCachedDocument {
             description: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -108,6 +113,14 @@ impl InlineQueryResultCachedDocument {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
index 6c0b8069..cc51a823 100644
--- a/src/types/inline_query_result_cached_gif.rs
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to an animated GIF file stored on the Telegram servers.
 ///
@@ -33,6 +33,10 @@ pub struct InlineQueryResultCachedGif {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -54,6 +58,7 @@ impl InlineQueryResultCachedGif {
             title: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -96,6 +101,14 @@ impl InlineQueryResultCachedGif {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
index cecafb0b..2714ac7e 100644
--- a/src/types/inline_query_result_cached_mpeg4_gif.rs
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a video animation (H.264/MPEG-4 AVC video without
 /// sound) stored on the Telegram servers.
@@ -33,6 +33,10 @@ pub struct InlineQueryResultCachedMpeg4Gif {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -55,6 +59,7 @@ impl InlineQueryResultCachedMpeg4Gif {
             caption: None,
             parse_mode: None,
             reply_markup: None,
+            caption_entities: None,
             input_message_content: None,
         }
     }
@@ -88,6 +93,14 @@ impl InlineQueryResultCachedMpeg4Gif {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
index 719ec652..2be3d4cf 100644
--- a/src/types/inline_query_result_cached_photo.rs
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a photo stored on the Telegram servers.
 ///
@@ -35,6 +35,10 @@ pub struct InlineQueryResultCachedPhoto {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -57,6 +61,7 @@ impl InlineQueryResultCachedPhoto {
             description: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -107,6 +112,14 @@ impl InlineQueryResultCachedPhoto {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
index b726d0ee..cb9ab93d 100644
--- a/src/types/inline_query_result_cached_video.rs
+++ b/src/types/inline_query_result_cached_video.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a video file stored on the Telegram servers.
 ///
@@ -35,6 +35,10 @@ pub struct InlineQueryResultCachedVideo {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -58,6 +62,7 @@ impl InlineQueryResultCachedVideo {
             description: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -108,6 +113,14 @@ impl InlineQueryResultCachedVideo {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
index cef3fa08..0567b897 100644
--- a/src/types/inline_query_result_cached_voice.rs
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a voice message stored on the Telegram servers.
 ///
@@ -32,6 +32,10 @@ pub struct InlineQueryResultCachedVoice {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -54,6 +58,7 @@ impl InlineQueryResultCachedVoice {
             title: title.into(),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -96,6 +101,14 @@ impl InlineQueryResultCachedVoice {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
index 780e2cb7..e44342ad 100644
--- a/src/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -1,7 +1,7 @@
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a file.
 ///
@@ -31,6 +31,10 @@ pub struct InlineQueryResultDocument {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// A valid URL for the file.
     pub document_url: String,
 
@@ -88,6 +92,14 @@ impl InlineQueryResultDocument {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn document_url<S>(mut self, val: S) -> Self
     where
         S: Into<String>,
diff --git a/src/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
index 73c5f36d..fdfad686 100644
--- a/src/types/inline_query_result_gif.rs
+++ b/src/types/inline_query_result_gif.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to an animated GIF file.
 ///
@@ -44,6 +44,10 @@ pub struct InlineQueryResultGif {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -72,6 +76,7 @@ impl InlineQueryResultGif {
             parse_mode: None,
             reply_markup: None,
             input_message_content: None,
+            caption_entities: None,
         }
     }
 
@@ -135,6 +140,14 @@ impl InlineQueryResultGif {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
index 0a4672f3..733d84f4 100644
--- a/src/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -24,10 +24,22 @@ pub struct InlineQueryResultLocation {
     /// Location title.
     pub title: String,
 
+    /// The radius of uncertainty for the location, measured in meters; 0-1500
+    pub horizontal_accuracy: Option<f64>,
+
     /// Period in seconds for which the location can be updated, should be
     /// between 60 and 86400.
     pub live_period: Option<i32>,
 
+    /// For live locations, a direction in which the user is moving, in degrees.
+    /// Must be between 1 and 360 if specified.
+    pub heading: Option<u16>,
+
+    /// For live locations, a maximum distance for proximity alerts about
+    /// approaching another chat member, in meters. Must be between 1 and 100000
+    /// if specified.
+    pub proximity_alert_radius: Option<u32>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -40,10 +52,10 @@ pub struct InlineQueryResultLocation {
     pub thumb_url: Option<String>,
 
     /// Thumbnail width.
-    pub thumb_width: Option<i32>,
+    pub thumb_width: Option<u32>,
 
     /// Thumbnail height.
-    pub thumb_height: Option<i32>,
+    pub thumb_height: Option<u32>,
 }
 
 impl InlineQueryResultLocation {
@@ -63,6 +75,9 @@ impl InlineQueryResultLocation {
             thumb_url: None,
             thumb_width: None,
             thumb_height: None,
+            horizontal_accuracy: None,
+            heading: None,
+            proximity_alert_radius: None,
         }
     }
 
@@ -92,11 +107,26 @@ impl InlineQueryResultLocation {
         self
     }
 
+    pub fn horizontal_accuracy<S>(mut self, val: f64) -> Self {
+        self.horizontal_accuracy = Some(val);
+        self
+    }
+
     pub fn live_period(mut self, val: i32) -> Self {
         self.live_period = Some(val);
         self
     }
 
+    pub fn heading(mut self, val: u16) -> Self {
+        self.heading = Some(val);
+        self
+    }
+
+    pub fn proximity_alert_radius(mut self, val: u32) -> Self {
+        self.proximity_alert_radius = Some(val);
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
@@ -115,12 +145,12 @@ impl InlineQueryResultLocation {
         self
     }
 
-    pub fn thumb_width(mut self, val: i32) -> Self {
+    pub fn thumb_width(mut self, val: u32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
-    pub fn thumb_height(mut self, val: i32) -> Self {
+    pub fn thumb_height(mut self, val: u32) -> Self {
         self.thumb_height = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
index b57e4935..b8284243 100644
--- a/src/types/inline_query_result_mpeg4_gif.rs
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a video animation (H.264/MPEG-4 AVC video without
 /// sound).
@@ -45,6 +45,10 @@ pub struct InlineQueryResultMpeg4Gif {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -71,6 +75,7 @@ impl InlineQueryResultMpeg4Gif {
             title: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -136,6 +141,14 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
index 66e3bdfa..51402e63 100644
--- a/src/types/inline_query_result_photo.rs
+++ b/src/types/inline_query_result_photo.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a photo.
 ///
@@ -45,6 +45,10 @@ pub struct InlineQueryResultPhoto {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -71,6 +75,7 @@ impl InlineQueryResultPhoto {
             description: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             reply_markup: None,
             input_message_content: None,
         }
@@ -139,6 +144,14 @@ impl InlineQueryResultPhoto {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
index d5c16800..ac013ad0 100644
--- a/src/types/inline_query_result_venue.rs
+++ b/src/types/inline_query_result_venue.rs
@@ -35,6 +35,14 @@ pub struct InlineQueryResultVenue {
     /// `food/icecream`.)
     pub foursquare_type: Option<String>,
 
+    /// Google Places identifier of the venue.
+    pub google_place_id: Option<String>,
+
+    /// Google Places type of the venue. (See [supported types].)
+    ///
+    /// [supported types]: https://developers.google.com/places/web-service/supported_types
+    pub google_place_type: Option<String>,
+
     /// [Inline keyboard] attached to the message.
     ///
     /// [Inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
@@ -68,6 +76,8 @@ impl InlineQueryResultVenue {
             address: address.into(),
             foursquare_id: None,
             foursquare_type: None,
+            google_place_id: None,
+            google_place_type: None,
             reply_markup: None,
             input_message_content: None,
             thumb_url: None,
@@ -126,6 +136,22 @@ impl InlineQueryResultVenue {
         self
     }
 
+    pub fn google_place_id<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.google_place_id = Some(val.into());
+        self
+    }
+
+    pub fn google_place_type<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.google_place_type = Some(val.into());
+        self
+    }
+
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
index a9d9030f..aa887cae 100644
--- a/src/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -1,7 +1,7 @@
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a page containing an embedded video player or a video
 /// file.
@@ -41,6 +41,10 @@ pub struct InlineQueryResultVideo {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Video width.
     pub video_width: Option<i32>,
 
@@ -89,6 +93,7 @@ impl InlineQueryResultVideo {
             title: title.into(),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             video_width: None,
             video_height: None,
             video_duration: None,
@@ -148,6 +153,14 @@ impl InlineQueryResultVideo {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn video_width(mut self, val: i32) -> Self {
         self.video_width = Some(val);
         self
diff --git a/src/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
index 9365765e..c2765a61 100644
--- a/src/types/inline_query_result_voice.rs
+++ b/src/types/inline_query_result_voice.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InlineKeyboardMarkup, InputMessageContent, ParseMode};
+use crate::types::{InlineKeyboardMarkup, InputMessageContent, MessageEntity, ParseMode};
 
 /// Represents a link to a voice recording in an .ogg container encoded with
 /// OPUS.
@@ -33,6 +33,10 @@ pub struct InlineQueryResultVoice {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Recording duration in seconds.
     pub voice_duration: Option<i32>,
 
@@ -58,6 +62,7 @@ impl InlineQueryResultVoice {
             title: title.into(),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             voice_duration: None,
             reply_markup: None,
             input_message_content: None,
@@ -101,6 +106,14 @@ impl InlineQueryResultVoice {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn voice_duration(mut self, value: i32) -> Self {
         self.voice_duration = Some(value);
         self
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 6726c0f5..9da6e6a9 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{InputFile, ParseMode};
+use crate::types::{InputFile, MessageEntity, ParseMode};
 
 /// This object represents the content of a media message to be sent.
 ///
@@ -35,6 +35,10 @@ pub struct InputMediaPhoto {
     /// [HTML]: https://core.telegram.org/bots/api#html-style
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
+
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
 }
 
 impl InputMediaPhoto {
@@ -43,6 +47,7 @@ impl InputMediaPhoto {
             media,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
         }
     }
 
@@ -92,6 +97,10 @@ pub struct InputMediaVideo {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Video width.
     pub width: Option<u16>,
 
@@ -112,6 +121,7 @@ impl InputMediaVideo {
             thumb: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
             width: None,
             height: None,
             duration: None,
@@ -142,6 +152,14 @@ impl InputMediaVideo {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub const fn width(mut self, val: u16) -> Self {
         self.width = Some(val);
         self
@@ -191,6 +209,10 @@ pub struct InputMediaAnimation {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Animation width.
     pub width: Option<u16>,
 
@@ -211,6 +233,7 @@ impl InputMediaAnimation {
             width: None,
             height: None,
             duration: None,
+            caption_entities: None,
         }
     }
 
@@ -237,6 +260,14 @@ impl InputMediaAnimation {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub const fn width(mut self, val: u16) -> Self {
         self.width = Some(val);
         self
@@ -280,6 +311,10 @@ pub struct InputMediaAudio {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
     /// Duration of the audio in seconds.
     pub duration: Option<u16>,
 
@@ -300,6 +335,7 @@ impl InputMediaAudio {
             performer: None,
             title: None,
             duration: None,
+            caption_entities: None,
         }
     }
 
@@ -326,6 +362,14 @@ impl InputMediaAudio {
         self
     }
 
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub const fn duration(mut self, val: u16) -> Self {
         self.duration = Some(val);
         self
@@ -374,6 +418,15 @@ pub struct InputMediaDocument {
     /// [HTML]: https://core.telegram.org/bots/api#html-style
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
+
+    /// List of special entities that appear in the caption, which can be
+    /// specified instead of `parse_mode`.
+    pub caption_entities: Option<Vec<MessageEntity>>,
+
+    /// Disables automatic server-side content type detection for files uploaded
+    /// using multipart/form-data. Always true, if the document is sent as part
+    /// of an album.
+    pub disable_content_type_detection: Option<bool>,
 }
 
 impl InputMediaDocument {
@@ -383,6 +436,8 @@ impl InputMediaDocument {
             thumb: None,
             caption: None,
             parse_mode: None,
+            disable_content_type_detection: None,
+            caption_entities: None,
         }
     }
 
@@ -408,6 +463,14 @@ impl InputMediaDocument {
         self.parse_mode = Some(val);
         self
     }
+
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
 }
 
 impl From<InputMedia> for InputFile {
@@ -446,6 +509,7 @@ mod tests {
             media: InputFile::FileId(String::from("123456")),
             caption: None,
             parse_mode: None,
+            caption_entities: None,
         });
 
         let actual_json = serde_json::to_string(&photo).unwrap();
@@ -464,6 +528,7 @@ mod tests {
             height: None,
             duration: None,
             supports_streaming: None,
+            caption_entities: None,
         });
 
         let actual_json = serde_json::to_string(&video).unwrap();
@@ -481,6 +546,7 @@ mod tests {
             width: None,
             height: None,
             duration: None,
+            caption_entities: None,
         });
 
         let actual_json = serde_json::to_string(&video).unwrap();
@@ -498,6 +564,7 @@ mod tests {
             duration: None,
             performer: None,
             title: None,
+            caption_entities: None,
         });
 
         let actual_json = serde_json::to_string(&video).unwrap();
@@ -512,6 +579,8 @@ mod tests {
             thumb: None,
             caption: None,
             parse_mode: None,
+            caption_entities: None,
+            disable_content_type_detection: None,
         });
 
         let actual_json = serde_json::to_string(&video).unwrap();
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index f8cae294..c243af72 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::ParseMode;
+use crate::types::{MessageEntity, ParseMode};
 
 /// This object represents the content of a message to be sent as a result of an
 /// inline query.
@@ -30,6 +30,10 @@ pub struct InputMessageContentText {
     /// [bold, italic, fixed-width text or inline URLs]: https://core.telegram.org/bots/api#formatting-options
     pub parse_mode: Option<ParseMode>,
 
+    /// List of special entities that appear in message text, which can be
+    /// specified instead of `parse_mode`.
+    pub entities: Option<Vec<MessageEntity>>,
+
     /// Disables link previews for links in the sent message.
     pub disable_web_page_preview: Option<bool>,
 }
@@ -43,6 +47,7 @@ impl InputMessageContentText {
             message_text: message_text.into(),
             parse_mode: None,
             disable_web_page_preview: None,
+            entities: None,
         }
     }
 
@@ -59,6 +64,14 @@ impl InputMessageContentText {
         self
     }
 
+    pub fn entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.entities = Some(val.into_iter().collect());
+        self
+    }
+
     pub fn disable_web_page_preview(mut self, val: bool) -> Self {
         self.disable_web_page_preview = Some(val);
         self
@@ -76,9 +89,21 @@ pub struct InputMessageContentLocation {
     /// Longitude of the location in degrees.
     pub longitude: f64,
 
+    /// The radius of uncertainty for the location, measured in meters; 0-1500
+    pub horizontal_accuracy: Option<f64>,
+
     /// Period in seconds for which the location can be updated, should be
     /// between 60 and 86400.
     pub live_period: Option<u32>,
+
+    /// For live locations, a direction in which the user is moving, in degrees.
+    /// Must be between 1 and 360 if specified.
+    pub heading: Option<u16>,
+
+    /// For live locations, a maximum distance for proximity alerts about
+    /// approaching another chat member, in meters. Must be between 1 and 100000
+    /// if specified.
+    pub proximity_alert_radius: Option<u32>,
 }
 
 impl InputMessageContentLocation {
@@ -87,6 +112,9 @@ impl InputMessageContentLocation {
             latitude,
             longitude,
             live_period: None,
+            horizontal_accuracy: None,
+            heading: None,
+            proximity_alert_radius: None,
         }
     }
 
@@ -130,6 +158,14 @@ pub struct InputMessageContentVenue {
     /// `arts_entertainment/default`, `arts_entertainment/aquarium`
     /// or `food/icecream`.)
     pub foursquare_type: Option<String>,
+
+    /// Google Places identifier of the venue.
+    pub google_place_id: Option<String>,
+
+    /// Google Places type of the venue. (See [supported types].)
+    ///
+    /// [supported types]: https://developers.google.com/places/web-service/supported_types
+    pub google_place_type: Option<String>,
 }
 
 impl InputMessageContentVenue {
@@ -145,6 +181,8 @@ impl InputMessageContentVenue {
             address: address.into(),
             foursquare_id: None,
             foursquare_type: None,
+            google_place_id: None,
+            google_place_type: None,
         }
     }
 
@@ -270,6 +308,7 @@ mod tests {
             message_text: String::from("text"),
             parse_mode: None,
             disable_web_page_preview: None,
+            entities: None,
         });
 
         let actual_json = serde_json::to_string(&text_content).unwrap();
@@ -283,6 +322,9 @@ mod tests {
             latitude: 59.08,
             longitude: 38.4326,
             live_period: None,
+            horizontal_accuracy: None,
+            heading: None,
+            proximity_alert_radius: None,
         });
 
         let actual_json = serde_json::to_string(&location_content).unwrap();
@@ -299,6 +341,8 @@ mod tests {
             address: String::from("some address"),
             foursquare_id: None,
             foursquare_type: None,
+            google_place_id: None,
+            google_place_type: None,
         });
 
         let actual_json = serde_json::to_string(&venue_content).unwrap();
diff --git a/src/types/location.rs b/src/types/location.rs
index c624d638..eb417c52 100644
--- a/src/types/location.rs
+++ b/src/types/location.rs
@@ -8,4 +8,19 @@ pub struct Location {
 
     /// Latitude as defined by sender.
     pub latitude: f64,
+
+    /// The radius of uncertainty for the location, measured in meters; 0-1500
+    pub horizontal_accuracy: Option<f64>,
+
+    /// Time relative to the message sending date, during which the location can
+    /// be updated, in seconds. For active live locations only.
+    pub live_period: Option<u32>,
+
+    /// The direction in which user is moving, in degrees; 1-360. For active
+    /// live locations only.
+    pub heading: Option<u16>,
+
+    /// Maximum distance for proximity alerts about approaching another chat
+    /// member, in meters. For sent live locations only.
+    pub proximity_alert_radius: Option<u32>,
 }
diff --git a/src/types/message.rs b/src/types/message.rs
index bc8ddb32..a743a714 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -5,8 +5,9 @@ use serde::{Deserialize, Serialize};
 use crate::types::{
     chat::{ChatKind, PublicChatKind},
     Animation, Audio, Chat, ChatPublic, Contact, Dice, Document, Game, InlineKeyboardMarkup,
-    Invoice, Location, MessageEntity, PassportData, PhotoSize, Poll, PublicChatChannel,
-    PublicChatSupergroup, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote, Voice,
+    Invoice, Location, MessageEntity, PassportData, PhotoSize, Poll, ProximityAlertTriggered,
+    PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment, True, User, Venue, Video,
+    VideoNote, Voice,
 };
 
 /// This object represents a message.
@@ -50,6 +51,7 @@ pub enum MessageKind {
     ConnectedWebsite(MessageConnectedWebsite),
     PassportData(MessagePassportData),
     Dice(MessageDice),
+    ProximityAlertTriggered(MessageProximityAlertTriggered),
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -58,6 +60,16 @@ pub struct MessageCommon {
     /// Sender, empty for messages sent to channels.
     pub from: Option<User>,
 
+    /// Sender of the message, sent on behalf of a chat. The channel itself for
+    /// channel messages. The supergroup itself for messages from anonymous
+    /// group administrators. The linked channel for messages automatically
+    /// forwarded to the discussion group
+    pub sender_chat: Option<Chat>,
+
+    /// Signature of the post author for messages in channels, or the custom
+    /// title of an anonymous group administrator.
+    pub author_signature: Option<String>,
+
     #[serde(flatten)]
     pub forward_kind: ForwardKind,
 
@@ -426,27 +438,28 @@ pub struct MessageDice {
     pub dice: Dice,
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageProximityAlertTriggered {
+    /// Service message. A user in the chat triggered another user's proximity
+    /// alert while sharing Live Location.
+    pub proximity_alert_triggered: ProximityAlertTriggered,
+}
+
 mod getters {
     use std::ops::Deref;
 
     use crate::types::{
         self,
-        message::{
-            ForwardKind::NonChannel,
-            MessageKind::{
-                ChannelChatCreated, Common, ConnectedWebsite, DeleteChatPhoto, GroupChatCreated,
-                Invoice, LeftChatMember, Migrate, NewChatMembers, NewChatPhoto, NewChatTitle,
-                PassportData, Pinned, SuccessfulPayment, SupergroupChatCreated,
-            },
-        },
+        message::{ForwardKind::NonChannel, MessageKind::*},
         Chat, ForwardChannel, ForwardKind, ForwardNonChannel, ForwardOrigin, ForwardedFrom,
         MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind,
         MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo,
         MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
-        MessageConnectedWebsite, MessageDeleteChatPhoto, MessageEntity, MessageGroupChatCreated,
-        MessageInvoice, MessageLeftChatMember, MessageMigrate, MessageNewChatMembers,
-        MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessagePinned,
-        MessageSuccessfulPayment, MessageSupergroupChatCreated, PhotoSize, True, User,
+        MessageConnectedWebsite, MessageDeleteChatPhoto, MessageDice, MessageEntity,
+        MessageGroupChatCreated, MessageInvoice, MessageLeftChatMember, MessageMigrate,
+        MessageNewChatMembers, MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData,
+        MessagePinned, MessageProximityAlertTriggered, MessageSuccessfulPayment,
+        MessageSupergroupChatCreated, PhotoSize, True, User,
     };
 
     /// Getters for [Message] fields from [telegram docs].
@@ -454,7 +467,6 @@ mod getters {
     /// [Message]: crate::types::Message
     /// [telegram docs]: https://core.telegram.org/bots/api#message
     impl Message {
-        /// NOTE: this is getter for both `from` and `author_signature`
         pub fn from(&self) -> Option<&User> {
             match &self.kind {
                 Common(MessageCommon { from, .. }) => from.as_ref(),
@@ -462,6 +474,22 @@ mod getters {
             }
         }
 
+        pub fn author_signature(&self) -> Option<&str> {
+            match &self.kind {
+                Common(MessageCommon {
+                    author_signature, ..
+                }) => author_signature.as_deref(),
+                _ => None,
+            }
+        }
+
+        pub fn sender_chat(&self) -> Option<&Chat> {
+            match &self.kind {
+                Common(MessageCommon { sender_chat, .. }) => sender_chat.as_ref(),
+                _ => None,
+            }
+        }
+
         pub fn chat_id(&self) -> i64 {
             self.chat.id
         }
@@ -566,10 +594,6 @@ mod getters {
             }
         }
 
-        pub fn text_owned(&self) -> Option<String> {
-            self.text().map(ToOwned::to_owned)
-        }
-
         pub fn entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -903,6 +927,22 @@ mod getters {
             }
         }
 
+        pub fn dice(&self) -> Option<&types::Dice> {
+            match &self.kind {
+                Dice(MessageDice { dice }) => Some(dice),
+                _ => None,
+            }
+        }
+
+        pub fn proximity_alert_triggered(&self) -> Option<&types::ProximityAlertTriggered> {
+            match &self.kind {
+                ProximityAlertTriggered(MessageProximityAlertTriggered {
+                    proximity_alert_triggered,
+                }) => Some(proximity_alert_triggered),
+                _ => None,
+            }
+        }
+
         pub fn reply_markup(&self) -> Option<&types::InlineKeyboardMarkup> {
             match &self.kind {
                 Common(MessageCommon { reply_markup, .. }) => reply_markup.as_ref(),
@@ -919,6 +959,7 @@ impl Message {
                 kind:
                     PublicChatKind::Channel(PublicChatChannel {
                         username: Some(username),
+                        ..
                     }),
                 ..
             })
diff --git a/src/types/message_id.rs b/src/types/message_id.rs
new file mode 100644
index 00000000..05079c95
--- /dev/null
+++ b/src/types/message_id.rs
@@ -0,0 +1,5 @@
+/// This object represents a unique message identifier.
+pub struct MessageId {
+    /// Unique message identifier
+    pub message_id: i32,
+}
diff --git a/src/types/proximity_alert_triggered.rs b/src/types/proximity_alert_triggered.rs
new file mode 100644
index 00000000..a0addc95
--- /dev/null
+++ b/src/types/proximity_alert_triggered.rs
@@ -0,0 +1,17 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::User;
+
+/// This object represents the content of a service message, sent whenever a
+/// user in the chat triggers a proximity alert set by another user.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct ProximityAlertTriggered {
+    /// User that triggered the alert.
+    pub traveler: User,
+
+    /// User that set the alert.
+    pub watcher: User,
+
+    /// The distance between the users.
+    pub distance: u32,
+}
diff --git a/src/types/update.rs b/src/types/update.rs
index b4f8aecd..d5514d96 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -169,8 +169,10 @@ mod test {
                         username: Some(String::from("WaffleLapkin")),
                         first_name: Some(String::from("Waffle")),
                         last_name: None,
+                        bio: None,
                     }),
                     photo: None,
+                    pinned_message: None,
                 },
                 kind: MessageKind::Common(MessageCommon {
                     from: Some(User {
@@ -190,6 +192,8 @@ mod test {
                         entities: vec![],
                     }),
                     reply_markup: None,
+                    sender_chat: None,
+                    author_signature: None,
                 }),
             }),
         };
diff --git a/src/types/venue.rs b/src/types/venue.rs
index afb0cc90..6915472d 100644
--- a/src/types/venue.rs
+++ b/src/types/venue.rs
@@ -22,4 +22,12 @@ pub struct Venue {
     /// `arts_entertainment/default`, `arts_entertainment/aquarium` or
     /// `food/icecream`.)
     pub foursquare_type: Option<String>,
+
+    /// Google Places identifier of the venue.
+    pub google_place_id: Option<String>,
+
+    /// Google Places type of the venue. (See [supported types].)
+    ///
+    /// [supported types]: https://developers.google.com/places/web-service/supported_types
+    pub google_place_type: Option<String>,
 }
diff --git a/src/types/video.rs b/src/types/video.rs
index bc8611ec..c0e1ac46 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -29,6 +29,9 @@ pub struct Video {
     /// Video thumbnail.
     pub thumb: Option<PhotoSize>,
 
+    /// Original filename as defined by sender
+    pub file_name: Option<String>,
+
     /// Mime type of a file as defined by sender.
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index e7658381..d725264a 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -16,6 +16,9 @@ pub struct WebhookInfo {
     /// Number of updates awaiting delivery.
     pub pending_update_count: u32,
 
+    /// Currently used webhook IP address.
+    pub ip_address: Option<String>,
+
     /// Unix time for the most recent error that happened when trying to
     /// deliver an update via webhook.
     pub last_error_date: Option<u64>,

From fa5ab5aa7c4efac07fc89a8d51e71b3e10565228 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 14 Mar 2021 22:44:33 +0300
Subject: [PATCH 256/755] Update methods to tba 5.0

---
 src/adaptors/auto_send.rs                     | 12 ++---
 src/adaptors/cache_me.rs                      | 20 ++------
 src/adaptors/parse_mode.rs                    | 21 +++++----
 src/adaptors/throttle.rs                      | 15 +++---
 src/bot/api.rs                                | 34 ++++++++++++++
 src/local_macros.rs                           | 33 +++++++++++++
 src/payloads.rs                               | 10 +++-
 src/payloads/close.rs                         | 14 ++++++
 src/payloads/copy_message.rs                  | 46 +++++++++++++++++++
 src/payloads/delete_webhook.rs                |  4 ++
 src/payloads/edit_message_caption.rs          |  4 +-
 src/payloads/edit_message_caption_inline.rs   |  4 +-
 src/payloads/edit_message_live_location.rs    |  6 +++
 .../edit_message_live_location_inline.rs      |  6 +++
 src/payloads/edit_message_text.rs             |  4 +-
 src/payloads/edit_message_text_inline.rs      |  4 +-
 src/payloads/log_out.rs                       | 14 ++++++
 src/payloads/promote_chat_member.rs           |  2 +
 src/payloads/send_animation.rs                |  6 ++-
 src/payloads/send_audio.rs                    |  6 ++-
 src/payloads/send_contact.rs                  |  2 +
 src/payloads/send_dice.rs                     |  2 +
 src/payloads/send_document.rs                 |  8 +++-
 src/payloads/send_game.rs                     | 16 ++++++-
 src/payloads/send_invoice.rs                  |  2 +
 src/payloads/send_location.rs                 |  8 ++++
 src/payloads/send_media_group.rs              |  8 ++--
 src/payloads/send_message.rs                  |  6 ++-
 src/payloads/send_photo.rs                    |  6 ++-
 src/payloads/send_poll.rs                     |  8 +++-
 src/payloads/send_sticker.rs                  |  2 +
 src/payloads/send_venue.rs                    |  8 ++++
 src/payloads/send_video.rs                    |  6 ++-
 src/payloads/send_video_note.rs               |  2 +
 src/payloads/send_voice.rs                    |  6 ++-
 src/payloads/set_webhook.rs                   |  4 ++
 src/payloads/setters.rs                       | 32 ++++++-------
 src/payloads/unban_chat_member.rs             |  6 ++-
 src/payloads/unpin_all_chat_messages.rs       | 17 +++++++
 src/payloads/unpin_chat_message.rs            |  6 ++-
 src/requests/requester.rs                     | 35 ++++++++++++--
 41 files changed, 376 insertions(+), 79 deletions(-)
 create mode 100644 src/payloads/close.rs
 create mode 100644 src/payloads/copy_message.rs
 create mode 100644 src/payloads/log_out.rs
 create mode 100644 src/payloads/unpin_all_chat_messages.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index d6a7f44c..1fb51ba7 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -82,17 +82,17 @@ where
     type Err = B::Err;
 
     requester_forward! {
-        get_me, send_message, get_updates, set_webhook, delete_webhook,
-        get_webhook_info, forward_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group,
-        send_location, edit_message_live_location, edit_message_live_location_inline,
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
-        get_chat, get_chat_administrators, get_chat_members_count, get_chat_member,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
         set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index f964f6a4..70f5f30e 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -87,28 +87,18 @@ where
         }
     }
 
-    type SendMessage = B::SendMessage;
-
-    fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
-    where
-        C: Into<ChatId>,
-        T: Into<String>,
-    {
-        self.bot.send_message(chat_id, text)
-    }
-
     requester_forward! {
-        get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, send_photo, send_audio, send_document, send_video,
-        send_animation, send_voice, send_video_note, send_media_group, send_location,
+        log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
-        get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
         set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index f35cd3b2..e22b02ab 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -94,25 +94,26 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
     }
 
     requester_forward! {
-        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, send_video_note, send_media_group, send_location,
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_video_note, send_media_group, send_location,
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
-        get_chat, get_chat_administrators, get_chat_members_count, get_chat_member,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, answer_inline_query, edit_message_media,
-        edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message,
-        send_sticker, get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        set_my_commands, get_my_commands, answer_inline_query,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game, set_game_score,
-        set_game_score_inline, get_game_high_scores, get_updates_fault_tolerant => fid, fty
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => fid, fty
     }
 }
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index efdda09f..1b66d884 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -387,6 +387,7 @@ impl<B: Requester> Requester for Throttle<B>
 where
     B::SendMessage: Send,
     B::ForwardMessage: Send,
+    B::CopyMessage: Send,
     B::SendPhoto: Send,
     B::SendAudio: Send,
     B::SendDocument: Send,
@@ -406,10 +407,10 @@ where
     type Err = B::Err;
 
     requester_forward! {
-        send_message,
-        forward_message, send_photo, send_audio, send_document, send_video,
-        send_animation, send_voice, send_video_note, send_media_group, send_location,
-        send_venue, send_contact, send_poll, send_dice, send_sticker,  => f, fty
+        send_message, forward_message, copy_message, send_photo, send_audio,
+        send_document, send_video, send_animation, send_voice, send_video_note,
+        send_media_group, send_location, send_venue, send_contact, send_poll,
+        send_dice, send_sticker,  => f, fty
     }
 
     type SendInvoice = ThrottlingRequest<B::SendInvoice>;
@@ -451,15 +452,15 @@ where
     }
 
     requester_forward! {
-        get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline,
         send_chat_action, get_user_profile_photos, get_file, kick_chat_member,
         unban_chat_member, restrict_chat_member, promote_chat_member,
         set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
-        get_chat, get_chat_administrators, get_chat_members_count,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
         get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
         answer_callback_query, set_my_commands, get_my_commands, answer_inline_query,
         edit_message_text, edit_message_text_inline, edit_message_caption,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 2b35eb31..bc391edb 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -967,6 +967,40 @@ impl Requester for Bot {
         )
     }
 
+    type LogOut = JsonRequest<payloads::LogOut>;
+
+    fn log_out(&self) -> Self::LogOut {
+        Self::LogOut::new(self.clone(), payloads::LogOut::new())
+    }
+
+    type Close = JsonRequest<payloads::Close>;
+
+    fn close(&self) -> Self::Close {
+        Self::Close::new(self.clone(), payloads::Close::new())
+    }
+
+    type CopyMessage = JsonRequest<payloads::CopyMessage>;
+
+    fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>,
+    {
+        Self::CopyMessage::new(
+            self.clone(),
+            payloads::CopyMessage::new(chat_id, from_chat_id, message_id),
+        )
+    }
+
+    type UnpinAllChatMessages = JsonRequest<payloads::UnpinAllChatMessages>;
+
+    fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages
+    where
+        C: Into<ChatId>,
+    {
+        Self::UnpinAllChatMessages::new(self.clone(), payloads::UnpinAllChatMessages::new(chat_id))
+    }
+
     type GetUpdatesFaultTolerant = JsonRequest<payloads::GetUpdatesFaultTolerant>;
 
     fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant {
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 99911839..5bb47f20 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -443,6 +443,22 @@ macro_rules! requester_forward {
             $body!(get_me this ())
         }
     };
+    (@method log_out $body:ident $ty:ident) => {
+        type LogOut = $ty![LogOut];
+
+        fn log_out(&self) -> Self::LogOut {
+            let this = self;
+            $body!(log_out this ())
+        }
+    };
+    (@method close $body:ident $ty:ident) => {
+        type Close = $ty![Close];
+
+        fn close(&self) -> Self::Close {
+            let this = self;
+            $body!(close this ())
+        }
+    };
     (@method send_message $body:ident $ty:ident) => {
         type SendMessage = $ty![SendMessage];
 
@@ -461,6 +477,15 @@ macro_rules! requester_forward {
             $body!(forward_message this (chat_id: C, from_chat_id: F, message_id: i32))
         }
     };
+    (@method copy_message $body:ident $ty:ident) => {
+        type CopyMessage = $ty![CopyMessage];
+
+        fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage where C: Into<ChatId>,
+        F: Into<ChatId> {
+            let this = self;
+            $body!(copy_message this (chat_id: C, from_chat_id: F, message_id: i32))
+        }
+    };
     (@method send_photo $body:ident $ty:ident) => {
         type SendPhoto = $ty![SendPhoto];
 
@@ -734,6 +759,14 @@ macro_rules! requester_forward {
             $body!(unpin_chat_message this (chat_id: C))
         }
     };
+    (@method unpin_all_chat_messages $body:ident $ty:ident) => {
+        type UnpinAllChatMessages = $ty![UnpinAllChatMessages];
+
+        fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages where C: Into<ChatId> {
+            let this = self;
+            $body!(unpin_all_chat_messages this (chat_id: C))
+        }
+    };
     (@method leave_chat $body:ident $ty:ident) => {
         type LeaveChat = $ty![LeaveChat];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index 685fafba..bf6bfa93 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -12,7 +12,7 @@
 /// namespace.
 pub mod setters;
 
-// This block is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This block is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS BLOCK**,
 // edit `cg` instead.
 mod add_sticker_to_set;
@@ -20,6 +20,8 @@ mod answer_callback_query;
 mod answer_inline_query;
 mod answer_pre_checkout_query;
 mod answer_shipping_query;
+mod close;
+mod copy_message;
 mod create_new_sticker_set;
 mod delete_chat_photo;
 mod delete_chat_sticker_set;
@@ -52,6 +54,7 @@ mod get_user_profile_photos;
 mod get_webhook_info;
 mod kick_chat_member;
 mod leave_chat;
+mod log_out;
 mod pin_chat_message;
 mod promote_chat_member;
 mod restrict_chat_member;
@@ -90,6 +93,7 @@ mod stop_message_live_location;
 mod stop_message_live_location_inline;
 mod stop_poll;
 mod unban_chat_member;
+mod unpin_all_chat_messages;
 mod unpin_chat_message;
 mod upload_sticker_file;
 
@@ -98,6 +102,8 @@ pub use answer_callback_query::{AnswerCallbackQuery, AnswerCallbackQuerySetters}
 pub use answer_inline_query::{AnswerInlineQuery, AnswerInlineQuerySetters};
 pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQuerySetters};
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
+pub use close::{Close, CloseSetters};
+pub use copy_message::{CopyMessage, CopyMessageSetters};
 pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters};
 pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
 pub use delete_chat_sticker_set::{DeleteChatStickerSet, DeleteChatStickerSetSetters};
@@ -134,6 +140,7 @@ pub use get_user_profile_photos::{GetUserProfilePhotos, GetUserProfilePhotosSett
 pub use get_webhook_info::{GetWebhookInfo, GetWebhookInfoSetters};
 pub use kick_chat_member::{KickChatMember, KickChatMemberSetters};
 pub use leave_chat::{LeaveChat, LeaveChatSetters};
+pub use log_out::{LogOut, LogOutSetters};
 pub use pin_chat_message::{PinChatMessage, PinChatMessageSetters};
 pub use promote_chat_member::{PromoteChatMember, PromoteChatMemberSetters};
 pub use restrict_chat_member::{RestrictChatMember, RestrictChatMemberSetters};
@@ -176,6 +183,7 @@ pub use stop_message_live_location_inline::{
 };
 pub use stop_poll::{StopPoll, StopPollSetters};
 pub use unban_chat_member::{UnbanChatMember, UnbanChatMemberSetters};
+pub use unpin_all_chat_messages::{UnpinAllChatMessages, UnpinAllChatMessagesSetters};
 pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
 
diff --git a/src/payloads/close.rs b/src/payloads/close.rs
new file mode 100644
index 00000000..3386aff1
--- /dev/null
+++ b/src/payloads/close.rs
@@ -0,0 +1,14 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to close the bot instance before moving it from one local server to another. You need to delete the webhook before calling this method to ensure that the bot isn't launched again after server restart. The method will return error 429 in the first 10 minutes after the bot is launched. Returns _True_ on success. Requires no parameters.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub Close (CloseSetters) => True {
+
+    }
+}
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
new file mode 100644
index 00000000..0e5eeefd
--- /dev/null
+++ b/src/payloads/copy_message.rs
@@ -0,0 +1,46 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
+
+impl_payload! {
+    /// Use this method to copy messages of any kind. The method is analogous to the method forwardMessage, but the copied message doesn't have a link to the original message. Returns the [`MessageId`] of the sent message on success.
+    ///
+    /// [`MessageId`]: crate::types::MessageId
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub CopyMessage (CopyMessageSetters) => Message {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
+            pub from_chat_id: ChatId [into],
+            /// Message identifier in the chat specified in _from\_chat\_id_
+            pub message_id: i32,
+        }
+        optional {
+            /// New caption for media, 0-1024 characters after entities parsing. If not specified, the original caption is kept
+            pub caption: String [into],
+            /// Mode for parsing entities in the photo caption. See [formatting options] for more details.
+            ///
+            /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
+            pub parse_mode: ParseMode,
+            /// List of special entities that appear in the new caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
+            /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            /// [custom reply keyboard]: https://core.telegram.org/bots#keyboards
+            pub reply_markup: ReplyMarkup [into],
+        }
+    }
+}
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index 2822e14a..cda82309 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -12,5 +12,9 @@ impl_payload! {
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub DeleteWebhook (DeleteWebhookSetters) => True {
 
+        optional {
+            /// Pass _True_ to drop all pending updates
+            pub drop_pending_updates: bool,
+        }
     }
 }
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 8216f859..143a703c 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Message, ParseMode};
+use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
 
 impl_payload! {
     /// Use this method to edit captions of messages. On success, the edited Message is returned.
@@ -24,6 +24,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// A JSON-serialized object for an [inline keyboard].
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 661d7fd9..247b59de 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, ParseMode, True};
+use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
 
 impl_payload! {
     /// Use this method to edit captions of messages. On success, _True_ is returned.
@@ -22,6 +22,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// A JSON-serialized object for an [inline keyboard].
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 5e7aaba4..e9b3670e 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -24,6 +24,12 @@ impl_payload! {
             pub longitude: f64,
         }
         optional {
+            /// The radius of uncertainty for the location, measured in meters; 0-1500
+            pub horizontal_accuracy: f64,
+            /// For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.
+            pub heading: u16,
+            /// For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.
+            pub proximity_alert_radius: u32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 348fa138..c7241a1c 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -22,6 +22,12 @@ impl_payload! {
             pub longitude: f64,
         }
         optional {
+            /// The radius of uncertainty for the location, measured in meters; 0-1500
+            pub horizontal_accuracy: f64,
+            /// For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.
+            pub heading: u16,
+            /// For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.
+            pub proximity_alert_radius: u32,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index a9d5dcce..ee8f18de 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Message, ParseMode};
+use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
 
 impl_payload! {
     /// Use this method to edit text and [games] messages. On success, the edited Message is returned.
@@ -26,6 +26,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in message text, which can be specified instead of _parse\_mode_
+            pub entities: Vec<MessageEntity> [collect],
             /// Disables link previews for links in this message
             pub disable_web_page_preview: bool,
             /// A JSON-serialized object for an [inline keyboard].
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 9e51eca3..d529814a 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, ParseMode, True};
+use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
 
 impl_payload! {
     /// Use this method to edit text and [games] messages. On success, _True_ is returned.
@@ -24,6 +24,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in message text, which can be specified instead of _parse\_mode_
+            pub entities: Vec<MessageEntity> [collect],
             /// Disables link previews for links in this message
             pub disable_web_page_preview: bool,
             /// A JSON-serialized object for an [inline keyboard].
diff --git a/src/payloads/log_out.rs b/src/payloads/log_out.rs
new file mode 100644
index 00000000..ece3cc50
--- /dev/null
+++ b/src/payloads/log_out.rs
@@ -0,0 +1,14 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::True;
+
+impl_payload! {
+    /// Use this method to log out from the cloud Bot API server before launching the bot locally. You **must** log out the bot before running it locally, otherwise there is no guarantee that the bot will receive updates. After a successful call, you can immediately log in on a local server, but will not be able to log in back to the cloud Bot API server for 10 minutes. Returns _True_ on success. Requires no parameters.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub LogOut (LogOutSetters) => True {
+
+    }
+}
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 7af9050b..d8229d09 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -16,6 +16,8 @@ impl_payload! {
             pub user_id: i32,
         }
         optional {
+            /// Pass True, if the administrator's presence in the chat is hidden
+            pub is_anonymous: bool,
             /// Pass True, if the administrator can change chat title, photo and other settings
             pub can_change_info: bool,
             /// Pass True, if the administrator can create channel posts, channels only
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 1cd351a4..786d778f 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -37,12 +37,16 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the photo caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 9caf22ad..d52c4bfa 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -30,6 +30,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the photo caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// Duration of the audio in seconds
             pub duration: u32,
             /// Performer
@@ -46,6 +48,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index ed08f42f..9bc256b1 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -32,6 +32,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 0aa5e59f..613ac091 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -24,6 +24,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index fca931ef..9d262300 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -31,12 +31,18 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the photo caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
+            /// Disables automatic server-side content type detection for files uploaded using multipart/form-data.
+            pub disable_content_type_detection: bool,
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index 6b657a55..f9ef39c4 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::Message;
+use crate::types::{Message, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send a game. On success, the sent [`Message`] is returned.
@@ -17,5 +17,19 @@ impl_payload! {
             /// Short name of the game, serves as the unique identifier for the game. Set up your games via Botfather.
             pub game_short_name: String [into],
         }
+        optional {
+            /// Sends the message [silently]. Users will receive a notification with no sound.
+            ///
+            /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
+            pub disable_notification: bool,
+            /// If the message is a reply, ID of the original message
+            pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
+            /// A JSON-serialized object for an [inline keyboard]. If empty, one 'Play game_title' button will be shown. If not empty, the first button must launch the game.
+            ///
+            /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
+            pub reply_markup: ReplyMarkup [into],
+        }
     }
 }
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index ede44d1a..0eb4df20 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -62,6 +62,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// A JSON-serialized object for an [inline keyboard]. If empty, one 'Pay `total price`' button will be shown. If not empty, the first button must be a Pay button.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 28c8c329..fdc49e8a 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -20,16 +20,24 @@ impl_payload! {
             pub longitude: f64,
         }
         optional {
+            /// The radius of uncertainty for the location, measured in meters; 0-1500
+            pub horizontal_accuracy: f64,
             /// Period in seconds for which the location will be updated (see [Live Locations], should be between 60 and 86400.
             ///
             /// [Live Locations]: https://telegram.org/blog/live-locations
             pub live_period: u32,
+            /// For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.
+            pub heading: u16,
+            /// For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.
+            pub proximity_alert_radius: u32,
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index fba6ac81..d84ee27e 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -6,15 +6,15 @@ use serde::Serialize;
 use crate::types::{ChatId, InputMedia, Message};
 
 impl_payload! {
-    /// Use this method to send a group of photos or videos as an album. On success, an array of the sent [`Message`]s is returned.
+    /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Messages`] that were sent is returned.
     ///
-    /// [`Message`]: crate::types::Message
+    /// [`Messages`]: crate::types::Messages
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendMediaGroup (SendMediaGroupSetters) => Vec<Message> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// A JSON-serialized array describing photos and videos to be sent, must include 2-10 items
+            /// A JSON-serialized array describing messages to be sent, must include 2-10 items
             pub media: Vec<InputMedia> [collect],
         }
         optional {
@@ -24,6 +24,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
         }
     }
 }
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 07815164..6417d53f 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send text messages. On success, the sent [`Message`] is returned.
@@ -22,6 +22,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the message text, which can be specified instead of _parse\_mode_
+            pub entities: Vec<MessageEntity> [collect],
             /// Disables link previews for links in this message
             pub disable_web_page_preview: bool,
             /// Sends the message [silently]. Users will receive a notification with no sound.
@@ -30,6 +32,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index d35cec82..33a333c8 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -27,12 +27,16 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the photo caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index a141e7e7..48ef9331 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ParseMode, PollType, ReplyMarkup};
+use crate::types::{ChatId, Message, MessageEntity, ParseMode, PollType, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
@@ -14,7 +14,7 @@ impl_payload! {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// Poll question, 1-255 characters
+            /// Poll question, 1-300 characters
             pub question: String [into],
             /// A JSON-serialized list of answer options, 2-10 strings 1-100 characters each
             pub options: Vec<String> [collect],
@@ -34,6 +34,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub explanation_parse_mode: ParseMode,
+            /// List of special entities that appear in the poll explanation, which can be specified instead of _parse\_mode_
+            pub explanation_entities: Vec<MessageEntity> [collect],
             /// Amount of time in seconds the poll will be active after creation, 5-600. Can't be used together with close_date.
             pub open_period: u16,
             /// Point in time (Unix timestamp) when the poll will be automatically closed. Must be at least 5 and no more than 600 seconds in the future. Can't be used together with open_period.
@@ -46,6 +48,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 1434cd55..21199ca1 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -27,6 +27,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 4805199b..331807b4 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -28,12 +28,20 @@ impl_payload! {
             pub foursquare_id: String [into],
             /// Foursquare type of the venue, if known. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
             pub foursquare_type: String [into],
+            /// Google Places identifier of the venue
+            pub google_place_id: String [into],
+            /// Google Places type of the venue. (See [supported types].)
+            ///
+            /// [supported types]: https://developers.google.com/places/web-service/supported_types
+            pub google_place_type: String [into],
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 3321f5ef..13815516 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -38,6 +38,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// Pass _True_, if the uploaded video is suitable for streaming
             pub supports_streaming: bool,
             /// Sends the message [silently]. Users will receive a notification with no sound.
@@ -46,6 +48,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 3001ad53..08fefd48 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -36,6 +36,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 8f7edb15..0a4817a0 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -3,7 +3,7 @@
 // edit `cg` instead.
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
     @[multipart]
@@ -29,6 +29,8 @@ impl_payload! {
             ///
             /// [formatting options]: https://core.telegram.org/bots/api#formatting-options
             pub parse_mode: ParseMode,
+            /// List of special entities that appear in the photo caption, which can be specified instead of _parse\_mode_
+            pub caption_entities: Vec<MessageEntity> [collect],
             /// Duration of the voice message in seconds
             pub duration: u32,
             /// Sends the message [silently]. Users will receive a notification with no sound.
@@ -37,6 +39,8 @@ impl_payload! {
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
+            /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
+            pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
             ///
             /// [inline keyboard]: https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 401d3f4b..9a6ba57a 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -23,6 +23,8 @@ impl_payload! {
             ///
             /// [self-signed guide]: https://core.telegram.org/bots/self-signed
             pub certificate: InputFile,
+            /// The fixed IP address which will be used to send webhook requests instead of the IP address resolved through DNS
+            pub ip_address: String [into],
             /// Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery, 1-100. Defaults to 40. Use lower values to limit the load on your bot's server, and higher values to increase your bot's throughput.
             pub max_connections: u8,
             /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
@@ -31,6 +33,8 @@ impl_payload! {
             ///
             /// [`Update`]: crate::types::Update
             pub allowed_updates: Vec<AllowedUpdate> [collect],
+            /// Pass _True_ to drop all pending updates
+            pub drop_pending_updates: bool,
         }
     }
 }
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 2947bef2..32aba566 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1,27 +1,27 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (9a82143).
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
 // **DO NOT EDIT THIS FILE**,
 // edit `cg` instead.
 
 #[doc(no_inline)]
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
-    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
-    CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _,
-    DeleteMessageSetters as _, DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _,
-    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
-    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
-    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
-    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
-    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
-    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _, CloseSetters as _,
+    CopyMessageSetters as _, CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _,
+    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteStickerFromSetSetters as _,
+    DeleteWebhookSetters as _, EditMessageCaptionInlineSetters as _,
+    EditMessageCaptionSetters as _, EditMessageLiveLocationInlineSetters as _,
+    EditMessageLiveLocationSetters as _, EditMessageMediaInlineSetters as _,
+    EditMessageMediaSetters as _, EditMessageReplyMarkupInlineSetters as _,
+    EditMessageReplyMarkupSetters as _, EditMessageTextInlineSetters as _,
+    EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberSetters as _, GetChatMembersCountSetters as _,
     GetChatSetters as _, GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
     GetMyCommandsSetters as _, GetStickerSetSetters as _, GetUpdatesSetters as _,
     GetUserProfilePhotosSetters as _, GetWebhookInfoSetters as _, KickChatMemberSetters as _,
-    LeaveChatSetters as _, PinChatMessageSetters as _, PromoteChatMemberSetters as _,
-    RestrictChatMemberSetters as _, SendAnimationSetters as _, SendAudioSetters as _,
-    SendChatActionSetters as _, SendContactSetters as _, SendDiceSetters as _,
-    SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
+    LeaveChatSetters as _, LogOutSetters as _, PinChatMessageSetters as _,
+    PromoteChatMemberSetters as _, RestrictChatMemberSetters as _, SendAnimationSetters as _,
+    SendAudioSetters as _, SendChatActionSetters as _, SendContactSetters as _,
+    SendDiceSetters as _, SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
     SendLocationSetters as _, SendMediaGroupSetters as _, SendMessageSetters as _,
     SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _, SendVenueSetters as _,
     SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
@@ -31,6 +31,6 @@ pub use crate::payloads::{
     SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
     SetStickerPositionInSetSetters as _, SetStickerSetThumbSetters as _, SetWebhookSetters as _,
     StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
-    StopPollSetters as _, UnbanChatMemberSetters as _, UnpinChatMessageSetters as _,
-    UploadStickerFileSetters as _,
+    StopPollSetters as _, UnbanChatMemberSetters as _, UnpinAllChatMessagesSetters as _,
+    UnpinChatMessageSetters as _, UploadStickerFileSetters as _,
 };
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 54768eac..993b05f1 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -6,7 +6,7 @@ use serde::Serialize;
 use crate::types::{ChatId, True};
 
 impl_payload! {
-    /// Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. Returns _True_ on success.
+    /// Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. By default, this method guarantees that after the call the user is not a member of the chat, but will be able to join it. So if the user is a member of the chat they will also be **removed** from the chat. If you don't want this, use the parameter _only\_if\_banned_. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub UnbanChatMember (UnbanChatMemberSetters) => True {
         required {
@@ -15,5 +15,9 @@ impl_payload! {
             /// Unique identifier of the target user
             pub user_id: i32,
         }
+        optional {
+            /// Do nothing if the user is not banned
+            pub only_if_banned: bool,
+        }
     }
 }
diff --git a/src/payloads/unpin_all_chat_messages.rs b/src/payloads/unpin_all_chat_messages.rs
new file mode 100644
index 00000000..84094426
--- /dev/null
+++ b/src/payloads/unpin_all_chat_messages.rs
@@ -0,0 +1,17 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to clear the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub UnpinAllChatMessages (UnpinAllChatMessagesSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index 9815c7e5..36f08d33 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -6,12 +6,16 @@ use serde::Serialize;
 use crate::types::ChatId;
 
 impl_payload! {
-    /// Use this method to unpin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
+    /// Use this method to remove a message from the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub UnpinChatMessage (UnpinChatMessageSetters) => String {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
         }
+        optional {
+            /// Identifier of a message to unpin. If not specified, the most recent pinned message (by sending date) will be unpinned.
+            pub message_id: i32,
+        }
     }
 }
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index fc48802f..adc4f5f9 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -83,6 +83,16 @@ pub trait Requester {
     /// For Telegram documentation see [`GetMe`].
     fn get_me(&self) -> Self::GetMe;
 
+    type LogOut: Request<Payload = LogOut, Err = Self::Err>;
+
+    /// For Telegram documentation see [`LogOut`].
+    fn log_out(&self) -> Self::LogOut;
+
+    type Close: Request<Payload = Close, Err = Self::Err>;
+
+    /// For Telegram documentation see [`Close`].
+    fn close(&self) -> Self::Close;
+
     type SendMessage: Request<Payload = SendMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendMessage`].
@@ -104,6 +114,14 @@ pub trait Requester {
         C: Into<ChatId>,
         F: Into<ChatId>;
 
+    type CopyMessage: Request<Payload = CopyMessage, Err = Self::Err>;
+
+    /// For Telegram documentation see [`CopyMessage`].
+    fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
+    where
+        C: Into<ChatId>,
+        F: Into<ChatId>;
+
     type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendPhoto`].
@@ -405,6 +423,13 @@ pub trait Requester {
     where
         C: Into<ChatId>;
 
+    type UnpinAllChatMessages: Request<Payload = UnpinAllChatMessages, Err = Self::Err>;
+
+    /// For Telegram documentation see [`UnpinAllChatMessages`].
+    fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages
+    where
+        C: Into<ChatId>;
+
     type LeaveChat: Request<Payload = LeaveChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`LeaveChat`].
@@ -769,17 +794,17 @@ macro_rules! fwd_deref {
 macro_rules! forward_all {
     () => {
         requester_forward! {
-            get_me, get_updates, set_webhook, delete_webhook, get_webhook_info,
-            forward_message, send_message, send_photo, send_audio, send_document, send_video,
-            send_animation, send_voice, send_video_note, send_media_group, send_location,
+            get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+            forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+            send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
             edit_message_live_location, edit_message_live_location_inline,
             stop_message_live_location, stop_message_live_location_inline, send_venue,
             send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
             get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
             promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
             export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-            set_chat_description, pin_chat_message, unpin_chat_message, leave_chat,
-            get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+            set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+            leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
             set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
             set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
             edit_message_text_inline, edit_message_caption, edit_message_caption_inline,

From 467477d38e04dd7aca83987674be95af81046399 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 14 Mar 2021 22:51:01 +0300
Subject: [PATCH 257/755] Update changelog & readme

---
 CHANGELOG.md | 6 ++++++
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 514ddf40..e84be8f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Changed
+
+- Support telegram bot API version 5.0 (see it's [changelog](https://core.telegram.org/bots/api#november-4-2020)) ([#pr62][pr62]) (**BC**)
+
+[pr62]: https://github.com/teloxide/teloxide-core/pull/62
+
 ### Added
 
 - `GetUpdatesFaultTolerant` - fault toletant version of `GetUpdates` ([#58][pr58]) (**BC**)
diff --git a/README.md b/README.md
index 472a36ac..10f32504 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.4.9%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.5.0%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/lib.rs b/src/lib.rs
index 64329eb9..5976f8f9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `4.9` is supported) with ease. The library is fully
+//! (Currently, version `5.0` is supported) with ease. The library is fully
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml

From 9abb6d688437754a06a9fb5c512db1fd53c6437f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 14 Mar 2021 23:18:07 +0300
Subject: [PATCH 258/755] Small fixes

---
 src/types/chat.rs        | 2 +-
 src/types/chat_member.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index aedd6e90..24dd6805 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -165,7 +165,7 @@ pub struct PublicChatSupergroup {
     /// [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
-    pub location: ChatLocation,
+    pub location: Option<ChatLocation>,
 }
 
 struct PrivateChatKindVisitor;
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 0ad0dca0..cd279393 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -375,7 +375,7 @@ mod tests {
             "can_restrict_members":true,
             "can_pin_messages":true,
             "can_promote_members":true,
-            "is_anonymous":false,
+            "is_anonymous":false
         }"#;
         let expected = ChatMember {
             user: User {

From aef88f97c33e7514574fd22223b66c965be165a3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 15 Mar 2021 23:43:42 +0300
Subject: [PATCH 259/755] Update to tba API version 5.1

---
 CHANGELOG.md                                  |  2 +
 README.md                                     |  2 +-
 src/adaptors/auto_send.rs                     |  3 +-
 src/adaptors/cache_me.rs                      |  3 +-
 src/adaptors/parse_mode.rs                    |  3 +-
 src/adaptors/throttle.rs                      |  3 +-
 src/bot/api.rs                                | 69 +++++++++++----
 src/lib.rs                                    |  2 +-
 src/local_macros.rs                           | 86 ++++++++++++-------
 src/payloads.rs                               |  6 ++
 src/payloads/add_sticker_to_set.rs            |  2 +-
 src/payloads/create_chat_invite_link.rs       | 26 ++++++
 src/payloads/create_new_sticker_set.rs        |  2 +-
 src/payloads/edit_chat_invite_link.rs         | 27 ++++++
 src/payloads/get_chat_member.rs               |  2 +-
 src/payloads/get_game_high_scores.rs          |  2 +-
 src/payloads/get_updates.rs                   |  2 +-
 src/payloads/get_user_profile_photos.rs       |  2 +-
 src/payloads/kick_chat_member.rs              |  4 +-
 src/payloads/promote_chat_member.rs           |  6 +-
 src/payloads/restrict_chat_member.rs          |  2 +-
 src/payloads/revoke_chat_invite_link.rs       | 21 +++++
 src/payloads/send_dice.rs                     |  2 +-
 .../set_chat_administrator_custom_title.rs    |  2 +-
 src/payloads/set_game_score.rs                |  2 +-
 src/payloads/set_game_score_inline.rs         |  2 +-
 src/payloads/set_passport_data_errors.rs      |  2 +-
 src/payloads/set_sticker_set_thumb.rs         |  2 +-
 src/payloads/setters.rs                       | 24 +++---
 src/payloads/unban_chat_member.rs             |  2 +-
 src/payloads/upload_sticker_file.rs           |  2 +-
 src/requests/requester.rs                     | 60 +++++++++----
 src/types.rs                                  | 12 +++
 src/types/allowed_update.rs                   |  6 ++
 src/types/chat_invite_link.rs                 | 22 +++++
 src/types/chat_member.rs                      | 60 +++++++++++--
 src/types/chat_member_updated.rs              | 20 +++++
 src/types/dice_emoji.rs                       |  4 +
 src/types/message.rs                          | 35 +++++++-
 .../message_auto_delete_timer_changed.rs      |  9 ++
 src/types/update.rs                           | 17 +++-
 src/types/user.rs                             |  2 +-
 src/types/voice_chat_ended.rs                 |  6 ++
 src/types/voice_chat_participants_invited.rs  | 11 +++
 src/types/voice_chat_started.rs               |  6 ++
 45 files changed, 477 insertions(+), 110 deletions(-)
 create mode 100644 src/payloads/create_chat_invite_link.rs
 create mode 100644 src/payloads/edit_chat_invite_link.rs
 create mode 100644 src/payloads/revoke_chat_invite_link.rs
 create mode 100644 src/types/chat_invite_link.rs
 create mode 100644 src/types/chat_member_updated.rs
 create mode 100644 src/types/message_auto_delete_timer_changed.rs
 create mode 100644 src/types/voice_chat_ended.rs
 create mode 100644 src/types/voice_chat_participants_invited.rs
 create mode 100644 src/types/voice_chat_started.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e84be8f9..12fcb260 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Support telegram bot API version 5.1 (see it's [changelog](https://core.telegram.org/bots/api#march-9-2021)) ([#pr63][pr63]) (**BC**)
 - Support telegram bot API version 5.0 (see it's [changelog](https://core.telegram.org/bots/api#november-4-2020)) ([#pr62][pr62]) (**BC**)
 
 [pr62]: https://github.com/teloxide/teloxide-core/pull/62
+[pr63]: https://github.com/teloxide/teloxide-core/pull/63
 
 ### Added
 
diff --git a/README.md b/README.md
index 10f32504..898b3485 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.5.0%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.5.1%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 1fb51ba7..b3716ef9 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -90,7 +90,8 @@ where
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 70f5f30e..26ed04b9 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -96,7 +96,8 @@ where
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index e22b02ab..d753f422 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -101,7 +101,8 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         send_contact, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 1b66d884..adcdfb16 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -458,7 +458,8 @@ where
         send_chat_action, get_user_profile_photos, get_file, kick_chat_member,
         unban_chat_member, restrict_chat_member, promote_chat_member,
         set_chat_administrator_custom_title, set_chat_permissions,
-        export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
         get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index bc391edb..35b5da58 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -313,7 +313,7 @@ impl Requester for Bot {
 
     type GetUserProfilePhotos = JsonRequest<payloads::GetUserProfilePhotos>;
 
-    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos {
+    fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos {
         Self::GetUserProfilePhotos::new(self.clone(), payloads::GetUserProfilePhotos::new(user_id))
     }
 
@@ -328,7 +328,7 @@ impl Requester for Bot {
 
     type KickChatMember = JsonRequest<payloads::KickChatMember>;
 
-    fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
     where
         C: Into<ChatId>,
     {
@@ -340,7 +340,7 @@ impl Requester for Bot {
 
     type UnbanChatMember = JsonRequest<payloads::UnbanChatMember>;
 
-    fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
     where
         C: Into<ChatId>,
     {
@@ -355,7 +355,7 @@ impl Requester for Bot {
     fn restrict_chat_member<C>(
         &self,
         chat_id: C,
-        user_id: i32,
+        user_id: i64,
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
@@ -369,7 +369,7 @@ impl Requester for Bot {
 
     type PromoteChatMember = JsonRequest<payloads::PromoteChatMember>;
 
-    fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
     where
         C: Into<ChatId>,
     {
@@ -384,7 +384,7 @@ impl Requester for Bot {
     fn set_chat_administrator_custom_title<Ch, Cu>(
         &self,
         chat_id: Ch,
-        user_id: i32,
+        user_id: i64,
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
@@ -422,6 +422,45 @@ impl Requester for Bot {
         Self::ExportChatInviteLink::new(self.clone(), payloads::ExportChatInviteLink::new(chat_id))
     }
 
+    type CreateChatInviteLink = JsonRequest<payloads::CreateChatInviteLink>;
+
+    fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink
+    where
+        C: Into<ChatId>,
+    {
+        Self::CreateChatInviteLink::new(self.clone(), payloads::CreateChatInviteLink::new(chat_id))
+    }
+
+    type EditChatInviteLink = JsonRequest<payloads::EditChatInviteLink>;
+
+    fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink
+    where
+        C: Into<ChatId>,
+        I: Into<String>,
+    {
+        Self::EditChatInviteLink::new(
+            self.clone(),
+            payloads::EditChatInviteLink::new(chat_id, invite_link),
+        )
+    }
+
+    type RevokeChatInviteLink = JsonRequest<payloads::RevokeChatInviteLink>;
+
+    fn revoke_chat_invite_link<C, I>(
+        &self,
+        chat_id: C,
+        invite_link: I,
+    ) -> Self::RevokeChatInviteLink
+    where
+        C: Into<ChatId>,
+        I: Into<String>,
+    {
+        Self::RevokeChatInviteLink::new(
+            self.clone(),
+            payloads::RevokeChatInviteLink::new(chat_id, invite_link),
+        )
+    }
+
     type SetChatPhoto = MultipartRequest<payloads::SetChatPhoto>;
 
     fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
@@ -521,7 +560,7 @@ impl Requester for Bot {
 
     type GetChatMember = JsonRequest<payloads::GetChatMember>;
 
-    fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember
+    fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
     where
         C: Into<ChatId>,
     {
@@ -749,7 +788,7 @@ impl Requester for Bot {
 
     type UploadStickerFile = MultipartRequest<payloads::UploadStickerFile>;
 
-    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile where
+    fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile where
     {
         Self::UploadStickerFile::new(
             self.clone(),
@@ -761,7 +800,7 @@ impl Requester for Bot {
 
     fn create_new_sticker_set<N, T, E>(
         &self,
-        user_id: i32,
+        user_id: i64,
         name: N,
         title: T,
         sticker: InputSticker,
@@ -782,7 +821,7 @@ impl Requester for Bot {
 
     fn add_sticker_to_set<N, E>(
         &self,
-        user_id: i32,
+        user_id: i64,
         name: N,
         sticker: InputSticker,
         emojis: E,
@@ -824,7 +863,7 @@ impl Requester for Bot {
 
     type SetStickerSetThumb = MultipartRequest<payloads::SetStickerSetThumb>;
 
-    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb
     where
         N: Into<String>,
     {
@@ -901,7 +940,7 @@ impl Requester for Bot {
 
     type SetPassportDataErrors = JsonRequest<payloads::SetPassportDataErrors>;
 
-    fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
+    fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = crate::types::PassportElementError>,
     {
@@ -927,7 +966,7 @@ impl Requester for Bot {
 
     fn set_game_score(
         &self,
-        user_id: u32,
+        user_id: i64,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -942,7 +981,7 @@ impl Requester for Bot {
 
     fn set_game_score_inline<I>(
         &self,
-        user_id: u32,
+        user_id: i64,
         score: u64,
         inline_message_id: I,
     ) -> Self::SetGameScoreInline
@@ -957,7 +996,7 @@ impl Requester for Bot {
 
     type GetGameHighScores = JsonRequest<payloads::GetGameHighScores>;
 
-    fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
+    fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores
     where
         T: Into<crate::types::TargetMessage>,
     {
diff --git a/src/lib.rs b/src/lib.rs
index 5976f8f9..c43fe760 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `5.0` is supported) with ease. The library is fully
+//! (Currently, version `5.` is supported) with ease. The library is fully
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 5bb47f20..b8a4db59 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -640,9 +640,9 @@ macro_rules! requester_forward {
     (@method get_user_profile_photos $body:ident $ty:ident) => {
         type GetUserProfilePhotos = $ty![GetUserProfilePhotos];
 
-        fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos {
+        fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos {
             let this = self;
-            $body!(get_user_profile_photos this (user_id: i32))
+            $body!(get_user_profile_photos this (user_id: i64))
         }
     };
     (@method get_file $body:ident $ty:ident) => {
@@ -656,42 +656,42 @@ macro_rules! requester_forward {
     (@method kick_chat_member $body:ident $ty:ident) => {
         type KickChatMember = $ty![KickChatMember];
 
-        fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember where C: Into<ChatId> {
+        fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember where C: Into<ChatId> {
             let this = self;
-            $body!(kick_chat_member this (chat_id: C, user_id: i32))
+            $body!(kick_chat_member this (chat_id: C, user_id: i64))
         }
     };
     (@method unban_chat_member $body:ident $ty:ident) => {
         type UnbanChatMember = $ty![UnbanChatMember];
 
-        fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember where C: Into<ChatId> {
+        fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember where C: Into<ChatId> {
             let this = self;
-            $body!(unban_chat_member this (chat_id: C, user_id: i32))
+            $body!(unban_chat_member this (chat_id: C, user_id: i64))
         }
     };
     (@method restrict_chat_member $body:ident $ty:ident) => {
         type RestrictChatMember = $ty![RestrictChatMember];
 
-        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i32, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<ChatId> {
+        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i64, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<ChatId> {
             let this = self;
-            $body!(restrict_chat_member this (chat_id: C, user_id: i32, permissions: ChatPermissions))
+            $body!(restrict_chat_member this (chat_id: C, user_id: i64, permissions: ChatPermissions))
         }
     };
     (@method promote_chat_member $body:ident $ty:ident) => {
         type PromoteChatMember = $ty![PromoteChatMember];
 
-        fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember where C: Into<ChatId> {
+        fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember where C: Into<ChatId> {
             let this = self;
-            $body!(promote_chat_member this (chat_id: C, user_id: i32))
+            $body!(promote_chat_member this (chat_id: C, user_id: i64))
         }
     };
     (@method set_chat_administrator_custom_title $body:ident $ty:ident) => {
         type SetChatAdministratorCustomTitle = $ty![SetChatAdministratorCustomTitle];
 
-        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i32, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<ChatId>,
+        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i64, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<ChatId>,
         Cu: Into<String> {
             let this = self;
-            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i32, custom_title: Cu))
+            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i64, custom_title: Cu))
         }
     };
     (@method set_chat_permissions $body:ident $ty:ident) => {
@@ -710,6 +710,32 @@ macro_rules! requester_forward {
             $body!(export_chat_invite_link this (chat_id: C))
         }
     };
+    (@method create_chat_invite_link $body:ident $ty:ident) => {
+        type CreateChatInviteLink = $ty![CreateChatInviteLink];
+
+        fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink where C: Into<ChatId> {
+            let this = self;
+            $body!(create_chat_invite_link this (chat_id: C))
+        }
+    };
+    (@method edit_chat_invite_link $body:ident $ty:ident) => {
+        type EditChatInviteLink = $ty![EditChatInviteLink];
+
+        fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink where C: Into<ChatId>,
+        I: Into<String> {
+            let this = self;
+            $body!(edit_chat_invite_link this (chat_id: C, invite_link: I))
+        }
+    };
+    (@method revoke_chat_invite_link $body:ident $ty:ident) => {
+        type RevokeChatInviteLink = $ty![RevokeChatInviteLink];
+
+        fn revoke_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::RevokeChatInviteLink where C: Into<ChatId>,
+        I: Into<String> {
+            let this = self;
+            $body!(revoke_chat_invite_link this (chat_id: C, invite_link: I))
+        }
+    };
     (@method set_chat_photo $body:ident $ty:ident) => {
         type SetChatPhoto = $ty![SetChatPhoto];
 
@@ -802,9 +828,9 @@ macro_rules! requester_forward {
     (@method get_chat_member $body:ident $ty:ident) => {
         type GetChatMember = $ty![GetChatMember];
 
-        fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember where C: Into<ChatId> {
+        fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember where C: Into<ChatId> {
             let this = self;
-            $body!(get_chat_member this (chat_id: C, user_id: i32))
+            $body!(get_chat_member this (chat_id: C, user_id: i64))
         }
     };
     (@method set_chat_sticker_set $body:ident $ty:ident) => {
@@ -958,28 +984,28 @@ macro_rules! requester_forward {
     (@method upload_sticker_file $body:ident $ty:ident) => {
         type UploadStickerFile = $ty![UploadStickerFile];
 
-        fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile {
+        fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile {
             let this = self;
-            $body!(upload_sticker_file this (user_id: i32, png_sticker: InputFile))
+            $body!(upload_sticker_file this (user_id: i64, png_sticker: InputFile))
         }
     };
     (@method create_new_sticker_set $body:ident $ty:ident) => {
         type CreateNewStickerSet = $ty![CreateNewStickerSet];
 
-        fn create_new_sticker_set<N, T, E>(&self, user_id: i32, name: N, title: T, sticker: InputSticker, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
+        fn create_new_sticker_set<N, T, E>(&self, user_id: i64, name: N, title: T, sticker: InputSticker, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
         T: Into<String>,
         E: Into<String> {
             let this = self;
-            $body!(create_new_sticker_set this (user_id: i32, name: N, title: T, sticker: InputSticker, emojis: E))
+            $body!(create_new_sticker_set this (user_id: i64, name: N, title: T, sticker: InputSticker, emojis: E))
         }
     };
     (@method add_sticker_to_set $body:ident $ty:ident) => {
         type AddStickerToSet = $ty![AddStickerToSet];
 
-        fn add_sticker_to_set<N, E>(&self, user_id: i32, name: N, sticker: InputSticker, emojis: E) -> Self::AddStickerToSet where N: Into<String>,
+        fn add_sticker_to_set<N, E>(&self, user_id: i64, name: N, sticker: InputSticker, emojis: E) -> Self::AddStickerToSet where N: Into<String>,
         E: Into<String> {
             let this = self;
-            $body!(add_sticker_to_set this (user_id: i32, name: N, sticker: InputSticker, emojis: E))
+            $body!(add_sticker_to_set this (user_id: i64, name: N, sticker: InputSticker, emojis: E))
         }
     };
     (@method set_sticker_position_in_set $body:ident $ty:ident) => {
@@ -1001,9 +1027,9 @@ macro_rules! requester_forward {
     (@method set_sticker_set_thumb $body:ident $ty:ident) => {
         type SetStickerSetThumb = $ty![SetStickerSetThumb];
 
-        fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb where N: Into<String> {
+        fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb where N: Into<String> {
             let this = self;
-            $body!(set_sticker_set_thumb this (name: N, user_id: i32))
+            $body!(set_sticker_set_thumb this (name: N, user_id: i64))
         }
     };
     (@method send_invoice $body:ident $ty:ident) => {
@@ -1039,9 +1065,9 @@ macro_rules! requester_forward {
     (@method set_passport_data_errors $body:ident $ty:ident) => {
         type SetPassportDataErrors = $ty![SetPassportDataErrors];
 
-        fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors where E: IntoIterator<Item = PassportElementError> {
+        fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors where E: IntoIterator<Item = PassportElementError> {
             let this = self;
-            $body!(set_passport_data_errors this (user_id: i32, errors: E))
+            $body!(set_passport_data_errors this (user_id: i64, errors: E))
         }
     };
     (@method send_game $body:ident $ty:ident) => {
@@ -1055,25 +1081,25 @@ macro_rules! requester_forward {
     (@method set_game_score $body:ident $ty:ident) => {
         type SetGameScore = $ty![SetGameScore];
 
-        fn set_game_score(&self, user_id: u32, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
+        fn set_game_score(&self, user_id: i64, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
             let this = self;
-            $body!(set_game_score this (user_id: u32, score: u64, chat_id: u32, message_id: i64))
+            $body!(set_game_score this (user_id: i64, score: u64, chat_id: u32, message_id: i64))
         }
     };
     (@method set_game_score_inline $body:ident $ty:ident) => {
         type SetGameScoreInline = $ty![SetGameScoreInline];
 
-        fn set_game_score_inline<I>(&self, user_id: u32, score: u64, inline_message_id: I) -> Self::SetGameScoreInline where I: Into<String> {
+        fn set_game_score_inline<I>(&self, user_id: i64, score: u64, inline_message_id: I) -> Self::SetGameScoreInline where I: Into<String> {
             let this = self;
-            $body!(set_game_score_inline this (user_id: u32, score: u64, inline_message_id: I))
+            $body!(set_game_score_inline this (user_id: i64, score: u64, inline_message_id: I))
         }
     };
     (@method get_game_high_scores $body:ident $ty:ident) => {
         type GetGameHighScores = $ty![GetGameHighScores];
 
-        fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores where T: Into<TargetMessage> {
+        fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores where T: Into<TargetMessage> {
             let this = self;
-            $body!(get_game_high_scores this (user_id: u32, target: T))
+            $body!(get_game_high_scores this (user_id: i64, target: T))
         }
     };
     (@method get_updates_fault_tolerant $body:ident $ty:ident) => {
diff --git a/src/payloads.rs b/src/payloads.rs
index bf6bfa93..c6baef2f 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -22,12 +22,14 @@ mod answer_pre_checkout_query;
 mod answer_shipping_query;
 mod close;
 mod copy_message;
+mod create_chat_invite_link;
 mod create_new_sticker_set;
 mod delete_chat_photo;
 mod delete_chat_sticker_set;
 mod delete_message;
 mod delete_sticker_from_set;
 mod delete_webhook;
+mod edit_chat_invite_link;
 mod edit_message_caption;
 mod edit_message_caption_inline;
 mod edit_message_live_location;
@@ -58,6 +60,7 @@ mod log_out;
 mod pin_chat_message;
 mod promote_chat_member;
 mod restrict_chat_member;
+mod revoke_chat_invite_link;
 mod send_animation;
 mod send_audio;
 mod send_chat_action;
@@ -104,12 +107,14 @@ pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQue
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
 pub use close::{Close, CloseSetters};
 pub use copy_message::{CopyMessage, CopyMessageSetters};
+pub use create_chat_invite_link::{CreateChatInviteLink, CreateChatInviteLinkSetters};
 pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters};
 pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
 pub use delete_chat_sticker_set::{DeleteChatStickerSet, DeleteChatStickerSetSetters};
 pub use delete_message::{DeleteMessage, DeleteMessageSetters};
 pub use delete_sticker_from_set::{DeleteStickerFromSet, DeleteStickerFromSetSetters};
 pub use delete_webhook::{DeleteWebhook, DeleteWebhookSetters};
+pub use edit_chat_invite_link::{EditChatInviteLink, EditChatInviteLinkSetters};
 pub use edit_message_caption::{EditMessageCaption, EditMessageCaptionSetters};
 pub use edit_message_caption_inline::{EditMessageCaptionInline, EditMessageCaptionInlineSetters};
 pub use edit_message_live_location::{EditMessageLiveLocation, EditMessageLiveLocationSetters};
@@ -144,6 +149,7 @@ pub use log_out::{LogOut, LogOutSetters};
 pub use pin_chat_message::{PinChatMessage, PinChatMessageSetters};
 pub use promote_chat_member::{PromoteChatMember, PromoteChatMemberSetters};
 pub use restrict_chat_member::{RestrictChatMember, RestrictChatMemberSetters};
+pub use revoke_chat_invite_link::{RevokeChatInviteLink, RevokeChatInviteLinkSetters};
 pub use send_animation::{SendAnimation, SendAnimationSetters};
 pub use send_audio::{SendAudio, SendAudioSetters};
 pub use send_chat_action::{SendChatAction, SendChatActionSetters};
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 4366de42..ca2f6242 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -12,7 +12,7 @@ impl_payload! {
     pub AddStickerToSet (AddStickerToSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i32,
+            pub user_id: i64,
             /// Sticker set name
             pub name: String [into],
             /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
new file mode 100644
index 00000000..e543ca34
--- /dev/null
+++ b/src/payloads/create_chat_invite_link.rs
@@ -0,0 +1,26 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::{ChatId, ChatInviteLink};
+
+impl_payload! {
+    /// Use this method to create an additional invite link for a chat. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. The link can be revoked using the method [`RevokeChatInviteLink`]. Returns the new invite link as [`ChatInviteLink`] object.
+    ///
+    /// [`ChatInviteLink`]: crate::types::ChatInviteLink
+    /// [`RevokeChatInviteLink`]: crate::payloads::RevokeChatInviteLink
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub CreateChatInviteLink (CreateChatInviteLinkSetters) => ChatInviteLink {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+        optional {
+            /// Point in time (Unix timestamp) when the link will expire
+            pub expire_date: i64,
+            /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
+            pub member_limit: u32,
+        }
+    }
+}
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index a763e61b..6625f64f 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -12,7 +12,7 @@ impl_payload! {
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i32,
+            pub user_id: i64,
             /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g., _animals_). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in _“\_by\_<bot username>”. <bot\_username>_ is case insensitive. 1-64 characters.
             pub name: String [into],
             /// Sticker set title, 1-64 characters
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
new file mode 100644
index 00000000..92d09934
--- /dev/null
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -0,0 +1,27 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to edit a non-primary invite link created by the bot. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the edited invite link as a [`ChatInviteLink`] object.
+    ///
+    /// [`ChatInviteLink`]: crate::types::ChatInviteLink
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub EditChatInviteLink (EditChatInviteLinkSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// The invite link to edit
+            pub invite_link: String [into],
+        }
+        optional {
+            /// Point in time (Unix timestamp) when the link will expire
+            pub expire_date: i64,
+            /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
+            pub member_limit: u32,
+        }
+    }
+}
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index 4f91f285..a4cbaa0e 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -15,7 +15,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
         }
     }
 }
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index 0aaa6e27..6ddfa108 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -15,7 +15,7 @@ impl_payload! {
     pub GetGameHighScores (GetGameHighScoresSetters) => True {
         required {
             /// User identifier
-            pub user_id: u32,
+            pub user_id: i64,
             /// Target message
             #[serde(flatten)]
             pub target: TargetMessage [into],
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 053bca02..3bc35912 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -22,7 +22,7 @@ impl_payload! {
             pub limit: u8,
             /// Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. Should be positive, short polling should be used for testing purposes only.
             pub timeout: u32,
-            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.
+            /// A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [`Update`] for a complete list of available update types. Specify an empty list to receive all update types except chat_member (default). If not specified, the previous setting will be used.
             ///
             /// Please note that this parameter doesn't affect updates created before the call to the getUpdates, so unwanted updates may be received for a short period of time.
             ///
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 5da97186..b9a6b0fc 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -13,7 +13,7 @@ impl_payload! {
     pub GetUserProfilePhotos (GetUserProfilePhotosSetters) => UserProfilePhotos {
         required {
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
         }
         optional {
             /// Sequential number of the first photo to be returned. By default, all photos are returned.
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index e4eb968b..a64798ff 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -15,11 +15,13 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
             pub until_date: u64,
+            /// Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.
+            pub revoke_messages: bool,
         }
     }
 }
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index d8229d09..7aaa11dc 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -13,11 +13,13 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
         }
         optional {
             /// Pass True, if the administrator's presence in the chat is hidden
             pub is_anonymous: bool,
+            /// Pass True, if the administrator can access the chat event log, chat statistics, message statistics in channels, see channel members, see anonymous administrators in supergroups and ignore slow mode. Implied by any other administrator privilege
+            pub can_manage_chat: bool,
             /// Pass True, if the administrator can change chat title, photo and other settings
             pub can_change_info: bool,
             /// Pass True, if the administrator can create channel posts, channels only
@@ -26,6 +28,8 @@ impl_payload! {
             pub can_edit_messages: bool,
             /// Pass True, if the administrator can delete messages of other users
             pub can_delete_messages: bool,
+            /// Pass True, if the administrator can manage voice chats, supergroups only
+            pub can_manage_voice_chats: bool,
             /// Pass True, if the administrator can invite new users to the chat
             pub can_invite_users: bool,
             /// Pass True, if the administrator can restrict, ban or unban chat members
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 648b92fc..c0db9c07 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
             /// A JSON-serialized object for new user permissions
             pub permissions: ChatPermissions,
         }
diff --git a/src/payloads/revoke_chat_invite_link.rs b/src/payloads/revoke_chat_invite_link.rs
new file mode 100644
index 00000000..0c4d466b
--- /dev/null
+++ b/src/payloads/revoke_chat_invite_link.rs
@@ -0,0 +1,21 @@
+// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// **DO NOT EDIT THIS FILE**,
+// edit `cg` instead.
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to revoke an invite link created by the bot. If the primary link is revoked, a new link is automatically generated. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the revoked invite link as [`ChatInviteLink`] object.
+    ///
+    /// [`ChatInviteLink`]: crate::types::ChatInviteLink
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub RevokeChatInviteLink (RevokeChatInviteLinkSetters) => String {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// The invite link to revoke
+            pub invite_link: String [into],
+        }
+    }
+}
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 613ac091..b3b168d4 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -16,7 +16,7 @@ impl_payload! {
             pub chat_id: ChatId [into],
         }
         optional {
-            /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, or “🏀”. Dice can have values 1-6 for “🎲” and “🎯”, and values 1-5 for “🏀”. Defaults to “🎲”
+            /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, “🏀”, “⚽”, “🎳”, or “🎰”. Dice can have values 1-6 for “🎲”, “🎯” and “🎳”, values 1-5 for “🏀” and “⚽”, and values 1-64 for “🎰”. Defaults to “🎲”
             pub emoji: DiceEmoji,
             /// Sends the message [silently]. Users will receive a notification with no sound.
             ///
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index aeab4408..323f9e62 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
             /// New custom title for the administrator; 0-16 characters, emoji are not allowed
             pub custom_title: String [into],
         }
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 54ead85f..addbf208 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -15,7 +15,7 @@ impl_payload! {
     pub SetGameScore (SetGameScoreSetters) => Message {
         required {
             /// User identifier
-            pub user_id: u32,
+            pub user_id: i64,
             /// New score
             pub score: u64,
             /// Unique identifier for the target chat
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 0e7aeb55..5f7834e2 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -13,7 +13,7 @@ impl_payload! {
     pub SetGameScoreInline (SetGameScoreInlineSetters) => Message {
         required {
             /// User identifier
-            pub user_id: u32,
+            pub user_id: i64,
             /// New score
             pub score: u64,
             /// Identifier of the inline message
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index ecfb1cbc..0ed70843 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -13,7 +13,7 @@ impl_payload! {
     pub SetPassportDataErrors (SetPassportDataErrorsSetters) => True {
         required {
             /// User identifier
-            pub user_id: i32,
+            pub user_id: i64,
             /// A JSON-serialized array describing the errors
             pub errors: Vec<PassportElementError> [collect],
         }
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index c4a2cb11..edb32b00 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -14,7 +14,7 @@ impl_payload! {
             /// Name of the sticker set
             pub name: String [into],
             /// User identifier of sticker file owner
-            pub user_id: i32,
+            pub user_id: i64,
         }
         optional {
             /// A **PNG** image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a **TGS** animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]. Animated sticker set thumbnail can't be uploaded via HTTP URL.
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 32aba566..da76b0f3 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -6,22 +6,24 @@
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
     AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _, CloseSetters as _,
-    CopyMessageSetters as _, CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _,
-    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteStickerFromSetSetters as _,
-    DeleteWebhookSetters as _, EditMessageCaptionInlineSetters as _,
-    EditMessageCaptionSetters as _, EditMessageLiveLocationInlineSetters as _,
-    EditMessageLiveLocationSetters as _, EditMessageMediaInlineSetters as _,
-    EditMessageMediaSetters as _, EditMessageReplyMarkupInlineSetters as _,
-    EditMessageReplyMarkupSetters as _, EditMessageTextInlineSetters as _,
-    EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    CopyMessageSetters as _, CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
+    DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _, DeleteMessageSetters as _,
+    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
+    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
+    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
+    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
+    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
+    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
+    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberSetters as _, GetChatMembersCountSetters as _,
     GetChatSetters as _, GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
     GetMyCommandsSetters as _, GetStickerSetSetters as _, GetUpdatesSetters as _,
     GetUserProfilePhotosSetters as _, GetWebhookInfoSetters as _, KickChatMemberSetters as _,
     LeaveChatSetters as _, LogOutSetters as _, PinChatMessageSetters as _,
-    PromoteChatMemberSetters as _, RestrictChatMemberSetters as _, SendAnimationSetters as _,
-    SendAudioSetters as _, SendChatActionSetters as _, SendContactSetters as _,
-    SendDiceSetters as _, SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
+    PromoteChatMemberSetters as _, RestrictChatMemberSetters as _,
+    RevokeChatInviteLinkSetters as _, SendAnimationSetters as _, SendAudioSetters as _,
+    SendChatActionSetters as _, SendContactSetters as _, SendDiceSetters as _,
+    SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
     SendLocationSetters as _, SendMediaGroupSetters as _, SendMessageSetters as _,
     SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _, SendVenueSetters as _,
     SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 993b05f1..2ca4225e 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -13,7 +13,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
             /// Unique identifier of the target user
-            pub user_id: i32,
+            pub user_id: i64,
         }
         optional {
             /// Do nothing if the user is not banned
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 74c9c346..953276c8 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -12,7 +12,7 @@ impl_payload! {
     pub UploadStickerFile (UploadStickerFileSetters) => File {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i32,
+            pub user_id: i64,
             /// PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index adc4f5f9..083b0398 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -304,7 +304,7 @@ pub trait Requester {
     type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetUserProfilePhotos`].
-    fn get_user_profile_photos(&self, user_id: i32) -> Self::GetUserProfilePhotos;
+    fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos;
 
     type GetFile: Request<Payload = GetFile, Err = Self::Err>;
 
@@ -316,14 +316,14 @@ pub trait Requester {
     type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`KickChatMember`].
-    fn kick_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::KickChatMember
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
     where
         C: Into<ChatId>;
 
     type UnbanChatMember: Request<Payload = UnbanChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnbanChatMember`].
-    fn unban_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::UnbanChatMember
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
     where
         C: Into<ChatId>;
 
@@ -333,7 +333,7 @@ pub trait Requester {
     fn restrict_chat_member<C>(
         &self,
         chat_id: C,
-        user_id: i32,
+        user_id: i64,
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
@@ -342,7 +342,7 @@ pub trait Requester {
     type PromoteChatMember: Request<Payload = PromoteChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`PromoteChatMember`].
-    fn promote_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::PromoteChatMember
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
     where
         C: Into<ChatId>;
 
@@ -355,7 +355,7 @@ pub trait Requester {
     fn set_chat_administrator_custom_title<Ch, Cu>(
         &self,
         chat_id: Ch,
-        user_id: i32,
+        user_id: i64,
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
@@ -380,6 +380,33 @@ pub trait Requester {
     where
         C: Into<ChatId>;
 
+    type CreateChatInviteLink: Request<Payload = CreateChatInviteLink, Err = Self::Err>;
+
+    /// For Telegram documentation see [`CreateChatInviteLink`].
+    fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink
+    where
+        C: Into<ChatId>;
+
+    type EditChatInviteLink: Request<Payload = EditChatInviteLink, Err = Self::Err>;
+
+    /// For Telegram documentation see [`EditChatInviteLink`].
+    fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink
+    where
+        C: Into<ChatId>,
+        I: Into<String>;
+
+    type RevokeChatInviteLink: Request<Payload = RevokeChatInviteLink, Err = Self::Err>;
+
+    /// For Telegram documentation see [`RevokeChatInviteLink`].
+    fn revoke_chat_invite_link<C, I>(
+        &self,
+        chat_id: C,
+        invite_link: I,
+    ) -> Self::RevokeChatInviteLink
+    where
+        C: Into<ChatId>,
+        I: Into<String>;
+
     type SetChatPhoto: Request<Payload = SetChatPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetChatPhoto`].
@@ -461,7 +488,7 @@ pub trait Requester {
     type GetChatMember: Request<Payload = GetChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMember`].
-    fn get_chat_member<C>(&self, chat_id: C, user_id: i32) -> Self::GetChatMember
+    fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
     where
         C: Into<ChatId>;
 
@@ -631,14 +658,14 @@ pub trait Requester {
     type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
 
     /// For Telegram documentation see [`UploadStickerFile`].
-    fn upload_sticker_file(&self, user_id: i32, png_sticker: InputFile) -> Self::UploadStickerFile;
+    fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile;
 
     type CreateNewStickerSet: Request<Payload = CreateNewStickerSet, Err = Self::Err>;
 
     /// For Telegram documentation see [`CreateNewStickerSet`].
     fn create_new_sticker_set<N, T, E>(
         &self,
-        user_id: i32,
+        user_id: i64,
         name: N,
         title: T,
         sticker: InputSticker,
@@ -654,7 +681,7 @@ pub trait Requester {
     /// For Telegram documentation see [`AddStickerToSet`].
     fn add_sticker_to_set<N, E>(
         &self,
-        user_id: i32,
+        user_id: i64,
         name: N,
         sticker: InputSticker,
         emojis: E,
@@ -684,7 +711,7 @@ pub trait Requester {
     type SetStickerSetThumb: Request<Payload = SetStickerSetThumb, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetStickerSetThumb`].
-    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i32) -> Self::SetStickerSetThumb
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb
     where
         N: Into<String>;
 
@@ -732,7 +759,7 @@ pub trait Requester {
     type SetPassportDataErrors: Request<Payload = SetPassportDataErrors, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetPassportDataErrors`].
-    fn set_passport_data_errors<E>(&self, user_id: i32, errors: E) -> Self::SetPassportDataErrors
+    fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = PassportElementError>;
 
@@ -748,7 +775,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SetGameScore`].
     fn set_game_score(
         &self,
-        user_id: u32,
+        user_id: i64,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -759,7 +786,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SetGameScoreInline`].
     fn set_game_score_inline<I>(
         &self,
-        user_id: u32,
+        user_id: i64,
         score: u64,
         inline_message_id: I,
     ) -> Self::SetGameScoreInline
@@ -769,7 +796,7 @@ pub trait Requester {
     type GetGameHighScores: Request<Payload = GetGameHighScores, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetGameHighScores`].
-    fn get_game_high_scores<T>(&self, user_id: u32, target: T) -> Self::GetGameHighScores
+    fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;
 
@@ -802,7 +829,8 @@ macro_rules! forward_all {
             send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
             get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
             promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
-            export_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+            export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+            revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
             set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
             leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
             set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
diff --git a/src/types.rs b/src/types.rs
index 5e3936d8..2161d872 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -9,8 +9,10 @@ pub use callback_query::*;
 pub use chat::*;
 pub use chat_action::*;
 pub use chat_id::*;
+pub use chat_invite_link::*;
 pub use chat_location::*;
 pub use chat_member::*;
+pub use chat_member_updated::*;
 pub use chat_permissions::*;
 pub use chat_photo::*;
 pub use chosen_inline_result::*;
@@ -61,6 +63,7 @@ pub use login_url::*;
 pub use mask_position::*;
 pub use me::*;
 pub use message::*;
+pub use message_auto_delete_timer_changed::*;
 pub use message_entity::*;
 pub use message_id::*;
 pub use order_info::*;
@@ -94,6 +97,9 @@ pub use venue::*;
 pub use video::*;
 pub use video_note::*;
 pub use voice::*;
+pub use voice_chat_ended::*;
+pub use voice_chat_participants_invited::*;
+pub use voice_chat_started::*;
 pub use webhook_info::*;
 
 mod allowed_update;
@@ -105,8 +111,10 @@ mod callback_query;
 mod chat;
 mod chat_action;
 mod chat_id;
+mod chat_invite_link;
 mod chat_location;
 mod chat_member;
+mod chat_member_updated;
 mod chat_permissions;
 mod chat_photo;
 mod chosen_inline_result;
@@ -133,6 +141,7 @@ mod login_url;
 mod mask_position;
 mod me;
 mod message;
+mod message_auto_delete_timer_changed;
 mod message_entity;
 mod message_id;
 mod order_info;
@@ -163,6 +172,9 @@ mod venue;
 mod video;
 mod video_note;
 mod voice;
+mod voice_chat_ended;
+mod voice_chat_participants_invited;
+mod voice_chat_started;
 mod webhook_info;
 
 mod inline_query;
diff --git a/src/types/allowed_update.rs b/src/types/allowed_update.rs
index 932f053e..0683683f 100644
--- a/src/types/allowed_update.rs
+++ b/src/types/allowed_update.rs
@@ -10,4 +10,10 @@ pub enum AllowedUpdate {
     InlineQuery,
     ChosenInlineResult,
     CallbackQuery,
+    ShippingQuery,
+    PreCheckoutQuery,
+    Poll,
+    PollAnswer,
+    MyChatMember,
+    ChatMember,
 }
diff --git a/src/types/chat_invite_link.rs b/src/types/chat_invite_link.rs
new file mode 100644
index 00000000..4488dfbc
--- /dev/null
+++ b/src/types/chat_invite_link.rs
@@ -0,0 +1,22 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::User;
+
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct ChatInviteLink {
+    /// The invite link. If the link was created by another chat administrator,
+    /// then the second part of the link will be replaced with “…”.
+    pub invite_link: String,
+    /// Creator of the link
+    pub creator: User,
+    /// `true`, if the link is primary
+    pub is_primary: bool,
+    /// `true`, if the link is revoked
+    pub is_revoked: bool,
+    /// Point in time (Unix timestamp) when the link will expire or has been
+    /// expired
+    pub expire_date: Option<i64>,
+    /// Maximum number of users that can be members of the chat simultaneously
+    /// after joining the chat via this invite link; 1-99999
+    pub member_limit: Option<u32>,
+}
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index cd279393..26b82002 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -51,6 +51,12 @@ pub struct Administrator {
     /// administrator privileges of that user.
     pub can_be_edited: bool,
 
+    /// `true`, if the administrator can access the chat event log, chat
+    /// statistics, message statistics in channels, see channel members, see
+    /// anonymous administrators in supergroups and ignore slow mode. Implied by
+    /// any other administrator privilege
+    pub can_manage_chat: bool,
+
     /// `true`, if the administrator can change the chat
     /// title, photo and other settings.
     pub can_change_info: bool,
@@ -67,6 +73,9 @@ pub struct Administrator {
     /// of other users.
     pub can_delete_messages: bool,
 
+    /// `true`, if the administrator can manage voice chats.
+    pub can_manage_voice_chats: bool,
+
     /// `true`, if the administrator can invite new users
     /// to the chat.
     pub can_invite_users: bool,
@@ -166,6 +175,20 @@ impl ChatMemberKind {
         }
     }
 
+    /// Getter for [`Administrator::can_manage_chat`] field.
+    pub fn can_manage_chat(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator(Administrator {
+                can_manage_chat, ..
+            }) => Some(*can_manage_chat),
+            Self::Creator(_)
+            | Self::Member
+            | Self::Restricted(_)
+            | Self::Left
+            | Self::Kicked(_) => None,
+        }
+    }
+
     /// Getter for [`Administrator::can_change_info`] field.
     pub fn can_change_info(&self) -> Option<bool> {
         match &self {
@@ -223,6 +246,21 @@ impl ChatMemberKind {
         }
     }
 
+    /// Getter for [`Administrator::can_manage_voice_chats`] field.
+    pub fn can_manage_voice_chats(&self) -> Option<bool> {
+        match &self {
+            Self::Administrator(Administrator {
+                can_manage_voice_chats,
+                ..
+            }) => Some(*can_manage_voice_chats),
+            Self::Creator(_)
+            | Self::Member
+            | Self::Restricted(_)
+            | Self::Left
+            | Self::Kicked(_) => None,
+        }
+    }
+
     /// Getter for [`Administrator::can_invite_users`] field.
     pub fn can_invite_users(&self) -> Option<bool> {
         match &self {
@@ -368,14 +406,16 @@ mod tests {
                 "language_code":"en"
             },
             "status":"administrator",
-            "can_be_edited":false,
-            "can_change_info":true,
-            "can_delete_messages":true,
-            "can_invite_users":true,
-            "can_restrict_members":true,
-            "can_pin_messages":true,
-            "can_promote_members":true,
-            "is_anonymous":false
+            "is_anonymous": false,
+            "can_be_edited": false,
+            "can_manage_chat": true,
+            "can_change_info": true,
+            "can_delete_messages": true,
+            "can_manage_voice_chats": true,
+            "can_invite_users": true,
+            "can_restrict_members": true,
+            "can_pin_messages": true,
+            "can_promote_members": true
         }"#;
         let expected = ChatMember {
             user: User {
@@ -388,16 +428,18 @@ mod tests {
             },
             kind: ChatMemberKind::Administrator(Administrator {
                 custom_title: None,
+                is_anonymous: false,
                 can_be_edited: false,
+                can_manage_chat: true,
                 can_change_info: true,
                 can_post_messages: None,
                 can_edit_messages: None,
                 can_delete_messages: true,
+                can_manage_voice_chats: true,
                 can_invite_users: true,
                 can_restrict_members: true,
                 can_pin_messages: Some(true),
                 can_promote_members: true,
-                is_anonymous: false,
             }),
         };
         let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
diff --git a/src/types/chat_member_updated.rs b/src/types/chat_member_updated.rs
new file mode 100644
index 00000000..7f4b3a95
--- /dev/null
+++ b/src/types/chat_member_updated.rs
@@ -0,0 +1,20 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Chat, ChatInviteLink, ChatMember, User};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct ChatMemberUpdated {
+    /// Chat the user belongs to
+    pub chat: Chat,
+    /// Performer of the action, which resulted in the change
+    pub from: User,
+    /// Date the change was done in Unix time
+    pub date: i64,
+    /// Previous information about the chat member
+    pub old_chat_member: ChatMember,
+    /// New information about the chat member
+    pub new_chat_member: ChatMember,
+    /// Chat invite link, which was used by the user to join the chat; for
+    /// joining by invite link events only.
+    pub invite_link: Option<ChatInviteLink>,
+}
diff --git a/src/types/dice_emoji.rs b/src/types/dice_emoji.rs
index 46525699..c5e1a69b 100644
--- a/src/types/dice_emoji.rs
+++ b/src/types/dice_emoji.rs
@@ -18,6 +18,10 @@ pub enum DiceEmoji {
     #[serde(rename = "⚽")]
     Football,
 
+    /// Values 1-5
+    #[serde(rename = "🎳")]
+    Bowling,
+
     /// Values 1-64
     #[serde(rename = "🎰")]
     SlotMachine,
diff --git a/src/types/message.rs b/src/types/message.rs
index a743a714..2f11d51b 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -5,9 +5,10 @@ use serde::{Deserialize, Serialize};
 use crate::types::{
     chat::{ChatKind, PublicChatKind},
     Animation, Audio, Chat, ChatPublic, Contact, Dice, Document, Game, InlineKeyboardMarkup,
-    Invoice, Location, MessageEntity, PassportData, PhotoSize, Poll, ProximityAlertTriggered,
-    PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment, True, User, Venue, Video,
-    VideoNote, Voice,
+    Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
+    ProximityAlertTriggered, PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment,
+    True, User, Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
+    VoiceChatStarted,
 };
 
 /// This object represents a message.
@@ -44,6 +45,7 @@ pub enum MessageKind {
     GroupChatCreated(MessageGroupChatCreated),
     SupergroupChatCreated(MessageSupergroupChatCreated),
     ChannelChatCreated(MessageChannelChatCreated),
+    MessageAutoDeleteTimerChanged(MessageMessageAutoDeleteTimerChanged),
     Migrate(MessageMigrate),
     Pinned(MessagePinned),
     Invoice(MessageInvoice),
@@ -52,6 +54,9 @@ pub enum MessageKind {
     PassportData(MessagePassportData),
     Dice(MessageDice),
     ProximityAlertTriggered(MessageProximityAlertTriggered),
+    VoiceChatStarted(MessageVoiceChatStarted),
+    VoiceChatEnded(MessageVoiceChatEnded),
+    VoiceChatParticipantsInvited(MessageVoiceChatParticipantsInvited),
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -143,6 +148,12 @@ pub struct MessageChannelChatCreated {
     pub channel_chat_created: True,
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageMessageAutoDeleteTimerChanged {
+    /// Service message: auto-delete timer settings changed in the chat.
+    message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged,
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageMigrate {
     /// The group has been migrated to a supergroup with the specified
@@ -445,6 +456,24 @@ pub struct MessageProximityAlertTriggered {
     pub proximity_alert_triggered: ProximityAlertTriggered,
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageVoiceChatStarted {
+    /// Service message: voice chat started.
+    pub voice_chat_started: VoiceChatStarted,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageVoiceChatEnded {
+    /// Service message: voice chat ended.
+    pub voice_chat_ended: VoiceChatEnded,
+}
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageVoiceChatParticipantsInvited {
+    /// Service message: new participants invited to a voice chat.
+    pub voice_chat_participants_invited: VoiceChatParticipantsInvited,
+}
+
 mod getters {
     use std::ops::Deref;
 
diff --git a/src/types/message_auto_delete_timer_changed.rs b/src/types/message_auto_delete_timer_changed.rs
new file mode 100644
index 00000000..0e24be5a
--- /dev/null
+++ b/src/types/message_auto_delete_timer_changed.rs
@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a service message about a change in auto-delete timer
+/// settings.
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct MessageAutoDeleteTimerChanged {
+    /// New auto-delete time for messages in the chat
+    pub message_auto_delete_time: u32,
+}
diff --git a/src/types/update.rs b/src/types/update.rs
index d5514d96..94ec099e 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -3,8 +3,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    CallbackQuery, Chat, ChosenInlineResult, InlineQuery, Message, Poll, PollAnswer,
-    PreCheckoutQuery, ShippingQuery, User,
+    CallbackQuery, Chat, ChatMemberUpdated, ChosenInlineResult, InlineQuery, Message, Poll,
+    PollAnswer, PreCheckoutQuery, ShippingQuery, User,
 };
 use serde_json::Value;
 
@@ -95,6 +95,19 @@ pub enum UpdateKind {
     /// A user changed their answer in a non-anonymous poll. Bots receive new
     /// votes only in polls that were sent by the bot itself.
     PollAnswer(PollAnswer),
+
+    /// The bot's chat member status was updated in a chat. For private chats,
+    /// this update is received only when the bot is blocked or unblocked by the
+    /// user.
+    MyChatMember(ChatMemberUpdated),
+
+    /// A chat member's status was updated in a chat. The bot must be an
+    /// administrator in the chat and must explicitly specify
+    /// [`AllowedUpdate::ChatMember`] in the list of `allowed_updates` to
+    /// receive these updates.
+    ///
+    /// [`AllowedUpdate::ChatMember`]: crate::types::AllowedUpdate::ChatMember
+    ChatMember(ChatMemberUpdated),
 }
 
 impl Update {
diff --git a/src/types/user.rs b/src/types/user.rs
index b575ef04..28bff17e 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct User {
     /// Unique identifier for this user or bot.
-    pub id: i32,
+    pub id: i64,
 
     /// `true`, if this user is a bot.
     pub is_bot: bool,
diff --git a/src/types/voice_chat_ended.rs b/src/types/voice_chat_ended.rs
new file mode 100644
index 00000000..8ca83332
--- /dev/null
+++ b/src/types/voice_chat_ended.rs
@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a service message about a voice chat ended in the
+/// chat.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct VoiceChatEnded;
diff --git a/src/types/voice_chat_participants_invited.rs b/src/types/voice_chat_participants_invited.rs
new file mode 100644
index 00000000..b02d5fa8
--- /dev/null
+++ b/src/types/voice_chat_participants_invited.rs
@@ -0,0 +1,11 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::User;
+
+/// This object represents a service message about new members invited to a
+/// voice chat.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct VoiceChatParticipantsInvited {
+    /// New members that were invited to the voice chat
+    pub users: Option<Vec<User>>,
+}
diff --git a/src/types/voice_chat_started.rs b/src/types/voice_chat_started.rs
new file mode 100644
index 00000000..82bb2f30
--- /dev/null
+++ b/src/types/voice_chat_started.rs
@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a service message about a voice chat started in the
+/// chat. Currently holds no information.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct VoiceChatStarted;

From c8939dff09eda702865b904f62d7d57163416f1e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 15 Mar 2021 23:50:09 +0300
Subject: [PATCH 260/755] Turn on nightly clippy again

The fix of the bug finally got released
---
 .github/workflows/ci.yml | 5 ++---
 src/lib.rs               | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ab0617b..939b0930 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: beta #nightly
+          toolchain: nightly
           override: true
           components: clippy
 
@@ -64,8 +64,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets --features full -- -D warnings
-          #args: --all-targets --all-features -- -D warnings
+          args: --all-targets --all-features -- -D warnings
 
   style:
     runs-on: ubuntu-latest
diff --git a/src/lib.rs b/src/lib.rs
index c43fe760..bdc2e580 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@
 // ```
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
-#![cfg_attr(feature = "full", deny(broken_intra_doc_links))]
+#![cfg_attr(feature = "full", deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 
 // The internal helper macros.

From 084caa9c12cae3f1878c03d6f5f957b3ac311a07 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Mar 2021 13:53:52 +0300
Subject: [PATCH 261/755] fix doc link

---
 src/payloads/send_media_group.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index d84ee27e..adffeaa1 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -6,9 +6,9 @@ use serde::Serialize;
 use crate::types::{ChatId, InputMedia, Message};
 
 impl_payload! {
-    /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Messages`] that were sent is returned.
+    /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Message`]s that were sent is returned.
     ///
-    /// [`Messages`]: crate::types::Messages
+    /// [`Message`]: crate::types::Message
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
     pub SendMediaGroup (SendMediaGroupSetters) => Vec<Message> {
         required {

From 348989023076a3a3def16a4b56c6653e26fb806a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Mar 2021 14:06:22 +0300
Subject: [PATCH 262/755] fix CI

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

diff --git a/src/lib.rs b/src/lib.rs
index bdc2e580..be51b5d6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@
 // ```
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
-#![cfg_attr(feature = "full", deny(rustdoc::broken_intra_doc_links))]
+#![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 
 // The internal helper macros.

From 510b0c9ac021dda10c8e3eaceea3490b239468e6 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 16 Mar 2021 14:16:40 +0300
Subject: [PATCH 263/755] Make MediaContact::contact public

---
 src/types/message.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 2f11d51b..c9b8b2a4 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -319,7 +319,7 @@ pub struct MediaAudio {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MediaContact {
     /// Message is a shared contact, information about the contact.
-    contact: Contact,
+    pub contact: Contact,
 }
 
 #[serde_with_macros::skip_serializing_none]

From 36557573aa47cbae2b655c11a0f03c8651b55a61 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Mar 2021 15:11:30 +0300
Subject: [PATCH 264/755] Refactor `ReplyMarkup`

This commit tries to make using ReplyMarkup less noisy. It
- Renames `ReplyMarkup::{InlineKeyboardMarkup => InlineKeyboard, ReplyKeyboardMarkup => Keyboard, ReplyKeyboardRemove => KeyboardRemove}`
- Adds `inline_kb`, `keyboad`, `kb_remove` and `force_reply` `ReplyMarkup`
  consructors
- Renames `ReplyKeyboardMarkup` => `KeyboardMarkup`
- Renames `ReplyKeyboardRemove` => `KeyboardRemove`
- Removes useless generic param from `ReplyKeyboardMarkup::new` and
  `InlineKeyboardMarkup::new`
- Changes parameters order in `ReplyKeyboardMarkup::append_to_row` and
  `InlineKeyboardMarkup::append_to_row`
---
 CHANGELOG.md                        |  9 +++++
 src/types/inline_keyboard_markup.rs | 18 ++++-----
 src/types/reply_keyboard_markup.rs  | 12 +++---
 src/types/reply_keyboard_remove.rs  | 12 +++---
 src/types/reply_markup.rs           | 62 ++++++++++++++++++++++++++---
 5 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12fcb260..664a9483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Refactor `ReplyMarkup` ([#pr65][pr65]) (**BC**)
+  - Rename `ReplyMarkup::{InlineKeyboardMarkup => InlineKeyboard, ReplyKeyboardMarkup => Keyboard, ReplyKeyboardRemove => KeyboardRemove}`
+  - Add `inline_kb`, `keyboad`, `kb_remove` and `force_reply` `ReplyMarkup` consructors
+  - Rename `ReplyKeyboardMarkup` => `KeyboardMarkup`
+  - Rename `ReplyKeyboardRemove` => `KeyboardRemove`
+  - Remove useless generic param from `ReplyKeyboardMarkup::new` and `InlineKeyboardMarkup::new`
+  - Change parameters order in `ReplyKeyboardMarkup::append_to_row` and `InlineKeyboardMarkup::append_to_row`
 - Support telegram bot API version 5.1 (see it's [changelog](https://core.telegram.org/bots/api#march-9-2021)) ([#pr63][pr63]) (**BC**)
 - Support telegram bot API version 5.0 (see it's [changelog](https://core.telegram.org/bots/api#november-4-2020)) ([#pr62][pr62]) (**BC**)
 
@@ -24,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Make `MediaContact::contact` public ([#pr64][pr64])
 - `set_webhook` signature (make `allowed_updates` optional) ([#59][pr59])
 - Fix typos in payloads ([#57][pr57]):
   - `get_updates`: `offset` `i64` -> `i32`
@@ -33,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr56]: https://github.com/teloxide/teloxide-core/pull/56
 [pr57]: https://github.com/teloxide/teloxide-core/pull/57
 [pr59]: https://github.com/teloxide/teloxide-core/pull/59
+[pr64]: https://github.com/teloxide/teloxide-core/pull/64
 
 ### Changed
 
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index 76294ddd..10828a80 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -30,10 +30,10 @@ pub struct InlineKeyboardMarkup {
 /// let keyboard = InlineKeyboardMarkup::default().append_row(vec![url_button]);
 /// ```
 impl InlineKeyboardMarkup {
-    pub fn new<I1, I2>(inline_keyboard: I1) -> Self
+    pub fn new<I>(inline_keyboard: I) -> Self
     where
-        I1: IntoIterator<Item = I2>,
-        I2: IntoIterator<Item = InlineKeyboardButton>,
+        I: IntoIterator,
+        I::Item: IntoIterator<Item = InlineKeyboardButton>,
     {
         Self {
             inline_keyboard: inline_keyboard
@@ -44,10 +44,10 @@ impl InlineKeyboardMarkup {
         }
     }
 
-    pub fn inline_keyboard<I1, I2>(mut self, val: I1) -> Self
+    pub fn inline_keyboard<I>(mut self, val: I) -> Self
     where
-        I1: IntoIterator<Item = I2>,
-        I2: IntoIterator<Item = InlineKeyboardButton>,
+        I: IntoIterator,
+        I::Item: IntoIterator<Item = InlineKeyboardButton>,
     {
         self.inline_keyboard = val
             .into_iter()
@@ -65,7 +65,7 @@ impl InlineKeyboardMarkup {
         self
     }
 
-    pub fn append_to_row(mut self, button: InlineKeyboardButton, index: usize) -> Self {
+    pub fn append_to_row(mut self, index: usize, button: InlineKeyboardButton) -> Self {
         match self.inline_keyboard.get_mut(index) {
             Some(buttons) => buttons.push(button),
             None => self.inline_keyboard.push(vec![button]),
@@ -100,7 +100,7 @@ mod tests {
 
         let markup = InlineKeyboardMarkup::default()
             .append_row(vec![button1.clone()])
-            .append_to_row(button2.clone(), 0);
+            .append_to_row(0, button2.clone());
 
         let expected = InlineKeyboardMarkup {
             inline_keyboard: vec![vec![button1, button2]],
@@ -116,7 +116,7 @@ mod tests {
 
         let markup = InlineKeyboardMarkup::default()
             .append_row(vec![button1.clone()])
-            .append_to_row(button2.clone(), 1);
+            .append_to_row(1, button2.clone());
 
         let expected = InlineKeyboardMarkup {
             inline_keyboard: vec![vec![button1], vec![button2]],
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index b2e8d3b1..0b99d1d5 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -11,7 +11,7 @@ use crate::types::KeyboardButton;
 /// [Introduction to bots]: https://core.telegram.org/bots#keyboards
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
-pub struct ReplyKeyboardMarkup {
+pub struct KeyboardMarkup {
     /// Array of button rows, each represented by an Array of
     /// [`KeyboardButton`] objects
     ///
@@ -44,11 +44,11 @@ pub struct ReplyKeyboardMarkup {
     pub selective: Option<bool>,
 }
 
-impl ReplyKeyboardMarkup {
-    pub fn new<K1, K2>(keyboard: K1) -> Self
+impl KeyboardMarkup {
+    pub fn new<K>(keyboard: K) -> Self
     where
-        K1: IntoIterator<Item = K2>,
-        K2: IntoIterator<Item = KeyboardButton>,
+        K: IntoIterator,
+        K::Item: IntoIterator<Item = KeyboardButton>,
     {
         Self {
             keyboard: keyboard
@@ -67,7 +67,7 @@ impl ReplyKeyboardMarkup {
         self
     }
 
-    pub fn append_to_row(mut self, button: KeyboardButton, index: usize) -> Self {
+    pub fn append_to_row(mut self, index: usize, button: KeyboardButton) -> Self {
         match self.keyboard.get_mut(index) {
             Some(buttons) => buttons.push(button),
             None => self.keyboard.push(vec![button]),
diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
index 2e9c81f6..5acb6ccc 100644
--- a/src/types/reply_keyboard_remove.rs
+++ b/src/types/reply_keyboard_remove.rs
@@ -7,20 +7,20 @@ use crate::types::True;
 ///
 /// By default, custom keyboards are displayed until a new keyboard is sent by a
 /// bot. An exception is made for one-time keyboards that are hidden immediately
-/// after the user presses a button (see [`ReplyKeyboardMarkup`]).
+/// after the user presses a button (see [`KeyboardMarkup`]).
 ///
 /// [The official docs](https://core.telegram.org/bots/api#replykeyboardremove).
 ///
-/// [`ReplyKeyboardMarkup`]: crate::types::ReplyKeyboardMarkup
+/// [`KeyboardMarkup`]: crate::types::KeyboardMarkup
 #[serde_with_macros::skip_serializing_none]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct ReplyKeyboardRemove {
+pub struct KeyboardRemove {
     /// Requests clients to remove the custom keyboard (user will not be able
     /// to summon this keyboard; if you want to hide the keyboard from sight
     /// but keep it accessible, use one_time_keyboard in
-    /// [`ReplyKeyboardMarkup`]).
+    /// [`KeyboardMarkup`]).
     ///
-    /// [`ReplyKeyboardMarkup`]: crate::types::ReplyKeyboardMarkup
+    /// [`KeyboardMarkup`]: crate::types::KeyboardMarkup
     pub remove_keyboard: True,
 
     /// Use this parameter if you want to remove the keyboard for specific
@@ -36,7 +36,7 @@ pub struct ReplyKeyboardRemove {
     pub selective: Option<bool>,
 }
 
-impl ReplyKeyboardRemove {
+impl KeyboardRemove {
     pub const fn new() -> Self {
         Self {
             remove_keyboard: True,
diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
index 5f0afbbe..233f2584 100644
--- a/src/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -1,17 +1,69 @@
 use derive_more::From;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{ForceReply, InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove};
+use crate::types::{
+    ForceReply, InlineKeyboardButton, InlineKeyboardMarkup, KeyboardButton, KeyboardMarkup,
+    KeyboardRemove,
+};
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, From)]
 #[serde(untagged)]
 pub enum ReplyMarkup {
-    InlineKeyboardMarkup(InlineKeyboardMarkup),
-    ReplyKeyboardMarkup(ReplyKeyboardMarkup),
-    ReplyKeyboardRemove(ReplyKeyboardRemove),
+    InlineKeyboard(InlineKeyboardMarkup),
+    Keyboard(KeyboardMarkup),
+    KeyboardRemove(KeyboardRemove),
     ForceReply(ForceReply),
 }
 
+impl ReplyMarkup {
+    /// Constructor for [`InlineKeyboard`] variant.
+    ///
+    /// This is a shortcut to
+    /// `ReplyMarkup::InlineKeyboard(InlineKeyboardMarkup::new(_))`.
+    ///
+    /// [`InlineKeyboard`]: ReplyMarkup::InlineKeyboard
+    pub fn inline_kb<I>(inline_keyboard: I) -> Self
+    where
+        I: IntoIterator,
+        I::Item: IntoIterator<Item = InlineKeyboardButton>,
+    {
+        Self::InlineKeyboard(InlineKeyboardMarkup::new(inline_keyboard))
+    }
+
+    /// Constructor for [`Keyboard`] variant.
+    ///
+    /// This is a shortcut to
+    /// `ReplyMarkup::Keyboard(KeyboardMarkup::new(_))`.
+    ///
+    /// [`Keyboard`]: ReplyMarkup::Keyboard
+    pub fn keyboad<K>(keyboard: K) -> Self
+    where
+        K: IntoIterator,
+        K::Item: IntoIterator<Item = KeyboardButton>,
+    {
+        Self::Keyboard(KeyboardMarkup::new(keyboard))
+    }
+
+    /// Constructor for [`KeyboardRemove`] variant.
+    ///
+    /// This is a shortcut to
+    /// `ReplyMarkup::KeyboardRemove(ReplyKeyboardRemove::new()))`.
+    ///
+    /// [`KeyboardRemove`]: ReplyMarkup::KeyboardRemove
+    pub fn kb_remove() -> Self {
+        Self::KeyboardRemove(KeyboardRemove::new())
+    }
+
+    /// Constructor for [`ForceReply`] variant.
+    ///
+    /// This is a shortcut to `ReplyMarkup::ForceReply(ForceReply::new())`.
+    ///
+    /// [`ForceReply`]: ReplyMarkup::KeyboardRemove
+    pub fn force_reply() -> Self {
+        Self::ForceReply(ForceReply::new())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -19,7 +71,7 @@ mod tests {
     #[test]
     fn inline_keyboard_markup() {
         let data = InlineKeyboardMarkup::default();
-        let expected = ReplyMarkup::InlineKeyboardMarkup(data.clone());
+        let expected = ReplyMarkup::InlineKeyboard(data.clone());
         let actual: ReplyMarkup = data.into();
         assert_eq!(actual, expected)
     }

From fd841ecd95820d6c9d334327f8cb8d1b4ec1f4f4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 16 Mar 2021 15:36:46 +0300
Subject: [PATCH 265/755] prepare for 0.2 release

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 6 +++---
 README.md    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 664a9483..1dc5506c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.2.0] - 2020-03-16
+
 ### Changed
 
 - Refactor `ReplyMarkup` ([#pr65][pr65]) (**BC**)
diff --git a/Cargo.toml b/Cargo.toml
index 06a14ebd..9ad16d2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
@@ -32,7 +32,7 @@ exclude = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "1.0.1", features = ["fs"] }
+tokio = { version = "1.2.0", features = ["fs"] }
 tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
@@ -41,7 +41,7 @@ log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
-serde_with_macros = "1.1.0"
+serde_with_macros = "1.4.1"
 uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
  
 derive_more = "0.99.9"
diff --git a/README.md b/README.md
index 898b3485..c4425c1d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 </div>
 
 ```toml
-teloxide_core = "0.1"
+teloxide_core = "0.2"
 ```
 _Compiler support: requires rustc 1.49+_.
 

From f3edcc28251215e2d89ada9d845df2e763c52d49 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Wed, 17 Mar 2021 22:56:33 +0300
Subject: [PATCH 266/755] Add unnoticed change to changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dc5506c..d0c6b576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr62]: https://github.com/teloxide/teloxide-core/pull/62
 [pr63]: https://github.com/teloxide/teloxide-core/pull/63
+[pr65]: https://github.com/teloxide/teloxide-core/pull/65
 
 ### Added
 
@@ -45,6 +46,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr59]: https://github.com/teloxide/teloxide-core/pull/59
 [pr64]: https://github.com/teloxide/teloxide-core/pull/64
 
+### Removed
+
+- `Message::text_owned` ([#pr62][pr62]) (**BC**)
+
 ### Changed
 
  - `NonStrictVec` -> `SemiparsedVec`.
@@ -164,4 +169,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   
 
 [`teloxide`]: https://github.com/teloxide/teloxide
-[`CHANGELOG.md`]: https://github.com/teloxide/teloxide/blob/master/CHANGELOG.md
\ No newline at end of file
+[`CHANGELOG.md`]: https://github.com/teloxide/teloxide/blob/master/CHANGELOG.md

From 2cdadf774f27a1e0c59617aac5168db8135378e6 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 18 Mar 2021 14:32:03 +0300
Subject: [PATCH 267/755] fix nightly-feature name

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

diff --git a/src/lib.rs b/src/lib.rs
index be51b5d6..e3a229b1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -73,7 +73,7 @@
 // $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
 // ```
 #![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
-#![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
+#![cfg_attr(feature = "nightly", feature(min_type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 

From f4507bd3d2e0b7dd4ee2c035d75afdadbd7d9ae1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 19 Mar 2021 12:20:26 +0300
Subject: [PATCH 268/755] Fix: types fields privacy (make fields of some types
 public)

The typos were found with `grep`:
```text
; grep -r -P "^    \w{2,}: .+, *$" ./src/types/*
./src/types/dice.rs:    emoji: DiceEmoji,
./src/types/dice.rs:    value: i32,
./src/types/keyboard_button.rs:    contact: Option<True>,
./src/types/keyboard_button.rs:    location: Option<True>,
./src/types/keyboard_button.rs:    poll: Option<KeyboardButtonPollType>,
./src/types/message.rs:    message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged,
./src/types/passport_element_error.rs:    message: String,
./src/types/passport_element_error.rs:    kind: PassportElementErrorKind,
./src/types/sticker_set.rs:    thumb: Option<PhotoSize>,
```

`src/types/keyboard_button.rs` can be ignored since in just contains private
helper structure.

Fields made public:
- `Dice::{emoji, value}`
- `MessageMessageAutoDeleteTimerChanged::message_auto_delete_timer_changed`
- `PassportElementError::{message, kind}`
- `StickerSet::thumb`
---
 CHANGELOG.md                        | 10 ++++++++++
 src/types/dice.rs                   |  4 ++--
 src/types/message.rs                |  2 +-
 src/types/passport_element_error.rs |  4 ++--
 src/types/sticker_set.rs            |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0c6b576..061c1e08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Fixed 
+
+- Types fields privacy (make fields of some types public) ([#68][pr68])
+  - `Dice::{emoji, value}`
+  - `MessageMessageAutoDeleteTimerChanged::message_auto_delete_timer_changed`
+  - `PassportElementError::{message, kind}`
+  - `StickerSet::thumb`
+
+[pr68]: https://github.com/teloxide/teloxide-core/pull/68
+
 ## [0.2.0] - 2020-03-16
 
 ### Changed
diff --git a/src/types/dice.rs b/src/types/dice.rs
index 404abd8e..67f69bbb 100644
--- a/src/types/dice.rs
+++ b/src/types/dice.rs
@@ -7,7 +7,7 @@ use crate::types::DiceEmoji;
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Dice {
     /// Emoji on which the dice throw animation is based.
-    emoji: DiceEmoji,
+    pub emoji: DiceEmoji,
 
     /// Value of the dice.
     ///
@@ -17,5 +17,5 @@ pub struct Dice {
     /// [`DiceEmoji::Dice`]: crate::types::DiceEmoji::Dice
     /// [`DiceEmoji::Darts`]:crate::types::DiceEmoji::Darts
     /// [`DiceEmoji::Basketball`]:crate::types::DiceEmoji::Basketball
-    value: i32,
+    pub value: i32,
 }
diff --git a/src/types/message.rs b/src/types/message.rs
index c9b8b2a4..0159c705 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -151,7 +151,7 @@ pub struct MessageChannelChatCreated {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageMessageAutoDeleteTimerChanged {
     /// Service message: auto-delete timer settings changed in the chat.
-    message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged,
+    pub message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index dbada303..dd594ba7 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -7,10 +7,10 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Hash, Eq, PartialEq, Serialize, Deserialize)]
 pub struct PassportElementError {
     /// Error message.
-    message: String,
+    pub message: String,
 
     #[serde(flatten)]
-    kind: PassportElementErrorKind,
+    pub kind: PassportElementErrorKind,
 }
 
 impl PassportElementError {
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index 9fea1621..5f501d60 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -25,5 +25,5 @@ pub struct StickerSet {
     pub stickers: Vec<Sticker>,
 
     /// Sticker set thumbnail in the .WEBP or .TGS format.
-    thumb: Option<PhotoSize>,
+    pub thumb: Option<PhotoSize>,
 }

From 670979e5ca9c8aa36428de5dc0cb8bb1054a93da Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 19 Mar 2021 12:27:32 +0300
Subject: [PATCH 269/755] Release 0.2.1

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 src/lib.rs   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 061c1e08..a97e221a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.2.1] - 2020-03-19
+
 ### Fixed 
 
 - Types fields privacy (make fields of some types public) ([#68][pr68])
diff --git a/Cargo.toml b/Cargo.toml
index 9ad16d2e..b9ee1fec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
diff --git a/src/lib.rs b/src/lib.rs
index e3a229b1..1dada893 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,11 +1,11 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `5.` is supported) with ease. The library is fully
+//! (Currently, version `5.1` is supported) with ease. The library is fully
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.1"
+//! teloxide_core = "0.2"
 //! ```
 //! _Compiler support: requires rustc 1.49+_
 //!

From c2fb1d5c261097868b68091ca37952a17902d238 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 19 Mar 2021 12:30:34 +0300
Subject: [PATCH 270/755] Fix API coverage version in README: "0.5.1" => "5.1"

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c4425c1d..60475ca4 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%200.5.1%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.1%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">

From 66e1f27702f5e7fe8066305cb342d58be80661fc Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Fri, 19 Mar 2021 16:31:05 +0600
Subject: [PATCH 271/755] Get ready for v0.4.0

---
 CHANGELOG.md | 6 ++++++
 Cargo.toml   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eceacff6..9741094d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2021-03-19
+
+### Changed
+
+ - Adjust dialogues with the latest teloxide (v0.4.0).
+
 ## [0.3.2] - 2020-07-27
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 3e294160..b8dfd878 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.3.2"
+version = "0.4.0"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 907d8a23a9f571e8862dde5f8f7203ba4a3bc530 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Mar 2021 10:46:39 +0300
Subject: [PATCH 272/755] doc(no_inline) prelude reexports

---
 src/prelude.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/prelude.rs b/src/prelude.rs
index ed53d1d7..13f135c9 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,5 +1,6 @@
 //! Commonly used items.
 
+#[doc(no_inline)]
 pub use crate::{
     payloads::setters::*,
     requests::{Request, Requester, RequesterExt},

From b5003d8b34563437b1c563df5296e68cd5d9e7be Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Mar 2021 10:48:56 +0300
Subject: [PATCH 273/755] Fix typo: ReplyMarkup::{keyboad => keyboard}

This commit adds `ReplyMarkup::keyboard}` and deprecates `ReplyMarkup::keyboad`.
---
 CHANGELOG.md              |  7 +++++++
 src/types/reply_markup.rs | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a97e221a..0dda49dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.2.2] - 2020-03-22
+
+### Fixed
+
+- Typo: `ReplyMarkup::{keyboad => keyboard}` ([#69][pr69])
+  - Note: method with the old name was deprecated and hidden from docs
+
 ## [0.2.1] - 2020-03-19
 
 ### Fixed 
diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
index 233f2584..838aff35 100644
--- a/src/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -36,7 +36,7 @@ impl ReplyMarkup {
     /// `ReplyMarkup::Keyboard(KeyboardMarkup::new(_))`.
     ///
     /// [`Keyboard`]: ReplyMarkup::Keyboard
-    pub fn keyboad<K>(keyboard: K) -> Self
+    pub fn keyboard<K>(keyboard: K) -> Self
     where
         K: IntoIterator,
         K::Item: IntoIterator<Item = KeyboardButton>,
@@ -62,6 +62,17 @@ impl ReplyMarkup {
     pub fn force_reply() -> Self {
         Self::ForceReply(ForceReply::new())
     }
+
+    // FIXME(waffle): remove this method in the next minor version bump (0.3.0)
+    #[doc(hidden)]
+    #[deprecated = "This method has a typo in name. Use `ReplyMarkup::keyboard` instead."]
+    pub fn keyboad<K>(keyboard: K) -> Self
+    where
+        K: IntoIterator,
+        K::Item: IntoIterator<Item = KeyboardButton>,
+    {
+        Self::Keyboard(KeyboardMarkup::new(keyboard))
+    }
 }
 
 #[cfg(test)]

From 46b6c124eb868d4f0023bd82c14b1084d9dee44b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Mar 2021 10:53:19 +0300
Subject: [PATCH 274/755] Bump version (0.2.1 => 0.2.2)

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index b9ee1fec..d2792dcd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",

From 59cb2939f86141ce337127cb52c297851a66c1c8 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Mar 2021 11:05:00 +0300
Subject: [PATCH 275/755] Fix broken link in changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dda49dc..d0246141 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Typo: `ReplyMarkup::{keyboad => keyboard}` ([#69][pr69])
   - Note: method with the old name was deprecated and hidden from docs
 
+[pr69]: https://github.com/teloxide/teloxide-core/pull/69
+
 ## [0.2.1] - 2020-03-19
 
 ### Fixed 

From 84a18d2b5dc6b12bc10feb8e7f38940a5b23932c Mon Sep 17 00:00:00 2001
From: Diego Roig <2140622+diegopy@users.noreply.github.com>
Date: Fri, 26 Mar 2021 16:47:03 -0500
Subject: [PATCH 276/755] fix reqwest dependency features

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index d2792dcd..a27b496a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ tokio = { version = "1.2.0", features = ["fs"] }
 tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
-reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"] }
+reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"], default-features = false }
 log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }

From bebce82d22c9f537fc303ad7b84cf0fe79264ec1 Mon Sep 17 00:00:00 2001
From: Diego Roig <2140622+diegopy@users.noreply.github.com>
Date: Fri, 26 Mar 2021 17:14:10 -0500
Subject: [PATCH 277/755] document reqwest dependency fix

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0246141..b000c57a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Fixed
+
+- `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
+
+[pr71]: https://github.com/teloxide/teloxide-core/pull/71
+
 ## [0.2.2] - 2020-03-22
 
 ### Fixed

From b1e764366272f940cbc78cfd1e4173d0fff1383f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 13:49:27 +0300
Subject: [PATCH 278/755] Make annoying headers less annoying

Remove commit, so they won't change every time.
Also change the text to better reflect what's going on.
---
 src/local_macros.rs                                 |  9 +++++++--
 src/payloads.rs                                     |  9 +++++++--
 src/payloads/add_sticker_to_set.rs                  |  9 +++++++--
 src/payloads/answer_callback_query.rs               |  9 +++++++--
 src/payloads/answer_inline_query.rs                 |  9 +++++++--
 src/payloads/answer_pre_checkout_query.rs           |  9 +++++++--
 src/payloads/answer_shipping_query.rs               |  9 +++++++--
 src/payloads/close.rs                               |  9 +++++++--
 src/payloads/copy_message.rs                        |  9 +++++++--
 src/payloads/create_chat_invite_link.rs             |  9 +++++++--
 src/payloads/create_new_sticker_set.rs              |  9 +++++++--
 src/payloads/delete_chat_photo.rs                   |  9 +++++++--
 src/payloads/delete_chat_sticker_set.rs             |  9 +++++++--
 src/payloads/delete_message.rs                      |  9 +++++++--
 src/payloads/delete_sticker_from_set.rs             |  9 +++++++--
 src/payloads/delete_webhook.rs                      |  9 +++++++--
 src/payloads/edit_chat_invite_link.rs               |  9 +++++++--
 src/payloads/edit_message_caption.rs                |  9 +++++++--
 src/payloads/edit_message_caption_inline.rs         |  9 +++++++--
 src/payloads/edit_message_live_location.rs          |  9 +++++++--
 src/payloads/edit_message_live_location_inline.rs   |  9 +++++++--
 src/payloads/edit_message_media.rs                  |  9 +++++++--
 src/payloads/edit_message_media_inline.rs           |  9 +++++++--
 src/payloads/edit_message_reply_markup.rs           |  9 +++++++--
 src/payloads/edit_message_reply_markup_inline.rs    |  9 +++++++--
 src/payloads/edit_message_text.rs                   |  9 +++++++--
 src/payloads/edit_message_text_inline.rs            |  9 +++++++--
 src/payloads/export_chat_invite_link.rs             |  9 +++++++--
 src/payloads/forward_message.rs                     |  9 +++++++--
 src/payloads/get_chat.rs                            |  9 +++++++--
 src/payloads/get_chat_administrators.rs             |  9 +++++++--
 src/payloads/get_chat_member.rs                     |  9 +++++++--
 src/payloads/get_chat_members_count.rs              |  9 +++++++--
 src/payloads/get_file.rs                            |  9 +++++++--
 src/payloads/get_game_high_scores.rs                |  9 +++++++--
 src/payloads/get_me.rs                              |  9 +++++++--
 src/payloads/get_my_commands.rs                     |  9 +++++++--
 src/payloads/get_sticker_set.rs                     |  9 +++++++--
 src/payloads/get_updates.rs                         |  9 +++++++--
 src/payloads/get_user_profile_photos.rs             |  9 +++++++--
 src/payloads/get_webhook_info.rs                    |  9 +++++++--
 src/payloads/kick_chat_member.rs                    |  9 +++++++--
 src/payloads/leave_chat.rs                          |  9 +++++++--
 src/payloads/log_out.rs                             |  9 +++++++--
 src/payloads/pin_chat_message.rs                    |  9 +++++++--
 src/payloads/promote_chat_member.rs                 |  9 +++++++--
 src/payloads/restrict_chat_member.rs                |  9 +++++++--
 src/payloads/revoke_chat_invite_link.rs             |  9 +++++++--
 src/payloads/send_animation.rs                      |  9 +++++++--
 src/payloads/send_audio.rs                          |  9 +++++++--
 src/payloads/send_chat_action.rs                    |  9 +++++++--
 src/payloads/send_contact.rs                        |  9 +++++++--
 src/payloads/send_dice.rs                           |  9 +++++++--
 src/payloads/send_document.rs                       |  9 +++++++--
 src/payloads/send_game.rs                           |  9 +++++++--
 src/payloads/send_invoice.rs                        |  9 +++++++--
 src/payloads/send_location.rs                       |  9 +++++++--
 src/payloads/send_media_group.rs                    |  9 +++++++--
 src/payloads/send_message.rs                        |  9 +++++++--
 src/payloads/send_photo.rs                          |  9 +++++++--
 src/payloads/send_poll.rs                           |  9 +++++++--
 src/payloads/send_sticker.rs                        |  9 +++++++--
 src/payloads/send_venue.rs                          |  9 +++++++--
 src/payloads/send_video.rs                          |  9 +++++++--
 src/payloads/send_video_note.rs                     |  9 +++++++--
 src/payloads/send_voice.rs                          |  9 +++++++--
 src/payloads/set_chat_administrator_custom_title.rs |  9 +++++++--
 src/payloads/set_chat_description.rs                |  9 +++++++--
 src/payloads/set_chat_permissions.rs                |  9 +++++++--
 src/payloads/set_chat_photo.rs                      |  9 +++++++--
 src/payloads/set_chat_sticker_set.rs                |  9 +++++++--
 src/payloads/set_chat_title.rs                      |  9 +++++++--
 src/payloads/set_game_score.rs                      |  9 +++++++--
 src/payloads/set_game_score_inline.rs               |  9 +++++++--
 src/payloads/set_my_commands.rs                     |  9 +++++++--
 src/payloads/set_passport_data_errors.rs            |  9 +++++++--
 src/payloads/set_sticker_position_in_set.rs         |  9 +++++++--
 src/payloads/set_sticker_set_thumb.rs               |  9 +++++++--
 src/payloads/set_webhook.rs                         |  9 +++++++--
 src/payloads/setters.rs                             | 10 +++++++---
 src/payloads/stop_message_live_location.rs          |  9 +++++++--
 src/payloads/stop_message_live_location_inline.rs   |  9 +++++++--
 src/payloads/stop_poll.rs                           |  9 +++++++--
 src/payloads/unban_chat_member.rs                   |  9 +++++++--
 src/payloads/unpin_all_chat_messages.rs             |  9 +++++++--
 src/payloads/unpin_chat_message.rs                  |  9 +++++++--
 src/payloads/upload_sticker_file.rs                 |  9 +++++++--
 src/requests/requester.rs                           |  9 +++++++--
 88 files changed, 616 insertions(+), 177 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index b8a4db59..68c746a7 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -393,9 +393,14 @@ macro_rules! impl_payload {
 }
 
 #[macro_use]
-// This macro is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This macro is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS MACRO**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 macro_rules! requester_forward {
     ($i:ident $(, $rest:ident )* $(,)? => $body:ident, $ty:ident ) => {
         requester_forward!(@method $i $body $ty);
diff --git a/src/payloads.rs b/src/payloads.rs
index c6baef2f..bf4e498c 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -12,9 +12,14 @@
 /// namespace.
 pub mod setters;
 
-// This block is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This block is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS BLOCK**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 mod add_sticker_to_set;
 mod answer_callback_query;
 mod answer_inline_query;
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index ca2f6242..7d58a7ea 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InputSticker, MaskPosition, True};
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 8c636ac7..7d0d1bb3 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index b81e0892..1225600c 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineQueryResult, True};
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index 375180b0..d185dbdc 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index 46cd48a1..da97b5d0 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ShippingOption, True};
diff --git a/src/payloads/close.rs b/src/payloads/close.rs
index 3386aff1..406b0054 100644
--- a/src/payloads/close.rs
+++ b/src/payloads/close.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index 0e5eeefd..4a6cbbc1 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
index e543ca34..9fcfcd93 100644
--- a/src/payloads/create_chat_invite_link.rs
+++ b/src/payloads/create_chat_invite_link.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatInviteLink};
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 6625f64f..cd043718 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InputSticker, MaskPosition, True};
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index db346e4e..9905ba12 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index c8b66e32..c9042585 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 3e113023..a287ead9 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index c3f30b59..680a2452 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index cda82309..843643de 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
index 92d09934..98732b98 100644
--- a/src/payloads/edit_chat_invite_link.rs
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 143a703c..df901a8b 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index 247b59de..f5a65e03 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index e9b3670e..26f2be3e 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, ReplyMarkup};
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index c7241a1c..5a6238d6 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index c0c3388c..b8d59e9c 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, InputMedia, Message};
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index 47bd4600..69c28718 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, InputMedia, True};
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index b580cfe2..81ab2496 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, Message};
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 0cfbf92e..20f2a178 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, True};
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index ee8f18de..fb704638 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index d529814a..38fdb60a 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index 0cfd1b10..adf5e49e 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index fd33171d..2ccad51e 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message};
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index 403629f3..2b40a11d 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{Chat, ChatId};
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 49c05bf6..9cdb1f06 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatMember};
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index a4cbaa0e..7b76d51c 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatMember};
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 237c4d33..b5bb6350 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 0535b768..2c2c0b08 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::File;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index 6ddfa108..854cd5e4 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{TargetMessage, True};
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 66b6c48a..4c2f85ff 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::Me;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index f5591f29..29063456 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 impl_payload! {
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index e9e35f5a..c3dbc0db 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::StickerSet;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 3bc35912..695b60de 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{AllowedUpdate, Update};
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index b9a6b0fc..56a97492 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::UserProfilePhotos;
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index e3e9d050..0ea91a87 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::WebhookInfo;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index a64798ff..26a51129 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 3c237c7e..17dbf567 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/log_out.rs b/src/payloads/log_out.rs
index ece3cc50..82c362eb 100644
--- a/src/payloads/log_out.rs
+++ b/src/payloads/log_out.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 6ad729cc..7293bccb 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 7aaa11dc..9e69082f 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index c0db9c07..c6cb3c9c 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatPermissions, True};
diff --git a/src/payloads/revoke_chat_invite_link.rs b/src/payloads/revoke_chat_invite_link.rs
index 0c4d466b..04a7389f 100644
--- a/src/payloads/revoke_chat_invite_link.rs
+++ b/src/payloads/revoke_chat_invite_link.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 786d778f..115dc8b0 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index d52c4bfa..bbfb8734 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 1d5cd378..854b69c2 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatAction, ChatId, Message};
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 9bc256b1..01852e8f 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, ReplyMarkup};
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index b3b168d4..fc19d585 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, DiceEmoji, Message, ReplyMarkup};
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 9d262300..82c72606 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index f9ef39c4..eaa8e9e9 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 0eb4df20..4573633b 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, LabeledPrice, Message};
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index fdc49e8a..96c7e4c4 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, ReplyMarkup};
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index adffeaa1..7da96386 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputMedia, Message};
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 6417d53f..e3ff3dab 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 33a333c8..64339696 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 48ef9331..ec289ae3 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, MessageEntity, ParseMode, PollType, ReplyMarkup};
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 21199ca1..b40e46e3 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 331807b4..b3181b78 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, ReplyMarkup};
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 13815516..49e03a73 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 08fefd48..de68d364 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 0a4817a0..e6900f63 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 323f9e62..3ce02ccf 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index e964a799..1192228e 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 334c53cd..1c619310 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatPermissions, True};
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 46723c03..a02c2378 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InputFile};
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 3a6d3fe6..54410143 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 9df76f55..40e98248 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index addbf208..5d1bdb4c 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::Message;
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 5f7834e2..1b62c50a 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::Message;
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 951cf160..3071b667 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::BotCommand;
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index 0ed70843..fdb52796 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{PassportElementError, True};
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index b264b2bc..965c0e69 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index edb32b00..a73f687a 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{InputFile, True};
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 9a6ba57a..2162642a 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{AllowedUpdate, InputFile, True};
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index da76b0f3..9a7f520d 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1,7 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
-
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 #[doc(no_inline)]
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index cd7a2dc2..55c4e0e6 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, ReplyMarkup};
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index 802d51cf..0aeb7650 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index 3446b9c7..f5a956cf 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, Poll};
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 2ca4225e..ca94d87c 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
diff --git a/src/payloads/unpin_all_chat_messages.rs b/src/payloads/unpin_all_chat_messages.rs
index 84094426..d605e314 100644
--- a/src/payloads/unpin_all_chat_messages.rs
+++ b/src/payloads/unpin_all_chat_messages.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index 36f08d33..fb9a88d0 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::ChatId;
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 953276c8..05a49f86 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,6 +1,11 @@
-// This file is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+// This file is auto generated by [`cg`] from [`schema`].
+//
 // **DO NOT EDIT THIS FILE**,
-// edit `cg` instead.
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
 use crate::types::{File, InputFile};
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 083b0398..c6689ef8 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -52,9 +52,14 @@ pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by `cg` <https://github.com/teloxide/cg> (24572cd + local changes).
+    // This block is auto generated by [`cg`] from [`schema`].
+    //
     // **DO NOT EDIT THIS BLOCK**,
-    // edit `cg` instead.
+    //
+    // Edit `cg` or `schema` instead.
+    //
+    // [cg]: https://github.com/teloxide/cg
+    // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 

From 02cd4dc97f95cf171fe2281ca200aa333cca0a17 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 14:02:10 +0300
Subject: [PATCH 279/755] Fix `GetChatAdministrators` output type `ChatMember`
 => `Vec<ChatMember>`

---
 CHANGELOG.md                            | 2 ++
 src/payloads/get_chat_administrators.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b000c57a..f9fd1fe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
 
 [pr71]: https://github.com/teloxide/teloxide-core/pull/71
+[pr73]: https://github.com/teloxide/teloxide-core/pull/73
 
 ## [0.2.2] - 2020-03-22
 
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index 9cdb1f06..dc14eb20 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -15,7 +15,7 @@ impl_payload! {
     ///
     /// [`ChatMember`]: crate::types::ChatMember
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub GetChatAdministrators (GetChatAdministratorsSetters) => ChatMember {
+    pub GetChatAdministrators (GetChatAdministratorsSetters) => Vec<ChatMember> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],

From c36762c7af66a1603134220d47aeecabaabf93e5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 14:39:03 +0300
Subject: [PATCH 280/755] Add `Deref` impl for `ChatMember` to allow calling
 kind's methods directly

---
 src/types/chat_member.rs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 26b82002..7367b75f 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -1,3 +1,5 @@
+use std::ops::Deref;
+
 use serde::{Deserialize, Serialize};
 
 use crate::types::User;
@@ -130,9 +132,27 @@ pub struct Kicked {
     pub until_date: i32,
 }
 
-impl ChatMember {
+/// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`]
+///
+/// ```no_run
+/// use teloxide_core::types::ChatMember;
+///
+/// let member: ChatMember = todo!();
+///
+/// let _ = member.status();
+/// let _ = member.kind.status();
+/// ```
+impl Deref for ChatMember {
+    type Target = ChatMemberKind;
+
+    fn deref(&self) -> &Self::Target {
+        &self.kind
+    }
+}
+
+impl ChatMemberKind {
     pub fn status(&self) -> ChatMemberStatus {
-        match &self.kind {
+        match self {
             ChatMemberKind::Creator(_) => ChatMemberStatus::Creator,
             ChatMemberKind::Administrator(_) => ChatMemberStatus::Administrator,
             ChatMemberKind::Member => ChatMemberStatus::Member,
@@ -141,9 +161,7 @@ impl ChatMember {
             ChatMemberKind::Kicked(_) => ChatMemberStatus::Kicked,
         }
     }
-}
 
-impl ChatMemberKind {
     /// Getter for [`Administrator::custom_title`] and [`Creator::custom_title`]
     /// fields.
     pub fn custom_title(&self) -> Option<&str> {

From 2a6e9353e7cc8444fa10f63be14db2c8ff28ff46 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 15:06:45 +0300
Subject: [PATCH 281/755] Add is_* methods to `ChatMember`

Among with simple `is_{creator,administrator,restricted,left,kicked}` methods
which just check `.kind`, this patch adds `is_privileged` and `is_in_chat`
compound methods, which may be usefull.
---
 src/types/chat_member.rs | 52 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 7367b75f..75fa2b57 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -150,7 +150,9 @@ impl Deref for ChatMember {
     }
 }
 
+/// Simple methods to check user status.
 impl ChatMemberKind {
+    /// Returns chat member status.
     pub fn status(&self) -> ChatMemberStatus {
         match self {
             ChatMemberKind::Creator(_) => ChatMemberStatus::Creator,
@@ -162,6 +164,56 @@ impl ChatMemberKind {
         }
     }
 
+    /// Returns `true` if the user is the creator (owner) of the given chat.
+    pub fn is_creator(&self) -> bool {
+        matches!(self, Self::Creator { .. })
+    }
+
+    /// Returns `true` if the user is an administrator of the given chat.
+    ///
+    /// **Note**: this function doesn't return `true` if the user is the creator
+    /// of the given chat. See also: [`is_privileged`].
+    pub fn is_administrator(&self) -> bool {
+        matches!(self, Self::Administrator { .. })
+    }
+
+    /// Returns `true` if the user is a common member of the given chat.
+    pub fn is_member(&self) -> bool {
+        matches!(self, Self::Member { .. })
+    }
+
+    /// Returns `true` if the user is restricred in the given chat.
+    pub fn is_restricted(&self) -> bool {
+        matches!(self, Self::Restricted { .. })
+    }
+
+    /// Returns `true` if the user left the given chat.
+    pub fn is_left(&self) -> bool {
+        matches!(self, Self::Left { .. })
+    }
+
+    /// Returns `true` if the user is kicked from the given chat.
+    pub fn is_kicked(&self) -> bool {
+        matches!(self, Self::Kicked { .. })
+    }
+}
+
+/// Compound methods to check user status.
+impl ChatMemberKind {
+    /// Returns `true` if the user is privileged in the given chat. i.e. if the
+    /// user is either creator or administrator.
+    pub fn is_privileged(&self) -> bool {
+        self.is_administrator() || self.is_creator()
+    }
+
+    /// Returns `true` if the user is currently in chat. i.e. the user hasn't
+    /// left or been kicked.
+    pub fn is_in_chat(&self) -> bool {
+        !(self.is_left() || self.is_kicked())
+    }
+}
+
+impl ChatMemberKind {
     /// Getter for [`Administrator::custom_title`] and [`Creator::custom_title`]
     /// fields.
     pub fn custom_title(&self) -> Option<&str> {

From 9333fca3c24f2d2f5b20e8782f5adef56972162a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 16:02:42 +0300
Subject: [PATCH 282/755] Make privileges checks easier to use

Change `ChatMemberKind::can_*` methods:
- Make them return bool, instead if option
- Return appropriate result for creators
---
 src/types/chat_member.rs | 253 ++++++++++++++++++++++++---------------
 1 file changed, 159 insertions(+), 94 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 75fa2b57..a1af148a 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -232,163 +232,228 @@ impl ChatMemberKind {
             | Self::Kicked(Kicked { until_date, .. }) => Some(*until_date),
         }
     }
+}
 
-    /// Getter for [`Administrator::can_be_edited`] field.
-    pub fn can_be_edited(&self) -> Option<bool> {
-        match &self {
-            Self::Administrator(Administrator { can_be_edited, .. }) => Some(*can_be_edited),
+/// Methods to check admin privileges.
+impl ChatMemberKind {
+    /// Returns `true` if the user is an administrator in the given chat and the
+    /// bot is allowed to edit administrator privileges of that user.
+    pub fn can_be_edited(&self) -> bool {
+        match self {
+            Self::Administrator(Administrator { can_be_edited, .. }) => *can_be_edited,
+            // Creator can't ever be edited by any bot.
             Self::Creator(_)
             | Self::Member
             | Self::Restricted(_)
             | Self::Left
-            | Self::Kicked(_) => None,
+            | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_manage_chat`] field.
-    pub fn can_manage_chat(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, if the can access the chat event log, chat
+    /// statistics, message statistics in channels, see channel members, see
+    /// anonymous administrators in supergroups and ignore slow mode. Implied by
+    /// any other administrator privilege.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_manage_chat`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_manage_chat`]: ChatMemberKind::Administrator::can_manage_chat
+    pub fn can_manage_chat(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_manage_chat, ..
-            }) => Some(*can_manage_chat),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_manage_chat,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => true,
         }
     }
 
-    /// Getter for [`Administrator::can_change_info`] field.
-    pub fn can_change_info(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can change the chat
+    /// title, photo and other settings.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_change_info`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_change_info`]: ChatMemberKind::Administrator::can_change_info
+    pub fn can_change_info(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_change_info, ..
-            }) => Some(*can_change_info),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_change_info,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_post_messages`] field.
-    pub fn can_post_messages(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can post in the
+    /// channel, channels only.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is administrator and has [`can_post_messages`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_post_messages`]: ChatMemberKind::Administrator::can_post_messages
+    pub fn can_post_messages(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_post_messages, ..
-            }) => *can_post_messages,
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => can_post_messages.unwrap_or_default(),
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_edit_messages`] field.
-    pub fn can_edit_messages(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can edit messages of
+    /// other users and can pin messages, channels only.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is administrator and has [`can_edit_messages`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_edit_messages`]: ChatMemberKind::Administrator::can_edit_messages
+    pub fn can_edit_messages(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_edit_messages, ..
-            }) => *can_edit_messages,
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => can_edit_messages.unwrap_or_default(),
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_delete_messages`] field.
-    pub fn can_delete_messages(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can delete messages
+    /// of other users.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_delete_messages`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_delete_messages`]:
+    /// ChatMemberKind::Administrator::can_delete_messages
+    pub fn can_delete_messages(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_delete_messages,
                 ..
-            }) => Some(*can_delete_messages),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_delete_messages,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_manage_voice_chats`] field.
-    pub fn can_manage_voice_chats(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can manage voice chats.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_manage_voice_chats`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_manage_voice_chats`]:
+    /// ChatMemberKind::Administrator::can_manage_voice_chats
+    pub fn can_manage_voice_chats(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_manage_voice_chats,
                 ..
-            }) => Some(*can_manage_voice_chats),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_manage_voice_chats,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_invite_users`] field.
-    pub fn can_invite_users(&self) -> Option<bool> {
+    /// Returns `true`, the user can can invite new users
+    /// to the chat.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_invite_users`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_invite_users`]: ChatMemberKind::Administrator::can_invite_users
+    pub fn can_invite_users(&self) -> bool {
         match &self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_invite_users, ..
-            }) => Some(*can_invite_users),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_invite_users,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_restrict_members`] field.
-    pub fn can_restrict_members(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can restrict,
+    /// ban or unban chat members.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat
+    /// - is administrator and has [`can_restrict_members`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_restrict_members`]:
+    /// ChatMemberKind::Administrator::can_restrict_members
+    pub fn can_restrict_members(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_restrict_members,
                 ..
-            }) => Some(*can_restrict_members),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_restrict_members,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_pin_messages`] field.
-    pub fn can_pin_messages(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can pin messages,
+    /// supergroups only.
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat (even if the chat is not a supergroups)
+    /// - is administrator and has [`can_pin_messages`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_pin_messages`]: ChatMemberKind::Administrator::can_pin_messages
+    pub fn can_pin_messages(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_pin_messages, ..
-            }) => *can_pin_messages,
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => can_pin_messages.unwrap_or_default(),
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Administrator::can_promote_members`] field.
-    pub fn can_promote_members(&self) -> Option<bool> {
-        match &self {
+    /// Returns `true`, the user can add new
+    /// administrators with a subset of his own privileges or demote
+    /// administrators that he has promoted, directly or indirectly
+    /// (promoted by administrators that were appointed by the
+    /// user).
+    ///
+    /// I.e. returns `true` if the user
+    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is administrator and has [`can_promote_members`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_promote_members`]:
+    /// ChatMemberKind::Administrator::can_promote_members
+    pub fn can_promote_members(&self) -> bool {
+        match self {
+            Self::Creator(_) => true,
             Self::Administrator(Administrator {
                 can_promote_members,
                 ..
-            }) => Some(*can_promote_members),
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_promote_members,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
         }
     }
+}
 
+impl ChatMemberKind {
     /// Getter for [`Restricted::can_send_messages`] field.
     pub fn can_send_messages(&self) -> Option<bool> {
         match &self {

From f50e1d2d45595ea6365625f518de7ee472a762fc Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Mar 2021 16:24:06 +0300
Subject: [PATCH 283/755] Make rights checks easier to use

---
 src/types/chat_member.rs | 93 ++++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index a1af148a..5d927302 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -106,19 +106,19 @@ pub struct Restricted {
     /// this user, unix time.
     pub until_date: i32,
 
-    /// Restricted only. `true`, if the user can send text messages,
+    /// `true`, if the user can send text messages,
     /// contacts, locations and venues.
     pub can_send_messages: bool,
 
-    /// Restricted only. `true`, if the user is allowed to send audios,
+    /// `true`, if the user is allowed to send audios,
     /// documents, photos, videos, video notes and voice notes.
     pub can_send_media_messages: bool,
 
-    /// Restricted only. `true`, if the user is allowed to send animations,
+    /// `true`, if the user is allowed to send animations,
     /// games, stickers and use inline bots.
     pub can_send_other_messages: bool,
 
-    /// Restricted only. `true`, if the user is allowed to add web page
+    /// `true`, if the user is allowed to add web page
     /// previews to their messages.
     pub can_add_web_page_previews: bool,
 }
@@ -453,63 +453,84 @@ impl ChatMemberKind {
     }
 }
 
+/// Methods to check member rights.
 impl ChatMemberKind {
-    /// Getter for [`Restricted::can_send_messages`] field.
-    pub fn can_send_messages(&self) -> Option<bool> {
+    /// Returns `true`, if the user can send text messages,
+    /// contacts, locations and venues.
+    ///
+    /// I.e. returns **`false`** if the user
+    /// - has left or has been kicked from the chat
+    /// - is restricted and doesn't have [`can_send_messages`] right
+    /// Returns `true` otherwise.
+    ///
+    /// [`can_send_messages`]: Restricted::can_send_messages
+    pub fn can_send_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
                 can_send_messages, ..
-            }) => Some(*can_send_messages),
-            Self::Creator(_)
-            | Self::Administrator(_)
-            | Self::Member
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_send_messages,
+            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Restricted::can_send_media_messages`] field.
-    pub fn can_send_media_messages(&self) -> Option<bool> {
+    /// Returns `true`, if the user is allowed to send audios,
+    /// documents, photos, videos, video notes and voice notes.
+    ///
+    /// I.e. returns **`false`** if the user
+    /// - has left or has been kicked from the chat
+    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// Returns `true` otherwise.
+    ///
+    /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    pub fn can_send_media_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
                 can_send_media_messages,
                 ..
-            }) => Some(*can_send_media_messages),
-            Self::Creator(_)
-            | Self::Administrator(_)
-            | Self::Member
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_send_media_messages,
+            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Restricted::can_send_other_messages`] field.
-    pub fn can_send_other_messages(&self) -> Option<bool> {
+    /// Returns `true`, if the user is allowed to send animations,
+    /// games, stickers and use inline bots.
+    ///
+    /// I.e. returns **`false`** if the user
+    /// - has left or has been kicked from the chat
+    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// Returns `true` otherwise.
+    ///
+    /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    pub fn can_send_other_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
                 can_send_other_messages,
                 ..
-            }) => Some(*can_send_other_messages),
-            Self::Creator(_)
-            | Self::Administrator(_)
-            | Self::Member
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_send_other_messages,
+            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Kicked(_) => false,
         }
     }
 
-    /// Getter for [`Restricted::can_add_web_page_previews`] field.
-    pub fn can_add_web_page_previews(&self) -> Option<bool> {
+    /// Returns `true`, if the user is allowed to add web page
+    /// previews to their messages.
+    ///
+    /// I.e. returns **`false`** if the user
+    /// - has left or has been kicked from the chat
+    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// Returns `true` otherwise.
+    ///
+    /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    pub fn can_add_web_page_previews(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
                 can_add_web_page_previews,
                 ..
-            }) => Some(*can_add_web_page_previews),
-            Self::Creator(_)
-            | Self::Administrator(_)
-            | Self::Member
-            | Self::Left
-            | Self::Kicked(_) => None,
+            }) => *can_add_web_page_previews,
+            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Kicked(_) => false,
         }
     }
 }

From 75aaf56d5351d6e512e828eeecac0ddff66d909f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 29 Mar 2021 00:33:02 +0300
Subject: [PATCH 284/755] Add ChatMemberKind::is_anonymous method

---
 src/types/chat_member.rs | 47 ++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 5d927302..5c00dde5 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -224,6 +224,21 @@ impl ChatMemberKind {
         }
     }
 
+    /// Returns `true`, if the user's presence in the chat is hidden.
+    ///
+    /// I.e. returns `true` if the user is the creator of the chat or an
+    /// administrator in the chat and has [`can_manage_chat`] privilege.
+    /// Returns `false` otherwise.
+    ///
+    /// [`can_manage_chat`]: ChatMemberKind::Administrator::can_manage_chat
+    pub fn is_anonymous(&self) -> bool {
+        match self {
+            Self::Creator(Creator { is_anonymous, .. })
+            | Self::Administrator(Administrator { is_anonymous, .. }) => *is_anonymous,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+        }
+    }
+
     /// Getter for [`Restricted::until_date`] and [`Kicked::until_date`] fields.
     pub fn until_date(&self) -> Option<i32> {
         match &self {
@@ -250,14 +265,15 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the can access the chat event log, chat
+    /// Returns `true`, if the user can access the chat event log, chat
     /// statistics, message statistics in channels, see channel members, see
     /// anonymous administrators in supergroups and ignore slow mode. Implied by
     /// any other administrator privilege.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_manage_chat`] privilege.
+    /// - is an administrator in the given chat and has [`can_manage_chat`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_chat`]: ChatMemberKind::Administrator::can_manage_chat
@@ -276,7 +292,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_change_info`] privilege.
+    /// - is an administrator in the given chat and has [`can_change_info`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_change_info`]: ChatMemberKind::Administrator::can_change_info
@@ -295,7 +312,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is administrator and has [`can_post_messages`] privilege.
+    /// - is an administrator in the given chat and has [`can_post_messages`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_post_messages`]: ChatMemberKind::Administrator::can_post_messages
@@ -314,7 +332,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is administrator and has [`can_edit_messages`] privilege.
+    /// - is an administrator in the given chat and has [`can_edit_messages`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_edit_messages`]: ChatMemberKind::Administrator::can_edit_messages
@@ -333,7 +352,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_delete_messages`] privilege.
+    /// - is an administrator in the given chat and has [`can_delete_messages`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_delete_messages`]:
@@ -353,7 +373,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_manage_voice_chats`] privilege.
+    /// - is an administrator in the given chat and has
+    ///   [`can_manage_voice_chats`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_voice_chats`]:
@@ -374,7 +395,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_invite_users`] privilege.
+    /// - is an administrator in the given chat and has [`can_invite_users`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_invite_users`]: ChatMemberKind::Administrator::can_invite_users
@@ -393,7 +415,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is administrator and has [`can_restrict_members`] privilege.
+    /// - is an administrator in the given chat and has [`can_restrict_members`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_restrict_members`]:
@@ -414,7 +437,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a supergroups)
-    /// - is administrator and has [`can_pin_messages`] privilege.
+    /// - is an administrator in the given chat and has [`can_pin_messages`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_pin_messages`]: ChatMemberKind::Administrator::can_pin_messages
@@ -436,7 +460,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is administrator and has [`can_promote_members`] privilege.
+    /// - is an administrator in the given chat and has [`can_promote_members`]
+    ///   privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_promote_members`]:

From 06fa3f42e81fd57e3129201c12eb5015488bb280 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 29 Mar 2021 00:44:42 +0300
Subject: [PATCH 285/755] Update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fd1fe2..e66bcd9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Changed
+
+- Refactor `ChatMember` methods ([#74][pr74])
+  - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callible directly on `ChatMember`
+  - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
+  - Refactor privilege getters 
+
+[pr74]: https://github.com/teloxide/teloxide-core/pull/74
+
 ### Fixed
 
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])

From 3522a2328912c6319048beacebc7a401b8255ef4 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 29 Mar 2021 10:16:02 +0300
Subject: [PATCH 286/755] fix docs

---
 src/types/chat_member.rs | 70 ++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 5c00dde5..98f944c0 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -164,35 +164,49 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user is the creator (owner) of the given chat.
+    /// Returns `true` if the user is the [creator] (owner) of the given chat.
+    ///
+    /// [creator]: ChatMemberKind::Creator
     pub fn is_creator(&self) -> bool {
         matches!(self, Self::Creator { .. })
     }
 
-    /// Returns `true` if the user is an administrator of the given chat.
+    /// Returns `true` if the user is an [administrator] of the given chat.
     ///
-    /// **Note**: this function doesn't return `true` if the user is the creator
-    /// of the given chat. See also: [`is_privileged`].
+    /// [administrator]: ChatMemberKind::Administrator
+    ///
+    /// **Note**: this function **doesn't** return `true` if the user is the
+    /// creator of the given chat. See also: [`is_privileged`].
+    ///
+    /// [`is_privileged`]: ChatMemberKind::is_privileged
     pub fn is_administrator(&self) -> bool {
         matches!(self, Self::Administrator { .. })
     }
 
-    /// Returns `true` if the user is a common member of the given chat.
+    /// Returns `true` if the user is a common [member] of the given chat.
+    ///
+    /// [member]: ChatMemberKind::Member
     pub fn is_member(&self) -> bool {
         matches!(self, Self::Member { .. })
     }
 
-    /// Returns `true` if the user is restricred in the given chat.
+    /// Returns `true` if the user is [restricted] in the given chat.
+    ///
+    /// [restricted]: ChatMemberKind::Restricted
     pub fn is_restricted(&self) -> bool {
         matches!(self, Self::Restricted { .. })
     }
 
-    /// Returns `true` if the user left the given chat.
+    /// Returns `true` if the user [left] the given chat.
+    ///
+    /// [left]: ChatMemberKind::Left
     pub fn is_left(&self) -> bool {
         matches!(self, Self::Left { .. })
     }
 
-    /// Returns `true` if the user is kicked from the given chat.
+    /// Returns `true` if the user is [kicked] from the given chat.
+    ///
+    /// [kicked]: ChatMemberKind::Kicked
     pub fn is_kicked(&self) -> bool {
         matches!(self, Self::Kicked { .. })
     }
@@ -201,14 +215,20 @@ impl ChatMemberKind {
 /// Compound methods to check user status.
 impl ChatMemberKind {
     /// Returns `true` if the user is privileged in the given chat. i.e. if the
-    /// user is either creator or administrator.
+    /// user is either the [creator] or an [administrator] in the given chat.
+    ///
+    /// [creator]: ChatMemberKind::Creator
+    /// [administrator]: ChatMemberKind::Administrator
     pub fn is_privileged(&self) -> bool {
         self.is_administrator() || self.is_creator()
     }
 
-    /// Returns `true` if the user is currently in chat. i.e. the user hasn't
-    /// left or been kicked.
-    pub fn is_in_chat(&self) -> bool {
+    /// Returns `true` if the user is currently present in the chat. i.e. if the
+    /// user **hasn't** [left] or been [kicked].
+    ///
+    /// [left]: ChatMemberKind::Left
+    /// [kicked]: ChatMemberKind::Kicked
+    pub fn is_present(&self) -> bool {
         !(self.is_left() || self.is_kicked())
     }
 }
@@ -230,7 +250,7 @@ impl ChatMemberKind {
     /// administrator in the chat and has [`can_manage_chat`] privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_manage_chat`]: ChatMemberKind::Administrator::can_manage_chat
+    /// [`can_manage_chat`]: Administrator::can_manage_chat
     pub fn is_anonymous(&self) -> bool {
         match self {
             Self::Creator(Creator { is_anonymous, .. })
@@ -276,7 +296,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_manage_chat`]: ChatMemberKind::Administrator::can_manage_chat
+    /// [`can_manage_chat`]: Administrator::can_manage_chat
     pub fn can_manage_chat(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -296,7 +316,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_change_info`]: ChatMemberKind::Administrator::can_change_info
+    /// [`can_change_info`]: Administrator::can_change_info
     pub fn can_change_info(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -316,7 +336,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_post_messages`]: ChatMemberKind::Administrator::can_post_messages
+    /// [`can_post_messages`]: Administrator::can_post_messages
     pub fn can_post_messages(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -336,7 +356,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_edit_messages`]: ChatMemberKind::Administrator::can_edit_messages
+    /// [`can_edit_messages`]: Administrator::can_edit_messages
     pub fn can_edit_messages(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -356,8 +376,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_delete_messages`]:
-    /// ChatMemberKind::Administrator::can_delete_messages
+    /// [`can_delete_messages`]: Administrator::can_delete_messages
     pub fn can_delete_messages(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -377,8 +396,7 @@ impl ChatMemberKind {
     ///   [`can_manage_voice_chats`] privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_manage_voice_chats`]:
-    /// ChatMemberKind::Administrator::can_manage_voice_chats
+    /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
     pub fn can_manage_voice_chats(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -399,7 +417,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_invite_users`]: ChatMemberKind::Administrator::can_invite_users
+    /// [`can_invite_users`]: Administrator::can_invite_users
     pub fn can_invite_users(&self) -> bool {
         match &self {
             Self::Creator(_) => true,
@@ -419,8 +437,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_restrict_members`]:
-    /// ChatMemberKind::Administrator::can_restrict_members
+    /// [`can_restrict_members`]: Administrator::can_restrict_members
     pub fn can_restrict_members(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -441,7 +458,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_pin_messages`]: ChatMemberKind::Administrator::can_pin_messages
+    /// [`can_pin_messages`]: Administrator::can_pin_messages
     pub fn can_pin_messages(&self) -> bool {
         match self {
             Self::Creator(_) => true,
@@ -464,8 +481,7 @@ impl ChatMemberKind {
     ///   privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_promote_members`]:
-    /// ChatMemberKind::Administrator::can_promote_members
+    /// [`can_promote_members`]: Administrator::can_promote_members
     pub fn can_promote_members(&self) -> bool {
         match self {
             Self::Creator(_) => true,

From 23cf36327145fe591d0bbb9f163f4dbc86a7d5b3 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 29 Mar 2021 10:20:03 +0300
Subject: [PATCH 287/755] Prevent year 2038 problem in `ChatMember`

This patch changes the Type of `{Restricted,Kicked}::until_date` fields:
`i32` => `i64`.

This is done to fix so called "year 2038 problem"
(See <https://en.wikipedia.org/wiki/Year_2038_problem>).
---
 CHANGELOG.md             | 1 +
 src/types/chat_member.rs | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e66bcd9a..2c757877 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
+- Type of `{Restricted,Kicked}::until_date` fields: `i32` => `i64` ([#74][pr74])
 
 [pr71]: https://github.com/teloxide/teloxide-core/pull/71
 [pr73]: https://github.com/teloxide/teloxide-core/pull/73
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 98f944c0..b50a6253 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -104,7 +104,7 @@ pub struct Administrator {
 pub struct Restricted {
     /// Date when restrictions will be lifted for
     /// this user, unix time.
-    pub until_date: i32,
+    pub until_date: i64,
 
     /// `true`, if the user can send text messages,
     /// contacts, locations and venues.
@@ -129,7 +129,7 @@ pub struct Restricted {
 pub struct Kicked {
     /// Date when restrictions will be lifted for
     /// this user, unix time.
-    pub until_date: i32,
+    pub until_date: i64,
 }
 
 /// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`]
@@ -260,7 +260,7 @@ impl ChatMemberKind {
     }
 
     /// Getter for [`Restricted::until_date`] and [`Kicked::until_date`] fields.
-    pub fn until_date(&self) -> Option<i32> {
+    pub fn until_date(&self) -> Option<i64> {
         match &self {
             Self::Creator(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
             Self::Restricted(Restricted { until_date, .. })

From 528187d7e6393b9323154040d04be130139c6f26 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 29 Mar 2021 13:47:34 +0300
Subject: [PATCH 288/755] Fix SendChatAction return type

---
 CHANGELOG.md                     | 2 ++
 src/payloads/send_chat_action.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fd1fe2..84cf62d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `SendChatAction` output type `Message` => `True` ([#75][pr75])
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
 
 [pr71]: https://github.com/teloxide/teloxide-core/pull/71
 [pr73]: https://github.com/teloxide/teloxide-core/pull/73
+[pr75]: https://github.com/teloxide/teloxide-core/pull/75
 
 ## [0.2.2] - 2020-03-22
 
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 854b69c2..21de091c 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatAction, ChatId, Message};
+use crate::types::{ChatAction, ChatId, True};
 
 impl_payload! {
     /// Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns True on success.
@@ -19,7 +19,7 @@ impl_payload! {
     ///
     /// [ImageBot]: https://t.me/imagebot
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SendChatAction (SendChatActionSetters) => Message {
+    pub SendChatAction (SendChatActionSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],

From 44a044af02209891ce1ccad935efcd51b4f2c666 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 12:17:49 +0300
Subject: [PATCH 289/755] `impl Clone` for {`CacheMe<_>`,
 `DefaultParseMode<_>`, `Throttle<_>`}

---
 CHANGELOG.md               | 6 ++++++
 src/adaptors/cache_me.rs   | 1 +
 src/adaptors/parse_mode.rs | 1 +
 src/adaptors/throttle.rs   | 1 +
 4 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fd1fe2..57b15230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- `impl Clone` for {`CacheMe<_>`, `DefaultParseMode<_>`, `Throttle<_>`} ([#75][pr75])
+
+[pr75]: https://github.com/teloxide/teloxide-core/pull/75
+
 ### Fixed
 
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 26ed04b9..fdbccb61 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -18,6 +18,7 @@ use crate::{
 ///
 /// Bot's user is hardly ever changed, so sometimes it's reasonable to cache
 /// response from `get_me` method.
+#[derive(Clone)]
 pub struct CacheMe<B> {
     bot: B,
     me: Arc<OnceCell<Me>>,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index d753f422..6d1c9948 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -6,6 +6,7 @@ use crate::{
 
 /// Default parse mode adaptor, see
 /// [`RequesterExt::parse_mode`](crate::requests::RequesterExt::parse_mode).
+#[derive(Clone)]
 pub struct DefaultParseMode<B> {
     bot: B,
     mode: ParseMode,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index adcdfb16..74149fdb 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -146,6 +146,7 @@ impl Default for Limits {
 ///
 /// As such, we encourage not to use `ChatId::ChannelUsername(u)` with this bot
 /// wrapper.
+#[derive(Clone)]
 pub struct Throttle<B> {
     bot: B,
     // `RequestLock` allows to unlock requests (allowing them to be sent).

From 9946a2ff20d3dacc5efbbded2875e4a66b7db07a Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 14:35:43 +0300
Subject: [PATCH 290/755] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57b15230..ac5040f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `impl Clone` for {`CacheMe<_>`, `DefaultParseMode<_>`, `Throttle<_>`} ([#75][pr75])
+- `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#75][pr75])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
 

From 16d0852e4aae34c22acaefd4e6b4ae887825550b Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 15:04:44 +0300
Subject: [PATCH 291/755] Apply suggestions from code review

Co-authored-by: Hirrolot <hirrolot@gmail.com>
---
 src/types/chat_member.rs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index b50a6253..54afc15d 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -110,15 +110,15 @@ pub struct Restricted {
     /// contacts, locations and venues.
     pub can_send_messages: bool,
 
-    /// `true`, if the user is allowed to send audios,
+    /// `true` if the user is allowed to send audios,
     /// documents, photos, videos, video notes and voice notes.
     pub can_send_media_messages: bool,
 
-    /// `true`, if the user is allowed to send animations,
+    /// `true` if the user is allowed to send animations,
     /// games, stickers and use inline bots.
     pub can_send_other_messages: bool,
 
-    /// `true`, if the user is allowed to add web page
+    /// `true` if the user is allowed to add web page
     /// previews to their messages.
     pub can_add_web_page_previews: bool,
 }
@@ -132,7 +132,7 @@ pub struct Kicked {
     pub until_date: i64,
 }
 
-/// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`]
+/// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`].
 ///
 /// ```no_run
 /// use teloxide_core::types::ChatMember;
@@ -247,7 +247,7 @@ impl ChatMemberKind {
     /// Returns `true`, if the user's presence in the chat is hidden.
     ///
     /// I.e. returns `true` if the user is the creator of the chat or an
-    /// administrator in the chat and has [`can_manage_chat`] privilege.
+    /// administrator in the chat and has the [`can_manage_chat`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_chat`]: Administrator::can_manage_chat
@@ -269,7 +269,7 @@ impl ChatMemberKind {
     }
 }
 
-/// Methods to check admin privileges.
+/// Methods for checking admin privileges.
 impl ChatMemberKind {
     /// Returns `true` if the user is an administrator in the given chat and the
     /// bot is allowed to edit administrator privileges of that user.
@@ -312,7 +312,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has [`can_change_info`]
+    /// - is an administrator in the given chat and has the [`can_change_info`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -352,7 +352,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is an administrator in the given chat and has [`can_edit_messages`]
+    /// - is an administrator in the given chat and has the [`can_edit_messages`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -372,7 +372,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has [`can_delete_messages`]
+    /// - is an administrator in the given chat and has the [`can_delete_messages`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -393,7 +393,7 @@ impl ChatMemberKind {
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
     /// - is an administrator in the given chat and has
-    ///   [`can_manage_voice_chats`] privilege.
+    /// the [`can_manage_voice_chats`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
@@ -413,7 +413,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has [`can_invite_users`]
+    /// - is an administrator in the given chat and has the [`can_invite_users`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -433,7 +433,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has [`can_restrict_members`]
+    /// - is an administrator in the given chat and has the [`can_restrict_members`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -453,8 +453,8 @@ impl ChatMemberKind {
     /// supergroups only.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat (even if the chat is not a supergroups)
-    /// - is an administrator in the given chat and has [`can_pin_messages`]
+    /// - is the creator of the chat (even if the chat is not a supergroup)
+    /// - is an administrator in the given chat and has the [`can_pin_messages`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -477,7 +477,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is an administrator in the given chat and has [`can_promote_members`]
+    /// - is an administrator in the given chat and has the [`can_promote_members`]
     ///   privilege.
     /// Returns `false` otherwise.
     ///
@@ -494,14 +494,14 @@ impl ChatMemberKind {
     }
 }
 
-/// Methods to check member rights.
+    /// Methods for checking member rights.
 impl ChatMemberKind {
     /// Returns `true`, if the user can send text messages,
     /// contacts, locations and venues.
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
-    /// - is restricted and doesn't have [`can_send_messages`] right
+    /// - is restricted and doesn't have the [`can_send_messages`] right
     /// Returns `true` otherwise.
     ///
     /// [`can_send_messages`]: Restricted::can_send_messages
@@ -520,7 +520,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
-    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages
@@ -540,7 +540,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
-    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages
@@ -560,7 +560,7 @@ impl ChatMemberKind {
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
-    /// - is restricted and doesn't have [`can_send_media_messages`] right
+    /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages

From 5b9956528915c29274c618b3e9b7ef320819b71c Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 16:22:49 +0300
Subject: [PATCH 292/755] Apply suggestions from code review

Co-authored-by: Hirrolot <hirrolot@gmail.com>
---
 src/types/chat_member.rs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 54afc15d..45e03bd1 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -106,7 +106,7 @@ pub struct Restricted {
     /// this user, unix time.
     pub until_date: i64,
 
-    /// `true`, if the user can send text messages,
+    /// `true` if the user can send text messages,
     /// contacts, locations and venues.
     pub can_send_messages: bool,
 
@@ -244,7 +244,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the user's presence in the chat is hidden.
+    /// Returns `true` if the user's presence in the chat is hidden.
     ///
     /// I.e. returns `true` if the user is the creator of the chat or an
     /// administrator in the chat and has the [`can_manage_chat`] privilege.
@@ -285,7 +285,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the user can access the chat event log, chat
+    /// Returns `true` if the user can access the chat event log, chat
     /// statistics, message statistics in channels, see channel members, see
     /// anonymous administrators in supergroups and ignore slow mode. Implied by
     /// any other administrator privilege.
@@ -307,7 +307,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can change the chat
+    /// Returns `true` if the user can change the chat
     /// title, photo and other settings.
     ///
     /// I.e. returns `true` if the user
@@ -327,7 +327,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can post in the
+    /// Returns `true` if the user can post in the
     /// channel, channels only.
     ///
     /// I.e. returns `true` if the user
@@ -347,7 +347,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can edit messages of
+    /// Returns `true` if the user can edit messages of
     /// other users and can pin messages, channels only.
     ///
     /// I.e. returns `true` if the user
@@ -367,7 +367,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can delete messages
+    /// Returns `true` if the user can delete messages
     /// of other users.
     ///
     /// I.e. returns `true` if the user
@@ -388,7 +388,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can manage voice chats.
+    /// Returns `true` if the user can manage voice chats.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
@@ -408,7 +408,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can can invite new users
+    /// Returns `true` if the user can can invite new users
     /// to the chat.
     ///
     /// I.e. returns `true` if the user
@@ -428,7 +428,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can restrict,
+    /// Returns `true` if the user can restrict,
     /// ban or unban chat members.
     ///
     /// I.e. returns `true` if the user
@@ -449,7 +449,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can pin messages,
+    /// Returns `true` if the user can pin messages,
     /// supergroups only.
     ///
     /// I.e. returns `true` if the user
@@ -469,7 +469,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, the user can add new
+    /// Returns `true` if the user can add new
     /// administrators with a subset of his own privileges or demote
     /// administrators that he has promoted, directly or indirectly
     /// (promoted by administrators that were appointed by the
@@ -496,7 +496,7 @@ impl ChatMemberKind {
 
     /// Methods for checking member rights.
 impl ChatMemberKind {
-    /// Returns `true`, if the user can send text messages,
+    /// Returns `true` if the user can send text messages,
     /// contacts, locations and venues.
     ///
     /// I.e. returns **`false`** if the user
@@ -515,7 +515,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the user is allowed to send audios,
+    /// Returns `true` if the user is allowed to send audios,
     /// documents, photos, videos, video notes and voice notes.
     ///
     /// I.e. returns **`false`** if the user
@@ -535,7 +535,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the user is allowed to send animations,
+    /// Returns `true` if the user is allowed to send animations,
     /// games, stickers and use inline bots.
     ///
     /// I.e. returns **`false`** if the user
@@ -555,7 +555,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true`, if the user is allowed to add web page
+    /// Returns `true` if the user is allowed to add web page
     /// previews to their messages.
     ///
     /// I.e. returns **`false`** if the user

From 747898c3102aea75acf1a164c41ec12857f015e5 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 16:24:41 +0300
Subject: [PATCH 293/755] Apply suggestions from code review

Co-authored-by: Hirrolot <hirrolot@gmail.com>
---
 src/types/chat_member.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 45e03bd1..cae7fbc2 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -150,7 +150,7 @@ impl Deref for ChatMember {
     }
 }
 
-/// Simple methods to check user status.
+/// Simple methods for checking a user status.
 impl ChatMemberKind {
     /// Returns chat member status.
     pub fn status(&self) -> ChatMemberStatus {
@@ -212,7 +212,7 @@ impl ChatMemberKind {
     }
 }
 
-/// Compound methods to check user status.
+/// Compound methods for checking a user status.
 impl ChatMemberKind {
     /// Returns `true` if the user is privileged in the given chat. i.e. if the
     /// user is either the [creator] or an [administrator] in the given chat.

From c73e73ad02684441316d9ced43f4a8947fcb2313 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 16:38:24 +0300
Subject: [PATCH 294/755] fmt

---
 src/types/chat_member.rs | 134 ++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 74 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index cae7fbc2..cef53e92 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -46,55 +46,49 @@ pub struct Administrator {
     /// Custom title for this user.
     pub custom_title: Option<String>,
 
-    /// True, if the user's presence in the chat is hidden
+    /// `true` if the user's presence in the chat is hidden
     pub is_anonymous: bool,
 
-    /// `true`, if the bot is allowed to edit
-    /// administrator privileges of that user.
+    /// `true` if the bot is allowed to edit administrator privileges of that
+    /// user.
     pub can_be_edited: bool,
 
-    /// `true`, if the administrator can access the chat event log, chat
+    /// `true` if the administrator can access the chat event log, chat
     /// statistics, message statistics in channels, see channel members, see
     /// anonymous administrators in supergroups and ignore slow mode. Implied by
     /// any other administrator privilege
     pub can_manage_chat: bool,
 
-    /// `true`, if the administrator can change the chat
-    /// title, photo and other settings.
+    /// `true` if the administrator can change the chat title, photo and other
+    /// settings.
     pub can_change_info: bool,
 
-    /// `true`, if the administrator can post in the
-    /// channel, channels only.
+    /// `true` if the administrator can post in the channel, channels only.
     pub can_post_messages: Option<bool>,
 
-    /// `true`, if the administrator can edit messages of
-    /// other users and can pin messages, channels only.
+    /// `true` if the administrator can edit messages of other users and can pin
+    /// messages, channels only.
     pub can_edit_messages: Option<bool>,
 
-    /// `true`, if the administrator can delete messages
-    /// of other users.
+    /// `true` if the administrator can delete messages of other users.
     pub can_delete_messages: bool,
 
-    /// `true`, if the administrator can manage voice chats.
+    /// `true` if the administrator can manage voice chats.
     pub can_manage_voice_chats: bool,
 
-    /// `true`, if the administrator can invite new users
-    /// to the chat.
+    /// `true` if the administrator can invite new users to the chat.
     pub can_invite_users: bool,
 
-    /// `true`, if the administrator can restrict,
-    /// ban or unban chat members.
+    /// `true` if the administrator can restrict, ban or unban chat members.
     pub can_restrict_members: bool,
 
-    /// `true`, if the administrator can pin messages,
-    /// supergroups only.
+    /// `true` if the administrator can pin messages, supergroups only.
     pub can_pin_messages: Option<bool>,
 
-    /// `true`, if the administrator can add new
-    /// administrators with a subset of his own privileges or demote
-    /// administrators that he has promoted, directly or indirectly
-    /// (promoted by administrators that were appointed by the
-    /// user).
+    /// `true` if the administrator can add new administrators with a subset of
+    /// his own privileges or demote administrators that he has promoted,
+    /// directly or indirectly (promoted by administrators that were appointed
+    /// by the user).
     pub can_promote_members: bool,
 }
 
@@ -102,24 +96,23 @@ pub struct Administrator {
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Restricted {
-    /// Date when restrictions will be lifted for
-    /// this user, unix time.
+    /// Date when restrictions will be lifted for this user, unix time.
     pub until_date: i64,
 
-    /// `true` if the user can send text messages,
-    /// contacts, locations and venues.
+    /// `true` if the user can send text messages, contacts, locations and
+    /// venues.
     pub can_send_messages: bool,
 
-    /// `true` if the user is allowed to send audios,
-    /// documents, photos, videos, video notes and voice notes.
+    /// `true` if the user is allowed to send audios, documents, photos, videos,
+    /// video notes and voice notes.
     pub can_send_media_messages: bool,
 
-    /// `true` if the user is allowed to send animations,
-    /// games, stickers and use inline bots.
+    /// `true` if the user is allowed to send animations, games, stickers and
+    /// use inline bots.
     pub can_send_other_messages: bool,
 
-    /// `true` if the user is allowed to add web page
-    /// previews to their messages.
+    /// `true` if the user is allowed to add web page previews to their
+    /// messages.
     pub can_add_web_page_previews: bool,
 }
 
@@ -127,8 +120,7 @@ pub struct Restricted {
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Kicked {
-    /// Date when restrictions will be lifted for
-    /// this user, unix time.
+    /// Date when restrictions will be lifted for this user, unix time.
     pub until_date: i64,
 }
 
@@ -307,8 +299,8 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can change the chat
-    /// title, photo and other settings.
+    /// Returns `true` if the user can change the chat title, photo and other
+    /// settings.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
@@ -327,8 +319,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can post in the
-    /// channel, channels only.
+    /// Returns `true` if the user can post in the channel, channels only.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
@@ -347,13 +338,13 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can edit messages of
-    /// other users and can pin messages, channels only.
+    /// Returns `true` if the user can edit messages of other users and can pin
+    /// messages, channels only.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is an administrator in the given chat and has the [`can_edit_messages`]
-    ///   privilege.
+    /// - is an administrator in the given chat and has the
+    ///   [`can_edit_messages`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_edit_messages`]: Administrator::can_edit_messages
@@ -367,13 +358,12 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can delete messages
-    /// of other users.
+    /// Returns `true` if the user can delete messages of other users.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has the [`can_delete_messages`]
-    ///   privilege.
+    /// - is an administrator in the given chat and has the
+    ///   [`can_delete_messages`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_delete_messages`]: Administrator::can_delete_messages
@@ -392,8 +382,8 @@ impl ChatMemberKind {
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has
-    /// the [`can_manage_voice_chats`] privilege.
+    /// - is an administrator in the given chat and has the
+    ///   [`can_manage_voice_chats`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
@@ -408,8 +398,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can can invite new users
-    /// to the chat.
+    /// Returns `true` if the user can can invite new users to the chat.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
@@ -428,13 +417,12 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can restrict,
-    /// ban or unban chat members.
+    /// Returns `true` if the user can restrict, ban or unban chat members.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat
-    /// - is an administrator in the given chat and has the [`can_restrict_members`]
-    ///   privilege.
+    /// - is an administrator in the given chat and has the
+    ///   [`can_restrict_members`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_restrict_members`]: Administrator::can_restrict_members
@@ -449,8 +437,7 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can pin messages,
-    /// supergroups only.
+    /// Returns `true` if the user can pin messages, supergroups only.
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a supergroup)
@@ -469,16 +456,15 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can add new
-    /// administrators with a subset of his own privileges or demote
-    /// administrators that he has promoted, directly or indirectly
-    /// (promoted by administrators that were appointed by the
-    /// user).
+    /// Returns `true` if the user can add new administrators with a subset of
+    /// his own privileges or demote administrators that he has promoted,
+    /// directly or indirectly (promoted by administrators that were appointed
+    /// by the user).
     ///
     /// I.e. returns `true` if the user
     /// - is the creator of the chat (even if the chat is not a channel)
-    /// - is an administrator in the given chat and has the [`can_promote_members`]
-    ///   privilege.
+    /// - is an administrator in the given chat and has the
+    ///   [`can_promote_members`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_promote_members`]: Administrator::can_promote_members
@@ -494,10 +480,10 @@ impl ChatMemberKind {
     }
 }
 
-    /// Methods for checking member rights.
+/// Methods for checking member rights.
 impl ChatMemberKind {
-    /// Returns `true` if the user can send text messages,
-    /// contacts, locations and venues.
+    /// Returns `true` if the user can send text messages, contacts, locations
+    /// and venues.
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
@@ -515,8 +501,8 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user is allowed to send audios,
-    /// documents, photos, videos, video notes and voice notes.
+    /// Returns `true` if the user is allowed to send audios, documents, photos,
+    /// videos, video notes and voice notes.
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
@@ -535,8 +521,8 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user is allowed to send animations,
-    /// games, stickers and use inline bots.
+    /// Returns `true` if the user is allowed to send animations, games,
+    /// stickers and use inline bots.
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat
@@ -555,8 +541,8 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user is allowed to add web page
-    /// previews to their messages.
+    /// Returns `true` if the user is allowed to add web page previews to their
+    /// messages.
     ///
     /// I.e. returns **`false`** if the user
     /// - has left or has been kicked from the chat

From 5d0713e742bf7b1ad1d904bbb791fe1cd7104ffe Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 22 Apr 2021 17:29:27 +0300
Subject: [PATCH 295/755] Fix return types of methods

Fix return types of LeaveChat, PinChatMessage, SetChatDescription, SetChatPhoto,
SetChatTitle, UnpinAllChatMessages and UnpinChatMessage: String => True
---
 CHANGELOG.md                            | 2 ++
 src/payloads/leave_chat.rs              | 4 ++--
 src/payloads/pin_chat_message.rs        | 4 ++--
 src/payloads/set_chat_description.rs    | 4 ++--
 src/payloads/set_chat_photo.rs          | 4 ++--
 src/payloads/set_chat_title.rs          | 4 ++--
 src/payloads/unpin_all_chat_messages.rs | 4 ++--
 src/payloads/unpin_chat_message.rs      | 4 ++--
 8 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f149a76f..8055ad32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Output types of `LeaveChat` `PinChatMessage`, `SetChatDescription`, `SetChatPhoto` `SetChatTitle`, `UnpinAllChatMessages` and `UnpinChatMessage`: `String` => `True` ([#79][pr79])
 - `SendChatAction` output type `Message` => `True` ([#75][pr75])
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
@@ -32,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr71]: https://github.com/teloxide/teloxide-core/pull/71
 [pr73]: https://github.com/teloxide/teloxide-core/pull/73
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
+[pr79]: https://github.com/teloxide/teloxide-core/pull/79
 
 ## [0.2.2] - 2020-03-22
 
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 17dbf567..32d417b6 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method for your bot to leave a group, supergroup or channel. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub LeaveChat (LeaveChatSetters) => String {
+    pub LeaveChat (LeaveChatSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 7293bccb..b16dd8f3 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method to pin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub PinChatMessage (PinChatMessageSetters) => String {
+    pub PinChatMessage (PinChatMessageSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index 1192228e..1c7cc88b 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method to change the description of a group, a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SetChatDescription (SetChatDescriptionSetters) => String {
+    pub SetChatDescription (SetChatDescriptionSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index a02c2378..67b6fc32 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -8,13 +8,13 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile};
+use crate::types::{ChatId, InputFile, True};
 
 impl_payload! {
     @[multipart]
     /// Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SetChatPhoto (SetChatPhotoSetters) => String {
+    pub SetChatPhoto (SetChatPhotoSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 40e98248..8b26a35c 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method to change the title of a chat. Titles can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SetChatTitle (SetChatTitleSetters) => String {
+    pub SetChatTitle (SetChatTitleSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/unpin_all_chat_messages.rs b/src/payloads/unpin_all_chat_messages.rs
index d605e314..6629c6f8 100644
--- a/src/payloads/unpin_all_chat_messages.rs
+++ b/src/payloads/unpin_all_chat_messages.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method to clear the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub UnpinAllChatMessages (UnpinAllChatMessagesSetters) => String {
+    pub UnpinAllChatMessages (UnpinAllChatMessagesSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index fb9a88d0..6ebce38b 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::{ChatId, True};
 
 impl_payload! {
     /// Use this method to remove a message from the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub UnpinChatMessage (UnpinChatMessageSetters) => String {
+    pub UnpinChatMessage (UnpinChatMessageSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],

From b55bdd274b26696460a19dafaac5d00ef06268a8 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 11:42:31 +0300
Subject: [PATCH 296/755] Add `Chat` getters

Add getters for all `Chat` fields nested in `ChatKind`.
`Chat` has a lot of nested enums and so is hard to match on.
The getters help with this.

This patch also corrects type of `slow_mode_delay`: `Option<i32>`` -> `Option<u32>``
---
 src/types/chat.rs | 173 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 172 insertions(+), 1 deletion(-)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index 24dd6805..1680ca5e 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -153,7 +153,7 @@ pub struct PublicChatSupergroup {
     /// unpriviledged user. Returned only from [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
-    pub slow_mode_delay: Option<i32>,
+    pub slow_mode_delay: Option<u32>,
 
     /// Unique identifier for the linked chat, i.e. the discussion group
     /// identifier for a channel and vice versa. Returned only in [`GetChat`].
@@ -199,6 +199,7 @@ impl Chat {
     pub fn is_private(&self) -> bool {
         matches!(self.kind, ChatKind::Private(_))
     }
+
     pub fn is_group(&self) -> bool {
         matches!(
             self.kind,
@@ -208,6 +209,7 @@ impl Chat {
             })
         )
     }
+
     pub fn is_supergroup(&self) -> bool {
         matches!(
             self.kind,
@@ -217,6 +219,7 @@ impl Chat {
             })
         )
     }
+
     pub fn is_channel(&self) -> bool {
         matches!(
             self.kind,
@@ -232,6 +235,174 @@ impl Chat {
     }
 }
 
+/// Getters
+impl Chat {
+    /// A title, for supergroups, channels and group chats.
+    pub fn title(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Public(this) => this.title.as_deref(),
+            _ => None,
+        }
+    }
+
+    /// A username, for private chats, supergroups and channels if available.
+    pub fn username(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Public(this) => match &this.kind {
+                PublicChatKind::Channel(PublicChatChannel { username, .. })
+                | PublicChatKind::Supergroup(PublicChatSupergroup { username, .. }) => {
+                    username.as_deref()
+                }
+                PublicChatKind::Group(_) => None,
+            },
+            ChatKind::Private(this) => this.username.as_deref(),
+        }
+    }
+
+    /// Unique identifier for the linked chat, i.e. the discussion group
+    /// identifier for a channel and vice versa. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn linked_chat_id(&self) -> Option<i64> {
+        match &self.kind {
+            ChatKind::Public(this) => match &this.kind {
+                PublicChatKind::Channel(PublicChatChannel { linked_chat_id, .. })
+                | PublicChatKind::Supergroup(PublicChatSupergroup { linked_chat_id, .. }) => {
+                    *linked_chat_id
+                }
+                PublicChatKind::Group(_) => None,
+            },
+            _ => None,
+        }
+    }
+
+    /// A default chat member permissions, for groups and supergroups. Returned
+    /// only from [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn permissions(&self) -> Option<ChatPermissions> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Group(PublicChatGroup { permissions })
+            | PublicChatKind::Supergroup(PublicChatSupergroup { permissions, .. }) = &this.kind
+            {
+                return *permissions;
+            }
+        }
+
+        None
+    }
+
+    /// For supergroups, name of group sticker set. Returned only from
+    /// [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn sticker_set_name(&self) -> Option<&str> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.sticker_set_name.as_deref();
+            }
+        }
+
+        None
+    }
+
+    /// `true`, if the bot can change the group sticker set. Returned only
+    /// from [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn can_set_sticker_set(&self) -> Option<bool> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.can_set_sticker_set;
+            }
+        }
+
+        None
+    }
+
+    /// The minimum allowed delay between consecutive messages sent by each
+    /// unpriviledged user. Returned only from [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn slow_mode_delay(&self) -> Option<u32> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.slow_mode_delay;
+            }
+        }
+
+        None
+    }
+
+    /// The location to which the supergroup is connected. Returned only in
+    /// [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn location(&self) -> Option<&ChatLocation> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.location.as_ref();
+            }
+        }
+
+        None
+    }
+
+    /// A description, for groups, supergroups and channel chats. Returned
+    /// only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn description(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Public(this) => this.description.as_deref(),
+            _ => None,
+        }
+    }
+
+    /// A chat invite link, for groups, supergroups and channel chats. Each
+    /// administrator in a chat generates their own invite links, so the
+    /// bot must first generate the link using
+    /// [`ExportChatInviteLink`]. Returned only in
+    /// [`GetChat`].
+    ///
+    /// [`ExportChatInviteLink`]:
+    /// crate::payloads::ExportChatInviteLink
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn invite_link(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Public(this) => this.invite_link.as_deref(),
+            _ => None,
+        }
+    }
+
+    /// A first name of the other party in a private chat.
+    pub fn first_name(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Private(this) => this.first_name.as_deref(),
+            _ => None,
+        }
+    }
+
+    /// A last name of the other party in a private chat.
+    pub fn last_name(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Private(this) => this.last_name.as_deref(),
+            _ => None,
+        }
+    }
+
+    /// Bio of the other party in a private chat. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn bio(&self) -> Option<&str> {
+        match &self.kind {
+            ChatKind::Private(this) => this.bio.as_deref(),
+            _ => None,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::from_str;

From bd52e93cdbc272f7c2368316a5173d7d07efc641 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 11:48:16 +0300
Subject: [PATCH 297/755] Add missing `Chat::message_auto_delete_time` field
 (tba 5.1)

---
 src/types/chat.rs   | 8 ++++++++
 src/types/update.rs | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index 1680ca5e..aaedc5d2 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -28,6 +28,12 @@ pub struct Chat {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub pinned_message: Option<Box<Message>>,
+
+    /// The time after which all messages sent to the chat will be automatically
+    /// deleted; in seconds. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub message_auto_delete_time: Option<u32>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -424,6 +430,7 @@ mod tests {
             }),
             photo: None,
             pinned_message: None,
+            message_auto_delete_time: None,
         };
         let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
         assert_eq!(expected, actual);
@@ -443,6 +450,7 @@ mod tests {
                 }),
                 photo: None,
                 pinned_message: None,
+                message_auto_delete_time: None,
             },
             from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
                 .unwrap()
diff --git a/src/types/update.rs b/src/types/update.rs
index 94ec099e..5a1c1355 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -186,6 +186,7 @@ mod test {
                     }),
                     photo: None,
                     pinned_message: None,
+                    message_auto_delete_time: None,
                 },
                 kind: MessageKind::Common(MessageCommon {
                     from: Some(User {

From ce969564ac267a1f3201ecf3322610580c0e3e7e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 11:50:09 +0300
Subject: [PATCH 298/755] Improve `Message::url`

Return urls to messages in private groups (t.me/c) when applicable.
---
 src/types/message.rs | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 0159c705..649f1b9d 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -982,29 +982,37 @@ mod getters {
 }
 
 impl Message {
+    /// Produces a direct link to the message.
+    ///
+    /// Note that for private groups the link will only be accesible for group
+    /// members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs).
     pub fn url(&self) -> Option<reqwest::Url> {
-        match &self.chat.kind {
-            ChatKind::Public(ChatPublic {
-                kind:
-                    PublicChatKind::Channel(PublicChatChannel {
-                        username: Some(username),
-                        ..
-                    }),
-                ..
-            })
-            | ChatKind::Public(ChatPublic {
-                kind:
-                    PublicChatKind::Supergroup(PublicChatSupergroup {
-                        username: Some(username),
-                        ..
-                    }),
-                ..
-            }) => Some(
-                reqwest::Url::parse(format!("https://t.me/{0}/{1}/", username, self.id).as_str())
-                    .unwrap(),
-            ),
-            _ => None,
+        if self.chat.is_private() {
+            // For private chats (i.e.: DMs) we can't produce "normal" t.me link.
+            //
+            // There are "tg://openmessage?user_id={0}&message_id={1}" links, which are
+            // supposed to open any chat, including private messages, but they
+            // are only supported by some telegram clients (e.g. Plus Messenger,
+            // Telegram for Androud 4.9+).
+            return None;
         }
+
+        let url = match self.chat.username() {
+            // If it's public group (i.e. not DM, not private group), we can produce
+            // "normal" t.me link (accesible to everyone).
+            Some(username) => format!("https://t.me/{0}/{1}/", username, self.id),
+            // For private groups we produce "private" t.me/c links. These are only
+            // accesible to the group members.
+            None => format!("https://t.me/c/{0}/{1}/", self.chat.id, self.id),
+        };
+
+        // UNWRAP:
+        //
+        // The `url` produced by formatting is correct since username is
+        // /[a-zA-Z0-9_]{5,32}/ and chat/message ids are integers.
+        Some(reqwest::Url::parse(&url).unwrap())
     }
 }
 

From cd170951ae0b1fa495ba6903a7a580ed135920c1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 12:03:43 +0300
Subject: [PATCH 299/755] Update CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f149a76f..1cf3cb25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#75][pr75])
+- Getters for fields nested in `Chat` ([#80][pr80]) 
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
+[pr80]: https://github.com/teloxide/teloxide-core/pull/80
 
 ### Changed
 
+- `Message::url` now returns links to messages in private groups too ([#80][pr80]) 
 - Refactor `ChatMember` methods ([#74][pr74])
   - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callible directly on `ChatMember`
   - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
@@ -24,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Add missing `Chat::message_auto_delete_time` field ([#80][pr80]) 
 - `SendChatAction` output type `Message` => `True` ([#75][pr75])
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])

From a7d07a770cefc256c5244eb942f164e91668d36b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 12:17:14 +0300
Subject: [PATCH 300/755] Update CHANGELOG and remove unused imports

---
 CHANGELOG.md         |  1 +
 src/types/message.rs | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cf3cb25..47604b9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Type of `PublicChatSupergroup::slow_mode_delay` field: `Option<i32>`=> `Option<u32>` ([#80][pr80]) 
 - Add missing `Chat::message_auto_delete_time` field ([#80][pr80]) 
 - `SendChatAction` output type `Message` => `True` ([#75][pr75])
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
diff --git a/src/types/message.rs b/src/types/message.rs
index 649f1b9d..c8490401 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -3,12 +3,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    chat::{ChatKind, PublicChatKind},
-    Animation, Audio, Chat, ChatPublic, Contact, Dice, Document, Game, InlineKeyboardMarkup,
-    Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
-    ProximityAlertTriggered, PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment,
-    True, User, Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
-    VoiceChatStarted,
+    Animation, Audio, Chat, Contact, Dice, Document, Game, InlineKeyboardMarkup, Invoice, Location,
+    MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
+    ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote,
+    Voice, VoiceChatEnded, VoiceChatParticipantsInvited, VoiceChatStarted,
 };
 
 /// This object represents a message.

From a95089bc6f368ed4a3a1eed70e35353b1f7c4c47 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Apr 2021 12:25:15 +0300
Subject: [PATCH 301/755] Fix docs

`doc_spotlight` nightly feature was renamed to `doc_notable_trait`
---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 1dada893..c58f9a7e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -72,7 +72,7 @@
 // ```console
 // $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
 // ```
-#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_spotlight))]
+#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_notable_trait))]
 #![cfg_attr(feature = "nightly", feature(min_type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]

From b3dec316e572128b89b09001f922b467136877d5 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Tue, 27 Apr 2021 23:40:01 +0700
Subject: [PATCH 302/755] Add NotEnoughRightsToManagePins error

Fixes teloxide/teloxide#371
---
 src/errors.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index 41c8e8e4..f9b221e1 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -373,6 +373,18 @@ pub enum ApiError {
     #[serde(rename = "Bad Request: not enough rights to pin a message")]
     NotEnoughRightsToPinMessage,
 
+    /// Occurs when bot tries to pin or unpin a message without rights to pin
+    /// in this chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`PinChatMessage`]
+    /// 2. [`UnpinChatMessage`]
+    ///
+    /// [`PinChatMessage`]: crate::payloads::PinChatMessage
+    /// [`UnpinChatMessage`]: crate::payloads::UnpinChatMessage
+    #[serde(rename = "Bad Request: not enough rights to manage pinned messages in the chat")]
+    NotEnoughRightsToManagePins,
+
     /// Occurs when bot tries to use method in group which is allowed only in a
     /// supergroup or channel.
     #[serde(rename = "Bad Request: method is available only for supergroups and channel")]

From 8a7909e7c781921cfdb7814c937a061f06f0fea5 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Tue, 27 Apr 2021 23:48:27 +0700
Subject: [PATCH 303/755] Add BotKickedFromSupergroup error

Fixes teloxide/teloxide#372
---
 src/errors.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index f9b221e1..c41822d5 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -487,6 +487,16 @@ pub enum ApiError {
     #[serde(rename = "Unauthorized: bot was kicked from a chat")]
     BotKicked,
 
+    /// Occurs when bot tries to do something in a supergroup the bot was
+    /// kicked from.
+    ///
+    /// May happen in methods:
+    /// 1. [`SendMessage`]
+    ///
+    /// [`SendMessage`]: crate::payloads::SendMessage
+    #[serde(rename = "Forbidden: bot was kicked from the supergroup chat")]
+    BotKickedFromSupergroup,
+
     /// Occurs when bot tries to send message to deactivated user.
     ///
     /// May happen in methods:

From 37b8256cd5ba682f7f8bef6ae2b02ae7964005e8 Mon Sep 17 00:00:00 2001
From: handlerug <umar@handlerug.me>
Date: Wed, 28 Apr 2021 15:24:14 +0700
Subject: [PATCH 304/755] Update changelog with new API errors info

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8055ad32..5ff29fb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#75][pr75])
+- API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
+[pr84]: https://github.com/teloxide/teloxide-core/pull/84
 
 ### Changed
 

From 653c8040376e649dfdd7cda770b325eb8c82c228 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 4 May 2021 15:55:03 +0300
Subject: [PATCH 305/755] Update types to TBA 5.2

---
 Cargo.toml                         |   1 +
 src/types.rs                       |   4 +
 src/types/chat_action.rs           |   4 +-
 src/types/chat_type.rs             |  13 ++
 src/types/inline_query.rs          |  11 +-
 src/types/input_message_content.rs | 260 ++++++++++++++++++++++++++++-
 src/types/message.rs               |   9 +-
 src/types/voice_chat_scheduled.rs  |  10 ++
 8 files changed, 307 insertions(+), 5 deletions(-)
 create mode 100644 src/types/chat_type.rs
 create mode 100644 src/types/voice_chat_scheduled.rs

diff --git a/Cargo.toml b/Cargo.toml
index a27b496a..10dbe708 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,6 +37,7 @@ tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
 reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"], default-features = false }
+url = { version = "2", features = ["serde"] }
 log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }
diff --git a/src/types.rs b/src/types.rs
index 2161d872..8cc6a35c 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -15,6 +15,7 @@ pub use chat_member::*;
 pub use chat_member_updated::*;
 pub use chat_permissions::*;
 pub use chat_photo::*;
+pub use chat_type::*;
 pub use chosen_inline_result::*;
 pub use contact::*;
 pub use dice::*;
@@ -99,6 +100,7 @@ pub use video_note::*;
 pub use voice::*;
 pub use voice_chat_ended::*;
 pub use voice_chat_participants_invited::*;
+pub use voice_chat_scheduled::*;
 pub use voice_chat_started::*;
 pub use webhook_info::*;
 
@@ -117,6 +119,7 @@ mod chat_member;
 mod chat_member_updated;
 mod chat_permissions;
 mod chat_photo;
+mod chat_type;
 mod chosen_inline_result;
 mod contact;
 mod dice;
@@ -174,6 +177,7 @@ mod video_note;
 mod voice;
 mod voice_chat_ended;
 mod voice_chat_participants_invited;
+mod voice_chat_scheduled;
 mod voice_chat_started;
 mod webhook_info;
 
diff --git a/src/types/chat_action.rs b/src/types/chat_action.rs
index a73887ea..87a07449 100644
--- a/src/types/chat_action.rs
+++ b/src/types/chat_action.rs
@@ -7,8 +7,8 @@ pub enum ChatAction {
     UploadPhoto,
     RecordVideo,
     UploadVideo,
-    RecordAudio,
-    UploadAudio,
+    RecordVoice,
+    UploadVoice,
     UploadDocument,
     FindLocation,
     RecordVideoNote,
diff --git a/src/types/chat_type.rs b/src/types/chat_type.rs
new file mode 100644
index 00000000..23350c59
--- /dev/null
+++ b/src/types/chat_type.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+/// Type of the chat, from which the inline query was sent.
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ChatType {
+    /// Private chat with the inline query sender.
+    Sender,
+    Private,
+    Group,
+    Supergroup,
+    Channel,
+}
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
index 0eba0270..8089cd54 100644
--- a/src/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{Location, User};
+use crate::types::{ChatType, Location, User};
 
 /// This object represents an incoming inline query.
 ///
@@ -25,8 +25,16 @@ pub struct InlineQuery {
 
     /// Offset of the results to be returned, can be controlled by the bot.
     pub offset: String,
+
+    /// Type of the chat, from which the inline query was sent.
+    ///
+    /// The chat type should be always known for requests sent from official
+    /// clients and most third-party clients, unless the request was sent
+    /// from a secret chat.
+    pub chat_type: Option<ChatType>,
 }
 
+// TODO(waffle): remove
 impl InlineQuery {
     pub fn new<S1, S2, S3>(id: S1, from: User, query: S2, offset: S3) -> Self
     where
@@ -40,6 +48,7 @@ impl InlineQuery {
             location: None,
             query: query.into(),
             offset: offset.into(),
+            chat_type: None,
         }
     }
 
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index c243af72..5f853c19 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -1,6 +1,7 @@
+use reqwest::Url;
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MessageEntity, ParseMode};
+use crate::types::{Currency, LabeledPrice, MessageEntity, ParseMode};
 
 /// This object represents the content of a message to be sent as a result of an
 /// inline query.
@@ -13,6 +14,7 @@ pub enum InputMessageContent {
     Location(InputMessageContentLocation),
     Venue(InputMessageContentVenue),
     Contact(InputMessageContentContact),
+    Invoice(InputMessageContentInvoice),
 }
 /// Represents the content of a text message to be sent as the result of an
 /// inline query.
@@ -297,6 +299,262 @@ impl InputMessageContentContact {
     }
 }
 
+/// Represents the [content] of an invoice message to be sent as the result of
+/// an inline query.
+///
+/// [content]: InputMessageContent
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct InputMessageContentInvoice {
+    /// Product name, 1-32 characters
+    pub title: String,
+
+    /// Product description, 1-255 characters
+    pub description: String,
+
+    /// Bot-defined invoice payload, 1-128 bytes. This will not be displayed to
+    /// the user, use for your internal processes.
+    pub payload: String,
+
+    /// Payment provider token, obtained via [@Botfather]
+    ///
+    /// [@Botfather]: https://t.me/Botfather
+    pub provider_token: String,
+
+    /// Three-letter ISO 4217 currency code, see [more on currencies]
+    ///
+    /// [more on currencies]: https://core.telegram.org/bots/payments#supported-currencies
+    pub currency: Currency,
+
+    /// Price breakdown, list of components (e.g. product price, tax, discount,
+    /// delivery cost, delivery tax, bonus, etc.)
+    pub prices: Vec<LabeledPrice>,
+
+    /// ----The maximum accepted amount for tips in the smallest units of the
+    /// currency (integer, not float/double). For example, for a maximum tip of
+    /// US$ 1.45 pass max_tip_amount = 145. See the exp parameter in
+    /// currencies.json, it shows the number of digits past the decimal point
+    /// for each currency (2 for the majority of currencies). Defaults to 0
+    pub max_tip_amount: Option<u32>,
+
+    /// List of suggested amounts of tip in the smallest units of the currency
+    /// (integer, not float/double). At most 4 suggested tip amounts can be
+    /// specified. The suggested tip amounts must be positive, passed in a
+    /// strictly increased order and must not exceed max_tip_amount.
+    pub suggested_tip_amounts: Option<Vec<u32>>,
+
+    /// ----A JSON-serialized object for data about the invoice, which will be
+    /// shared with the payment provider. A detailed description of the required
+    /// fields should be provided by the payment provider.
+    pub provider_data: Option<String>,
+
+    /// URL of the product photo for the invoice. Can be a photo of the goods or
+    /// a marketing image for a service. People like it better when they see
+    /// what they are paying for.
+    pub photo_url: Option<Url>,
+
+    /// Photo size
+    pub photo_size: Option<u32>,
+
+    /// Photo width
+    pub photo_width: Option<u32>,
+
+    /// Photo height
+    pub photo_height: Option<u32>,
+
+    /// Pass `true`, if you require the user's full name to complete the order
+    pub need_name: Option<bool>,
+
+    /// Pass `true`, if you require the user's phone number to complete the
+    /// order
+    pub need_phone_number: Option<bool>,
+
+    /// Pass `true`, if you require the user's email address to complete the
+    /// order
+    pub need_email: Option<bool>,
+
+    /// Pass `true`, if you require the user's shipping address to complete the
+    /// order
+    pub need_shipping_address: Option<bool>,
+
+    /// Pass True, if user's phone number should be sent to provider
+    pub send_phone_number_to_provider: Option<bool>,
+
+    /// Pass True, if user's email address should be sent to provider
+    pub send_email_to_provider: Option<bool>,
+
+    /// Pass True, if the final price depends on the shipping method
+    pub is_flexible: Option<bool>,
+}
+
+impl InputMessageContentInvoice {
+    pub fn new<T, D, PA, PT, PR>(
+        title: T,
+        description: D,
+        payload: PA,
+        provider_token: PT,
+        currency: Currency,
+        prices: PR,
+    ) -> Self
+    where
+        T: Into<String>,
+        D: Into<String>,
+        PA: Into<String>,
+        PT: Into<String>,
+        PR: IntoIterator<Item = LabeledPrice>,
+    {
+        let title = title.into();
+        let description = description.into();
+        let payload = payload.into();
+        let provider_token = provider_token.into();
+        let prices = prices.into_iter().collect();
+
+        Self {
+            title,
+            description,
+            payload,
+            provider_token,
+            currency,
+            prices,
+            max_tip_amount: None,
+            suggested_tip_amounts: None,
+            provider_data: None,
+            photo_url: None,
+            photo_size: None,
+            photo_width: None,
+            photo_height: None,
+            need_name: None,
+            need_phone_number: None,
+            need_email: None,
+            need_shipping_address: None,
+            send_phone_number_to_provider: None,
+            send_email_to_provider: None,
+            is_flexible: None,
+        }
+    }
+
+    pub fn title<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.title = val.into();
+        self
+    }
+
+    pub fn description<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.description = val.into();
+        self
+    }
+
+    pub fn payload<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.payload = val.into();
+        self
+    }
+
+    pub fn provider_token<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.provider_token = val.into();
+        self
+    }
+
+    pub fn currency(mut self, val: Currency) -> Self {
+        self.currency = val.into();
+        self
+    }
+
+    pub fn prices<T>(mut self, val: T) -> Self
+    where
+        T: IntoIterator<Item = LabeledPrice>,
+    {
+        self.prices = val.into_iter().collect();
+        self
+    }
+
+    pub fn max_tip_amount(mut self, val: u32) -> Self {
+        self.max_tip_amount = Some(val);
+        self
+    }
+
+    pub fn suggested_tip_amounts<T>(mut self, val: T) -> Self
+    where
+        T: IntoIterator<Item = u32>,
+    {
+        self.suggested_tip_amounts = Some(val.into_iter().collect());
+        self
+    }
+
+    pub fn provider_data<T>(mut self, val: T) -> Self
+    where
+        T: Into<String>,
+    {
+        self.provider_data = Some(val.into());
+        self
+    }
+
+    pub fn photo_url(mut self, val: Url) -> Self {
+        self.photo_url = Some(val);
+        self
+    }
+
+    pub fn photo_size(mut self, val: u32) -> Self {
+        self.photo_size = Some(val);
+        self
+    }
+
+    pub fn photo_width(mut self, val: u32) -> Self {
+        self.photo_width = Some(val);
+        self
+    }
+
+    pub fn photo_height(mut self, val: u32) -> Self {
+        self.photo_height = Some(val);
+        self
+    }
+
+    pub fn need_name(mut self, val: bool) -> Self {
+        self.need_name = Some(val);
+        self
+    }
+
+    pub fn need_phone_number(mut self, val: bool) -> Self {
+        self.need_phone_number = Some(val);
+        self
+    }
+
+    pub fn need_email(mut self, val: bool) -> Self {
+        self.need_email = Some(val);
+        self
+    }
+
+    pub fn need_shipping_address(mut self, val: bool) -> Self {
+        self.need_shipping_address = Some(val);
+        self
+    }
+
+    pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
+        self.send_phone_number_to_provider = Some(val);
+        self
+    }
+
+    pub fn send_email_to_provider(mut self, val: bool) -> Self {
+        self.send_email_to_provider = Some(val);
+        self
+    }
+
+    pub fn is_flexible(mut self, val: bool) -> Self {
+        self.is_flexible = Some(val);
+        self
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/types/message.rs b/src/types/message.rs
index 0159c705..e5241004 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -8,7 +8,7 @@ use crate::types::{
     Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
     ProximityAlertTriggered, PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment,
     True, User, Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
-    VoiceChatStarted,
+    VoiceChatScheduled, VoiceChatStarted,
 };
 
 /// This object represents a message.
@@ -54,6 +54,7 @@ pub enum MessageKind {
     PassportData(MessagePassportData),
     Dice(MessageDice),
     ProximityAlertTriggered(MessageProximityAlertTriggered),
+    VoiceChatScheduled(MessageVoiceChatScheduled),
     VoiceChatStarted(MessageVoiceChatStarted),
     VoiceChatEnded(MessageVoiceChatEnded),
     VoiceChatParticipantsInvited(MessageVoiceChatParticipantsInvited),
@@ -456,6 +457,12 @@ pub struct MessageProximityAlertTriggered {
     pub proximity_alert_triggered: ProximityAlertTriggered,
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageVoiceChatScheduled {
+    /// Service message: voice chat scheduled
+    pub voice_chat_scheduled: VoiceChatScheduled,
+}
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageVoiceChatStarted {
     /// Service message: voice chat started.
diff --git a/src/types/voice_chat_scheduled.rs b/src/types/voice_chat_scheduled.rs
new file mode 100644
index 00000000..c33a5ad8
--- /dev/null
+++ b/src/types/voice_chat_scheduled.rs
@@ -0,0 +1,10 @@
+use serde::{Deserialize, Serialize};
+
+/// This object represents a service message about a voice chat scheduled in the
+/// chat.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct VoiceChatScheduled {
+    /// Point in time (Unix timestamp) when the voice chat is supposed to be
+    /// started by a chat administrator.
+    pub start_date: u64,
+}

From 39c497ca1e94ac0f4f777177f69a6d7b2b97e070 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 4 May 2021 16:47:16 +0300
Subject: [PATCH 306/755] Update methods to TBA 5.2

---
 src/adaptors/throttle.rs     | 40 +-----------------------------------
 src/bot/api.rs               |  8 +++-----
 src/local_macros.rs          |  6 +++---
 src/payloads/send_invoice.rs | 14 +++++++++----
 src/requests/requester.rs    |  8 +++-----
 5 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 74149fdb..0f275758 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -411,45 +411,7 @@ where
         send_message, forward_message, copy_message, send_photo, send_audio,
         send_document, send_video, send_animation, send_voice, send_video_note,
         send_media_group, send_location, send_venue, send_contact, send_poll,
-        send_dice, send_sticker,  => f, fty
-    }
-
-    type SendInvoice = ThrottlingRequest<B::SendInvoice>;
-
-    fn send_invoice<T, D, Pa, P, S, C, Pri>(
-        &self,
-        chat_id: i32,
-        title: T,
-        description: D,
-        payload: Pa,
-        provider_token: P,
-        start_parameter: S,
-        currency: C,
-        prices: Pri,
-    ) -> Self::SendInvoice
-    where
-        T: Into<String>,
-        D: Into<String>,
-        Pa: Into<String>,
-        P: Into<String>,
-        S: Into<String>,
-        C: Into<String>,
-        Pri: IntoIterator<Item = LabeledPrice>,
-    {
-        ThrottlingRequest {
-            request: self.inner().send_invoice(
-                chat_id,
-                title,
-                description,
-                payload,
-                provider_token,
-                start_parameter,
-                currency,
-                prices,
-            ),
-            chat_id: |p| ChatIdHash::Id(p.payload_ref().chat_id as _),
-            worker: self.queue.clone(),
-        }
+        send_dice, send_sticker, send_invoice => f, fty
     }
 
     requester_forward! {
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 35b5da58..f0e95786 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -875,23 +875,22 @@ impl Requester for Bot {
 
     type SendInvoice = JsonRequest<payloads::SendInvoice>;
 
-    fn send_invoice<T, D, Pa, P, S, C, Pri>(
+    fn send_invoice<Ch, T, D, Pa, P, C, Pri>(
         &self,
-        chat_id: i32,
+        chat_id: Ch,
         title: T,
         description: D,
         payload: Pa,
         provider_token: P,
-        start_parameter: S,
         currency: C,
         prices: Pri,
     ) -> Self::SendInvoice
     where
+        Ch: Into<ChatId>,
         T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
         P: Into<String>,
-        S: Into<String>,
         C: Into<String>,
         Pri: IntoIterator<Item = LabeledPrice>,
     {
@@ -903,7 +902,6 @@ impl Requester for Bot {
                 description,
                 payload,
                 provider_token,
-                start_parameter,
                 currency,
                 prices,
             ),
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 68c746a7..0875949e 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1040,15 +1040,15 @@ macro_rules! requester_forward {
     (@method send_invoice $body:ident $ty:ident) => {
         type SendInvoice = $ty![SendInvoice];
 
-        fn send_invoice<T, D, Pa, P, S, C, Pri>(&self, chat_id: i32, title: T, description: D, payload: Pa, provider_token: P, start_parameter: S, currency: C, prices: Pri) -> Self::SendInvoice where T: Into<String>,
+        fn send_invoice<Ch, T, D, Pa, P, C, Pri>(&self, chat_id: Ch, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri) -> Self::SendInvoice where Ch: Into<ChatId>,
+        T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
         P: Into<String>,
-        S: Into<String>,
         C: Into<String>,
         Pri: IntoIterator<Item = LabeledPrice> {
             let this = self;
-            $body!(send_invoice this (chat_id: i32, title: T, description: D, payload: Pa, provider_token: P, start_parameter: S, currency: C, prices: Pri))
+            $body!(send_invoice this (chat_id: Ch, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri))
         }
     };
     (@method answer_shipping_query $body:ident $ty:ident) => {
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 4573633b..5a166f28 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, LabeledPrice, Message};
+use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice, Message};
 
 impl_payload! {
     /// Use this method to send invoices. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendInvoice (SendInvoiceSetters) => Message {
         required {
             /// Unique identifier for the target private chat
-            pub chat_id: i32,
+            pub chat_id: ChatId [into],
             /// Product name, 1-32 characters
             pub title: String [into],
             /// Product description, 1-255 characters
@@ -29,14 +29,20 @@ impl_payload! {
             ///
             /// [Botfather]: https://t.me/botfather
             pub provider_token: String [into],
-            /// Unique deep-linking parameter that can be used to generate this invoice when used as a start parameter
-            pub start_parameter: String [into],
             /// Three-letter ISO 4217 currency code, see more on currencies
             pub currency: String [into],
             /// Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
             pub prices: Vec<LabeledPrice> [collect],
         }
         optional {
+            /// The maximum accepted amount for tips in the smallest units of the currency (integer, **not** float/double). For example, for a maximum tip of `US$ 1.45` pass `max_tip_amount = 145`. See the exp parameter in [`currencies.json`], it shows the number of digits past the decimal point for each currency (2 for the majority of currencies). Defaults to 0
+            ///
+            /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+            pub max_tip_amount: u32,
+            /// A JSON-serialized array of suggested amounts of tips in the smallest units of the currency (integer, **not** float/double). At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed _max_tip_amount_.
+            pub suggested_tip_amounts: Vec<u32> [collect],
+            /// Unique deep-linking parameter. If left empty, **forwarded copies** of the sent message will have a Pay button, allowing multiple users to pay directly from the forwarded message, using the same invoice. If non-empty, forwarded copies of the sent message will have a URL button with a deep link to the bot (instead of a Pay button), with the value used as the start parameter
+            pub start_parameter: String [into],
             /// A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.
             pub provider_data: String [into],
             /// URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index c6689ef8..d4a0fe12 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -60,7 +60,6 @@ pub trait Requester {
     //
     // [cg]: https://github.com/teloxide/cg
     // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
-
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetUpdates`].
@@ -723,23 +722,22 @@ pub trait Requester {
     type SendInvoice: Request<Payload = SendInvoice, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendInvoice`].
-    fn send_invoice<T, D, Pa, P, S, C, Pri>(
+    fn send_invoice<Ch, T, D, Pa, P, C, Pri>(
         &self,
-        chat_id: i32,
+        chat_id: Ch,
         title: T,
         description: D,
         payload: Pa,
         provider_token: P,
-        start_parameter: S,
         currency: C,
         prices: Pri,
     ) -> Self::SendInvoice
     where
+        Ch: Into<ChatId>,
         T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
         P: Into<String>,
-        S: Into<String>,
         C: Into<String>,
         Pri: IntoIterator<Item = LabeledPrice>;
 

From 6c0eb174eda382a4fdfe7e6b7caeeed36a0b8950 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 4 May 2021 16:50:49 +0300
Subject: [PATCH 307/755] Move macro around

---
 src/local_macros.rs | 62 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index 0875949e..b5845248 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -392,6 +392,37 @@ macro_rules! impl_payload {
     (@[] $($ignored:tt)*) => {}
 }
 
+#[macro_use]
+macro_rules! download_forward {
+    ($l:lifetime $T:ident $S:ty {$this:ident => $inner:expr}) => {
+        impl<$l, $T: $crate::net::Download<$l>> $crate::net::Download<$l> for $S {
+            type Err = <$T as $crate::net::Download<$l>>::Err;
+
+            type Fut = <$T as $crate::net::Download<$l>>::Fut;
+
+            fn download_file(
+                &self,
+                path: &str,
+                destination: &'w mut (dyn tokio::io::AsyncWrite
+                             + core::marker::Unpin
+                             + core::marker::Send),
+            ) -> Self::Fut {
+                let $this = self;
+                ($inner).download_file(path, destination)
+            }
+
+            type StreamErr = <$T as $crate::net::Download<$l>>::StreamErr;
+
+            type Stream = <$T as $crate::net::Download<$l>>::Stream;
+
+            fn download_file_stream(&self, path: &str) -> Self::Stream {
+                let $this = self;
+                ($inner).download_file_stream(path)
+            }
+        }
+    };
+}
+
 #[macro_use]
 // This macro is auto generated by [`cg`] from [`schema`].
 //
@@ -1116,34 +1147,3 @@ macro_rules! requester_forward {
         }
     };
 }
-
-#[macro_use]
-macro_rules! download_forward {
-    ($l:lifetime $T:ident $S:ty {$this:ident => $inner:expr}) => {
-        impl<$l, $T: crate::net::Download<$l>> crate::net::Download<$l> for $S {
-            type Err = <$T as crate::net::Download<$l>>::Err;
-
-            type Fut = <$T as crate::net::Download<$l>>::Fut;
-
-            fn download_file(
-                &self,
-                path: &str,
-                destination: &'w mut (dyn tokio::io::AsyncWrite
-                             + core::marker::Unpin
-                             + core::marker::Send),
-            ) -> Self::Fut {
-                let $this = self;
-                ($inner).download_file(path, destination)
-            }
-
-            type StreamErr = <$T as crate::net::Download<$l>>::StreamErr;
-
-            type Stream = <$T as crate::net::Download<$l>>::Stream;
-
-            fn download_file_stream(&self, path: &str) -> Self::Stream {
-                let $this = self;
-                ($inner).download_file_stream(path)
-            }
-        }
-    };
-}

From b0f54533b08ae6d2f15a91c6b97ff0eae0377b47 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 4 May 2021 16:56:27 +0300
Subject: [PATCH 308/755] Update changelog and readme

---
 CHANGELOG.md | 5 ++++-
 README.md    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff29fb7..fd016314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,16 +11,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#75][pr75])
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
+- Telegram bot API 5.2 support ([#86][pr86])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
 [pr84]: https://github.com/teloxide/teloxide-core/pull/84
+[pr86]: https://github.com/teloxide/teloxide-core/pull/86
 
 ### Changed
 
 - Refactor `ChatMember` methods ([#74][pr74])
   - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callible directly on `ChatMember`
   - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
-  - Refactor privilege getters 
+  - Refactor privilege getters
+- Rename `ChatAction::{RecordAudio => RecordVoice, UploadAudio => UploadVoice}` ([#86][pr86])
 
 [pr74]: https://github.com/teloxide/teloxide-core/pull/74
 
diff --git a/README.md b/README.md
index 60475ca4..0d88e280 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.1%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.2%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">

From c49887277885b29840ddeedab5d9376167293787 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 4 May 2021 18:20:08 +0300
Subject: [PATCH 309/755] Fix clippy

---
 src/types/input_message_content.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index 5f853c19..5ece7563 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -466,7 +466,7 @@ impl InputMessageContentInvoice {
     }
 
     pub fn currency(mut self, val: Currency) -> Self {
-        self.currency = val.into();
+        self.currency = val;
         self
     }
 
@@ -549,6 +549,7 @@ impl InputMessageContentInvoice {
         self
     }
 
+    #[allow(clippy::wrong_self_convention)]
     pub fn is_flexible(mut self, val: bool) -> Self {
         self.is_flexible = Some(val);
         self

From 7faec64f95854111685c29e92ed8006d567a69d0 Mon Sep 17 00:00:00 2001
From: Temirkhan Myrzamadi <hirrolot@gmail.com>
Date: Tue, 4 May 2021 23:51:11 +0600
Subject: [PATCH 310/755] Fix Clippy

---
 src/types/message.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 71152820..0cb29a5f 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -3,12 +3,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    chat::{ChatKind, PublicChatKind},
-    Animation, Audio, Chat, ChatPublic, Contact, Dice, Document, Game, InlineKeyboardMarkup,
-    Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
-    ProximityAlertTriggered, PublicChatChannel, PublicChatSupergroup, Sticker, SuccessfulPayment,
-    True, User, Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
-    VoiceChatScheduled, VoiceChatStarted,
+    Animation, Audio, Chat, Contact, Dice, Document, Game, InlineKeyboardMarkup, Invoice, Location,
+    MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
+    ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote,
+    Voice, VoiceChatEnded, VoiceChatParticipantsInvited, VoiceChatScheduled, VoiceChatStarted,
 };
 
 /// This object represents a message.

From 4af9321e119b6d724ab105be6a72207e8c33911d Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Sat, 8 May 2021 23:15:51 +0300
Subject: [PATCH 311/755] Fixup docs badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d88e280..d9e24428 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <img src="https://github.com/teloxide/teloxide-core/workflows/Continuous%20integration/badge.svg">
   </a>
   <a href="https://docs.rs/teloxide_core/">
-    <img src="https://docs.rs/teloxide_core/badge.svg">
+    <img src="https://docs.rs/teloxide-core/badge.svg">
   </a>
   <a href="https://teloxide-core.netlify.com">
     <img src="https://img.shields.io/badge/docs-master-blue">

From 728313174f6dfa8253442de30bf5010963e8942f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 8 May 2021 23:49:00 +0300
Subject: [PATCH 312/755] Use proper notable_trait attr

---
 src/requests/payload.rs   | 2 +-
 src/requests/request.rs   | 2 +-
 src/requests/requester.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 34fa3d4b..a30f4bad 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -5,7 +5,7 @@
 ///
 /// Also, this trait provides some additional information needed to send a
 /// request to Telegram.
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
 pub trait Payload {
     /// The return type of a Telegram method.
     ///
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 6ea6c5b4..76520fed 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -16,7 +16,7 @@ use crate::requests::{HasPayload, Output};
 /// `B::send_ref` while _not_ meaning to really send the request at the moment.
 ///
 /// [`Throttle<B>`]: crate::adaptors::Throttle
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
 pub trait Request: HasPayload {
     /*
      * Could be mostly `core::future::IntoFuture` though there is no reason to
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index d4a0fe12..3a4a91d0 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -47,7 +47,7 @@ use crate::{
 ///     bot.send_message(chat, "hi").send().await.expect("error")
 /// }
 /// ```
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(spotlight))]
+#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
 pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;

From 4de91811c4d0c9c987c8f90b74e70c8cb44d8989 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 9 May 2021 00:43:16 +0300
Subject: [PATCH 313/755] Fix docs.rs metadata

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 10dbe708..db46ed81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,7 +76,7 @@ auto_send = []
 
 full = ["throttle", "cache_me", "auto_send"]
 
-[package.metadata."docs.rs"]
+[package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs", "-Znormalize-docs"]
 

From ecaa5d5bec25beddd10dd4a94595c940e71e9122 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 May 2021 11:51:03 +0300
Subject: [PATCH 314/755] Add `net::default_reqwest_settings` function

This function can help when users want to set up their own client setting for
one reason or another, since settings set by the function, are required for
stable work.

This function was previously private and named `sound_bot`. The old name was
confusing since safety and soundness are used in the Rust context almost
entirely for `unsafe` code, UB & co. So I've changed the name to a more
descriptive one.
---
 CHANGELOG.md |  2 ++
 src/bot.rs   | 41 +++++++++--------------------------------
 src/net.rs   | 42 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2543d9..ae63f5fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
+- `net::default_reqwest_settings` function ([#90][pr90])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
 [pr80]: https://github.com/teloxide/teloxide-core/pull/80
 [pr84]: https://github.com/teloxide/teloxide-core/pull/84
 [pr86]: https://github.com/teloxide/teloxide-core/pull/86
+[pr90]: https://github.com/teloxide/teloxide-core/pull/90
 
 ### Changed
 
diff --git a/src/bot.rs b/src/bot.rs
index 132bbaaa..e5677716 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -1,9 +1,6 @@
-use std::{future::Future, sync::Arc, time::Duration};
+use std::{future::Future, sync::Arc};
 
-use reqwest::{
-    header::{HeaderMap, CONNECTION},
-    Client, ClientBuilder,
-};
+use reqwest::Client;
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
@@ -17,8 +14,7 @@ mod api;
 mod api_url;
 mod download;
 
-pub(crate) const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
-pub(crate) const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
+const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 
 /// A requests sender.
 ///
@@ -76,13 +72,18 @@ impl Bot {
     where
         S: Into<String>,
     {
-        Self::with_client(token, build_sound_bot())
+        let client = net::default_reqwest_settings()
+            .build()
+            .expect("Client creation failed");
+
+        Self::with_client(token, client)
     }
 
     /// Creates a new `Bot` with the specified token and your
     /// [`reqwest::Client`].
     ///
     /// # Caution
+    ///
     /// Your custom client might not be configured correctly to be able to work
     /// in long time durations, see [issue 223].
     ///
@@ -239,30 +240,6 @@ impl Bot {
     }
 }
 
-/// Returns a builder with safe settings.
-///
-/// By "safe settings" I mean that a client will be able to work in long time
-/// durations, see the [issue 223].
-///
-/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
-pub(crate) fn sound_bot() -> ClientBuilder {
-    let mut headers = HeaderMap::new();
-    headers.insert(CONNECTION, "keep-alive".parse().unwrap());
-
-    let connect_timeout = Duration::from_secs(5);
-    let timeout = 10;
-
-    ClientBuilder::new()
-        .connect_timeout(connect_timeout)
-        .timeout(Duration::from_secs(connect_timeout.as_secs() + timeout + 2))
-        .tcp_nodelay(true)
-        .default_headers(headers)
-}
-
-pub(crate) fn build_sound_bot() -> Client {
-    sound_bot().build().expect("creating reqwest::Client")
-}
-
 fn get_env(env: &'static str) -> String {
     std::env::var(env).unwrap_or_else(|_| panic!("Cannot get the {} env variable", env))
 }
diff --git a/src/net.rs b/src/net.rs
index 6c9665dc..6ce6525d 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -1,5 +1,7 @@
 //! Network-specific API.
 
+use std::time::Duration;
+
 pub use self::download::{download_file, download_file_stream, Download};
 
 pub(crate) use self::{
@@ -33,19 +35,53 @@ pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 ///
 /// If `TELOXIDE_PROXY` exists, but isn't correct url.
 pub fn client_from_env() -> reqwest::Client {
-    use crate::bot::{sound_bot, TELOXIDE_PROXY};
     use reqwest::Proxy;
 
-    let builder = sound_bot();
+    const TELOXIDE_PROXY: &str = "TELOXIDE_PROXY";
+
+    let builder = default_reqwest_settings();
 
     match std::env::var(TELOXIDE_PROXY).ok() {
-        Some(proxy) => builder.proxy(Proxy::all(&proxy).expect("creating reqwest::Proxy")),
+        Some(proxy) => builder.proxy(Proxy::all(&proxy).expect("reqwest::Proxy creation failed")),
         None => builder,
     }
     .build()
     .expect("creating reqwest::Client")
 }
 
+/// Returns a reqwest client builder with default settings.
+///
+/// Client built from default settings is supposed to work in long time
+/// durations, see the [issue 223].
+///
+/// Current setting are:
+/// - `connection/keep-alive` default header
+/// - connection timeout of 5 seconds
+/// - timeout of 17 seconds
+/// - tcp_nodelay is on
+///
+/// Notes:
+/// 1. the settings may change in the future
+/// 2. if you are using polling mechanizm to get updates, the timeout configured
+///    in the client should be bigger than polling timeout
+///
+/// [issue 223]: https://github.com/teloxide/teloxide/issues/223
+pub fn default_reqwest_settings() -> reqwest::ClientBuilder {
+    use reqwest::header::{HeaderMap, CONNECTION};
+
+    let mut headers = HeaderMap::new();
+    headers.insert(CONNECTION, "keep-alive".parse().unwrap());
+
+    let connect_timeout = Duration::from_secs(5);
+    let timeout = connect_timeout + Duration::from_secs(12);
+
+    reqwest::Client::builder()
+        .connect_timeout(connect_timeout)
+        .timeout(timeout)
+        .tcp_nodelay(true)
+        .default_headers(headers)
+}
+
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests

From 6ac0ed8588805272bc4b7730ceb88ec9a9058e74 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Thu, 13 May 2021 18:43:07 +0300
Subject: [PATCH 315/755] Apply suggestions from code review

Co-authored-by: Hirrolot <hirrolot@gmail.com>
---
 src/net.rs | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/net.rs b/src/net.rs
index 6ce6525d..e7eec05c 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -51,19 +51,21 @@ pub fn client_from_env() -> reqwest::Client {
 
 /// Returns a reqwest client builder with default settings.
 ///
-/// Client built from default settings is supposed to work in long time
+/// Client built from default settings is supposed to work over long time
 /// durations, see the [issue 223].
 ///
-/// Current setting are:
-/// - `connection/keep-alive` default header
-/// - connection timeout of 5 seconds
-/// - timeout of 17 seconds
-/// - tcp_nodelay is on
+/// The current settings are:
+///  - The `connection/keep-alive` default header.
+///  - A connection timeout of 5 seconds.
+///  - A timeout of 17 seconds.
+///  - `tcp_nodelay` is on.
 ///
-/// Notes:
-/// 1. the settings may change in the future
-/// 2. if you are using polling mechanizm to get updates, the timeout configured
-///    in the client should be bigger than polling timeout
+/// ## Notes
+/// 1. The settings may change in the future.
+/// 2. If you are using the polling mechanism to get updates, the timeout
+///    configured in the client should be bigger than the polling timeout.
+/// 3. If you alter the current settings listed above, your bot will not be
+///    guaranteed to work over long time durations.
 ///
 /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
 pub fn default_reqwest_settings() -> reqwest::ClientBuilder {

From 961d67ccf18b1cec7dd90470869ab3d4e67d7250 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 21 May 2021 16:58:04 +0300
Subject: [PATCH 316/755] Fix formatting of `ParseMode` docs

---
 src/types/parse_mode.rs | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
index 7f0fba9a..88a42c48 100644
--- a/src/types/parse_mode.rs
+++ b/src/types/parse_mode.rs
@@ -47,10 +47,10 @@ use serde::{Deserialize, Serialize};
 /// pre-formatted fixed-width code block
 /// ```
 /// ```rust
-/// pre-formatted fixed-width code block written in the Rust programming
-/// language ```
+#[doc = "pre-formatted fixed-width code block written in the Rust programming language"]
+/// ```
 /// ````
-/// 
+///
 /// Please note:
 /// - Any character between 1 and 126 inclusively can be escaped anywhere with a
 ///   preceding '\' character, in which case it is treated as an ordinary
@@ -69,21 +69,23 @@ use serde::{Deserialize, Serialize};
 ///   ignored.
 ///
 /// ## HTML style
+///
 /// To use this mode, pass [`Html`] in the `parse_mode` field.
 /// The following tags are currently supported:
 /// ````text
 /// <b>bold</b>, <strong>bold</strong>
 /// <i>italic</i>, <em>italic</em>
 /// <u>underline</u>, <ins>underline</ins>
-/// <s>strikethrough</s>, <strike>strikethrough</strike>,
-/// <del>strikethrough</del> <b>bold <i>italic bold <s>italic bold
-/// strikethrough</s> <u>underline italic bold</u></i> bold</b> <a href="http:// www.example.com/">inline URL</a>
+/// <s>strikethrough</s>, <strike>strikethrough</strike>, <del>strikethrough</del>
+/// <b>bold <i>italic bold <s>italic bold strikethrough</s> <u>underline italic bold</u></i> bold</b>
+/// <a href="http:// www.example.com/">inline URL</a>
 /// <a href="tg:// user?id=123456789">inline mention of a user</a>
 /// <code>inline fixed-width code</code>
 /// <pre>pre-formatted fixed-width code block</pre>
-/// <pre><code class="language-rust">pre-formatted fixed-width code block
-/// written in the Rust programming language</code></pre> ````
-///
+#[doc = "<pre><code class=\"language-rust\">pre-formatted fixed-width code block written in the \
+         Rust programming language</code></pre>"]
+/// ````
+/// 
 /// Please note:
 ///
 /// - Only the tags mentioned above are currently supported.
@@ -98,6 +100,7 @@ use serde::{Deserialize, Serialize};
 /// - Programming language can't be specified for standalone `code` tags.
 ///
 /// ## Markdown style
+///
 /// This is a legacy mode, retained for backward compatibility. To use this
 /// mode, pass [`Markdown`] in the `parse_mode` field.
 /// Use the following syntax in your message:
@@ -107,9 +110,12 @@ use serde::{Deserialize, Serialize};
 /// [inline URL](http://www.example.com/)
 /// [inline mention of a user](tg://user?id=123456789)
 /// `inline fixed-width code`
+/// ```
+/// pre-formatted fixed-width code block
+/// ```
 /// ```rust
-/// pre-formatted fixed-width code block written in the Rust programming
-/// language ```
+/// pre-formatted fixed-width code block written in the Rust programming language
+/// ```
 /// ````
 /// 
 /// Please note:

From 77253422f878e04da9bd1a925178ea11f07f07ad Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 30 May 2021 13:34:20 +0300
Subject: [PATCH 317/755] clippy

---
 src/local_macros.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index b5845248..750df39a 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1,4 +1,3 @@
-#[macro_use]
 macro_rules! forward_to_unsuported_ty {
     (
         supported: $supported:expr;
@@ -37,7 +36,6 @@ macro_rules! forward_to_unsuported_ty {
     };
 }
 
-#[macro_use]
 macro_rules! req_future {
     (
         $v2:vis def: | $( $arg:ident: $ArgTy:ty ),* $(,)? | $body:block
@@ -118,7 +116,6 @@ macro_rules! req_future {
 /// Declares an item with a doc attribute computed by some macro expression.
 /// This allows documentation to be dynamically generated based on input.
 /// Necessary to work around https://github.com/rust-lang/rust/issues/52607.
-#[macro_use]
 macro_rules! calculated_doc {
     (
         $(
@@ -135,7 +132,6 @@ macro_rules! calculated_doc {
 
 /// Declare payload type, implement `Payload` trait and ::new method for it,
 /// declare setters trait and implement it for all type which have payload.
-#[macro_use]
 macro_rules! impl_payload {
     (
         $(
@@ -392,7 +388,6 @@ macro_rules! impl_payload {
     (@[] $($ignored:tt)*) => {}
 }
 
-#[macro_use]
 macro_rules! download_forward {
     ($l:lifetime $T:ident $S:ty {$this:ident => $inner:expr}) => {
         impl<$l, $T: $crate::net::Download<$l>> $crate::net::Download<$l> for $S {
@@ -423,7 +418,6 @@ macro_rules! download_forward {
     };
 }
 
-#[macro_use]
 // This macro is auto generated by [`cg`] from [`schema`].
 //
 // **DO NOT EDIT THIS MACRO**,

From 8ea42fe8715ee8b4b76298b68155a9597331fd75 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Wed, 9 Jun 2021 11:09:14 +0300
Subject: [PATCH 318/755] Resolve FIXME in `HasPayload`: we've decided to not
 add `As{Mut,Ref}` bounds

---
 src/requests/has_payload.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index 3a1135de..de6bd333 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -17,11 +17,7 @@ use crate::requests::Payload;
 /// [`BorrowMut`]: std::borrow::BorrowMut
 /// [`Payload`]: crate::requests::Payload
 /// [output type]: HasPayload::Payload
-pub trait HasPayload
-// FIXME(waffle):
-//   we wanted to use As{Mut,Ref} here, but they doesn't work
-//   because of https://github.com/rust-lang/rust/issues/77010
-{
+pub trait HasPayload {
     /// The type of the payload contained.
     type Payload: Payload;
 

From c1eca613d58d8cfca18d4c9c9538ac74a69e36e2 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 9 Jun 2021 11:34:40 +0300
Subject: [PATCH 319/755] Fix Clippy: remove useless (immediately implicitly
 dereferenced) refs

---
 src/types/audio.rs       | 2 +-
 src/types/chat_member.rs | 2 +-
 src/types/user.rs        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types/audio.rs b/src/types/audio.rs
index ac7a1f3b..57fb3196 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -80,7 +80,7 @@ mod tests {
             }),
             file_name: None,
         };
-        let actual = serde_json::from_str::<Audio>(&json).unwrap();
+        let actual = serde_json::from_str::<Audio>(json).unwrap();
         assert_eq!(actual, expected)
     }
 }
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index cef53e92..9f8b3909 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -625,7 +625,7 @@ mod tests {
                 can_promote_members: true,
             }),
         };
-        let actual = serde_json::from_str::<ChatMember>(&json).unwrap();
+        let actual = serde_json::from_str::<ChatMember>(json).unwrap();
         assert_eq!(actual, expected)
     }
 }
diff --git a/src/types/user.rs b/src/types/user.rs
index 28bff17e..24064d6f 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -66,7 +66,7 @@ mod tests {
             username: Some("Username".to_string()),
             language_code: Some(String::from("ru")),
         };
-        let actual = serde_json::from_str::<User>(&json).unwrap();
+        let actual = serde_json::from_str::<User>(json).unwrap();
         assert_eq!(actual, expected)
     }
 }

From ddecf40b3716c3c3c41269f39e86a623b8b972ce Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 15 Jun 2021 13:08:18 +0800
Subject: [PATCH 320/755] Fix generic type handling

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

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 440b45e5..34756805 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -106,7 +106,7 @@ fn parser_with_separator<'a>(
     let inner = quote! { let mut splited = s.split(#separator); };
     let i = 0..count_args;
     let inner2 = quote! {
-        #(#types::from_str(splited.next().ok_or(ParseError::TooFewArguments {
+        #(<#types>::from_str(splited.next().ok_or(ParseError::TooFewArguments {
             expected: #count_args,
             found: #i,
             message: format!("Expected but not found arg number {}", #i + 1),

From 4dc5fc689b5a563f86fae0ff9c5560bc3116f359 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 15 Jun 2021 14:03:49 +0600
Subject: [PATCH 321/755] Fix Clippy

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

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 34756805..40e5887c 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -89,7 +89,7 @@ fn create_parser<'a>(
             count_args,
         ),
         ParserType::Custom(s) => {
-            let ident = syn::Ident::new(&s, Span::call_site());
+            let ident = syn::Ident::new(s, Span::call_site());
             quote! { #ident }
         }
     };

From 57463d33dcf0913585fc2bfed327d29133beff5c Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 15 Jun 2021 14:06:05 +0600
Subject: [PATCH 322/755] Update `CHANGELOG.md`

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9741094d..8ae31dd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Fixed
+
+ - Fix generics support for a variant's arguments ([PR #8](https://github.com/teloxide/teloxide-macros/issues/8)).
+
 ## [0.4.0] - 2021-03-19
 
 ### Changed

From 414ce2c3a6f07a76bede461653248abc79eb2a58 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Sat, 19 Jun 2021 02:29:11 -0600
Subject: [PATCH 323/755] telegram_response: fix issue with handling ...

... `retry_after` and `migrate_to_chat_id`
---
 src/net/telegram_response.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index 306d100a..f074f8b4 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -25,6 +25,7 @@ pub(crate) enum TelegramResponse<R> {
         #[serde(rename = "description")]
         error: ApiError,
         error_code: u16,
+        #[serde(rename = "parameters")]
         response_parameters: Option<ResponseParameters>,
     },
 }

From 73c34f852ad493c9e97b81078aa23e4f9eb0ad4a Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Sat, 19 Jun 2021 03:21:50 -0600
Subject: [PATCH 324/755] CHANGELOG: add changeset information for #94

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae63f5fa..ba8ca3b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- telegram_response: fix issue `retry_after` and `migrate_to_chat_id` handling ([#94][pr94])
 - Type of `PublicChatSupergroup::slow_mode_delay` field: `Option<i32>`=> `Option<u32>` ([#80][pr80]) 
 - Add missing `Chat::message_auto_delete_time` field ([#80][pr80]) 
 - Output types of `LeaveChat` `PinChatMessage`, `SetChatDescription`, `SetChatPhoto` `SetChatTitle`, `UnpinAllChatMessages` and `UnpinChatMessage`: `String` => `True` ([#79][pr79])
@@ -46,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr73]: https://github.com/teloxide/teloxide-core/pull/73
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
 [pr79]: https://github.com/teloxide/teloxide-core/pull/79
+[pr94]: https://github.com/teloxide/teloxide-core/pull/94
 
 ## [0.2.2] - 2020-03-22
 

From e64c22753c1fee3c0eb83ac35e651231ef421984 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Fri, 18 Jun 2021 13:28:47 +0300
Subject: [PATCH 325/755] Correct pr link in the changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba8ca3b4..8e0ca19d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,13 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#75][pr75])
+- `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
 - `net::default_reqwest_settings` function ([#90][pr90])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
+[pr76]: https://github.com/teloxide/teloxide-core/pull/76
 [pr80]: https://github.com/teloxide/teloxide-core/pull/80
 [pr84]: https://github.com/teloxide/teloxide-core/pull/84
 [pr86]: https://github.com/teloxide/teloxide-core/pull/86

From 656e393779ce62b4c4eeb872eaaeab5a2a9b3148 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Jun 2021 20:49:26 +0300
Subject: [PATCH 326/755] Fix rt-tys of `{get,set}_my_commands` methods

Fix return types of `get_my_commands` (`u32` => `True`) and `set_my commands`
(`u32` => `Vec<BotCommand>`).
---
 src/payloads/get_my_commands.rs | 4 +++-
 src/payloads/set_my_commands.rs | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 29063456..0c80f25a 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -8,12 +8,14 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
+use crate::types::BotCommand;
+
 impl_payload! {
     /// Use this method to get the current list of the bot's commands. Requires no parameters. Returns Array of [`BotCommand`] on success.
     ///
     /// [`BotCommand`]: crate::types::BotCommand
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
-    pub GetMyCommands (GetMyCommandsSetters) => u32 {
+    pub GetMyCommands (GetMyCommandsSetters) => Vec<BotCommand> {
 
     }
 }
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 3071b667..21f2934f 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -8,12 +8,12 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::BotCommand;
+use crate::types::{BotCommand, True};
 
 impl_payload! {
     /// Use this method to change the list of the bot's commands. Returns _True_ on success.
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub SetMyCommands (SetMyCommandsSetters) => u32 {
+    pub SetMyCommands (SetMyCommandsSetters) => True {
         required {
             /// A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most 100 commands can be specified.
             pub commands: Vec<BotCommand> [collect],

From 0dc565211ff12531d99653a252affbc92cb530e5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 12:31:44 +0300
Subject: [PATCH 327/755] Add `DefaultParseMode::parse_mode`

---
 CHANGELOG.md               | 2 ++
 src/adaptors/parse_mode.rs | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e0ca19d..9f18c05e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
+- `DefaultParseMode::parse_mode` which allows to get currently used default parse mode ([#77][pr77])
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
 - `net::default_reqwest_settings` function ([#90][pr90])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
+[pr77]: https://github.com/teloxide/teloxide-core/pull/77
 [pr76]: https://github.com/teloxide/teloxide-core/pull/76
 [pr80]: https://github.com/teloxide/teloxide-core/pull/80
 [pr84]: https://github.com/teloxide/teloxide-core/pull/84
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 6d1c9948..31e0f2d9 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -34,6 +34,11 @@ impl<B> DefaultParseMode<B> {
     pub fn into_inner(self) -> B {
         self.bot
     }
+
+    /// Returns currently used [`ParseMode`].
+    pub fn parse_mode(&self) -> ParseMode {
+        self.mode
+    }
 }
 
 macro_rules! f {

From 34e73748c35d1efd49e399d31a4c76457f072af9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 30 Mar 2021 14:22:37 +0300
Subject: [PATCH 328/755] Add a way to get info from/into `Thrrotle`

This patch adds `Thrrotle::{limits,set_limits,queue_status}` functions and
`QueueStatus` struct allowing to get current status of worker & change
limits of the fly.
---
 CHANGELOG.md             |   1 +
 src/adaptors/throttle.rs | 394 +++++++++++++++++++++++++--------------
 2 files changed, 259 insertions(+), 136 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f18c05e..e23fd557 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
 - `DefaultParseMode::parse_mode` which allows to get currently used default parse mode ([#77][pr77])
+- `Thrrotle::{limits,set_limits,queue_status}` functions and `QueueStatus` struct ([#77][pr77])
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 0f275758..fc3f78af 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -23,91 +23,6 @@ use crate::{
     types::*,
 };
 
-// Throttling is quite complicated. This comment describes the algorithm of the
-// current implementation.
-//
-// ### Request
-//
-// When a throttling request is sent, it sends a tuple of `ChatId` and
-// `Sender<()>` to the worker. Then the request waits for a notification from
-// the worker. When notification is received, it sends the underlying request.
-//
-// ### Worker
-//
-// The worker does the most important job -- it ensures that the limits are
-// never exceeded.
-//
-// The worker stores a history of requests sent in the last minute (and to which
-// chats they were sent) and a queue of pending updates.
-//
-// The worker does the following algorithm loop:
-//
-// 1. If the queue is empty, wait for the first message in incoming channel (and
-// add it to the queue).
-//
-// 2. Read all present messages from an incoming channel and transfer them to
-// the queue.
-//
-// 3. Record the current time.
-//
-// 4. Clear the history from records whose time < (current time - minute).
-//
-// 5. Count all requests which were sent last second, `allowed =
-// limit.messages_per_sec_overall - count`.
-//
-// 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
-//
-// 7. Count how many requests were sent to which chats (i.e.: create
-// `Map<ChatId, Count>`). (Note: the same map, but for last minute also exists,
-// but it's updated, instead of recreation.)
-//
-// 8. While `allowed >= 0` search for requests which chat haven't exceed the
-// limits (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
-// the request that it can be now executed, increase counts, add record to the
-// history.
-
-const MINUTE: Duration = Duration::from_secs(60);
-const SECOND: Duration = Duration::from_secs(1);
-
-// Delay between worker iterations.
-//
-// For now it's `second/4`, but that number is chosen pretty randomly, we may
-// want to change this.
-const DELAY: Duration = Duration::from_millis(250);
-
-/// Telegram request limits.
-///
-/// This struct is used in [`Throttle`].
-///
-/// Note that you may ask telegram [@BotSupport] to increase limits for your
-/// particular bot if it has a lot of users (but they may or may not do that).
-///
-/// [@BotSupport]: https://t.me/botsupport
-#[derive(Copy, Clone, Eq, PartialEq, Hash)]
-pub struct Limits {
-    /// Allowed messages in one chat per second.
-    pub messages_per_sec_chat: u32,
-
-    /// Allowed messages in one chat per minute.
-    pub messages_per_min_chat: u32,
-
-    /// Allowed messages per second.
-    pub messages_per_sec_overall: u32,
-}
-
-/// Defaults are taken from [telegram documentation][tgdoc].
-///
-/// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
-impl Default for Limits {
-    fn default() -> Self {
-        Self {
-            messages_per_sec_chat: 1,
-            messages_per_sec_overall: 30,
-            messages_per_min_chat: 20,
-        }
-    }
-}
-
 /// Automatic request limits respecting mechanism.
 ///
 /// Telegram has strict [limits], which, if exceeded will sooner or later cause
@@ -151,6 +66,176 @@ pub struct Throttle<B> {
     bot: B,
     // `RequestLock` allows to unlock requests (allowing them to be sent).
     queue: mpsc::Sender<(ChatIdHash, RequestLock)>,
+    info_tx: mpsc::Sender<InfoMessage>,
+}
+
+impl<B> Throttle<B> {
+    /// Creates new [`Throttle`] alongside with worker future.
+    ///
+    /// Note: [`Throttle`] will only send requests if returned worker is
+    /// polled/spawned/awaited.
+    pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
+        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
+        let (info_tx, info_rx) = mpsc::channel(2);
+
+        let worker = worker(limits, rx, info_rx);
+        let this = Self {
+            bot,
+            queue: tx,
+            info_tx,
+        };
+
+        (this, worker)
+    }
+
+    /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
+    ///
+    /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
+    ///
+    /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
+    pub fn new_spawn(bot: B, limits: Limits) -> Self
+    where
+        // Basically, I hate this bound.
+        // This is yet another problem caused by [rust-lang/#76882].
+        // And I think it *is* a bug.
+        //
+        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
+        //
+        // Though crucially I can't think of a case with non-static bot.
+        // But anyway, it doesn't change the fact that this bound is redundant.
+        //
+        // (waffle)
+        B: 'static,
+    {
+        let (this, worker) = Self::new(bot, limits);
+        tokio::spawn(worker);
+        this
+    }
+
+    /// Allows to access inner bot
+    pub fn inner(&self) -> &B {
+        &self.bot
+    }
+
+    /// Unwraps inner bot
+    pub fn into_inner(self) -> B {
+        self.bot
+    }
+
+    /// Returns currently used [`Limits`].
+    pub async fn limits(&self) -> Limits {
+        let (tx, rx) = oneshot::channel();
+
+        self.info_tx
+            .send(InfoMessage::GetLimits { response: tx })
+            .await
+            .expect(WORKER_DIED);
+
+        rx.await.expect(WORKER_DIED)
+    }
+
+    /// Sets new limits.
+    ///
+    /// Note: changes may not be applied imidiately.
+    pub async fn set_limits(&self, new: Limits) {
+        let (tx, rx) = oneshot::channel();
+
+        self.info_tx
+            .send(InfoMessage::SetLimits { new, response: tx })
+            .await
+            .ok();
+
+        rx.await.ok();
+    }
+
+    /// Returns current queue status.
+    pub async fn queue_status(&self) -> QueueStatus {
+        let (tx, rx) = oneshot::channel();
+
+        self.info_tx
+            .send(InfoMessage::QueueStatus { response: tx })
+            .await
+            .expect(WORKER_DIED);
+
+        rx.await.expect(WORKER_DIED)
+    }
+}
+
+const WORKER_DIED: &str = "worker died before last `Throttle` instance";
+
+/// Telegram request limits.
+///
+/// This struct is used in [`Throttle`].
+///
+/// Note that you may ask telegram [@BotSupport] to increase limits for your
+/// particular bot if it has a lot of users (but they may or may not do that).
+///
+/// [@BotSupport]: https://t.me/botsupport
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+pub struct Limits {
+    /// Allowed messages in one chat per second.
+    pub messages_per_sec_chat: u32,
+
+    /// Allowed messages in one chat per minute.
+    pub messages_per_min_chat: u32,
+
+    /// Allowed messages per second.
+    pub messages_per_sec_overall: u32,
+}
+
+/// Defaults are taken from [telegram documentation][tgdoc].
+///
+/// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
+impl Default for Limits {
+    fn default() -> Self {
+        Self {
+            messages_per_sec_chat: 1,
+            messages_per_sec_overall: 30,
+            messages_per_min_chat: 20,
+        }
+    }
+}
+
+/// Requests queue status.
+#[derive(Clone, Debug)]
+#[non_exhaustive]
+pub struct QueueStatus {
+    /// Number of requests waiting to be sent.
+    pub used: usize,
+
+    /// Capacity of the queue.
+    pub capacity: usize,
+}
+
+impl QueueStatus {
+    /// Returns `true` if the queue is full. Note that if the queue is full
+    /// number of requests may be greater than [`used`].
+    ///
+    /// [`used`]: QueueStatus::used
+    pub fn is_full(&self) -> bool {
+        self.used >= self.capacity
+    }
+
+    /// Returns `true` if the queue is empty.
+    pub fn is_empty(&self) -> bool {
+        self.used == 0
+    }
+}
+
+const MINUTE: Duration = Duration::from_secs(60);
+const SECOND: Duration = Duration::from_secs(1);
+
+// Delay between worker iterations.
+//
+// For now it's `second/4`, but that number is chosen pretty randomly, we may
+// want to change this.
+const DELAY: Duration = Duration::from_millis(250);
+
+#[derive(Debug)]
+enum InfoMessage {
+    GetLimits { response: Sender<Limits> },
+    SetLimits { new: Limits, response: Sender<()> },
+    QueueStatus { response: Sender<QueueStatus> },
 }
 
 type RequestsSent = u32;
@@ -164,7 +249,54 @@ struct RequestsSentToChats {
     per_sec: HashMap<ChatIdHash, RequestsSent>,
 }
 
-async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>) {
+// Throttling is quite complicated. This comment describes the algorithm of the
+// current implementation.
+//
+// ### Request
+//
+// When a throttling request is sent, it sends a tuple of `ChatId` and
+// `Sender<()>` to the worker. Then the request waits for a notification from
+// the worker. When notification is received, it sends the underlying request.
+//
+// ### Worker
+//
+// The worker does the most important job -- it ensures that the limits are
+// never exceeded.
+//
+// The worker stores a history of requests sent in the last minute (and to which
+// chats they were sent) and a queue of pending updates.
+//
+// The worker does the following algorithm loop:
+//
+// 1. If the queue is empty, wait for the first message in incoming channel (and
+// add it to the queue).
+//
+// 2. Read all present messages from an incoming channel and transfer them to
+// the queue.
+//
+// 3. Record the current time.
+//
+// 4. Clear the history from records whose time < (current time - minute).
+//
+// 5. Count all requests which were sent last second, `allowed =
+// limit.messages_per_sec_overall - count`.
+//
+// 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
+//
+// 7. Count how many requests were sent to which chats (i.e.: create
+// `Map<ChatId, Count>`). (Note: the same map, but for last minute also exists,
+// but it's updated, instead of recreation.)
+//
+// 8. While `allowed >= 0` search for requests which chat haven't exceed the
+// limits (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
+// the request that it can be now executed, increase counts, add record to the
+// history.
+
+async fn worker(
+    mut limits: Limits,
+    mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
+    mut info_rx: mpsc::Receiver<InfoMessage>,
+) {
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
@@ -177,8 +309,22 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)
     let mut rx_is_closed = false;
 
     while !rx_is_closed || !queue.is_empty() {
+        // FIXME(waffle):
+        // 1. This call 'blocks' requests executing untill all info messages are
+        //    answered. Crucially, info messages are rare & easy to answer, but this
+        //    still doesn't feel right.
+        //
+        // 2. If the `queue` is empty, `read_from_rx` call down below will 'block'
+        //    execution untill a request is sent. While the execution is 'blocked' no
+        //    `InfoMessage`s could be answered.
+        //
+        // 3. If limits are descreased, idially we want to shrink queue.
+        //
+        // *blocked in asyncronous way
+        answer_info(&mut info_rx, &mut queue, &mut limits).await;
+
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
-        debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
+        //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
 
         // _Maybe_ we need to use `spawn_blocking` here, because there is
         // decent amount of blocking work. However _for now_ I've decided not
@@ -287,6 +433,31 @@ async fn worker(limits: Limits, mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)
     }
 }
 
+async fn answer_info(
+    rx: &mut mpsc::Receiver<InfoMessage>,
+    queue: &mut Vec<(ChatIdHash, RequestLock)>,
+    limits: &mut Limits,
+) {
+    // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
+    while let Some(Some(req)) = rx.recv().now_or_never() {
+        // Errors are ignored with .ok(). Error means that the response channel
+        // is closed and the response isn't needed.
+        match req {
+            InfoMessage::GetLimits { response } => response.send(*limits).ok(),
+            InfoMessage::SetLimits { new, response } => {
+                *limits = new;
+                response.send(()).ok()
+            }
+            InfoMessage::QueueStatus { response } => response
+                .send(QueueStatus {
+                    used: queue.len(),
+                    capacity: queue.capacity(),
+                })
+                .ok(),
+        };
+    }
+}
+
 async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
     if queue.is_empty() {
         match rx.recv().await {
@@ -307,55 +478,6 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
     }
 }
 
-impl<B> Throttle<B> {
-    /// Creates new [`Throttle`] alongside with worker future.
-    ///
-    /// Note: [`Throttle`] will only send requests if returned worker is
-    /// polled/spawned/awaited.
-    pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
-        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
-
-        let worker = worker(limits, rx);
-        let this = Self { bot, queue: tx };
-
-        (this, worker)
-    }
-
-    /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
-    ///
-    /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
-    ///
-    /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
-    pub fn new_spawn(bot: B, limits: Limits) -> Self
-    where
-        // Basically, I hate this bound.
-        // This is yet another problem caused by [rust-lang/#76882].
-        // And I think it *is* a bug.
-        //
-        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
-        //
-        // Though crucially I can't think of a case with non-static bot.
-        // But anyway, it doesn't change the fact that this bound is redundant.
-        //
-        // (waffle)
-        B: 'static,
-    {
-        let (this, worker) = Self::new(bot, limits);
-        tokio::spawn(worker);
-        this
-    }
-
-    /// Allows to access inner bot
-    pub fn inner(&self) -> &B {
-        &self.bot
-    }
-
-    /// Unwraps inner bot
-    pub fn into_inner(self) -> B {
-        self.bot
-    }
-}
-
 macro_rules! f {
     ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
         ThrottlingRequest {

From 58cbf45bacb1540f158220251edbb521727b773e Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 28 Jun 2021 09:39:47 +0300
Subject: [PATCH 329/755] Remove QueueStatus

---
 src/adaptors/throttle.rs | 61 +++-------------------------------------
 1 file changed, 4 insertions(+), 57 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index fc3f78af..17098ee9 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -147,18 +147,6 @@ impl<B> Throttle<B> {
 
         rx.await.ok();
     }
-
-    /// Returns current queue status.
-    pub async fn queue_status(&self) -> QueueStatus {
-        let (tx, rx) = oneshot::channel();
-
-        self.info_tx
-            .send(InfoMessage::QueueStatus { response: tx })
-            .await
-            .expect(WORKER_DIED);
-
-        rx.await.expect(WORKER_DIED)
-    }
 }
 
 const WORKER_DIED: &str = "worker died before last `Throttle` instance";
@@ -196,32 +184,6 @@ impl Default for Limits {
     }
 }
 
-/// Requests queue status.
-#[derive(Clone, Debug)]
-#[non_exhaustive]
-pub struct QueueStatus {
-    /// Number of requests waiting to be sent.
-    pub used: usize,
-
-    /// Capacity of the queue.
-    pub capacity: usize,
-}
-
-impl QueueStatus {
-    /// Returns `true` if the queue is full. Note that if the queue is full
-    /// number of requests may be greater than [`used`].
-    ///
-    /// [`used`]: QueueStatus::used
-    pub fn is_full(&self) -> bool {
-        self.used >= self.capacity
-    }
-
-    /// Returns `true` if the queue is empty.
-    pub fn is_empty(&self) -> bool {
-        self.used == 0
-    }
-}
-
 const MINUTE: Duration = Duration::from_secs(60);
 const SECOND: Duration = Duration::from_secs(1);
 
@@ -235,7 +197,6 @@ const DELAY: Duration = Duration::from_millis(250);
 enum InfoMessage {
     GetLimits { response: Sender<Limits> },
     SetLimits { new: Limits, response: Sender<()> },
-    QueueStatus { response: Sender<QueueStatus> },
 }
 
 type RequestsSent = u32;
@@ -310,18 +271,14 @@ async fn worker(
 
     while !rx_is_closed || !queue.is_empty() {
         // FIXME(waffle):
-        // 1. This call 'blocks' requests executing untill all info messages are
-        //    answered. Crucially, info messages are rare & easy to answer, but this
-        //    still doesn't feel right.
-        //
-        // 2. If the `queue` is empty, `read_from_rx` call down below will 'block'
+        // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
         //    execution untill a request is sent. While the execution is 'blocked' no
         //    `InfoMessage`s could be answered.
         //
-        // 3. If limits are descreased, idially we want to shrink queue.
+        // 2. If limits are descreased, ideally we want to shrink queue.
         //
         // *blocked in asyncronous way
-        answer_info(&mut info_rx, &mut queue, &mut limits).await;
+        answer_info(&mut info_rx, &mut limits);
 
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
         //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
@@ -433,11 +390,7 @@ async fn worker(
     }
 }
 
-async fn answer_info(
-    rx: &mut mpsc::Receiver<InfoMessage>,
-    queue: &mut Vec<(ChatIdHash, RequestLock)>,
-    limits: &mut Limits,
-) {
+fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
     // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
     while let Some(Some(req)) = rx.recv().now_or_never() {
         // Errors are ignored with .ok(). Error means that the response channel
@@ -448,12 +401,6 @@ async fn answer_info(
                 *limits = new;
                 response.send(()).ok()
             }
-            InfoMessage::QueueStatus { response } => response
-                .send(QueueStatus {
-                    used: queue.len(),
-                    capacity: queue.capacity(),
-                })
-                .ok(),
         };
     }
 }

From 07676a7156276bd123cfa4b76e8ba30a8b475c9c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Jun 2021 19:34:29 +0300
Subject: [PATCH 330/755] Throttle: log when queue is full

---
 src/adaptors/throttle.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 17098ee9..5af3df59 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -78,7 +78,9 @@ impl<B> Throttle<B> {
         let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(limits, rx, info_rx);
+        let worker = worker(limits, rx, info_rx, |pending| async move {
+            log::warn!("Throttle queue is full ({} pending requests)", pending);
+        });
         let this = Self {
             bot,
             queue: tx,
@@ -253,11 +255,15 @@ struct RequestsSentToChats {
 // the request that it can be now executed, increase counts, add record to the
 // history.
 
-async fn worker(
+async fn worker<F, Fut>(
     mut limits: Limits,
     mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
     mut info_rx: mpsc::Receiver<InfoMessage>,
-) {
+    queue_full: F,
+) where
+    F: Fn(usize) -> Fut,
+    Fut: Future<Output = ()> + Send + 'static,
+{
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
@@ -283,6 +289,10 @@ async fn worker(
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
         //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
 
+        if queue.len() == queue.capacity() {
+            tokio::spawn(queue_full(queue.len()));
+        }
+
         // _Maybe_ we need to use `spawn_blocking` here, because there is
         // decent amount of blocking work. However _for now_ I've decided not
         // to use it here.

From 6450d9227d9595123102c6d6d7d0d730dec0c0d6 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Jun 2021 21:04:24 +0300
Subject: [PATCH 331/755] Add Throttle::{with_queue_full_fn,
 spawn_with_queue_full_fn}

---
 src/adaptors/throttle.rs | 76 ++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 5af3df59..c9a5f846 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -75,12 +75,30 @@ impl<B> Throttle<B> {
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
+        Self::with_queue_full_fn(bot, limits, |pending| async move {
+            log::warn!("Throttle queue is full ({} pending requests)", pending);
+        })
+    }
+
+    /// Creates new [`Throttle`] alongside with worker future.
+    ///
+    /// `queue_full` function is called when internal queue is full.
+    ///
+    /// Note: [`Throttle`] will only send requests if returned worker is
+    /// polled/spawned/awaited.
+    pub fn with_queue_full_fn<F, Fut>(
+        bot: B,
+        limits: Limits,
+        queue_full: F,
+    ) -> (Self, impl Future<Output = ()>)
+    where
+        F: Fn(usize) -> Fut,
+        Fut: Future<Output = ()> + Send + 'static,
+    {
         let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(limits, rx, info_rx, |pending| async move {
-            log::warn!("Throttle queue is full ({} pending requests)", pending);
-        });
+        let worker = worker(limits, rx, info_rx, queue_full);
         let this = Self {
             bot,
             queue: tx,
@@ -95,21 +113,49 @@ impl<B> Throttle<B> {
     /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
     ///
     /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
-    pub fn new_spawn(bot: B, limits: Limits) -> Self
-    where
-        // Basically, I hate this bound.
-        // This is yet another problem caused by [rust-lang/#76882].
-        // And I think it *is* a bug.
+    pub fn new_spawn(bot: B, limits: Limits) -> Self {
+        // new/with_queue_full_fn copypasted here to avoid [rust-lang/#76882]
         //
         // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
-        //
-        // Though crucially I can't think of a case with non-static bot.
-        // But anyway, it doesn't change the fact that this bound is redundant.
-        //
-        // (waffle)
-        B: 'static,
+
+        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
+        let (info_tx, info_rx) = mpsc::channel(2);
+
+        let worker = worker(limits, rx, info_rx, |pending| async move {
+            log::warn!("Throttle queue is full ({} pending requests)", pending);
+        });
+        let this = Self {
+            bot,
+            queue: tx,
+            info_tx,
+        };
+
+        tokio::spawn(worker);
+        this
+    }
+
+    /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
+    ///
+    /// `queue_full` function is called when internal queue is full.
+    pub fn spawn_with_queue_full_fn<F, Fut>(bot: B, limits: Limits, queue_full: F) -> Self
+    where
+        F: Fn(usize) -> Fut + Send + 'static,
+        Fut: Future<Output = ()> + Send + 'static,
     {
-        let (this, worker) = Self::new(bot, limits);
+        // with_queue_full_fn copypasted here to avoid [rust-lang/#76882]
+        //
+        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
+
+        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
+        let (info_tx, info_rx) = mpsc::channel(2);
+
+        let worker = worker(limits, rx, info_rx, queue_full);
+        let this = Self {
+            bot,
+            queue: tx,
+            info_tx,
+        };
+
         tokio::spawn(worker);
         this
     }

From 1661f9f9552eaa5e87d7a4de3c961bb76988cd19 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 29 Jun 2021 21:05:55 +0300
Subject: [PATCH 332/755] Throttle: Avoid repeatedly calling queue_`full`

---
 src/adaptors/throttle.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index c9a5f846..36005e49 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -241,6 +241,9 @@ const SECOND: Duration = Duration::from_secs(1);
 // want to change this.
 const DELAY: Duration = Duration::from_millis(250);
 
+/// Minimal time beetween calls to queue_full function
+const QUEUE_FULL_DELAY: Duration = Duration::from_secs(4);
+
 #[derive(Debug)]
 enum InfoMessage {
     GetLimits { response: Sender<Limits> },
@@ -321,6 +324,10 @@ async fn worker<F, Fut>(
 
     let mut rx_is_closed = false;
 
+    let mut last_queue_full = Instant::now()
+        .checked_sub(QUEUE_FULL_DELAY)
+        .unwrap_or_else(Instant::now);
+
     while !rx_is_closed || !queue.is_empty() {
         // FIXME(waffle):
         // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
@@ -335,7 +342,8 @@ async fn worker<F, Fut>(
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
         //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
 
-        if queue.len() == queue.capacity() {
+        if queue.len() == queue.capacity() && last_queue_full.elapsed() > QUEUE_FULL_DELAY {
+            last_queue_full = Instant::now();
             tokio::spawn(queue_full(queue.len()));
         }
 

From b0d2e35e5bcdee4a8242712ba612f2465fc2314f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 30 Jun 2021 20:30:13 +0300
Subject: [PATCH 333/755] Update changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e23fd557..9b9af44c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
 - `DefaultParseMode::parse_mode` which allows to get currently used default parse mode ([#77][pr77])
-- `Thrrotle::{limits,set_limits,queue_status}` functions and `QueueStatus` struct ([#77][pr77])
+- `Thrrotle::{limits,set_limits,with_queue_full_fn,spawn_with_queue_full_fn}` functions ([#77][pr77])
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
@@ -29,7 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `Message::url` now returns links to messages in private groups too ([#80][pr80]) 
 - Refactor `ChatMember` methods ([#74][pr74])
-  - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callible directly on `ChatMember`
+  - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callable directly on `ChatMember`
   - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
   - Refactor privilege getters
 - Rename `ChatAction::{RecordAudio => RecordVoice, UploadAudio => UploadVoice}` ([#86][pr86])

From 4377abd1496ff77f9dd866073834168fef943c68 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 3 Jul 2021 22:34:31 +0300
Subject: [PATCH 334/755] Make `Throttle` settings more extendable

Add a `#[non_exhaustive]` `Settings` builder struct.
Replace `with_queue_full_fn` and `spawn_with_queue_full_fn` with
`with_settings` and `spawn_with_settings`.

This allows to add more settings in the future without breaking changes.
---
 CHANGELOG.md             |   4 +-
 src/adaptors/throttle.rs | 118 ++++++++++++++++++++++++++-------------
 2 files changed, 81 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b9af44c..86a7ccae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
 - `DefaultParseMode::parse_mode` which allows to get currently used default parse mode ([#77][pr77])
-- `Thrrotle::{limits,set_limits,with_queue_full_fn,spawn_with_queue_full_fn}` functions ([#77][pr77])
+- `Thrrotle::{limits,set_limits}` functions ([#77][pr77])
+- `Throttle::{with_settings,spawn_with_settings}` and `throttle::Settings` ([#96][pr96])
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
@@ -24,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr84]: https://github.com/teloxide/teloxide-core/pull/84
 [pr86]: https://github.com/teloxide/teloxide-core/pull/86
 [pr90]: https://github.com/teloxide/teloxide-core/pull/90
+[pr96]: https://github.com/teloxide/teloxide-core/pull/96
 
 ### Changed
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 36005e49..7a43f255 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 use futures::{
+    future::ready,
     task::{Context, Poll},
     FutureExt,
 };
@@ -75,30 +76,22 @@ impl<B> Throttle<B> {
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
     pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
-        Self::with_queue_full_fn(bot, limits, |pending| async move {
-            log::warn!("Throttle queue is full ({} pending requests)", pending);
-        })
+        let settings = Settings {
+            limits,
+            ..<_>::default()
+        };
+        Self::with_settings(bot, settings)
     }
 
     /// Creates new [`Throttle`] alongside with worker future.
     ///
-    /// `queue_full` function is called when internal queue is full.
-    ///
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
-    pub fn with_queue_full_fn<F, Fut>(
-        bot: B,
-        limits: Limits,
-        queue_full: F,
-    ) -> (Self, impl Future<Output = ()>)
-    where
-        F: Fn(usize) -> Fut,
-        Fut: Future<Output = ()> + Send + 'static,
-    {
-        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
+    pub fn with_settings(bot: B, settings: Settings) -> (Self, impl Future<Output = ()>) {
+        let (tx, rx) = mpsc::channel(settings.limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(limits, rx, info_rx, queue_full);
+        let worker = worker(settings, rx, info_rx);
         let this = Self {
             bot,
             queue: tx,
@@ -114,16 +107,18 @@ impl<B> Throttle<B> {
     ///
     /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
     pub fn new_spawn(bot: B, limits: Limits) -> Self {
-        // new/with_queue_full_fn copypasted here to avoid [rust-lang/#76882]
+        // new/with_settings copypasted here to avoid [rust-lang/#76882]
         //
         // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
 
         let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(limits, rx, info_rx, |pending| async move {
-            log::warn!("Throttle queue is full ({} pending requests)", pending);
-        });
+        let settings = Settings {
+            limits,
+            ..<_>::default()
+        };
+        let worker = worker(settings, rx, info_rx);
         let this = Self {
             bot,
             queue: tx,
@@ -135,21 +130,15 @@ impl<B> Throttle<B> {
     }
 
     /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
-    ///
-    /// `queue_full` function is called when internal queue is full.
-    pub fn spawn_with_queue_full_fn<F, Fut>(bot: B, limits: Limits, queue_full: F) -> Self
-    where
-        F: Fn(usize) -> Fut + Send + 'static,
-        Fut: Future<Output = ()> + Send + 'static,
-    {
-        // with_queue_full_fn copypasted here to avoid [rust-lang/#76882]
+    pub fn spawn_with_settings(bot: B, settings: Settings) -> Self {
+        // with_settings copypasted here to avoid [rust-lang/#76882]
         //
         // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
 
-        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
+        let (tx, rx) = mpsc::channel(settings.limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(limits, rx, info_rx, queue_full);
+        let worker = worker(settings, rx, info_rx);
         let this = Self {
             bot,
             queue: tx,
@@ -197,8 +186,6 @@ impl<B> Throttle<B> {
     }
 }
 
-const WORKER_DIED: &str = "worker died before last `Throttle` instance";
-
 /// Telegram request limits.
 ///
 /// This struct is used in [`Throttle`].
@@ -232,6 +219,58 @@ impl Default for Limits {
     }
 }
 
+/// Settings used by [`Throttle`] adaptor.
+///
+/// ## Examples
+///
+/// ```
+/// use teloxide_core::adaptors::throttle;
+///
+/// let settings = throttle::Settings::default()
+///     .on_queue_full(|pending| async move { /* do something when internal queue is full */ });
+/// // use settings in `Throttle::with_settings` or other constructors
+/// # let _ = settings;
+/// ```
+#[non_exhaustive]
+pub struct Settings {
+    pub limits: Limits,
+    pub on_queue_full: BoxedFnMut<usize, BoxedFuture>,
+}
+
+impl Settings {
+    pub fn limits(mut self, val: Limits) -> Self {
+        self.limits = val;
+        self
+    }
+
+    pub fn on_queue_full<F, Fut>(mut self, mut val: F) -> Self
+    where
+        F: FnMut(usize) -> Fut + Send + 'static,
+        Fut: Future<Output = ()> + Send + 'static,
+    {
+        self.on_queue_full = Box::new(move |pending| Box::pin(val(pending)));
+        self
+    }
+}
+
+impl Default for Settings {
+    fn default() -> Self {
+        Self {
+            limits: <_>::default(),
+            on_queue_full: Box::new(|pending| {
+                log::warn!("Throttle queue is full ({} pending requests)", pending);
+                Box::pin(ready(()))
+            }),
+        }
+    }
+}
+
+// Required to not trigger `clippy::type-complexity` lint
+type BoxedFnMut<I, O> = Box<dyn FnMut(I) -> O + Send>;
+type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
+
+const WORKER_DIED: &str = "worker died before last `Throttle` instance";
+
 const MINUTE: Duration = Duration::from_secs(60);
 const SECOND: Duration = Duration::from_secs(1);
 
@@ -304,15 +343,14 @@ struct RequestsSentToChats {
 // the request that it can be now executed, increase counts, add record to the
 // history.
 
-async fn worker<F, Fut>(
-    mut limits: Limits,
+async fn worker(
+    Settings {
+        mut limits,
+        mut on_queue_full,
+    }: Settings,
     mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
     mut info_rx: mpsc::Receiver<InfoMessage>,
-    queue_full: F,
-) where
-    F: Fn(usize) -> Fut,
-    Fut: Future<Output = ()> + Send + 'static,
-{
+) {
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
@@ -344,7 +382,7 @@ async fn worker<F, Fut>(
 
         if queue.len() == queue.capacity() && last_queue_full.elapsed() > QUEUE_FULL_DELAY {
             last_queue_full = Instant::now();
-            tokio::spawn(queue_full(queue.len()));
+            tokio::spawn(on_queue_full(queue.len()));
         }
 
         // _Maybe_ we need to use `spawn_blocking` here, because there is

From 421cf4283542e44aacd9561fdd916383cb99d96b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 3 Jul 2021 23:35:13 +0300
Subject: [PATCH 335/755] Use `url::Url` for urls, use `chrono::DateTime<Utc>`
 for dates

---
 CHANGELOG.md                            |  2 ++
 Cargo.toml                              |  1 +
 src/adaptors/auto_send.rs               |  1 +
 src/adaptors/cache_me.rs                |  1 +
 src/adaptors/parse_mode.rs              |  2 ++
 src/adaptors/throttle.rs                |  1 +
 src/bot/api.rs                          |  7 +++----
 src/local_macros.rs                     |  5 +++--
 src/payloads/answer_callback_query.rs   |  3 ++-
 src/payloads/create_chat_invite_link.rs |  4 +++-
 src/payloads/edit_chat_invite_link.rs   |  4 +++-
 src/payloads/kick_chat_member.rs        |  4 +++-
 src/payloads/restrict_chat_member.rs    |  4 +++-
 src/payloads/send_invoice.rs            |  3 ++-
 src/payloads/send_poll.rs               |  4 +++-
 src/payloads/set_webhook.rs             |  3 ++-
 src/requests/requester.rs               |  7 ++++---
 src/types.rs                            | 24 ++++++++++++++++++++++++
 18 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b9af44c..7ae6371b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,8 +33,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
   - Refactor privilege getters
 - Rename `ChatAction::{RecordAudio => RecordVoice, UploadAudio => UploadVoice}` ([#86][pr86])
+- Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates ([#97][pr97])
 
 [pr74]: https://github.com/teloxide/teloxide-core/pull/74
+[pr97]: https://github.com/teloxide/teloxide-core/pull/97
 
 ### Fixed
 
diff --git a/Cargo.toml b/Cargo.toml
index db46ed81..1ce8e8fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,6 +50,7 @@ mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.5.0"
 never = "0.1.0"
+chrono = "0.4.19"
 
 vecrem = { version = "0.1", optional = true }
 
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index b3716ef9..736216e0 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -5,6 +5,7 @@ use std::{
 };
 
 use futures::future::FusedFuture;
+use url::Url;
 
 use crate::{
     requests::{HasPayload, Output, Request, Requester},
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index fdbccb61..4f7e06f3 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -7,6 +7,7 @@ use futures::{
     Future,
 };
 use once_cell::sync::OnceCell;
+use url::Url;
 
 use crate::{
     payloads::GetMe,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 31e0f2d9..42d349eb 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -1,3 +1,5 @@
+use url::Url;
+
 use crate::{
     prelude::Requester,
     requests::HasPayload,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 36005e49..349098b1 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -15,6 +15,7 @@ use tokio::sync::{
     mpsc,
     oneshot::{self, Receiver, Sender},
 };
+use url::Url;
 use vecrem::VecExt;
 
 use crate::{
diff --git a/src/bot/api.rs b/src/bot/api.rs
index f0e95786..cebf3733 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1,3 +1,5 @@
+use url::Url;
+
 use crate::{
     payloads,
     prelude::Requester,
@@ -20,10 +22,7 @@ impl Requester for Bot {
 
     type SetWebhook = JsonRequest<payloads::SetWebhook>;
 
-    fn set_webhook<U>(&self, url: U) -> Self::SetWebhook
-    where
-        U: Into<String>,
-    {
+    fn set_webhook(&self, url: Url) -> Self::SetWebhook {
         Self::SetWebhook::new(self.clone(), payloads::SetWebhook::new(url))
     }
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 750df39a..f5e5b30f 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -433,6 +433,7 @@ macro_rules! requester_forward {
             requester_forward!(@method $rest $body $ty);
         )*
     };
+
     (@method get_updates $body:ident $ty:ident) => {
         type GetUpdates = $ty![GetUpdates];
 
@@ -444,9 +445,9 @@ macro_rules! requester_forward {
     (@method set_webhook $body:ident $ty:ident) => {
         type SetWebhook = $ty![SetWebhook];
 
-        fn set_webhook<U>(&self, url: U) -> Self::SetWebhook where U: Into<String> {
+        fn set_webhook(&self, url: Url) -> Self::SetWebhook {
             let this = self;
-            $body!(set_webhook this (url: U))
+            $body!(set_webhook this (url: Url))
         }
     };
     (@method delete_webhook $body:ident $ty:ident) => {
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 7d0d1bb3..17381fe9 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -7,6 +7,7 @@
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
+use url::Url;
 
 use crate::types::True;
 
@@ -35,7 +36,7 @@ impl_payload! {
             /// [callback_game]: https://core.telegram.org/bots/api#inlinekeyboardbutton
             /// [@Botfather]: https://t.me/botfather
             /// [`Game`]: crate::types::Game
-            pub url: String [into],
+            pub url: Url,
             /// The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0.
             pub cache_time: u32,
         }
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
index 9fcfcd93..ca68f41e 100644
--- a/src/payloads/create_chat_invite_link.rs
+++ b/src/payloads/create_chat_invite_link.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatInviteLink};
@@ -23,7 +24,8 @@ impl_payload! {
         }
         optional {
             /// Point in time (Unix timestamp) when the link will expire
-            pub expire_date: i64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub expire_date: DateTime<Utc> [into],
             /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
             pub member_limit: u32,
         }
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
index 98732b98..6d683113 100644
--- a/src/payloads/edit_chat_invite_link.rs
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::ChatId;
@@ -24,7 +25,8 @@ impl_payload! {
         }
         optional {
             /// Point in time (Unix timestamp) when the link will expire
-            pub expire_date: i64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub expire_date: DateTime<Utc> [into],
             /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
             pub member_limit: u32,
         }
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 26a51129..5679d804 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
@@ -24,7 +25,8 @@ impl_payload! {
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
-            pub until_date: u64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub until_date: DateTime<Utc> [into],
             /// Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.
             pub revoke_messages: bool,
         }
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index c6cb3c9c..6e78192c 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::{ChatId, ChatPermissions, True};
@@ -24,7 +25,8 @@ impl_payload! {
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
-            pub until_date: u64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub until_date: DateTime<Utc> [into],
         }
     }
 }
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 5a166f28..3ffe3b93 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -7,6 +7,7 @@
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
+use url::Url;
 
 use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice, Message};
 
@@ -46,7 +47,7 @@ impl_payload! {
             /// A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.
             pub provider_data: String [into],
             /// URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
-            pub photo_url: String [into],
+            pub photo_url: Url,
             /// Photo size
             pub photo_size: String [into],
             /// Photo width
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index ec289ae3..213ead71 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::{ChatId, Message, MessageEntity, ParseMode, PollType, ReplyMarkup};
@@ -44,7 +45,8 @@ impl_payload! {
             /// Amount of time in seconds the poll will be active after creation, 5-600. Can't be used together with close_date.
             pub open_period: u16,
             /// Point in time (Unix timestamp) when the poll will be automatically closed. Must be at least 5 and no more than 600 seconds in the future. Can't be used together with open_period.
-            pub close_date: u64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub close_date: DateTime<Utc> [into],
             /// Pass True, if the poll needs to be immediately closed. This can be useful for poll preview.
             pub is_closed: bool,
             /// Sends the message [silently]. Users will receive a notification with no sound.
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 2162642a..954d059a 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -7,6 +7,7 @@
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
+use url::Url;
 
 use crate::types::{AllowedUpdate, InputFile, True};
 
@@ -21,7 +22,7 @@ impl_payload! {
     pub SetWebhook (SetWebhookSetters) => True {
         required {
             /// HTTPS url to send updates to. Use an empty string to remove webhook integration
-            pub url: String [into],
+            pub url: Url,
         }
         optional {
             /// Upload your public key certificate so that the root certificate in use can be checked. See our [self-signed guide] for details.
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 3a4a91d0..b5152a01 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1,6 +1,8 @@
 // We can't change Telegram API
 #![allow(clippy::too_many_arguments)]
 
+use url::Url;
+
 use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
@@ -60,6 +62,7 @@ pub trait Requester {
     //
     // [cg]: https://github.com/teloxide/cg
     // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetUpdates`].
@@ -68,9 +71,7 @@ pub trait Requester {
     type SetWebhook: Request<Payload = SetWebhook, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetWebhook`].
-    fn set_webhook<U>(&self, url: U) -> Self::SetWebhook
-    where
-        U: Into<String>;
+    fn set_webhook(&self, url: Url) -> Self::SetWebhook;
 
     type DeleteWebhook: Request<Payload = DeleteWebhook, Err = Self::Err>;
 
diff --git a/src/types.rs b/src/types.rs
index 8cc6a35c..b8593849 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -217,3 +217,27 @@ mod non_telegram_types {
     pub(crate) mod mime;
     pub(super) mod semiparsed_vec;
 }
+
+pub(crate) mod serde_opt_date_from_unix_timestamp {
+    use chrono::{DateTime, Utc};
+    use serde::{Serialize, Serializer};
+
+    pub(crate) fn serialize<S>(
+        this: &Option<DateTime<Utc>>,
+        serializer: S,
+    ) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        this.map(|dt| dt.timestamp()).serialize(serializer)
+    }
+
+    // pub(crate) fn deserialize<'de, D>(deserializer: D) ->
+    // Result<Option<DateTime<Utc>>, D::Error> where
+    //     D: Deserializer<'de>,
+    // {
+    //     Ok(Option::<i64>::deserialize(deserializer)?
+    //         .map(|timestamp|
+    // DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)))
+    // }
+}

From fa980453f3d6799e1d2434e3a7cde4a48e563cda Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 00:11:27 +0300
Subject: [PATCH 336/755] Ignore buggy nonstandard_macro_braces clippy lint

---
 src/lib.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index c58f9a7e..bd9c70ac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -77,6 +77,9 @@
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 
+// https://github.com/rust-lang/rust-clippy/issues/7422
+#![allow(clippy::nonstandard_macro_braces)]
+
 // The internal helper macros.
 #[macro_use]
 mod local_macros;

From 2c65fea74294399c5ca88fb1e714766d06ccfae5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 14:56:25 +0300
Subject: [PATCH 337/755] TBA 5.3: Add `input_field_placeholder` to
 `KeyboardMarkup` and `ForceReply`

---
 src/types/force_reply.rs           | 15 ++++++++++++++-
 src/types/reply_keyboard_markup.rs | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/types/force_reply.rs b/src/types/force_reply.rs
index 462e47a5..b641fc99 100644
--- a/src/types/force_reply.rs
+++ b/src/types/force_reply.rs
@@ -13,12 +13,16 @@ use crate::types::True;
 ///
 /// [privacy mode]: https://core.telegram.org/bots#privacy-mode
 #[serde_with_macros::skip_serializing_none]
-#[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct ForceReply {
     /// Shows reply interface to the user, as if they manually selected the
     /// bot‘s message and tapped ’Reply'.
     pub force_reply: True,
 
+    /// The placeholder to be shown in the input field when the reply is active;
+    /// 1-64 characters.
+    pub input_field_placeholder: Option<String>,
+
     /// Use this parameter if you want to force reply from specific users only.
     /// Targets: 1) users that are `@mentioned` in the text of the
     /// [`Message`] object; 2) if the bot's message is a reply
@@ -32,10 +36,19 @@ impl ForceReply {
     pub const fn new() -> Self {
         Self {
             force_reply: True,
+            input_field_placeholder: None,
             selective: None,
         }
     }
 
+    pub fn input_field_placeholder<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<String>>,
+    {
+        self.input_field_placeholder = val.into();
+        self
+    }
+
     pub const fn selective(mut self, val: bool) -> Self {
         self.selective = Some(val);
         self
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index 0b99d1d5..3553f710 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -31,6 +31,10 @@ pub struct KeyboardMarkup {
     /// Defaults to `false`.
     pub one_time_keyboard: Option<bool>,
 
+    /// The placeholder to be shown in the input field when the keyboard is
+    /// active; 1-64 characters.
+    pub input_field_placeholder: Option<String>,
+
     /// Use this parameter if you want to show the keyboard to specific users
     /// only. Targets: 1) users that are `@mentioned` in the `text` of the
     /// [`Message`] object; 2) if the bot's message is a reply (has
@@ -58,6 +62,7 @@ impl KeyboardMarkup {
                 .collect(),
             resize_keyboard: None,
             one_time_keyboard: None,
+            input_field_placeholder: None,
             selective: None,
         }
     }
@@ -91,6 +96,14 @@ impl KeyboardMarkup {
         self
     }
 
+    pub fn input_field_placeholder<T>(mut self, val: T) -> Self
+    where
+        T: Into<Option<String>>,
+    {
+        self.input_field_placeholder = val.into();
+        self
+    }
+
     pub fn selective<T>(mut self, val: T) -> Self
     where
         T: Into<Option<bool>>,

From c3a00c687a7ce109f2c004710b9da9d1da4e809b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 15:04:18 +0300
Subject: [PATCH 338/755] TBA 5.3: rename chat member statuses: `Creator` =>
 `Owner`, `Kicked` => `Banned`

---
 src/types/chat_member.rs | 178 +++++++++++++++++++++------------------
 1 file changed, 97 insertions(+), 81 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 9f8b3909..aa5284da 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -21,17 +21,19 @@ pub struct ChatMember {
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "status")]
 pub enum ChatMemberKind {
-    Creator(Creator),
+    #[serde(rename = "creator")]
+    Owner(Owner),
     Administrator(Administrator),
     Member,
     Restricted(Restricted),
     Left,
-    Kicked(Kicked),
+    #[serde(rename = "kicked")]
+    Banned(Banned),
 }
 
-/// Creator of the group. This struct is part of the [`ChatMemberKind`] enum.
+/// Owner of the group. This struct is part of the [`ChatMemberKind`] enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct Creator {
+pub struct Owner {
     /// Custom title for this user.
     pub custom_title: Option<String>,
 
@@ -116,10 +118,10 @@ pub struct Restricted {
     pub can_add_web_page_previews: bool,
 }
 
-/// User kicked from the group. This struct is part of the [`ChatMemberKind`]
-/// enum.
+/// User that was banned in the chat and can't return to it or view chat
+/// messages. This struct is part of the [`ChatMemberKind`] enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct Kicked {
+pub struct Banned {
     /// Date when restrictions will be lifted for this user, unix time.
     pub until_date: i64,
 }
@@ -147,20 +149,20 @@ impl ChatMemberKind {
     /// Returns chat member status.
     pub fn status(&self) -> ChatMemberStatus {
         match self {
-            ChatMemberKind::Creator(_) => ChatMemberStatus::Creator,
+            ChatMemberKind::Owner(_) => ChatMemberStatus::Owner,
             ChatMemberKind::Administrator(_) => ChatMemberStatus::Administrator,
             ChatMemberKind::Member => ChatMemberStatus::Member,
             ChatMemberKind::Restricted(_) => ChatMemberStatus::Restricted,
             ChatMemberKind::Left => ChatMemberStatus::Left,
-            ChatMemberKind::Kicked(_) => ChatMemberStatus::Kicked,
+            ChatMemberKind::Banned(_) => ChatMemberStatus::Banned,
         }
     }
 
-    /// Returns `true` if the user is the [creator] (owner) of the given chat.
+    /// Returns `true` if the user is the [owner] of the given chat.
     ///
-    /// [creator]: ChatMemberKind::Creator
-    pub fn is_creator(&self) -> bool {
-        matches!(self, Self::Creator { .. })
+    /// [owner]: ChatMemberKind::Owner
+    pub fn is_owner(&self) -> bool {
+        matches!(self, Self::Owner { .. })
     }
 
     /// Returns `true` if the user is an [administrator] of the given chat.
@@ -168,7 +170,7 @@ impl ChatMemberKind {
     /// [administrator]: ChatMemberKind::Administrator
     ///
     /// **Note**: this function **doesn't** return `true` if the user is the
-    /// creator of the given chat. See also: [`is_privileged`].
+    /// owner of the given chat. See also: [`is_privileged`].
     ///
     /// [`is_privileged`]: ChatMemberKind::is_privileged
     pub fn is_administrator(&self) -> bool {
@@ -196,67 +198,83 @@ impl ChatMemberKind {
         matches!(self, Self::Left { .. })
     }
 
+    /// Returns `true` if the user is [banned] in the given chat.
+    ///
+    /// [banned]: ChatMemberKind::Banned
+    pub fn is_banned(&self) -> bool {
+        matches!(self, Self::Banned { .. })
+    }
+
     /// Returns `true` if the user is [kicked] from the given chat.
     ///
-    /// [kicked]: ChatMemberKind::Kicked
+    /// [kicked]: ChatMemberKind::Banned
+    #[deprecated = "use `is_banned` instead"]
     pub fn is_kicked(&self) -> bool {
-        matches!(self, Self::Kicked { .. })
+        self.is_banned()
+    }
+
+    /// Returns `true` if the user is the [creator] (owner) of the given chat.
+    ///
+    /// [creator]: ChatMemberKind::Owner
+    #[deprecated = "use `is_owner` instead"]
+    pub fn is_creator(&self) -> bool {
+        self.is_owner()
     }
 }
 
 /// Compound methods for checking a user status.
 impl ChatMemberKind {
     /// Returns `true` if the user is privileged in the given chat. i.e. if the
-    /// user is either the [creator] or an [administrator] in the given chat.
+    /// user is either the [owner] or an [administrator] in the given chat.
     ///
-    /// [creator]: ChatMemberKind::Creator
+    /// [owner]: ChatMemberKind::Owner
     /// [administrator]: ChatMemberKind::Administrator
     pub fn is_privileged(&self) -> bool {
-        self.is_administrator() || self.is_creator()
+        self.is_administrator() || self.is_owner()
     }
 
     /// Returns `true` if the user is currently present in the chat. i.e. if the
-    /// user **hasn't** [left] or been [kicked].
+    /// user **hasn't** [left] or been [banned].
     ///
     /// [left]: ChatMemberKind::Left
-    /// [kicked]: ChatMemberKind::Kicked
+    /// [banned]: ChatMemberKind::Banned
     pub fn is_present(&self) -> bool {
-        !(self.is_left() || self.is_kicked())
+        !(self.is_left() || self.is_banned())
     }
 }
 
 impl ChatMemberKind {
-    /// Getter for [`Administrator::custom_title`] and [`Creator::custom_title`]
+    /// Getter for [`Administrator::custom_title`] and [`Owner::custom_title`]
     /// fields.
     pub fn custom_title(&self) -> Option<&str> {
         match &self {
             Self::Administrator(Administrator { custom_title, .. })
-            | Self::Creator(Creator { custom_title, .. }) => custom_title.as_deref(),
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => None,
+            | Self::Owner(Owner { custom_title, .. }) => custom_title.as_deref(),
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => None,
         }
     }
 
     /// Returns `true` if the user's presence in the chat is hidden.
     ///
-    /// I.e. returns `true` if the user is the creator of the chat or an
+    /// I.e. returns `true` if the user is the owner of the chat or an
     /// administrator in the chat and has the [`can_manage_chat`] privilege.
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_chat`]: Administrator::can_manage_chat
     pub fn is_anonymous(&self) -> bool {
         match self {
-            Self::Creator(Creator { is_anonymous, .. })
+            Self::Owner(Owner { is_anonymous, .. })
             | Self::Administrator(Administrator { is_anonymous, .. }) => *is_anonymous,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
-    /// Getter for [`Restricted::until_date`] and [`Kicked::until_date`] fields.
+    /// Getter for [`Restricted::until_date`] and [`Banned::until_date`] fields.
     pub fn until_date(&self) -> Option<i64> {
         match &self {
-            Self::Creator(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
+            Self::Owner(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
             Self::Restricted(Restricted { until_date, .. })
-            | Self::Kicked(Kicked { until_date, .. }) => Some(*until_date),
+            | Self::Banned(Banned { until_date, .. }) => Some(*until_date),
         }
     }
 }
@@ -268,12 +286,10 @@ impl ChatMemberKind {
     pub fn can_be_edited(&self) -> bool {
         match self {
             Self::Administrator(Administrator { can_be_edited, .. }) => *can_be_edited,
-            // Creator can't ever be edited by any bot.
-            Self::Creator(_)
-            | Self::Member
-            | Self::Restricted(_)
-            | Self::Left
-            | Self::Kicked(_) => false,
+            // Owner can't ever be edited by any bot.
+            Self::Owner(_) | Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => {
+                false
+            }
         }
     }
 
@@ -283,7 +299,7 @@ impl ChatMemberKind {
     /// any other administrator privilege.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has [`can_manage_chat`]
     ///   privilege.
     /// Returns `false` otherwise.
@@ -291,11 +307,11 @@ impl ChatMemberKind {
     /// [`can_manage_chat`]: Administrator::can_manage_chat
     pub fn can_manage_chat(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_manage_chat, ..
             }) => *can_manage_chat,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => true,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => true,
         }
     }
 
@@ -303,7 +319,7 @@ impl ChatMemberKind {
     /// settings.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has the [`can_change_info`]
     ///   privilege.
     /// Returns `false` otherwise.
@@ -311,18 +327,18 @@ impl ChatMemberKind {
     /// [`can_change_info`]: Administrator::can_change_info
     pub fn can_change_info(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_change_info, ..
             }) => *can_change_info,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can post in the channel, channels only.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is the owner of the chat (even if the chat is not a channel)
     /// - is an administrator in the given chat and has [`can_post_messages`]
     ///   privilege.
     /// Returns `false` otherwise.
@@ -330,11 +346,11 @@ impl ChatMemberKind {
     /// [`can_post_messages`]: Administrator::can_post_messages
     pub fn can_post_messages(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_post_messages, ..
             }) => can_post_messages.unwrap_or_default(),
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
@@ -342,7 +358,7 @@ impl ChatMemberKind {
     /// messages, channels only.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is the owner of the chat (even if the chat is not a channel)
     /// - is an administrator in the given chat and has the
     ///   [`can_edit_messages`] privilege.
     /// Returns `false` otherwise.
@@ -350,18 +366,18 @@ impl ChatMemberKind {
     /// [`can_edit_messages`]: Administrator::can_edit_messages
     pub fn can_edit_messages(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_edit_messages, ..
             }) => can_edit_messages.unwrap_or_default(),
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can delete messages of other users.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has the
     ///   [`can_delete_messages`] privilege.
     /// Returns `false` otherwise.
@@ -369,19 +385,19 @@ impl ChatMemberKind {
     /// [`can_delete_messages`]: Administrator::can_delete_messages
     pub fn can_delete_messages(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_delete_messages,
                 ..
             }) => *can_delete_messages,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can manage voice chats.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has the
     ///   [`can_manage_voice_chats`] privilege.
     /// Returns `false` otherwise.
@@ -389,19 +405,19 @@ impl ChatMemberKind {
     /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
     pub fn can_manage_voice_chats(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_manage_voice_chats,
                 ..
             }) => *can_manage_voice_chats,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can can invite new users to the chat.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has the [`can_invite_users`]
     ///   privilege.
     /// Returns `false` otherwise.
@@ -409,18 +425,18 @@ impl ChatMemberKind {
     /// [`can_invite_users`]: Administrator::can_invite_users
     pub fn can_invite_users(&self) -> bool {
         match &self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_invite_users, ..
             }) => *can_invite_users,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can restrict, ban or unban chat members.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat
+    /// - is the owner of the chat
     /// - is an administrator in the given chat and has the
     ///   [`can_restrict_members`] privilege.
     /// Returns `false` otherwise.
@@ -428,19 +444,19 @@ impl ChatMemberKind {
     /// [`can_restrict_members`]: Administrator::can_restrict_members
     pub fn can_restrict_members(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_restrict_members,
                 ..
             }) => *can_restrict_members,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
     /// Returns `true` if the user can pin messages, supergroups only.
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat (even if the chat is not a supergroup)
+    /// - is the owner of the chat (even if the chat is not a supergroup)
     /// - is an administrator in the given chat and has the [`can_pin_messages`]
     ///   privilege.
     /// Returns `false` otherwise.
@@ -448,11 +464,11 @@ impl ChatMemberKind {
     /// [`can_pin_messages`]: Administrator::can_pin_messages
     pub fn can_pin_messages(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_pin_messages, ..
             }) => can_pin_messages.unwrap_or_default(),
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
@@ -462,7 +478,7 @@ impl ChatMemberKind {
     /// by the user).
     ///
     /// I.e. returns `true` if the user
-    /// - is the creator of the chat (even if the chat is not a channel)
+    /// - is the owner of the chat (even if the chat is not a channel)
     /// - is an administrator in the given chat and has the
     ///   [`can_promote_members`] privilege.
     /// Returns `false` otherwise.
@@ -470,12 +486,12 @@ impl ChatMemberKind {
     /// [`can_promote_members`]: Administrator::can_promote_members
     pub fn can_promote_members(&self) -> bool {
         match self {
-            Self::Creator(_) => true,
+            Self::Owner(_) => true,
             Self::Administrator(Administrator {
                 can_promote_members,
                 ..
             }) => *can_promote_members,
-            Self::Member | Self::Restricted(_) | Self::Left | Self::Kicked(_) => false,
+            Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 }
@@ -486,7 +502,7 @@ impl ChatMemberKind {
     /// and venues.
     ///
     /// I.e. returns **`false`** if the user
-    /// - has left or has been kicked from the chat
+    /// - has left or has been banned in the chat
     /// - is restricted and doesn't have the [`can_send_messages`] right
     /// Returns `true` otherwise.
     ///
@@ -496,8 +512,8 @@ impl ChatMemberKind {
             Self::Restricted(Restricted {
                 can_send_messages, ..
             }) => *can_send_messages,
-            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
-            Self::Left | Self::Kicked(_) => false,
+            Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Banned(_) => false,
         }
     }
 
@@ -505,7 +521,7 @@ impl ChatMemberKind {
     /// videos, video notes and voice notes.
     ///
     /// I.e. returns **`false`** if the user
-    /// - has left or has been kicked from the chat
+    /// - has left or has been banned in the chat
     /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
@@ -516,8 +532,8 @@ impl ChatMemberKind {
                 can_send_media_messages,
                 ..
             }) => *can_send_media_messages,
-            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
-            Self::Left | Self::Kicked(_) => false,
+            Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Banned(_) => false,
         }
     }
 
@@ -525,7 +541,7 @@ impl ChatMemberKind {
     /// stickers and use inline bots.
     ///
     /// I.e. returns **`false`** if the user
-    /// - has left or has been kicked from the chat
+    /// - has left or has been banned from the chat
     /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
@@ -536,8 +552,8 @@ impl ChatMemberKind {
                 can_send_other_messages,
                 ..
             }) => *can_send_other_messages,
-            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
-            Self::Left | Self::Kicked(_) => false,
+            Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Banned(_) => false,
         }
     }
 
@@ -545,7 +561,7 @@ impl ChatMemberKind {
     /// messages.
     ///
     /// I.e. returns **`false`** if the user
-    /// - has left or has been kicked from the chat
+    /// - has left or has been banned from the chat
     /// - is restricted and doesn't have the [`can_send_media_messages`] right
     /// Returns `true` otherwise.
     ///
@@ -556,8 +572,8 @@ impl ChatMemberKind {
                 can_add_web_page_previews,
                 ..
             }) => *can_add_web_page_previews,
-            Self::Creator(_) | Self::Administrator(_) | Self::Member => true,
-            Self::Left | Self::Kicked(_) => false,
+            Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
+            Self::Left | Self::Banned(_) => false,
         }
     }
 }
@@ -565,12 +581,12 @@ impl ChatMemberKind {
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ChatMemberStatus {
-    Creator,
+    Owner,
     Administrator,
     Member,
     Restricted,
     Left,
-    Kicked,
+    Banned,
 }
 
 #[cfg(test)]

From ef84162314e2796774894e06ce970637e4552b99 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 15:09:13 +0300
Subject: [PATCH 339/755] Use `DateTime<Utc>` for `until_date` in `ChatMember`

---
 src/types.rs             | 24 ++++++++++++++++++++++++
 src/types/chat_member.rs | 13 ++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index b8593849..18e762be 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -241,3 +241,27 @@ pub(crate) mod serde_opt_date_from_unix_timestamp {
     // DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)))
     // }
 }
+
+pub(crate) mod serde_date_from_unix_timestamp {
+    use chrono::{DateTime, NaiveDateTime, Utc};
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub(crate) fn serialize<S>(this: &DateTime<Utc>, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        this.timestamp().serialize(serializer)
+    }
+
+    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<DateTime<Utc>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let timestamp = i64::deserialize(deserializer)?;
+
+        Ok(DateTime::from_utc(
+            NaiveDateTime::from_timestamp(timestamp, 0),
+            Utc,
+        ))
+    }
+}
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index aa5284da..b0d7c68f 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -1,5 +1,6 @@
 use std::ops::Deref;
 
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::User;
@@ -98,8 +99,9 @@ pub struct Administrator {
 /// enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Restricted {
-    /// Date when restrictions will be lifted for this user, unix time.
-    pub until_date: i64,
+    /// Date when restrictions will be lifted for this user.
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub until_date: DateTime<Utc>,
 
     /// `true` if the user can send text messages, contacts, locations and
     /// venues.
@@ -122,8 +124,9 @@ pub struct Restricted {
 /// messages. This struct is part of the [`ChatMemberKind`] enum.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Banned {
-    /// Date when restrictions will be lifted for this user, unix time.
-    pub until_date: i64,
+    /// Date when restrictions will be lifted for this user.
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub until_date: DateTime<Utc>,
 }
 
 /// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`].
@@ -270,7 +273,7 @@ impl ChatMemberKind {
     }
 
     /// Getter for [`Restricted::until_date`] and [`Banned::until_date`] fields.
-    pub fn until_date(&self) -> Option<i64> {
+    pub fn until_date(&self) -> Option<DateTime<Utc>> {
         match &self {
             Self::Owner(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
             Self::Restricted(Restricted { until_date, .. })

From 27f5875b4266e20528090c13a6835fc82b49a5a2 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 15:10:10 +0300
Subject: [PATCH 340/755] TBA 5.3: Add `BotCommandScope`

---
 src/types.rs                   |  2 ++
 src/types/bot_command_scope.rs | 55 ++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 src/types/bot_command_scope.rs

diff --git a/src/types.rs b/src/types.rs
index 18e762be..ee88a831 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -4,6 +4,7 @@ pub use allowed_update::*;
 pub use animation::*;
 pub use audio::*;
 pub use bot_command::*;
+pub use bot_command_scope::*;
 pub use callback_game::*;
 pub use callback_query::*;
 pub use chat::*;
@@ -108,6 +109,7 @@ mod allowed_update;
 mod animation;
 mod audio;
 mod bot_command;
+mod bot_command_scope;
 mod callback_game;
 mod callback_query;
 mod chat;
diff --git a/src/types/bot_command_scope.rs b/src/types/bot_command_scope.rs
new file mode 100644
index 00000000..47bc5b94
--- /dev/null
+++ b/src/types/bot_command_scope.rs
@@ -0,0 +1,55 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::ChatId;
+
+/// This object represents the scope to which bot commands are applied.
+///
+/// ## Determining list of commands
+///
+/// The following algorithm is used to determine the list of commands for a
+/// particular user viewing the bot menu. The first list of commands which is
+/// set is returned:
+///
+/// ### Commands in the chat with the bot
+///
+/// - [`Chat`] + `language_code`
+/// - [`Chat`]
+/// - [`AllPrivateChats`] + `language_code`
+/// - [`AllPrivateChats`]
+/// - [`Default`] + `language_code`
+/// - [`Default`]
+///
+/// ### Commands in group and supergroup chats
+///
+/// - [`ChatMember`] + `language_code`
+/// - [`ChatMember`]
+/// - [`ChatAdministrators`] + `language_code` (admins only)
+/// - [`ChatAdministrators`] (admins only)
+/// - [`Chat`] + `language_code`
+/// - [`Chat`]
+/// - [`AllChatAdministrators`] + `language_code` (admins only)
+/// - [`AllChatAdministrators`] (admins only)
+/// - [`AllGroupChats`] + `language_code`
+/// - [`AllGroupChats`]
+/// - [`Default`] + `language_code`
+/// - [`Default`]
+///
+/// [`Default`]: BotCommandScope::Default
+/// [`AllPrivateChats`]: BotCommandScope::AllPrivateChats
+/// [`AllGroupChats`]: BotCommandScope::AllGroupChats
+/// [`AllChatAdministrators`]: BotCommandScope::AllChatAdministrators
+/// [`Chat`]: BotCommandScope::Chat
+/// [`ChatAdministrators`]: BotCommandScope::ChatAdministrators
+/// [`ChatMember`]: BotCommandScope::ChatMember
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+pub enum BotCommandScope {
+    Default,
+    AllPrivateChats,
+    AllGroupChats,
+    AllChatAdministrators,
+    Chat(#[serde(rename = "chat_id")] ChatId),
+    ChatAdministrators(#[serde(rename = "chat_id")] ChatId),
+    ChatMember { chat_id: ChatId, user_id: i64 },
+}

From 120ed97e8c870a4d6d3fa59c08e7a9bd83712c99 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 15:38:22 +0300
Subject: [PATCH 341/755] TBA 5.3: Update methods

---
 src/adaptors/auto_send.rs             |  6 ++---
 src/adaptors/cache_me.rs              |  9 ++++----
 src/adaptors/parse_mode.rs            |  6 ++---
 src/adaptors/throttle.rs              |  6 ++---
 src/bot/api.rs                        | 24 ++++++++++++++++++++
 src/local_macros.rs                   | 24 ++++++++++++++++++++
 src/payloads.rs                       |  6 +++++
 src/payloads/ban_chat_member.rs       | 32 +++++++++++++++++++++++++++
 src/payloads/delete_my_commands.rs    | 27 ++++++++++++++++++++++
 src/payloads/get_chat_member_count.rs | 22 ++++++++++++++++++
 src/payloads/get_my_commands.rs       |  8 ++++++-
 src/payloads/set_my_commands.rs       |  8 ++++++-
 src/payloads/setters.rs               | 27 +++++++++++-----------
 src/requests/requester.rs             | 25 ++++++++++++++++++---
 14 files changed, 199 insertions(+), 31 deletions(-)
 create mode 100644 src/payloads/ban_chat_member.rs
 create mode 100644 src/payloads/delete_my_commands.rs
 create mode 100644 src/payloads/get_chat_member_count.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 736216e0..21db37b8 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -89,14 +89,14 @@ where
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 4f7e06f3..1d3b696c 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -96,14 +96,14 @@ where
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
@@ -111,7 +111,8 @@ where
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores, get_updates_fault_tolerant => f, fty
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => f, fty
     }
 }
 
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 42d349eb..ddef2661 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -107,14 +107,14 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
         promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, answer_inline_query,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
         get_sticker_set, upload_sticker_file, create_new_sticker_set,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 0fd044d7..b741ac35 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -590,15 +590,15 @@ where
         get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
         edit_message_live_location, edit_message_live_location_inline,
         stop_message_live_location, stop_message_live_location_inline,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, ban_chat_member,
         unban_chat_member, restrict_chat_member, promote_chat_member,
         set_chat_administrator_custom_title, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count,
         get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
-        answer_callback_query, set_my_commands, get_my_commands, answer_inline_query,
+        answer_callback_query, set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
         edit_message_text, edit_message_text_inline, edit_message_caption,
         edit_message_caption_inline, edit_message_media, edit_message_media_inline,
         edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index cebf3733..2bc2f85e 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -337,6 +337,15 @@ impl Requester for Bot {
         )
     }
 
+    type BanChatMember = JsonRequest<payloads::BanChatMember>;
+
+    fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
+    where
+        C: Into<ChatId>,
+    {
+        Self::BanChatMember::new(self.clone(), payloads::BanChatMember::new(chat_id, user_id))
+    }
+
     type UnbanChatMember = JsonRequest<payloads::UnbanChatMember>;
 
     fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
@@ -557,6 +566,15 @@ impl Requester for Bot {
         Self::GetChatMembersCount::new(self.clone(), payloads::GetChatMembersCount::new(chat_id))
     }
 
+    type GetChatMemberCount = JsonRequest<payloads::GetChatMemberCount>;
+
+    fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount
+    where
+        C: Into<ChatId>,
+    {
+        Self::GetChatMemberCount::new(self.clone(), payloads::GetChatMemberCount::new(chat_id))
+    }
+
     type GetChatMember = JsonRequest<payloads::GetChatMember>;
 
     fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
@@ -615,6 +633,12 @@ impl Requester for Bot {
         Self::GetMyCommands::new(self.clone(), payloads::GetMyCommands::new())
     }
 
+    type DeleteMyCommands = JsonRequest<payloads::DeleteMyCommands>;
+
+    fn delete_my_commands(&self) -> Self::DeleteMyCommands {
+        Self::DeleteMyCommands::new(self.clone(), payloads::DeleteMyCommands::new())
+    }
+
     type AnswerInlineQuery = JsonRequest<payloads::AnswerInlineQuery>;
 
     fn answer_inline_query<I, R>(&self, inline_query_id: I, results: R) -> Self::AnswerInlineQuery
diff --git a/src/local_macros.rs b/src/local_macros.rs
index f5e5b30f..27238be0 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -684,6 +684,14 @@ macro_rules! requester_forward {
             $body!(get_file this (file_id: F))
         }
     };
+    (@method ban_chat_member $body:ident $ty:ident) => {
+        type BanChatMember = $ty![BanChatMember];
+
+        fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember where C: Into<ChatId> {
+            let this = self;
+            $body!(ban_chat_member this (chat_id: C, user_id: i64))
+        }
+    };
     (@method kick_chat_member $body:ident $ty:ident) => {
         type KickChatMember = $ty![KickChatMember];
 
@@ -848,6 +856,14 @@ macro_rules! requester_forward {
             $body!(get_chat_administrators this (chat_id: C))
         }
     };
+    (@method get_chat_member_count $body:ident $ty:ident) => {
+        type GetChatMemberCount = $ty![GetChatMemberCount];
+
+        fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount where C: Into<ChatId> {
+            let this = self;
+            $body!(get_chat_member_count this (chat_id: C))
+        }
+    };
     (@method get_chat_members_count $body:ident $ty:ident) => {
         type GetChatMembersCount = $ty![GetChatMembersCount];
 
@@ -905,6 +921,14 @@ macro_rules! requester_forward {
             $body!(get_my_commands this ())
         }
     };
+    (@method delete_my_commands $body:ident $ty:ident) => {
+        type DeleteMyCommands = $ty![DeleteMyCommands];
+
+        fn delete_my_commands(&self) -> Self::DeleteMyCommands {
+            let this = self;
+            $body!(delete_my_commands this ())
+        }
+    };
     (@method answer_inline_query $body:ident $ty:ident) => {
         type AnswerInlineQuery = $ty![AnswerInlineQuery];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index bf4e498c..83622734 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -25,6 +25,7 @@ mod answer_callback_query;
 mod answer_inline_query;
 mod answer_pre_checkout_query;
 mod answer_shipping_query;
+mod ban_chat_member;
 mod close;
 mod copy_message;
 mod create_chat_invite_link;
@@ -32,6 +33,7 @@ mod create_new_sticker_set;
 mod delete_chat_photo;
 mod delete_chat_sticker_set;
 mod delete_message;
+mod delete_my_commands;
 mod delete_sticker_from_set;
 mod delete_webhook;
 mod edit_chat_invite_link;
@@ -50,6 +52,7 @@ mod forward_message;
 mod get_chat;
 mod get_chat_administrators;
 mod get_chat_member;
+mod get_chat_member_count;
 mod get_chat_members_count;
 mod get_file;
 mod get_game_high_scores;
@@ -110,6 +113,7 @@ pub use answer_callback_query::{AnswerCallbackQuery, AnswerCallbackQuerySetters}
 pub use answer_inline_query::{AnswerInlineQuery, AnswerInlineQuerySetters};
 pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQuerySetters};
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
+pub use ban_chat_member::{BanChatMember, BanChatMemberSetters};
 pub use close::{Close, CloseSetters};
 pub use copy_message::{CopyMessage, CopyMessageSetters};
 pub use create_chat_invite_link::{CreateChatInviteLink, CreateChatInviteLinkSetters};
@@ -117,6 +121,7 @@ pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters
 pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
 pub use delete_chat_sticker_set::{DeleteChatStickerSet, DeleteChatStickerSetSetters};
 pub use delete_message::{DeleteMessage, DeleteMessageSetters};
+pub use delete_my_commands::{DeleteMyCommands, DeleteMyCommandsSetters};
 pub use delete_sticker_from_set::{DeleteStickerFromSet, DeleteStickerFromSetSetters};
 pub use delete_webhook::{DeleteWebhook, DeleteWebhookSetters};
 pub use edit_chat_invite_link::{EditChatInviteLink, EditChatInviteLinkSetters};
@@ -139,6 +144,7 @@ pub use forward_message::{ForwardMessage, ForwardMessageSetters};
 pub use get_chat::{GetChat, GetChatSetters};
 pub use get_chat_administrators::{GetChatAdministrators, GetChatAdministratorsSetters};
 pub use get_chat_member::{GetChatMember, GetChatMemberSetters};
+pub use get_chat_member_count::{GetChatMemberCount, GetChatMemberCountSetters};
 pub use get_chat_members_count::{GetChatMembersCount, GetChatMembersCountSetters};
 pub use get_file::{GetFile, GetFileSetters};
 pub use get_game_high_scores::{GetGameHighScores, GetGameHighScoresSetters};
diff --git a/src/payloads/ban_chat_member.rs b/src/payloads/ban_chat_member.rs
new file mode 100644
index 00000000..9225d3a0
--- /dev/null
+++ b/src/payloads/ban_chat_member.rs
@@ -0,0 +1,32 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to ban a user in a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the chat on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
+    ///
+    /// [unbanned]: crate::payloads::UnbanChatMember
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub BanChatMember (BanChatMemberSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: i64,
+        }
+        optional {
+            /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
+            pub until_date: u64,
+            /// Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.
+            pub revoke_messages: bool,
+        }
+    }
+}
diff --git a/src/payloads/delete_my_commands.rs b/src/payloads/delete_my_commands.rs
new file mode 100644
index 00000000..b82f12d2
--- /dev/null
+++ b/src/payloads/delete_my_commands.rs
@@ -0,0 +1,27 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{BotCommandScope, True};
+
+impl_payload! {
+    /// Use this method to delete the list of the bot's commands for the given scope and user language. After deletion, [higher level commands] will be shown to affected users. Returns _True_ on success.
+    ///
+    /// [higher level commands]: https://core.telegram.org/bots/api#determining-list-of-commands
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub DeleteMyCommands (DeleteMyCommandsSetters) => True {
+
+        optional {
+            /// A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.
+            pub scope: BotCommandScope,
+            /// A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands
+            pub language_code: String [into],
+        }
+    }
+}
diff --git a/src/payloads/get_chat_member_count.rs b/src/payloads/get_chat_member_count.rs
new file mode 100644
index 00000000..aca48ab1
--- /dev/null
+++ b/src/payloads/get_chat_member_count.rs
@@ -0,0 +1,22 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::ChatId;
+
+impl_payload! {
+    /// Use this method to get the number of members in a chat. Returns _Int_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetChatMemberCount (GetChatMemberCountSetters) => u32 {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 0c80f25a..085cbe82 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::BotCommand;
+use crate::types::{BotCommand, BotCommandScope};
 
 impl_payload! {
     /// Use this method to get the current list of the bot's commands. Requires no parameters. Returns Array of [`BotCommand`] on success.
@@ -17,5 +17,11 @@ impl_payload! {
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetMyCommands (GetMyCommandsSetters) => Vec<BotCommand> {
 
+        optional {
+            /// A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.
+            pub scope: BotCommandScope,
+            /// A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands
+            pub language_code: String [into],
+        }
     }
 }
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 21f2934f..2c08f2e9 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{BotCommand, True};
+use crate::types::{BotCommand, BotCommandScope, True};
 
 impl_payload! {
     /// Use this method to change the list of the bot's commands. Returns _True_ on success.
@@ -18,5 +18,11 @@ impl_payload! {
             /// A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most 100 commands can be specified.
             pub commands: Vec<BotCommand> [collect],
         }
+        optional {
+            /// A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.
+            pub scope: BotCommandScope,
+            /// A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands
+            pub language_code: String [into],
+        }
     }
 }
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 9a7f520d..d407de97 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -9,25 +9,26 @@
 #[doc(no_inline)]
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
-    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _, CloseSetters as _,
-    CopyMessageSetters as _, CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
-    DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _, DeleteMessageSetters as _,
-    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
+    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _, BanChatMemberSetters as _,
+    CloseSetters as _, CopyMessageSetters as _, CreateChatInviteLinkSetters as _,
+    CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _,
+    DeleteMessageSetters as _, DeleteMyCommandsSetters as _, DeleteStickerFromSetSetters as _,
+    DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
     EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
     EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
     EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
     EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
     EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
     ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
-    GetChatAdministratorsSetters as _, GetChatMemberSetters as _, GetChatMembersCountSetters as _,
-    GetChatSetters as _, GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
-    GetMyCommandsSetters as _, GetStickerSetSetters as _, GetUpdatesSetters as _,
-    GetUserProfilePhotosSetters as _, GetWebhookInfoSetters as _, KickChatMemberSetters as _,
-    LeaveChatSetters as _, LogOutSetters as _, PinChatMessageSetters as _,
-    PromoteChatMemberSetters as _, RestrictChatMemberSetters as _,
-    RevokeChatInviteLinkSetters as _, SendAnimationSetters as _, SendAudioSetters as _,
-    SendChatActionSetters as _, SendContactSetters as _, SendDiceSetters as _,
-    SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
+    GetChatAdministratorsSetters as _, GetChatMemberCountSetters as _, GetChatMemberSetters as _,
+    GetChatMembersCountSetters as _, GetChatSetters as _, GetFileSetters as _,
+    GetGameHighScoresSetters as _, GetMeSetters as _, GetMyCommandsSetters as _,
+    GetStickerSetSetters as _, GetUpdatesSetters as _, GetUserProfilePhotosSetters as _,
+    GetWebhookInfoSetters as _, KickChatMemberSetters as _, LeaveChatSetters as _,
+    LogOutSetters as _, PinChatMessageSetters as _, PromoteChatMemberSetters as _,
+    RestrictChatMemberSetters as _, RevokeChatInviteLinkSetters as _, SendAnimationSetters as _,
+    SendAudioSetters as _, SendChatActionSetters as _, SendContactSetters as _,
+    SendDiceSetters as _, SendDocumentSetters as _, SendGameSetters as _, SendInvoiceSetters as _,
     SendLocationSetters as _, SendMediaGroupSetters as _, SendMessageSetters as _,
     SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _, SendVenueSetters as _,
     SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index b5152a01..90711fd7 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -318,6 +318,13 @@ pub trait Requester {
     where
         F: Into<String>;
 
+    type BanChatMember: Request<Payload = BanChatMember, Err = Self::Err>;
+
+    /// For Telegram documentation see [`BanChatMember`].
+    fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
+    where
+        C: Into<ChatId>;
+
     type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`KickChatMember`].
@@ -483,6 +490,13 @@ pub trait Requester {
     where
         C: Into<ChatId>;
 
+    type GetChatMemberCount: Request<Payload = GetChatMemberCount, Err = Self::Err>;
+
+    /// For Telegram documentation see [`GetChatMemberCount`].
+    fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount
+    where
+        C: Into<ChatId>;
+
     type GetChatMembersCount: Request<Payload = GetChatMembersCount, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMembersCount`].
@@ -535,6 +549,11 @@ pub trait Requester {
     /// For Telegram documentation see [`GetMyCommands`].
     fn get_my_commands(&self) -> Self::GetMyCommands;
 
+    type DeleteMyCommands: Request<Payload = DeleteMyCommands, Err = Self::Err>;
+
+    /// For Telegram documentation see [`DeleteMyCommands`].
+    fn delete_my_commands(&self) -> Self::DeleteMyCommands;
+
     type AnswerInlineQuery: Request<Payload = AnswerInlineQuery, Err = Self::Err>;
 
     /// For Telegram documentation see [`AnswerInlineQuery`].
@@ -831,14 +850,14 @@ macro_rules! forward_all {
             edit_message_live_location, edit_message_live_location_inline,
             stop_message_live_location, stop_message_live_location_inline, send_venue,
             send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-            get_file, kick_chat_member, unban_chat_member, restrict_chat_member,
+            get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
             promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
             export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
             revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
             set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-            leave_chat, get_chat, get_chat_administrators, get_chat_members_count,get_chat_member,
+            leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
             set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-            set_my_commands, get_my_commands, answer_inline_query, edit_message_text,
+            set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
             edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
             edit_message_media, edit_message_media_inline, edit_message_reply_markup,
             edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,

From e6b66a738326b92e57736c14abf97591442480bf Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 15:46:12 +0300
Subject: [PATCH 342/755] TBA 5.3: update changelog and supported version

---
 CHANGELOG.md | 2 ++
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba9b956e..d7bd2801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Getters for fields nested in `Chat` ([#80][pr80]) 
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
+- Telegram bot API 5.3 support ([#99][pr99])
 - `net::default_reqwest_settings` function ([#90][pr90])
 
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
@@ -26,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr86]: https://github.com/teloxide/teloxide-core/pull/86
 [pr90]: https://github.com/teloxide/teloxide-core/pull/90
 [pr96]: https://github.com/teloxide/teloxide-core/pull/96
+[pr99]: https://github.com/teloxide/teloxide-core/pull/99
 
 ### Changed
 
diff --git a/README.md b/README.md
index d9e24428..6fb9a164 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.2%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.3%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/lib.rs b/src/lib.rs
index bd9c70ac..4cff94e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `5.1` is supported) with ease. The library is fully
+//! (Currently, version `5.3` is supported) with ease. The library is fully
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml

From 2c9a4208b726572d198f4705ad39861de73321cb Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 10:37:59 +0300
Subject: [PATCH 343/755] Update deps

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ce8e8fd..886d4b1e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ exclude = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "1.2.0", features = ["fs"] }
+tokio = { version = "1.8.0", features = ["fs"] }
 tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"

From 44c1cfd4208437558ee0a8d02be89dd4f4b92786 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 16:30:22 +0300
Subject: [PATCH 344/755] Remove `keyboad` method (typo, was fixed to keyboard
 in 0.2.2)

---
 src/types/reply_markup.rs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
index 838aff35..7f9c07a0 100644
--- a/src/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -62,17 +62,6 @@ impl ReplyMarkup {
     pub fn force_reply() -> Self {
         Self::ForceReply(ForceReply::new())
     }
-
-    // FIXME(waffle): remove this method in the next minor version bump (0.3.0)
-    #[doc(hidden)]
-    #[deprecated = "This method has a typo in name. Use `ReplyMarkup::keyboard` instead."]
-    pub fn keyboad<K>(keyboard: K) -> Self
-    where
-        K: IntoIterator,
-        K::Item: IntoIterator<Item = KeyboardButton>,
-    {
-        Self::Keyboard(KeyboardMarkup::new(keyboard))
-    }
 }
 
 #[cfg(test)]

From 5ac43d4ac0df3440e9a9d2be13510ab44683bef7 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 17:35:36 +0300
Subject: [PATCH 345/755] Fix type of `PhotoSize::{width,height}` fields: `i32`
 => `u32`

---
 CHANGELOG.md            | 2 ++
 src/types/photo_size.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7bd2801..bfa10012 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,12 +52,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
 - `reqwest` dependency bringing `native-tls` in even when `rustls` was selected ([#71][pr71])
 - Type of `{Restricted,Kicked}::until_date` fields: `i32` => `i64` ([#74][pr74])
+- Type of `PhotoSize::{width,height}` fields: `i32` => `u32` ([#100][pr100])
 
 [pr71]: https://github.com/teloxide/teloxide-core/pull/71
 [pr73]: https://github.com/teloxide/teloxide-core/pull/73
 [pr75]: https://github.com/teloxide/teloxide-core/pull/75
 [pr79]: https://github.com/teloxide/teloxide-core/pull/79
 [pr94]: https://github.com/teloxide/teloxide-core/pull/94
+[pr100]: https://github.com/teloxide/teloxide-core/pull/100
 
 ## [0.2.2] - 2020-03-22
 
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 44ddfe32..e7527d19 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -16,10 +16,10 @@ pub struct PhotoSize {
     pub file_unique_id: String,
 
     /// Photo width.
-    pub width: i32,
+    pub width: u32,
 
     /// Photo height.
-    pub height: i32,
+    pub height: u32,
 
     /// File size.
     pub file_size: Option<u32>,

From df69d07f2bf6d7ce08161b31cd8b0ac4db99d339 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Jul 2021 16:28:00 +0300
Subject: [PATCH 346/755] Bump version (0.2.2 => 0.3.0)

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa10012..3ce2de21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## 0.3.0
+
 ### Added
 
 - `impl Clone` for {`CacheMe`, `DefaultParseMode`, `Throttle`} ([#76][pr76])
diff --git a/Cargo.toml b/Cargo.toml
index 886d4b1e..fc41b81c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.2.2"
+version = "0.3.0"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
diff --git a/README.md b/README.md
index 6fb9a164..fde42a77 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 </div>
 
 ```toml
-teloxide_core = "0.2"
+teloxide_core = "0.3"
 ```
 _Compiler support: requires rustc 1.49+_.
 
diff --git a/src/lib.rs b/src/lib.rs
index 4cff94e0..7ea0ab80 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.2"
+//! teloxide_core = "0.3"
 //! ```
 //! _Compiler support: requires rustc 1.49+_
 //!

From 2871623aa4558734ada5bd01e9c31e63efe5b592 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Mon, 5 Jul 2021 19:53:42 +0300
Subject: [PATCH 347/755] Fill in v0.3.0 release date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce2de21..33a956c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-## 0.3.0
+## 0.3.0 - 2021-07-05
 
 ### Added
 

From e7b44e6bbe984a3ece359ad3acb1a9d385e17b6a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 7 Jul 2021 20:06:58 +0300
Subject: [PATCH 348/755] Use `cfg(dep_docsrs)` to allow building docs properly
 as a dependency

---
 CHANGELOG.md                  |  6 ++++++
 src/adaptors.rs               | 30 ++++++++++++++++++++++++------
 src/lib.rs                    |  8 +++++++-
 src/requests/payload.rs       |  2 +-
 src/requests/request.rs       |  2 +-
 src/requests/requester.rs     |  2 +-
 src/requests/requester_ext.rs | 15 ++++++++++++---
 7 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33a956c0..6dce8e34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Changed
+
+- Minor documentation tweaks ([#102][pr102])
+
+[pr102]: https://github.com/teloxide/teloxide-core/pull/102
+
 ## 0.3.0 - 2021-07-05
 
 ### Added
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 8692d43c..71851d8e 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -14,7 +14,10 @@
 /// [`AutoSend`]: auto_send::AutoSend
 /// [`send`]: crate::requests::Request::send
 #[cfg(feature = "auto_send")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "auto_send"))
+)]
 pub mod auto_send;
 
 /// [`CacheMe`] bot adaptor which caches [`GetMe`] requests.
@@ -22,7 +25,10 @@ pub mod auto_send;
 /// [`CacheMe`]: cache_me::CacheMe
 /// [`GetMe`]: crate::payloads::GetMe
 #[cfg(feature = "cache_me")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "cache_me"))
+)]
 pub mod cache_me;
 
 /// [`Throttle`] bot adaptor which allows automatically throttle when hitting
@@ -30,19 +36,31 @@ pub mod cache_me;
 ///
 /// [`Throttle`]: throttle::Throttle
 #[cfg(feature = "throttle")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "throttle"))
+)]
 pub mod throttle;
 
 mod parse_mode;
 
 #[cfg(feature = "auto_send")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "auto_send"))
+)]
 pub use auto_send::AutoSend;
 #[cfg(feature = "cache_me")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "cache_me"))
+)]
 pub use cache_me::CacheMe;
 #[cfg(feature = "throttle")]
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "throttle"))
+)]
 pub use throttle::Throttle;
 
 pub use parse_mode::DefaultParseMode;
diff --git a/src/lib.rs b/src/lib.rs
index 7ea0ab80..c2f526bb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -72,7 +72,13 @@
 // ```console
 // $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
 // ```
-#![cfg_attr(all(docsrs, feature = "nightly"), feature(doc_cfg, doc_notable_trait))]
+//
+// `dep_docsrs` is used for the same purpose, but when `teloxide-core` is built as a dependency
+// (see: `teloxide`). We can't use `docsrs` as it breaks tokio compilation in this case.
+#![cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    feature(doc_cfg, doc_notable_trait)
+)]
 #![cfg_attr(feature = "nightly", feature(min_type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index a30f4bad..8129164c 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -5,7 +5,7 @@
 ///
 /// Also, this trait provides some additional information needed to send a
 /// request to Telegram.
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
+#[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]
 pub trait Payload {
     /// The return type of a Telegram method.
     ///
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 76520fed..e2f06b64 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -16,7 +16,7 @@ use crate::requests::{HasPayload, Output};
 /// `B::send_ref` while _not_ meaning to really send the request at the moment.
 ///
 /// [`Throttle<B>`]: crate::adaptors::Throttle
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
+#[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]
 pub trait Request: HasPayload {
     /*
      * Could be mostly `core::future::IntoFuture` though there is no reason to
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 90711fd7..2338072d 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -49,7 +49,7 @@ use crate::{
 ///     bot.send_message(chat, "hi").send().await.expect("error")
 /// }
 /// ```
-#[cfg_attr(all(docsrs, feature = "nightly"), doc(notable_trait))]
+#[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]
 pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 5f4b9e20..574dbb9f 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -15,7 +15,10 @@ pub trait RequesterExt: Requester {
     ///
     /// [`CacheMe`]:
     #[cfg(feature = "cache_me")]
-    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "cache_me")))]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "cache_me"))
+    )]
     fn cache_me(self) -> CacheMe<Self>
     where
         Self: Sized,
@@ -25,7 +28,10 @@ pub trait RequesterExt: Requester {
 
     /// Send requests automatically, see [`AutoSend`] for more.
     #[cfg(feature = "auto_send")]
-    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "auto_send")))]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "auto_send"))
+    )]
     fn auto_send(self) -> AutoSend<Self>
     where
         Self: Sized,
@@ -37,7 +43,10 @@ pub trait RequesterExt: Requester {
     ///
     /// Note: this spawns the worker, just as [`Throttle::new_spawn`].
     #[cfg(feature = "throttle")]
-    #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "throttle")))]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "throttle"))
+    )]
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
         Self: Sized,

From 23c125775cf286d55d75c2d560e97a6c61811bde Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 7 Jul 2021 20:11:24 +0300
Subject: [PATCH 349/755] Remove `Self: 'static` buound on
 `RequesterExt::throttle`

---
 CHANGELOG.md                  | 1 +
 src/requests/requester_ext.rs | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dce8e34..da94475e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Minor documentation tweaks ([#102][pr102])
+- Remove `Self: 'static` buound on `RequesterExt::throttle` ([#102][pr102])
 
 [pr102]: https://github.com/teloxide/teloxide-core/pull/102
 
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 574dbb9f..d9ef7ba5 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -50,9 +50,6 @@ pub trait RequesterExt: Requester {
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
         Self: Sized,
-        // >:(
-        // (waffle)
-        Self: 'static,
     {
         Throttle::new_spawn(self, limits)
     }

From b2152db74738d86c37225ee6ade63b9c319eeb9c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Wed, 7 Jul 2021 20:13:02 +0300
Subject: [PATCH 350/755] Prepare 0.3.1 release

---
 CHANGELOG.md | 2 +-
 Cargo.toml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da94475e..54ad8b18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-### Changed
+## 0.3.1 - 2021-07-07
 
 - Minor documentation tweaks ([#102][pr102])
 - Remove `Self: 'static` buound on `RequesterExt::throttle` ([#102][pr102])
diff --git a/Cargo.toml b/Cargo.toml
index fc41b81c..80019fea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",

From 5aa622b3616fa7b1bf984f003e48f8cd065ceaa5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 8 Jul 2021 13:04:40 +0300
Subject: [PATCH 351/755] impl `HasPayload`, `Request` and `Requester` for
 `either::Either`

This allows to use different adaptors depending on runtime context.
---
 CHANGELOG.md                |  8 +++++-
 Cargo.toml                  |  6 ++++-
 src/requests/has_payload.rs | 18 ++++++++++++++
 src/requests/request.rs     | 28 +++++++++++++++++++++
 src/requests/requester.rs   | 49 +++++++++++++++++++++++++++++++++++++
 5 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54ad8b18..45f82d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+
+- `HasPayload`, `Request` and `Requester` implementations for `either::Either` ([#103][pr103])
+
+[pr103]: https://github.com/teloxide/teloxide-core/pull/103
+
 ## 0.3.1 - 2021-07-07
 
 - Minor documentation tweaks ([#102][pr102])
-- Remove `Self: 'static` buound on `RequesterExt::throttle` ([#102][pr102])
+- Remove `Self: 'static` bound on `RequesterExt::throttle` ([#102][pr102])
 
 [pr102]: https://github.com/teloxide/teloxide-core/pull/102
 
diff --git a/Cargo.toml b/Cargo.toml
index 80019fea..ba9ee45d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ thiserror = "1.0.20"
 once_cell = "1.5.0"
 never = "0.1.0"
 chrono = "0.4.19"
+either = "1.6.1"
 
 vecrem = { version = "0.1", optional = true }
 
@@ -75,7 +76,10 @@ cache_me = []
 # AutoSend bot adaptor
 auto_send = []
 
-full = ["throttle", "cache_me", "auto_send"]
+# Erased bot adaptor
+erased = []
+
+full = ["throttle", "cache_me", "auto_send", "erased"]
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index de6bd333..870bc50c 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -1,3 +1,5 @@
+use either::Either;
+
 use crate::requests::Payload;
 
 /// Represents types having payload inside.
@@ -42,3 +44,19 @@ where
         self
     }
 }
+
+impl<L, R> HasPayload for Either<L, R>
+where
+    L: HasPayload,
+    R: HasPayload<Payload = L::Payload>,
+{
+    type Payload = L::Payload;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self.as_mut().either(<_>::payload_mut, <_>::payload_mut)
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self.as_ref().either(<_>::payload_ref, <_>::payload_ref)
+    }
+}
diff --git a/src/requests/request.rs b/src/requests/request.rs
index e2f06b64..aed2490e 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -1,5 +1,8 @@
 use std::future::Future;
 
+use either::Either;
+use futures::future;
+
 use crate::requests::{HasPayload, Output};
 
 /// A ready-to-send Telegram request.
@@ -85,3 +88,28 @@ pub trait Request: HasPayload {
     /// ```
     fn send_ref(&self) -> Self::SendRef;
 }
+
+impl<L, R> Request for Either<L, R>
+where
+    L: Request,
+    R: Request<Payload = L::Payload, Err = L::Err>,
+{
+    type Err = L::Err;
+
+    type Send = future::Either<L::Send, R::Send>;
+
+    type SendRef = future::Either<L::SendRef, R::SendRef>;
+
+    fn send(self) -> Self::Send {
+        self.map_left(<_>::send)
+            .map_right(<_>::send)
+            .either(future::Either::Left, future::Either::Right)
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        self.as_ref()
+            .map_left(<_>::send_ref)
+            .map_right(<_>::send_ref)
+            .either(future::Either::Left, future::Either::Right)
+    }
+}
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 2338072d..47337b51 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -915,3 +915,52 @@ where
 
     forward_all! {}
 }
+
+macro_rules! fty_either {
+    ($T:ident) => {
+        either::Either<LR::$T, RR::$T>
+    };
+}
+
+macro_rules! fwd_either {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        match ($this) {
+            either::Either::Left(l) => either::Either::Left(l.$m($($arg),*)),
+            either::Either::Right(r) => either::Either::Right(r.$m($($arg),*)),
+        }
+    };
+}
+
+impl<LR, RR> Requester for either::Either<LR, RR>
+where
+    LR: Requester,
+    RR: Requester<Err = LR::Err>,
+{
+    type Err = LR::Err;
+
+    requester_forward! {
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => fwd_either, fty_either
+    }
+}

From 1eddea5c85b16791894455c3113abe15033f2846 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 8 Jul 2021 13:50:17 +0300
Subject: [PATCH 352/755] Remove accidentally added cargo feature

---
 Cargo.toml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ba9ee45d..469dfaed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,10 +76,7 @@ cache_me = []
 # AutoSend bot adaptor
 auto_send = []
 
-# Erased bot adaptor
-erased = []
-
-full = ["throttle", "cache_me", "auto_send", "erased"]
+full = ["throttle", "cache_me", "auto_send"]
 
 [package.metadata.docs.rs]
 all-features = true

From 9e8819d726eb42e8149404c8064f183c0085d31a Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 10 Jul 2021 17:41:20 +0300
Subject: [PATCH 353/755] Add `Trace` bot adaptor

---
 CHANGELOG.md                  |   2 +
 Cargo.toml                    |   6 +-
 src/adaptors.rs               |  16 +++
 src/adaptors/trace.rs         | 259 ++++++++++++++++++++++++++++++++++
 src/requests/requester_ext.rs |  16 +++
 5 files changed, 298 insertions(+), 1 deletion(-)
 create mode 100644 src/adaptors/trace.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45f82d13..7502a6de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `Trace` bot adaptor ([#104][pr104])
 - `HasPayload`, `Request` and `Requester` implementations for `either::Either` ([#103][pr103])
 
 [pr103]: https://github.com/teloxide/teloxide-core/pull/103
+[pr104]: https://github.com/teloxide/teloxide-core/pull/104
 
 ## 0.3.1 - 2021-07-07
 
diff --git a/Cargo.toml b/Cargo.toml
index 469dfaed..68849a5b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,6 +54,7 @@ chrono = "0.4.19"
 either = "1.6.1"
 
 vecrem = { version = "0.1", optional = true }
+bitflags = { version = "1.2", optional = true }
 
 [features]
 default = ["native-tls"]
@@ -70,13 +71,16 @@ nightly = []
 # Throttling bot adaptor
 throttle = ["vecrem"]
 
+# Trace bot adaptor
+trace_adaptor = ["bitflags"]
+
 # CacheMe bot adaptor
 cache_me = []
 
 # AutoSend bot adaptor
 auto_send = []
 
-full = ["throttle", "cache_me", "auto_send"]
+full = ["throttle", "trace_adaptor", "cache_me", "auto_send"]
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 71851d8e..36a258b7 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -31,6 +31,16 @@ pub mod auto_send;
 )]
 pub mod cache_me;
 
+/// [`Trace`] bot adaptor which traces requests.
+///
+/// [`Trace`]: trace::Trace
+#[cfg(feature = "trace_adaptor")]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "trace_adaptor"))
+)]
+pub mod trace;
+
 /// [`Throttle`] bot adaptor which allows automatically throttle when hitting
 /// API limits.
 ///
@@ -62,5 +72,11 @@ pub use cache_me::CacheMe;
     doc(cfg(feature = "throttle"))
 )]
 pub use throttle::Throttle;
+#[cfg(feature = "trace_adaptor")]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "trace_adaptor"))
+)]
+pub use trace::Trace;
 
 pub use parse_mode::DefaultParseMode;
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
new file mode 100644
index 00000000..80cf7ac9
--- /dev/null
+++ b/src/adaptors/trace.rs
@@ -0,0 +1,259 @@
+use std::{
+    fmt::Debug,
+    future::Future,
+    pin::Pin,
+    task::{self, Poll},
+};
+
+use futures::ready;
+use url::Url;
+
+use crate::{
+    requests::{HasPayload, Output, Payload, Request, Requester},
+    types::*,
+};
+
+/// Trace requests and responses.
+///
+/// This is a tool for debugging.
+///
+/// Depending on [`Settings`] and `log` facade this adaptor may output messages
+/// like these:
+/// ```text
+/// TRACE teloxide_core::adaptors::trace > Sending `SendDice` request
+/// TRACE teloxide_core::adaptors::trace > Got response from `SendDice` request
+/// TRACE teloxide_core::adaptors::trace > Sending `SendDice` request: SendDice { chat_id: Id(0), emoji: Some(Dice), disable_notification: None, reply_to_message_id: None, allow_sending_without_reply: None, reply_markup: None }
+/// TRACE teloxide_core::adaptors::trace > Got response from `SendDice` request: Ok(Message { id: 13812, date: 1625926524, chat: Chat { .. }, via_bot: None, kind: Dice(MessageDice { dice: Dice { emoji: Dice, value: 3 } }) })
+/// ```
+#[derive(Clone)]
+pub struct Trace<B> {
+    inner: B,
+    settings: Settings,
+}
+
+impl<B> Trace<B> {
+    pub fn new(inner: B, settings: Settings) -> Self {
+        Self { inner, settings }
+    }
+
+    pub fn inner(&self) -> &B {
+        &self.inner
+    }
+
+    pub fn into_inner(self) -> B {
+        self.inner
+    }
+
+    pub fn settings(&self) -> Settings {
+        self.settings
+    }
+}
+
+bitflags::bitflags! {
+    /// [`Trace`] settings that determine what will be logged.
+    ///
+    /// ## Examples
+    ///
+    /// ```
+    /// use teloxide_core::adaptors::trace::Settings;
+    ///
+    /// // Trace nothing
+    /// let _ = Settings::empty();
+    /// // Trace only requests
+    /// let _ = Settings::TRACE_REQUESTS;
+    /// // Trace requests verbosely and responses (non verbosely)
+    /// let _ = Settings::TRACE_REQUESTS_VERBOSE | Settings::TRACE_RESPONSES;
+    /// ```
+    pub struct Settings: u8 {
+        /// Trace requests (only request kind, e.g. `send_message`)
+        const TRACE_REQUESTS = 0b00000001;
+
+        /// Trace requests verbosely (with all parameters).
+        ///
+        /// Implies [`TRACE_REQUESTS`]
+        const TRACE_REQUESTS_VERBOSE = 0b00000011;
+
+        /// Trace responses (only request kind, e.g. `send_message`)
+        const TRACE_RESPONSES = 0b00000100;
+
+        /// Trace responses verbosely (with full response).
+        ///
+        /// Implies [`TRACE_RESPONSES`]
+        const TRACE_RESPONSES_VERBOSE = 0b00001100;
+
+        /// Trace everything.
+        ///
+        /// Implies [`TRACE_REQUESTS`] and [`TRACE_RESPONSES`].
+        const TRACE_EVERYTHING = Self::TRACE_REQUESTS.bits | Self::TRACE_RESPONSES.bits;
+
+        /// Trace everything verbosely.
+        ///
+        /// Implies [`TRACE_REQUESTS_VERBOSE`] and [`TRACE_RESPONSES_VERBOSE`].
+        const TRACE_EVERYTHING_VERBOSE = Self::TRACE_REQUESTS_VERBOSE.bits | Self::TRACE_RESPONSES_VERBOSE.bits;
+    }
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        TraceRequest<B::$T>
+    };
+}
+
+macro_rules! fwd_inner {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        TraceRequest {
+            inner: $this.inner().$m($($arg),*),
+            settings: $this.settings
+        }
+    };
+}
+
+impl<B> Requester for Trace<B>
+where
+    B: Requester,
+{
+    type Err = B::Err;
+
+    requester_forward! {
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => fwd_inner, fty
+    }
+}
+
+pub struct TraceRequest<R> {
+    inner: R,
+    settings: Settings,
+}
+
+impl<R> TraceRequest<R>
+where
+    R: Request,
+{
+    fn trace_request(&self)
+    where
+        R::Payload: Debug,
+    {
+        if self.settings.contains(Settings::TRACE_REQUESTS_VERBOSE) {
+            log::trace!(
+                "Sending `{}` request: {:?}",
+                <R::Payload as Payload>::NAME,
+                self.inner.payload_ref()
+            );
+        } else if self.settings.contains(Settings::TRACE_REQUESTS) {
+            log::trace!("Sending `{}` request", R::Payload::NAME);
+        }
+    }
+
+    fn trace_response_fn(&self) -> fn(&Result<Output<R>, R::Err>)
+    where
+        Output<R>: Debug,
+        R::Err: Debug,
+    {
+        if self.settings.contains(Settings::TRACE_RESPONSES_VERBOSE) {
+            |response| {
+                log::trace!(
+                    "Got response from `{}` request: {:?}",
+                    R::Payload::NAME,
+                    response
+                )
+            }
+        } else if self.settings.contains(Settings::TRACE_RESPONSES) {
+            |_| log::trace!("Got response from `{}` request", R::Payload::NAME)
+        } else {
+            |_| {}
+        }
+    }
+}
+
+impl<R> HasPayload for TraceRequest<R>
+where
+    R: HasPayload,
+{
+    type Payload = R::Payload;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self.inner.payload_mut()
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self.inner.payload_ref()
+    }
+}
+
+impl<R> Request for TraceRequest<R>
+where
+    R: Request,
+    Output<R>: Debug,
+    R::Err: Debug,
+    R::Payload: Debug,
+{
+    type Err = R::Err;
+
+    type Send = Send<R::Send>;
+
+    type SendRef = Send<R::SendRef>;
+
+    fn send(self) -> Self::Send {
+        self.trace_request();
+
+        Send {
+            trace_fn: self.trace_response_fn(),
+            inner: self.inner.send(),
+        }
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        self.trace_request();
+
+        Send {
+            trace_fn: self.trace_response_fn(),
+            inner: self.inner.send_ref(),
+        }
+    }
+}
+
+#[pin_project::pin_project]
+pub struct Send<F>
+where
+    F: Future,
+{
+    trace_fn: fn(&F::Output),
+    #[pin]
+    inner: F,
+}
+
+impl<F> Future for Send<F>
+where
+    F: Future,
+{
+    type Output = F::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+
+        let ret = ready!(this.inner.poll(cx));
+        (this.trace_fn)(&ret);
+        Poll::Ready(ret)
+    }
+}
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index d9ef7ba5..424796b8 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -6,6 +6,9 @@ use crate::adaptors::CacheMe;
 #[cfg(feature = "auto_send")]
 use crate::adaptors::AutoSend;
 
+#[cfg(feature = "trace_adaptor")]
+use crate::adaptors::trace::{Settings, Trace};
+
 #[cfg(feature = "throttle")]
 use crate::adaptors::throttle::{Limits, Throttle};
 
@@ -39,6 +42,19 @@ pub trait RequesterExt: Requester {
         AutoSend::new(self)
     }
 
+    /// Trace requests, see [`Trace`] for more.
+    #[cfg(feature = "trace_adaptor")]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "trace_adaptor"))
+    )]
+    fn trace(self, settings: Settings) -> Trace<Self>
+    where
+        Self: Sized,
+    {
+        Trace::new(self, settings)
+    }
+
     /// Add throttling ability, see [`Throttle`] for more.
     ///
     /// Note: this spawns the worker, just as [`Throttle::new_spawn`].

From 611891ae48b2aa0abe903059250ccadf9252bc56 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 11 Jul 2021 17:41:08 +0600
Subject: [PATCH 354/755] Prepare for v0.4.1

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ae31dd6..be1e910e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.4.1] - 2021-07-11
+
 ### Fixed
 
  - Fix generics support for a variant's arguments ([PR #8](https://github.com/teloxide/teloxide-macros/issues/8)).
diff --git a/Cargo.toml b/Cargo.toml
index b8dfd878..d924b669 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.4.0"
+version = "0.4.1"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 33236f79e6748ec13acbb949fb808ba907ab9837 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sun, 11 Jul 2021 15:58:09 +0300
Subject: [PATCH 355/755] Document `trace_adaptor` feature

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index c2f526bb..788abe5b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,6 +47,7 @@
 //!   default**)
 //! - `rustls` — use [`rustls`] tls implementation
 //! - `auto_send` — enables [`AutoSend`] bot adaptor
+//! - `trace_adaptor` — enables [`Trace`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
 //! - `cache_me` — enables [`CacheMe`] bot adaptor
 //! - `full` — enables all features except `nigthly`
@@ -55,6 +56,7 @@
 //!   - Used to built docs (`#![feature(doc_cfg, doc_spotlight)]`)
 //!
 //! [`AutoSend`]: adaptors::AutoSend
+//! [`Trace`]: adaptors::Trace
 //! [`Throttle`]: adaptors::Throttle
 //! [`CacheMe`]: adaptors::CacheMe
 //! [`native-tls`]: https://docs.rs/native-tls

From 1fe4518ee9fb7459688fa0f1ec47107550b0180f Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 12 Jul 2021 16:58:51 +0300
Subject: [PATCH 356/755] Add tools for Bot/Request type erasure

---
 CHANGELOG.md                  |    2 +
 Cargo.toml                    |   12 +-
 examples/erased.rs            |   43 ++
 examples/self_info.rs         |    2 +
 src/adaptors.rs               |   18 +
 src/adaptors/erased.rs        | 1339 +++++++++++++++++++++++++++++++++
 src/lib.rs                    |    2 +
 src/requests/request.rs       |   12 +
 src/requests/requester_ext.rs |   17 +
 9 files changed, 1446 insertions(+), 1 deletion(-)
 create mode 100644 examples/erased.rs
 create mode 100644 src/adaptors/erased.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7502a6de..7f218057 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `ErasedRequester` bot adaptor, `ErasedRequest` struct, `{Request, RequesterExt}::erase` functions ([#105][pr105])
 - `Trace` bot adaptor ([#104][pr104])
 - `HasPayload`, `Request` and `Requester` implementations for `either::Either` ([#103][pr103])
 
 [pr103]: https://github.com/teloxide/teloxide-core/pull/103
 [pr104]: https://github.com/teloxide/teloxide-core/pull/104
+[pr105]: https://github.com/teloxide/teloxide-core/pull/105
 
 ## 0.3.1 - 2021-07-07
 
diff --git a/Cargo.toml b/Cargo.toml
index 68849a5b..987af2b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,6 +56,9 @@ either = "1.6.1"
 vecrem = { version = "0.1", optional = true }
 bitflags = { version = "1.2", optional = true }
 
+[dev-dependencies]
+pretty_env_logger = "0.4"
+
 [features]
 default = ["native-tls"]
 
@@ -74,13 +77,16 @@ throttle = ["vecrem"]
 # Trace bot adaptor
 trace_adaptor = ["bitflags"]
 
+# Erased bot adaptor
+erased = []
+
 # CacheMe bot adaptor
 cache_me = []
 
 # AutoSend bot adaptor
 auto_send = []
 
-full = ["throttle", "trace_adaptor", "cache_me", "auto_send"]
+full = ["throttle", "trace_adaptor", "erased", "cache_me", "auto_send"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -89,3 +95,7 @@ rustdoc-args = ["--cfg", "docsrs", "-Znormalize-docs"]
 [[example]]
 name = "self_info"
 required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send"]
+
+[[example]]
+name = "erased"
+required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send", "erased"]
diff --git a/examples/erased.rs b/examples/erased.rs
new file mode 100644
index 00000000..40195ebd
--- /dev/null
+++ b/examples/erased.rs
@@ -0,0 +1,43 @@
+use std::{env::VarError, time::Duration};
+
+use teloxide_core::{adaptors::trace, prelude::*, types::ChatAction};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    pretty_env_logger::init();
+
+    let chat_id = std::env::var("CHAT_ID")
+        .expect("Expected CHAT_ID env var")
+        .parse::<i64>()?;
+
+    let trace_settings = match std::env::var("TRACE").as_deref() {
+        Ok("EVERYTHING_VERBOSE") => trace::Settings::TRACE_EVERYTHING_VERBOSE,
+        Ok("EVERYTHING") => trace::Settings::TRACE_EVERYTHING,
+        Ok("REQUESTS_VERBOSE") => trace::Settings::TRACE_REQUESTS_VERBOSE,
+        Ok("REQUESTS") => trace::Settings::TRACE_REQUESTS,
+        Ok("RESPONSES_VERBOSE") => trace::Settings::TRACE_RESPONSES_VERBOSE,
+        Ok("RESPONSES") => trace::Settings::TRACE_RESPONSES,
+        Ok("EMPTY") | Ok("") | Err(VarError::NotPresent) => trace::Settings::empty(),
+        Ok(_) | Err(VarError::NotUnicode(_)) => {
+            panic!(
+                "Expected `TRACE` environment variable to be equal to any of the following: \
+                 `EVERYTHING_VERBOSE`, `EVERYTHING`, `REQUESTS_VERBOSE`, `REQUESTS`, \
+                 `RESPONSES_VERBOSE`, `RESPONSES`, `EMPTY`, `` (empty string)"
+            )
+        }
+    };
+
+    log::info!("Trace settings: {:?}", trace_settings);
+
+    let bot = if trace_settings.is_empty() {
+        Bot::from_env().erase().auto_send()
+    } else {
+        Bot::from_env().trace(trace_settings).erase().auto_send()
+    };
+
+    bot.send_chat_action(chat_id, ChatAction::Typing).await?;
+    tokio::time::sleep(Duration::from_secs(1)).await;
+    bot.send_message(chat_id, "Hey hey hey").await?;
+
+    Ok(())
+}
diff --git a/examples/self_info.rs b/examples/self_info.rs
index 5735bbb3..9c5304ae 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -5,6 +5,8 @@ use teloxide_core::{
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    pretty_env_logger::init();
+
     let chat_id = std::env::var("CHAT_ID")
         .expect("Expected CHAT_ID env var")
         .parse::<i64>()?;
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 36a258b7..6733662b 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -41,6 +41,18 @@ pub mod cache_me;
 )]
 pub mod trace;
 
+/// [`ErasedErasedRequester`] bot adaptor which allows to erase type of
+/// [`Requester`].
+///
+/// [`ErasedRequester`]: erased::ErasedRequester
+/// [`Requester`]: crate::requests::Requester
+#[cfg(feature = "erased")]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "erased"))
+)]
+pub mod erased;
+
 /// [`Throttle`] bot adaptor which allows automatically throttle when hitting
 /// API limits.
 ///
@@ -66,6 +78,12 @@ pub use auto_send::AutoSend;
     doc(cfg(feature = "cache_me"))
 )]
 pub use cache_me::CacheMe;
+#[cfg(feature = "erased")]
+#[cfg_attr(
+    all(any(docsrs, dep_docsrs), feature = "nightly"),
+    doc(cfg(feature = "erased"))
+)]
+pub use erased::ErasedRequester;
 #[cfg(feature = "throttle")]
 #[cfg_attr(
     all(any(docsrs, dep_docsrs), feature = "nightly"),
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
new file mode 100644
index 00000000..7141c9b6
--- /dev/null
+++ b/src/adaptors/erased.rs
@@ -0,0 +1,1339 @@
+use std::sync::Arc;
+
+use futures::{future::BoxFuture, FutureExt};
+use reqwest::Url;
+
+use crate::{
+    payloads::*,
+    requests::{HasPayload, Output, Payload, Request, Requester},
+    types::{
+        BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        InputSticker, LabeledPrice, PassportElementError, PollType, TargetMessage,
+    },
+};
+
+/// [`Requester`] with erased type.
+#[derive(Clone)]
+pub struct ErasedRequester<'a, E> {
+    inner: Arc<dyn ErasableRequester<'a, Err = E> + 'a>,
+}
+
+impl<'a, E> ErasedRequester<'a, E> {
+    /// Erases type of `requester`
+    ///
+    /// Note: it's recommended to use [`RequesterExt::erase`] instead.
+    ///
+    /// [`RequesterExt::erase`]: crate::requests::RequesterExt::erase
+    pub fn new<B>(requester: B) -> Self
+    where
+        B: Requester<Err = E> + 'a,
+    {
+        Self {
+            inner: Arc::new(requester),
+        }
+    }
+}
+
+/// [`Request`] with erased type.
+pub struct ErasedRequest<'a, T, E> {
+    inner: Box<dyn ErasableRequest<'a, Payload = T, Err = E> + 'a>,
+}
+
+impl<'a, T, E> ErasedRequest<'a, T, E> {
+    pub(crate) fn erase(request: impl Request<Payload = T, Err = E> + 'a) -> Self {
+        Self {
+            inner: Box::new(request),
+        }
+    }
+}
+
+impl<T, E> HasPayload for ErasedRequest<'_, T, E>
+where
+    T: Payload,
+{
+    type Payload = T;
+
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        self.inner.payload_mut()
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self.inner.payload_ref()
+    }
+}
+
+impl<'a, T, E> Request for ErasedRequest<'a, T, E>
+where
+    T: Payload,
+    E: std::error::Error + Send,
+{
+    type Err = E;
+
+    type Send = BoxFuture<'a, Result<Output<Self>, Self::Err>>;
+
+    type SendRef = BoxFuture<'a, Result<Output<Self>, Self::Err>>;
+
+    fn send(self) -> Self::Send {
+        self.inner.send_box()
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        self.inner.send_ref()
+    }
+}
+
+/// Object safe version of [`Request`].
+///
+/// TODO(waffle): make [`Request`] object safe and remove this trait (this is a
+/// breaking change)
+trait ErasableRequest<'a>: HasPayload {
+    type Err: std::error::Error + Send;
+
+    fn send_box(self: Box<Self>) -> BoxFuture<'a, Result<Output<Self>, Self::Err>>;
+
+    fn send_ref(&self) -> BoxFuture<'a, Result<Output<Self>, Self::Err>>;
+}
+
+impl<'a, R> ErasableRequest<'a> for R
+where
+    R: Request,
+    <R as Request>::Send: 'a,
+    <R as Request>::SendRef: 'a,
+{
+    type Err = R::Err;
+
+    fn send_box(self: Box<Self>) -> BoxFuture<'a, Result<Output<Self>, Self::Err>> {
+        self.send().boxed()
+    }
+
+    fn send_ref(&self) -> BoxFuture<'a, Result<Output<Self>, Self::Err>> {
+        Request::send_ref(self).boxed()
+    }
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        ErasedRequest<'a, $T, Err>
+    };
+}
+
+macro_rules! fwd_erased {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        $this.inner.$m($( fwd_erased!(@convert $m, $arg, $arg : $T) ),*)
+    };
+
+    (@convert send_media_group, $arg:ident, media : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, options : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, commands : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, results : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, prices : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, errors : $T:ty) => {
+        $arg.into_iter().collect()
+    };
+    (@convert $m:ident, $arg:ident, $arg_:ident : $T:ty) => {
+        $arg.into()
+    };
+}
+
+impl<'a, Err> Requester for ErasedRequester<'a, Err>
+where
+    Err: std::error::Error + Send,
+{
+    type Err = Err;
+
+    requester_forward! {
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
+        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline, send_venue,
+        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
+        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
+        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
+        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
+        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
+        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
+        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
+        get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, send_invoice, answer_shipping_query,
+        answer_pre_checkout_query, set_passport_data_errors, send_game,
+        set_game_score, set_game_score_inline, get_game_high_scores,
+        get_updates_fault_tolerant => fwd_erased, fty
+    }
+}
+
+/// Object safe version of [`Requester`].
+trait ErasableRequester<'a> {
+    /// Error type returned by all requests.
+    type Err: std::error::Error + Send;
+
+    fn get_updates(&self) -> ErasedRequest<'a, GetUpdates, Self::Err>;
+
+    fn set_webhook(&self, url: Url) -> ErasedRequest<'a, SetWebhook, Self::Err>;
+
+    fn delete_webhook(&self) -> ErasedRequest<'a, DeleteWebhook, Self::Err>;
+
+    fn get_webhook_info(&self) -> ErasedRequest<'a, GetWebhookInfo, Self::Err>;
+
+    fn get_me(&self) -> ErasedRequest<'a, GetMe, Self::Err>;
+
+    fn log_out(&self) -> ErasedRequest<'a, LogOut, Self::Err>;
+
+    fn close(&self) -> ErasedRequest<'a, Close, Self::Err>;
+
+    fn send_message(
+        &self,
+        chat_id: ChatId,
+        text: String,
+    ) -> ErasedRequest<'a, SendMessage, Self::Err>;
+
+    fn forward_message(
+        &self,
+        chat_id: ChatId,
+        from_chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, ForwardMessage, Self::Err>;
+
+    fn copy_message(
+        &self,
+        chat_id: ChatId,
+        from_chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, CopyMessage, Self::Err>;
+
+    fn send_photo(
+        &self,
+        chat_id: ChatId,
+        photo: InputFile,
+    ) -> ErasedRequest<'a, SendPhoto, Self::Err>;
+
+    fn send_audio(
+        &self,
+        chat_id: ChatId,
+        audio: InputFile,
+    ) -> ErasedRequest<'a, SendAudio, Self::Err>;
+
+    fn send_document(
+        &self,
+        chat_id: ChatId,
+        document: InputFile,
+    ) -> ErasedRequest<'a, SendDocument, Self::Err>;
+
+    fn send_video(
+        &self,
+        chat_id: ChatId,
+        video: InputFile,
+    ) -> ErasedRequest<'a, SendVideo, Self::Err>;
+
+    fn send_animation(
+        &self,
+        chat_id: ChatId,
+        animation: InputFile,
+    ) -> ErasedRequest<'a, SendAnimation, Self::Err>;
+
+    fn send_voice(
+        &self,
+        chat_id: ChatId,
+        voice: InputFile,
+    ) -> ErasedRequest<'a, SendVoice, Self::Err>;
+
+    fn send_video_note(
+        &self,
+        chat_id: ChatId,
+        video_note: InputFile,
+    ) -> ErasedRequest<'a, SendVideoNote, Self::Err>;
+
+    fn send_media_group(
+        &self,
+        chat_id: ChatId,
+        media: Vec<InputMedia>,
+    ) -> ErasedRequest<'a, SendMediaGroup, Self::Err>;
+
+    fn send_location(
+        &self,
+        chat_id: ChatId,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, SendLocation, Self::Err>;
+
+    fn edit_message_live_location(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, EditMessageLiveLocation, Self::Err>;
+
+    fn edit_message_live_location_inline(
+        &self,
+        inline_message_id: String,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, EditMessageLiveLocationInline, Self::Err>;
+
+    fn stop_message_live_location(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, StopMessageLiveLocation, Self::Err>;
+
+    fn stop_message_live_location_inline(
+        &self,
+        inline_message_id: String,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, StopMessageLiveLocationInline, Self::Err>;
+
+    fn send_venue(
+        &self,
+        chat_id: ChatId,
+        latitude: f64,
+        longitude: f64,
+        title: String,
+        address: String,
+    ) -> ErasedRequest<'a, SendVenue, Self::Err>;
+
+    fn send_contact(
+        &self,
+        chat_id: ChatId,
+        phone_number: String,
+        first_name: String,
+    ) -> ErasedRequest<'a, SendContact, Self::Err>;
+
+    fn send_poll(
+        &self,
+        chat_id: ChatId,
+        question: String,
+        options: Vec<String>,
+        type_: PollType,
+    ) -> ErasedRequest<'a, SendPoll, Self::Err>;
+
+    fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err>;
+
+    fn send_chat_action(
+        &self,
+        chat_id: ChatId,
+        action: ChatAction,
+    ) -> ErasedRequest<'a, SendChatAction, Self::Err>;
+
+    fn get_user_profile_photos(
+        &self,
+        user_id: i64,
+    ) -> ErasedRequest<'a, GetUserProfilePhotos, Self::Err>;
+
+    fn get_file(&self, file_id: String) -> ErasedRequest<'a, GetFile, Self::Err>;
+
+    fn ban_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, BanChatMember, Self::Err>;
+
+    fn kick_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, KickChatMember, Self::Err>;
+
+    fn unban_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, UnbanChatMember, Self::Err>;
+
+    fn restrict_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+        permissions: ChatPermissions,
+    ) -> ErasedRequest<'a, RestrictChatMember, Self::Err>;
+
+    fn promote_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, PromoteChatMember, Self::Err>;
+
+    fn set_chat_administrator_custom_title(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+        custom_title: String,
+    ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err>;
+
+    fn set_chat_permissions(
+        &self,
+        chat_id: ChatId,
+        permissions: ChatPermissions,
+    ) -> ErasedRequest<'a, SetChatPermissions, Self::Err>;
+
+    fn export_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, ExportChatInviteLink, Self::Err>;
+
+    fn create_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, CreateChatInviteLink, Self::Err>;
+
+    fn edit_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+        invite_link: String,
+    ) -> ErasedRequest<'a, EditChatInviteLink, Self::Err>;
+
+    fn revoke_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+        invite_link: String,
+    ) -> ErasedRequest<'a, RevokeChatInviteLink, Self::Err>;
+
+    fn set_chat_photo(
+        &self,
+        chat_id: ChatId,
+        photo: InputFile,
+    ) -> ErasedRequest<'a, SetChatPhoto, Self::Err>;
+
+    fn delete_chat_photo(&self, chat_id: ChatId) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err>;
+
+    fn set_chat_title(
+        &self,
+        chat_id: ChatId,
+        title: String,
+    ) -> ErasedRequest<'a, SetChatTitle, Self::Err>;
+
+    fn set_chat_description(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, SetChatDescription, Self::Err>;
+
+    fn pin_chat_message(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, PinChatMessage, Self::Err>;
+
+    fn unpin_chat_message(&self, chat_id: ChatId)
+        -> ErasedRequest<'a, UnpinChatMessage, Self::Err>;
+
+    fn unpin_all_chat_messages(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, UnpinAllChatMessages, Self::Err>;
+
+    fn leave_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, LeaveChat, Self::Err>;
+
+    fn get_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, GetChat, Self::Err>;
+
+    fn get_chat_administrators(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatAdministrators, Self::Err>;
+
+    fn get_chat_member_count(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatMemberCount, Self::Err>;
+
+    fn get_chat_members_count(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatMembersCount, Self::Err>;
+
+    fn get_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, GetChatMember, Self::Err>;
+
+    fn set_chat_sticker_set(
+        &self,
+        chat_id: ChatId,
+        sticker_set_name: String,
+    ) -> ErasedRequest<'a, SetChatStickerSet, Self::Err>;
+
+    fn delete_chat_sticker_set(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, DeleteChatStickerSet, Self::Err>;
+
+    fn answer_callback_query(
+        &self,
+        callback_query_id: String,
+    ) -> ErasedRequest<'a, AnswerCallbackQuery, Self::Err>;
+
+    fn set_my_commands(
+        &self,
+        commands: Vec<BotCommand>,
+    ) -> ErasedRequest<'a, SetMyCommands, Self::Err>;
+
+    fn get_my_commands(&self) -> ErasedRequest<'a, GetMyCommands, Self::Err>;
+
+    fn delete_my_commands(&self) -> ErasedRequest<'a, DeleteMyCommands, Self::Err>;
+
+    fn answer_inline_query(
+        &self,
+        inline_query_id: String,
+        results: Vec<InlineQueryResult>,
+    ) -> ErasedRequest<'a, AnswerInlineQuery, Self::Err>;
+
+    fn edit_message_text(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        text: String,
+    ) -> ErasedRequest<'a, EditMessageText, Self::Err>;
+
+    fn edit_message_text_inline(
+        &self,
+        inline_message_id: String,
+        text: String,
+    ) -> ErasedRequest<'a, EditMessageTextInline, Self::Err>;
+
+    fn edit_message_caption(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, EditMessageCaption, Self::Err>;
+
+    fn edit_message_caption_inline(
+        &self,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, EditMessageCaptionInline, Self::Err>;
+
+    fn edit_message_media(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        media: InputMedia,
+    ) -> ErasedRequest<'a, EditMessageMedia, Self::Err>;
+
+    fn edit_message_media_inline(
+        &self,
+        inline_message_id: String,
+        media: InputMedia,
+    ) -> ErasedRequest<'a, EditMessageMediaInline, Self::Err>;
+
+    fn edit_message_reply_markup(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err>;
+
+    fn edit_message_reply_markup_inline(
+        &self,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, EditMessageReplyMarkupInline, Self::Err>;
+
+    fn stop_poll(&self, chat_id: ChatId, message_id: i32)
+        -> ErasedRequest<'a, StopPoll, Self::Err>;
+
+    fn delete_message(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, DeleteMessage, Self::Err>;
+
+    fn send_sticker(
+        &self,
+        chat_id: ChatId,
+        sticker: InputFile,
+    ) -> ErasedRequest<'a, SendSticker, Self::Err>;
+
+    fn get_sticker_set(&self, name: String) -> ErasedRequest<'a, GetStickerSet, Self::Err>;
+
+    fn upload_sticker_file(
+        &self,
+        user_id: i64,
+        png_sticker: InputFile,
+    ) -> ErasedRequest<'a, UploadStickerFile, Self::Err>;
+
+    fn create_new_sticker_set(
+        &self,
+        user_id: i64,
+        name: String,
+        title: String,
+        sticker: InputSticker,
+        emojis: String,
+    ) -> ErasedRequest<'a, CreateNewStickerSet, Self::Err>;
+
+    fn add_sticker_to_set(
+        &self,
+        user_id: i64,
+        name: String,
+        sticker: InputSticker,
+        emojis: String,
+    ) -> ErasedRequest<'a, AddStickerToSet, Self::Err>;
+
+    fn set_sticker_position_in_set(
+        &self,
+        sticker: String,
+        position: u32,
+    ) -> ErasedRequest<'a, SetStickerPositionInSet, Self::Err>;
+
+    fn delete_sticker_from_set(
+        &self,
+        sticker: String,
+    ) -> ErasedRequest<'a, DeleteStickerFromSet, Self::Err>;
+
+    fn set_sticker_set_thumb(
+        &self,
+        name: String,
+        user_id: i64,
+    ) -> ErasedRequest<'a, SetStickerSetThumb, Self::Err>;
+
+    fn send_invoice(
+        &self,
+        chat_id: ChatId,
+        title: String,
+        description: String,
+        payload: String,
+        provider_token: String,
+        currency: String,
+        prices: Vec<LabeledPrice>,
+    ) -> ErasedRequest<'a, SendInvoice, Self::Err>;
+
+    fn answer_shipping_query(
+        &self,
+        shipping_query_id: String,
+        ok: bool,
+    ) -> ErasedRequest<'a, AnswerShippingQuery, Self::Err>;
+
+    fn answer_pre_checkout_query(
+        &self,
+        pre_checkout_query_id: String,
+        ok: bool,
+    ) -> ErasedRequest<'a, AnswerPreCheckoutQuery, Self::Err>;
+
+    fn set_passport_data_errors(
+        &self,
+        user_id: i64,
+        errors: Vec<PassportElementError>,
+    ) -> ErasedRequest<'a, SetPassportDataErrors, Self::Err>;
+
+    fn send_game(
+        &self,
+        chat_id: u32,
+        game_short_name: String,
+    ) -> ErasedRequest<'a, SendGame, Self::Err>;
+
+    fn set_game_score(
+        &self,
+        user_id: i64,
+        score: u64,
+        chat_id: u32,
+        message_id: i64,
+    ) -> ErasedRequest<'a, SetGameScore, Self::Err>;
+
+    fn set_game_score_inline(
+        &self,
+        user_id: i64,
+        score: u64,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, SetGameScoreInline, Self::Err>;
+
+    fn get_game_high_scores(
+        &self,
+        user_id: i64,
+        target: TargetMessage,
+    ) -> ErasedRequest<'a, GetGameHighScores, Self::Err>;
+
+    fn get_updates_fault_tolerant(&self) -> ErasedRequest<'a, GetUpdatesFaultTolerant, Self::Err>;
+}
+
+impl<'a, B> ErasableRequester<'a> for B
+where
+    B: Requester + 'a,
+{
+    type Err = B::Err;
+
+    fn get_updates(&self) -> ErasedRequest<'a, GetUpdates, Self::Err> {
+        Requester::get_updates(self).erase()
+    }
+
+    fn set_webhook(&self, url: Url) -> ErasedRequest<'a, SetWebhook, Self::Err> {
+        Requester::set_webhook(self, url).erase()
+    }
+
+    fn delete_webhook(&self) -> ErasedRequest<'a, DeleteWebhook, Self::Err> {
+        Requester::delete_webhook(self).erase()
+    }
+
+    fn get_webhook_info(&self) -> ErasedRequest<'a, GetWebhookInfo, Self::Err> {
+        Requester::get_webhook_info(self).erase()
+    }
+
+    fn get_me(&self) -> ErasedRequest<'a, GetMe, Self::Err> {
+        Requester::get_me(self).erase()
+    }
+
+    fn log_out(&self) -> ErasedRequest<'a, LogOut, Self::Err> {
+        Requester::log_out(self).erase()
+    }
+
+    fn close(&self) -> ErasedRequest<'a, Close, Self::Err> {
+        Requester::close(self).erase()
+    }
+
+    fn send_message(
+        &self,
+        chat_id: ChatId,
+        text: String,
+    ) -> ErasedRequest<'a, SendMessage, Self::Err> {
+        Requester::send_message(self, chat_id, text).erase()
+    }
+
+    fn forward_message(
+        &self,
+        chat_id: ChatId,
+        from_chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, ForwardMessage, Self::Err> {
+        Requester::forward_message(self, chat_id, from_chat_id, message_id).erase()
+    }
+
+    fn copy_message(
+        &self,
+        chat_id: ChatId,
+        from_chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, CopyMessage, Self::Err> {
+        Requester::copy_message(self, chat_id, from_chat_id, message_id).erase()
+    }
+
+    fn send_photo(
+        &self,
+        chat_id: ChatId,
+        photo: InputFile,
+    ) -> ErasedRequest<'a, SendPhoto, Self::Err> {
+        Requester::send_photo(self, chat_id, photo).erase()
+    }
+
+    fn send_audio(
+        &self,
+        chat_id: ChatId,
+        audio: InputFile,
+    ) -> ErasedRequest<'a, SendAudio, Self::Err> {
+        Requester::send_audio(self, chat_id, audio).erase()
+    }
+
+    fn send_document(
+        &self,
+        chat_id: ChatId,
+        document: InputFile,
+    ) -> ErasedRequest<'a, SendDocument, Self::Err> {
+        Requester::send_document(self, chat_id, document).erase()
+    }
+
+    fn send_video(
+        &self,
+        chat_id: ChatId,
+        video: InputFile,
+    ) -> ErasedRequest<'a, SendVideo, Self::Err> {
+        Requester::send_video(self, chat_id, video).erase()
+    }
+
+    fn send_animation(
+        &self,
+        chat_id: ChatId,
+        animation: InputFile,
+    ) -> ErasedRequest<'a, SendAnimation, Self::Err> {
+        Requester::send_animation(self, chat_id, animation).erase()
+    }
+
+    fn send_voice(
+        &self,
+        chat_id: ChatId,
+        voice: InputFile,
+    ) -> ErasedRequest<'a, SendVoice, Self::Err> {
+        Requester::send_voice(self, chat_id, voice).erase()
+    }
+
+    fn send_video_note(
+        &self,
+        chat_id: ChatId,
+        video_note: InputFile,
+    ) -> ErasedRequest<'a, SendVideoNote, Self::Err> {
+        Requester::send_video_note(self, chat_id, video_note).erase()
+    }
+
+    fn send_media_group(
+        &self,
+        chat_id: ChatId,
+        media: Vec<InputMedia>,
+    ) -> ErasedRequest<'a, SendMediaGroup, Self::Err> {
+        Requester::send_media_group(self, chat_id, media).erase()
+    }
+
+    fn send_location(
+        &self,
+        chat_id: ChatId,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, SendLocation, Self::Err> {
+        Requester::send_location(self, chat_id, latitude, longitude).erase()
+    }
+
+    fn edit_message_live_location(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, EditMessageLiveLocation, Self::Err> {
+        Requester::edit_message_live_location(self, chat_id, message_id, latitude, longitude)
+            .erase()
+    }
+
+    fn edit_message_live_location_inline(
+        &self,
+        inline_message_id: String,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, EditMessageLiveLocationInline, Self::Err> {
+        Requester::edit_message_live_location_inline(self, inline_message_id, latitude, longitude)
+            .erase()
+    }
+
+    fn stop_message_live_location(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, StopMessageLiveLocation, Self::Err> {
+        Requester::stop_message_live_location(self, chat_id, message_id, latitude, longitude)
+            .erase()
+    }
+
+    fn stop_message_live_location_inline(
+        &self,
+        inline_message_id: String,
+        latitude: f64,
+        longitude: f64,
+    ) -> ErasedRequest<'a, StopMessageLiveLocationInline, Self::Err> {
+        Requester::stop_message_live_location_inline(self, inline_message_id, latitude, longitude)
+            .erase()
+    }
+
+    fn send_venue(
+        &self,
+        chat_id: ChatId,
+        latitude: f64,
+        longitude: f64,
+        title: String,
+        address: String,
+    ) -> ErasedRequest<'a, SendVenue, Self::Err> {
+        Requester::send_venue(self, chat_id, latitude, longitude, title, address).erase()
+    }
+
+    fn send_contact(
+        &self,
+        chat_id: ChatId,
+        phone_number: String,
+        first_name: String,
+    ) -> ErasedRequest<'a, SendContact, Self::Err> {
+        Requester::send_contact(self, chat_id, phone_number, first_name).erase()
+    }
+
+    fn send_poll(
+        &self,
+        chat_id: ChatId,
+        question: String,
+        options: Vec<String>,
+        type_: PollType,
+    ) -> ErasedRequest<'a, SendPoll, Self::Err> {
+        Requester::send_poll(self, chat_id, question, options, type_).erase()
+    }
+
+    fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err> {
+        Requester::send_dice(self, chat_id).erase()
+    }
+
+    fn send_chat_action(
+        &self,
+        chat_id: ChatId,
+        action: ChatAction,
+    ) -> ErasedRequest<'a, SendChatAction, Self::Err> {
+        Requester::send_chat_action(self, chat_id, action).erase()
+    }
+
+    fn get_user_profile_photos(
+        &self,
+        user_id: i64,
+    ) -> ErasedRequest<'a, GetUserProfilePhotos, Self::Err> {
+        Requester::get_user_profile_photos(self, user_id).erase()
+    }
+
+    fn get_file(&self, file_id: String) -> ErasedRequest<'a, GetFile, Self::Err> {
+        Requester::get_file(self, file_id).erase()
+    }
+
+    fn ban_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, BanChatMember, Self::Err> {
+        Requester::ban_chat_member(self, chat_id, user_id).erase()
+    }
+
+    fn kick_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, KickChatMember, Self::Err> {
+        Requester::kick_chat_member(self, chat_id, user_id).erase()
+    }
+
+    fn unban_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, UnbanChatMember, Self::Err> {
+        Requester::unban_chat_member(self, chat_id, user_id).erase()
+    }
+
+    fn restrict_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+        permissions: ChatPermissions,
+    ) -> ErasedRequest<'a, RestrictChatMember, Self::Err> {
+        Requester::restrict_chat_member(self, chat_id, user_id, permissions).erase()
+    }
+
+    fn promote_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, PromoteChatMember, Self::Err> {
+        Requester::promote_chat_member(self, chat_id, user_id).erase()
+    }
+
+    fn set_chat_administrator_custom_title(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+        custom_title: String,
+    ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err> {
+        Requester::set_chat_administrator_custom_title(self, chat_id, user_id, custom_title).erase()
+    }
+
+    fn set_chat_permissions(
+        &self,
+        chat_id: ChatId,
+        permissions: ChatPermissions,
+    ) -> ErasedRequest<'a, SetChatPermissions, Self::Err> {
+        Requester::set_chat_permissions(self, chat_id, permissions).erase()
+    }
+
+    fn export_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, ExportChatInviteLink, Self::Err> {
+        Requester::export_chat_invite_link(self, chat_id).erase()
+    }
+
+    fn create_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, CreateChatInviteLink, Self::Err> {
+        Requester::create_chat_invite_link(self, chat_id).erase()
+    }
+
+    fn edit_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+        invite_link: String,
+    ) -> ErasedRequest<'a, EditChatInviteLink, Self::Err> {
+        Requester::edit_chat_invite_link(self, chat_id, invite_link).erase()
+    }
+
+    fn revoke_chat_invite_link(
+        &self,
+        chat_id: ChatId,
+        invite_link: String,
+    ) -> ErasedRequest<'a, RevokeChatInviteLink, Self::Err> {
+        Requester::revoke_chat_invite_link(self, chat_id, invite_link).erase()
+    }
+
+    fn set_chat_photo(
+        &self,
+        chat_id: ChatId,
+        photo: InputFile,
+    ) -> ErasedRequest<'a, SetChatPhoto, Self::Err> {
+        Requester::set_chat_photo(self, chat_id, photo).erase()
+    }
+
+    fn delete_chat_photo(&self, chat_id: ChatId) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err> {
+        Requester::delete_chat_photo(self, chat_id).erase()
+    }
+
+    fn set_chat_title(
+        &self,
+        chat_id: ChatId,
+        title: String,
+    ) -> ErasedRequest<'a, SetChatTitle, Self::Err> {
+        Requester::set_chat_title(self, chat_id, title).erase()
+    }
+
+    fn set_chat_description(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, SetChatDescription, Self::Err> {
+        Requester::set_chat_description(self, chat_id).erase()
+    }
+
+    fn pin_chat_message(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, PinChatMessage, Self::Err> {
+        Requester::pin_chat_message(self, chat_id, message_id).erase()
+    }
+
+    fn unpin_chat_message(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, UnpinChatMessage, Self::Err> {
+        Requester::unpin_chat_message(self, chat_id).erase()
+    }
+
+    fn unpin_all_chat_messages(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, UnpinAllChatMessages, Self::Err> {
+        Requester::unpin_all_chat_messages(self, chat_id).erase()
+    }
+
+    fn leave_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, LeaveChat, Self::Err> {
+        Requester::leave_chat(self, chat_id).erase()
+    }
+
+    fn get_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, GetChat, Self::Err> {
+        Requester::get_chat(self, chat_id).erase()
+    }
+
+    fn get_chat_administrators(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatAdministrators, Self::Err> {
+        Requester::get_chat_administrators(self, chat_id).erase()
+    }
+
+    fn get_chat_member_count(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatMemberCount, Self::Err> {
+        Requester::get_chat_member_count(self, chat_id).erase()
+    }
+
+    fn get_chat_members_count(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, GetChatMembersCount, Self::Err> {
+        Requester::get_chat_members_count(self, chat_id).erase()
+    }
+
+    fn get_chat_member(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, GetChatMember, Self::Err> {
+        Requester::get_chat_member(self, chat_id, user_id).erase()
+    }
+
+    fn set_chat_sticker_set(
+        &self,
+        chat_id: ChatId,
+        sticker_set_name: String,
+    ) -> ErasedRequest<'a, SetChatStickerSet, Self::Err> {
+        Requester::set_chat_sticker_set(self, chat_id, sticker_set_name).erase()
+    }
+
+    fn delete_chat_sticker_set(
+        &self,
+        chat_id: ChatId,
+    ) -> ErasedRequest<'a, DeleteChatStickerSet, Self::Err> {
+        Requester::delete_chat_sticker_set(self, chat_id).erase()
+    }
+
+    fn answer_callback_query(
+        &self,
+        callback_query_id: String,
+    ) -> ErasedRequest<'a, AnswerCallbackQuery, Self::Err> {
+        Requester::answer_callback_query(self, callback_query_id).erase()
+    }
+
+    fn set_my_commands(
+        &self,
+        commands: Vec<BotCommand>,
+    ) -> ErasedRequest<'a, SetMyCommands, Self::Err> {
+        Requester::set_my_commands(self, commands).erase()
+    }
+
+    fn get_my_commands(&self) -> ErasedRequest<'a, GetMyCommands, Self::Err> {
+        Requester::get_my_commands(self).erase()
+    }
+
+    fn delete_my_commands(&self) -> ErasedRequest<'a, DeleteMyCommands, Self::Err> {
+        Requester::delete_my_commands(self).erase()
+    }
+
+    fn answer_inline_query(
+        &self,
+        inline_query_id: String,
+        results: Vec<InlineQueryResult>,
+    ) -> ErasedRequest<'a, AnswerInlineQuery, Self::Err> {
+        Requester::answer_inline_query(self, inline_query_id, results).erase()
+    }
+
+    fn edit_message_text(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        text: String,
+    ) -> ErasedRequest<'a, EditMessageText, Self::Err> {
+        Requester::edit_message_text(self, chat_id, message_id, text).erase()
+    }
+
+    fn edit_message_text_inline(
+        &self,
+        inline_message_id: String,
+        text: String,
+    ) -> ErasedRequest<'a, EditMessageTextInline, Self::Err> {
+        Requester::edit_message_text_inline(self, inline_message_id, text).erase()
+    }
+
+    fn edit_message_caption(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, EditMessageCaption, Self::Err> {
+        Requester::edit_message_caption(self, chat_id, message_id).erase()
+    }
+
+    fn edit_message_caption_inline(
+        &self,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, EditMessageCaptionInline, Self::Err> {
+        Requester::edit_message_caption_inline(self, inline_message_id).erase()
+    }
+
+    fn edit_message_media(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+        media: InputMedia,
+    ) -> ErasedRequest<'a, EditMessageMedia, Self::Err> {
+        Requester::edit_message_media(self, chat_id, message_id, media).erase()
+    }
+
+    fn edit_message_media_inline(
+        &self,
+        inline_message_id: String,
+        media: InputMedia,
+    ) -> ErasedRequest<'a, EditMessageMediaInline, Self::Err> {
+        Requester::edit_message_media_inline(self, inline_message_id, media).erase()
+    }
+
+    fn edit_message_reply_markup(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err> {
+        Requester::edit_message_reply_markup(self, chat_id, message_id).erase()
+    }
+
+    fn edit_message_reply_markup_inline(
+        &self,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, EditMessageReplyMarkupInline, Self::Err> {
+        Requester::edit_message_reply_markup_inline(self, inline_message_id).erase()
+    }
+
+    fn stop_poll(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, StopPoll, Self::Err> {
+        Requester::stop_poll(self, chat_id, message_id).erase()
+    }
+
+    fn delete_message(
+        &self,
+        chat_id: ChatId,
+        message_id: i32,
+    ) -> ErasedRequest<'a, DeleteMessage, Self::Err> {
+        Requester::delete_message(self, chat_id, message_id).erase()
+    }
+
+    fn send_sticker(
+        &self,
+        chat_id: ChatId,
+        sticker: InputFile,
+    ) -> ErasedRequest<'a, SendSticker, Self::Err> {
+        Requester::send_sticker(self, chat_id, sticker).erase()
+    }
+
+    fn get_sticker_set(&self, name: String) -> ErasedRequest<'a, GetStickerSet, Self::Err> {
+        Requester::get_sticker_set(self, name).erase()
+    }
+
+    fn upload_sticker_file(
+        &self,
+        user_id: i64,
+        png_sticker: InputFile,
+    ) -> ErasedRequest<'a, UploadStickerFile, Self::Err> {
+        Requester::upload_sticker_file(self, user_id, png_sticker).erase()
+    }
+
+    fn create_new_sticker_set(
+        &self,
+        user_id: i64,
+        name: String,
+        title: String,
+        sticker: InputSticker,
+        emojis: String,
+    ) -> ErasedRequest<'a, CreateNewStickerSet, Self::Err> {
+        Requester::create_new_sticker_set(self, user_id, name, title, sticker, emojis).erase()
+    }
+
+    fn add_sticker_to_set(
+        &self,
+        user_id: i64,
+        name: String,
+        sticker: InputSticker,
+        emojis: String,
+    ) -> ErasedRequest<'a, AddStickerToSet, Self::Err> {
+        Requester::add_sticker_to_set(self, user_id, name, sticker, emojis).erase()
+    }
+
+    fn set_sticker_position_in_set(
+        &self,
+        sticker: String,
+        position: u32,
+    ) -> ErasedRequest<'a, SetStickerPositionInSet, Self::Err> {
+        Requester::set_sticker_position_in_set(self, sticker, position).erase()
+    }
+
+    fn delete_sticker_from_set(
+        &self,
+        sticker: String,
+    ) -> ErasedRequest<'a, DeleteStickerFromSet, Self::Err> {
+        Requester::delete_sticker_from_set(self, sticker).erase()
+    }
+
+    fn set_sticker_set_thumb(
+        &self,
+        name: String,
+        user_id: i64,
+    ) -> ErasedRequest<'a, SetStickerSetThumb, Self::Err> {
+        Requester::set_sticker_set_thumb(self, name, user_id).erase()
+    }
+
+    fn send_invoice(
+        &self,
+        chat_id: ChatId,
+        title: String,
+        description: String,
+        payload: String,
+        provider_token: String,
+        currency: String,
+        prices: Vec<LabeledPrice>,
+    ) -> ErasedRequest<'a, SendInvoice, Self::Err> {
+        Requester::send_invoice(
+            self,
+            chat_id,
+            title,
+            description,
+            payload,
+            provider_token,
+            currency,
+            prices,
+        )
+        .erase()
+    }
+
+    fn answer_shipping_query(
+        &self,
+        shipping_query_id: String,
+        ok: bool,
+    ) -> ErasedRequest<'a, AnswerShippingQuery, Self::Err> {
+        Requester::answer_shipping_query(self, shipping_query_id, ok).erase()
+    }
+
+    fn answer_pre_checkout_query(
+        &self,
+        pre_checkout_query_id: String,
+        ok: bool,
+    ) -> ErasedRequest<'a, AnswerPreCheckoutQuery, Self::Err> {
+        Requester::answer_pre_checkout_query(self, pre_checkout_query_id, ok).erase()
+    }
+
+    fn set_passport_data_errors(
+        &self,
+        user_id: i64,
+        errors: Vec<PassportElementError>,
+    ) -> ErasedRequest<'a, SetPassportDataErrors, Self::Err> {
+        Requester::set_passport_data_errors(self, user_id, errors).erase()
+    }
+
+    fn send_game(
+        &self,
+        chat_id: u32,
+        game_short_name: String,
+    ) -> ErasedRequest<'a, SendGame, Self::Err> {
+        Requester::send_game(self, chat_id, game_short_name).erase()
+    }
+
+    fn set_game_score(
+        &self,
+        user_id: i64,
+        score: u64,
+        chat_id: u32,
+        message_id: i64,
+    ) -> ErasedRequest<'a, SetGameScore, Self::Err> {
+        Requester::set_game_score(self, user_id, score, chat_id, message_id).erase()
+    }
+
+    fn set_game_score_inline(
+        &self,
+        user_id: i64,
+        score: u64,
+        inline_message_id: String,
+    ) -> ErasedRequest<'a, SetGameScoreInline, Self::Err> {
+        Requester::set_game_score_inline(self, user_id, score, inline_message_id).erase()
+    }
+
+    fn get_game_high_scores(
+        &self,
+        user_id: i64,
+        target: TargetMessage,
+    ) -> ErasedRequest<'a, GetGameHighScores, Self::Err> {
+        Requester::get_game_high_scores(self, user_id, target).erase()
+    }
+
+    fn get_updates_fault_tolerant(&self) -> ErasedRequest<'a, GetUpdatesFaultTolerant, Self::Err> {
+        Requester::get_updates_fault_tolerant(self).erase()
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 788abe5b..a1ad15d4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -48,6 +48,7 @@
 //! - `rustls` — use [`rustls`] tls implementation
 //! - `auto_send` — enables [`AutoSend`] bot adaptor
 //! - `trace_adaptor` — enables [`Trace`] bot adaptor
+//! - `erased` — enables [`ErasedRequester`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
 //! - `cache_me` — enables [`CacheMe`] bot adaptor
 //! - `full` — enables all features except `nigthly`
@@ -57,6 +58,7 @@
 //!
 //! [`AutoSend`]: adaptors::AutoSend
 //! [`Trace`]: adaptors::Trace
+//! [`ErasedRequester`]: adaptors::ErasedRequester
 //! [`Throttle`]: adaptors::Throttle
 //! [`CacheMe`]: adaptors::CacheMe
 //! [`native-tls`]: https://docs.rs/native-tls
diff --git a/src/requests/request.rs b/src/requests/request.rs
index aed2490e..3913dcb3 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -87,6 +87,18 @@ pub trait Request: HasPayload {
     /// # };
     /// ```
     fn send_ref(&self) -> Self::SendRef;
+
+    #[cfg(feature = "erased")]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "erased"))
+    )]
+    fn erase<'a>(self) -> crate::adaptors::erased::ErasedRequest<'a, Self::Payload, Self::Err>
+    where
+        Self: Sized + 'a,
+    {
+        crate::adaptors::erased::ErasedRequest::erase(self)
+    }
 }
 
 impl<L, R> Request for Either<L, R>
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 424796b8..24926ee7 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -6,6 +6,9 @@ use crate::adaptors::CacheMe;
 #[cfg(feature = "auto_send")]
 use crate::adaptors::AutoSend;
 
+#[cfg(feature = "erased")]
+use crate::adaptors::ErasedRequester;
+
 #[cfg(feature = "trace_adaptor")]
 use crate::adaptors::trace::{Settings, Trace};
 
@@ -42,6 +45,20 @@ pub trait RequesterExt: Requester {
         AutoSend::new(self)
     }
 
+    /// Erase requester type.
+    #[cfg(feature = "erased")]
+    #[cfg_attr(
+        all(any(docsrs, dep_docsrs), feature = "nightly"),
+        doc(cfg(feature = "erased"))
+    )]
+    fn erase<'a>(self) -> ErasedRequester<'a, Self::Err>
+    where
+        Self: 'a,
+        Self: Sized,
+    {
+        ErasedRequester::new(self)
+    }
+
     /// Trace requests, see [`Trace`] for more.
     #[cfg(feature = "trace_adaptor")]
     #[cfg_attr(

From 4ccedd7f7703cb62066d0a4b3f0976e2edd7294b Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Mon, 12 Jul 2021 17:07:20 +0300
Subject: [PATCH 357/755] suppress clippy

---
 src/adaptors/erased.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 7141c9b6..cd92c122 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -601,6 +601,8 @@ trait ErasableRequester<'a> {
         user_id: i64,
     ) -> ErasedRequest<'a, SetStickerSetThumb, Self::Err>;
 
+    // we can't change telegram API
+    #[allow(clippy::too_many_arguments)]
     fn send_invoice(
         &self,
         chat_id: ChatId,

From 2abd9b17a6c8ec9d9510cb8f528c4a8b2554a657 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 16 Jul 2021 22:41:50 +0300
Subject: [PATCH 358/755] Fix typo in docs

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

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 6733662b..3f8463db 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -41,7 +41,7 @@ pub mod cache_me;
 )]
 pub mod trace;
 
-/// [`ErasedErasedRequester`] bot adaptor which allows to erase type of
+/// [`ErasedRequester`] bot adaptor which allows to erase type of
 /// [`Requester`].
 ///
 /// [`ErasedRequester`]: erased::ErasedRequester

From 0471cb032229e78b4b955f9649e77fc30dc675e1 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Jul 2021 20:08:26 +0300
Subject: [PATCH 359/755] Use `tokio::task::unconstrained` when using
 `.now_or_never()` to prevent some problems I guess

The issue in fixme says to use `tokio::task::unconstrained`.
---
 src/adaptors/throttle.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index b741ac35..36d6d880 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -495,7 +495,7 @@ async fn worker(
 
 fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
     // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-    while let Some(Some(req)) = rx.recv().now_or_never() {
+    while let Some(Some(req)) = tokio::task::unconstrained(rx.recv()).now_or_never() {
         // Errors are ignored with .ok(). Error means that the response channel
         // is closed and the response isn't needed.
         match req {
@@ -519,7 +519,7 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
     // Don't grow queue bigger than the capacity to limit DOS posibility
     while queue.len() < queue.capacity() {
         // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-        match rx.recv().now_or_never() {
+        match tokio::task::unconstrained(rx.recv()).now_or_never() {
             Some(Some(req)) => queue.push(req),
             Some(None) => *rx_is_closed = true,
             // There are no items in queue.

From 1d379a34524ff687aa5a286722ac10a85d4de7a2 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 27 Jul 2021 12:58:11 +0300
Subject: [PATCH 360/755] Dump version: 0.3.1 => 0.3.2

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f218057..7352a145 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## 0.3.2 - 2021-07-27
+
 ### Added
 
 - `ErasedRequester` bot adaptor, `ErasedRequest` struct, `{Request, RequesterExt}::erase` functions ([#105][pr105])
diff --git a/Cargo.toml b/Cargo.toml
index 987af2b2..9ab400e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",

From 5349c8540440336d7bb5d4a4bac514b5bc49b3c5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 3 Aug 2021 02:29:26 +0300
Subject: [PATCH 361/755] Fix compilation with `nigthly` feature

The `min_type_alias_impl_trait` feature was removed in faviour of `type_alias_impl_trait`.
---
 CHANGELOG.md | 8 ++++++++
 Cargo.toml   | 2 +-
 src/lib.rs   | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7352a145..38c949ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## 0.3.3
+
+### Fixed
+
+- Compilation with `nightly` feature (use `type_alias_impl_trait` instead of `min_type_alias_impl_trait`) ([#108][pr108])
+
+[pr108]: https://github.com/teloxide/teloxide-core/pull/108
+
 ## 0.3.2 - 2021-07-27
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 9ab400e4..58a2e6a7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
diff --git a/src/lib.rs b/src/lib.rs
index a1ad15d4..8ac08e86 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,7 +54,7 @@
 //! - `full` — enables all features except `nigthly`
 //! - `nightly` — enables nigthly-only features, currently:
 //!   - Removes some future boxing using `#![feature(type_alias_impl_trait)]`
-//!   - Used to built docs (`#![feature(doc_cfg, doc_spotlight)]`)
+//!   - Used to built docs (`#![feature(doc_cfg, doc_notable_trait)]`)
 //!
 //! [`AutoSend`]: adaptors::AutoSend
 //! [`Trace`]: adaptors::Trace
@@ -83,7 +83,7 @@
     all(any(docsrs, dep_docsrs), feature = "nightly"),
     feature(doc_cfg, doc_notable_trait)
 )]
-#![cfg_attr(feature = "nightly", feature(min_type_alias_impl_trait))]
+#![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 

From 2417b636a64c726bc70bf937fb676997b237944c Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 21 Aug 2021 20:39:57 +0300
Subject: [PATCH 362/755] Add `EditedMessageIsTooLong` error

---
 CHANGELOG.md  |  4 ++++
 src/errors.rs | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38c949ba..b4c12199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+- Add `EditedMessageIsTooLong` error [#109][pr109]
+
+[pr109]: https://github.com/teloxide/teloxide-core/pull/109
+
 ## 0.3.3
 
 ### Fixed
diff --git a/src/errors.rs b/src/errors.rs
index c41822d5..7241dbb7 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -167,6 +167,22 @@ pub enum ApiError {
     #[serde(rename = "Bad Request: message is too long")]
     MessageIsTooLong,
 
+    /// Occurs when bot tries to edit a message with text size greater then
+    /// 4096 symbols.
+    ///
+    /// May happen in methods:
+    /// 1. [`EditMessageText`]
+    /// 2. [`EditMessageTextInline`]
+    /// 3. [`EditMessageCaption`]
+    /// 4. [`EditMessageCaptionInline`]
+    ///
+    /// [`EditMessageText`]: crate::payloads::EditMessageText
+    /// [`EditMessageTextInline`]: crate::payloads::EditMessageTextInline
+    /// [`EditMessageCaption`]: crate::payloads::EditMessageCaption
+    /// [`EditMessageCaptionInline`]: crate::payloads::EditMessageCaptionInline
+    #[serde(rename = "Bad Request: MESSAGE_TOO_LONG")]
+    EditedMessageIsTooLong,
+
     /// Occurs when bot tries to send media group with more than 10 items.
     ///
     /// May happen in methods:

From f793d1c684dc418ce0c43a14916f48aca51232a7 Mon Sep 17 00:00:00 2001
From: Kezi <keziolio123@gmail.com>
Date: Wed, 25 Aug 2021 20:59:02 +0200
Subject: [PATCH 363/755] typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fde42a77..186621c4 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
 </div>
 
 ```toml
-teloxide_core = "0.3"
+teloxide-core = "0.3"
 ```
 _Compiler support: requires rustc 1.49+_.
 

From a422f97480a4c877b90fad63df12c130c79de624 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Sat, 28 Aug 2021 14:54:40 +0300
Subject: [PATCH 364/755] Do not re-parse default tba url on every request

---
 src/bot.rs          | 42 +++++++++++++++++++++++++++++++-----------
 src/bot/api_url.rs  | 18 ------------------
 src/bot/download.rs | 10 ++++++++--
 3 files changed, 39 insertions(+), 31 deletions(-)
 delete mode 100644 src/bot/api_url.rs

diff --git a/src/bot.rs b/src/bot.rs
index e5677716..a79c75a7 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -4,14 +4,12 @@ use reqwest::Client;
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
-    bot::api_url::ApiUrl,
     net,
     requests::{MultipartPayload, Payload, ResponseResult},
     serde_multipart,
 };
 
 mod api;
-mod api_url;
 mod download;
 
 const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
@@ -56,7 +54,7 @@ const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 #[derive(Debug, Clone)]
 pub struct Bot {
     token: Arc<str>,
-    api_url: ApiUrl,
+    api_url: Arc<reqwest::Url>,
     client: Client,
 }
 
@@ -93,9 +91,15 @@ impl Bot {
     where
         S: Into<String>,
     {
+        let token = Into::<String>::into(token).into();
+        let api_url = Arc::new(
+            reqwest::Url::parse(net::TELEGRAM_API_URL)
+                .expect("Failed to parse default Telegram bot API url"),
+        );
+
         Self {
-            token: Into::<Arc<str>>::into(Into::<String>::into(token)),
-            api_url: ApiUrl::Default,
+            token,
+            api_url,
             client,
         }
     }
@@ -174,7 +178,7 @@ impl Bot {
     /// assert_ne!(bot2.api_url().as_str(), "https://example.com/");
     /// ```
     pub fn set_api_url(mut self, url: reqwest::Url) -> Self {
-        self.api_url = ApiUrl::Custom(Arc::new(url));
+        self.api_url = Arc::new(url);
         self
     }
 }
@@ -193,7 +197,7 @@ impl Bot {
 
     /// Returns currently used token API url.
     pub fn api_url(&self) -> reqwest::Url {
-        self.api_url.get()
+        reqwest::Url::clone(&*self.api_url)
     }
 }
 
@@ -208,14 +212,23 @@ impl Bot {
     {
         let client = self.client.clone();
         let token = Arc::clone(&self.token);
-        let api_url = self.api_url.clone();
+        let api_url = Arc::clone(&self.api_url);
 
         let params = serde_json::to_vec(payload)
             // this `expect` should be ok since we don't write request those may trigger error here
             .expect("serialization of request to be infallible");
 
         // async move to capture client&token&api_url&params
-        async move { net::request_json(&client, token.as_ref(), api_url.get(), P::NAME, params).await }
+        async move {
+            net::request_json(
+                &client,
+                token.as_ref(),
+                reqwest::Url::clone(&*api_url),
+                P::NAME,
+                params,
+            )
+            .await
+        }
     }
 
     pub(crate) fn execute_multipart<P>(
@@ -228,14 +241,21 @@ impl Bot {
     {
         let client = self.client.clone();
         let token = Arc::clone(&self.token);
-        let api_url = self.api_url.clone();
+        let api_url = Arc::clone(&self.api_url);
 
         let params = serde_multipart::to_form(payload);
 
         // async move to capture client&token&api_url&params
         async move {
             let params = params.await?;
-            net::request_multipart(&client, token.as_ref(), api_url.get(), P::NAME, params).await
+            net::request_multipart(
+                &client,
+                token.as_ref(),
+                reqwest::Url::clone(&*api_url),
+                P::NAME,
+                params,
+            )
+            .await
         }
     }
 }
diff --git a/src/bot/api_url.rs b/src/bot/api_url.rs
deleted file mode 100644
index 9db6a826..00000000
--- a/src/bot/api_url.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use std::sync::Arc;
-
-#[derive(Debug, Clone)]
-pub(crate) enum ApiUrl {
-    Default,
-    Custom(Arc<reqwest::Url>),
-}
-
-impl ApiUrl {
-    pub(crate) fn get(&self) -> reqwest::Url {
-        match self {
-            // FIXME(waffle): parse once
-            ApiUrl::Default => reqwest::Url::parse(crate::net::TELEGRAM_API_URL)
-                .expect("failed to parse default url"),
-            ApiUrl::Custom(url) => (&**url).clone(),
-        }
-    }
-}
diff --git a/src/bot/download.rs b/src/bot/download.rs
index 32b19d6e..5a98e488 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -22,7 +22,7 @@ impl<'w> Download<'w> for Bot {
     ) -> Self::Fut {
         net::download_file(
             &self.client,
-            self.api_url.get(),
+            reqwest::Url::clone(&*self.api_url),
             &self.token,
             path,
             destination,
@@ -35,6 +35,12 @@ impl<'w> Download<'w> for Bot {
     type Stream = BoxStream<'static, Result<Bytes, Self::StreamErr>>;
 
     fn download_file_stream(&self, path: &str) -> Self::Stream {
-        net::download_file_stream(&self.client, self.api_url.get(), &self.token, path).boxed()
+        net::download_file_stream(
+            &self.client,
+            reqwest::Url::clone(&*self.api_url),
+            &self.token,
+            path,
+        )
+        .boxed()
     }
 }

From 2c53236af4691e334386b4d4e29de8f6d0aae5d8 Mon Sep 17 00:00:00 2001
From: hex0x0000 <hex0x0000@protonmail.com>
Date: Sun, 22 Aug 2021 03:37:30 +0200
Subject: [PATCH 365/755] Fixed url formatting and a typo

Fixed formatting

Merging suggestion

Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>

Fixed other typos
---
 src/types/message.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 0cb29a5f..42fe7441 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -989,7 +989,7 @@ mod getters {
 impl Message {
     /// Produces a direct link to the message.
     ///
-    /// Note that for private groups the link will only be accesible for group
+    /// Note that for private groups the link will only be accessible for group
     /// members.
     ///
     /// Returns `None` for private chats (i.e.: DMs).
@@ -1000,17 +1000,21 @@ impl Message {
             // There are "tg://openmessage?user_id={0}&message_id={1}" links, which are
             // supposed to open any chat, including private messages, but they
             // are only supported by some telegram clients (e.g. Plus Messenger,
-            // Telegram for Androud 4.9+).
+            // Telegram for Android 4.9+).
             return None;
         }
 
         let url = match self.chat.username() {
             // If it's public group (i.e. not DM, not private group), we can produce
-            // "normal" t.me link (accesible to everyone).
+            // "normal" t.me link (accessible to everyone).
             Some(username) => format!("https://t.me/{0}/{1}/", username, self.id),
             // For private groups we produce "private" t.me/c links. These are only
-            // accesible to the group members.
-            None => format!("https://t.me/c/{0}/{1}/", self.chat.id, self.id),
+            // accessible to the group members.
+            None => format!(
+                "https://t.me/c/{0}/{1}/",
+                (-self.chat.id) - 1000000000000,
+                self.id
+            ),
         };
 
         // UNWRAP:

From d3bf4499ea4b855e05b775ed61aa2ae06810b458 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Tue, 31 Aug 2021 17:45:20 +0300
Subject: [PATCH 366/755] Use `url::Url` for urls, use `chrono::DateTime<Utc>`
 for dates in types

---
 CHANGELOG.md                                  |  2 +
 src/serde_multipart/serializers.rs            | 17 +++++--
 src/serde_multipart/unserializers.rs          |  2 +-
 .../unserializers/input_file.rs               |  4 +-
 src/types.rs                                  | 48 +++++++++++++++----
 src/types/chat_invite_link.rs                 |  7 ++-
 src/types/chat_member_updated.rs              |  6 ++-
 src/types/inline_keyboard_button.rs           |  7 +--
 src/types/inline_keyboard_markup.rs           | 19 +++++---
 src/types/inline_query_result_article.rs      | 18 +++----
 src/types/inline_query_result_audio.rs        | 14 ++----
 .../inline_query_result_cached_document.rs    |  2 +-
 .../inline_query_result_cached_mpeg4_gif.rs   |  2 +-
 src/types/inline_query_result_cached_photo.rs |  2 +-
 src/types/inline_query_result_cached_video.rs |  2 +-
 src/types/inline_query_result_cached_voice.rs |  2 +-
 src/types/inline_query_result_contact.rs      |  9 ++--
 src/types/inline_query_result_document.rs     | 20 +++-----
 src/types/inline_query_result_gif.rs          | 28 ++++-------
 src/types/inline_query_result_location.rs     |  9 ++--
 src/types/inline_query_result_mpeg4_gif.rs    | 30 +++++-------
 src/types/inline_query_result_photo.rs        | 34 +++++--------
 src/types/inline_query_result_venue.rs        |  9 ++--
 src/types/inline_query_result_video.rs        | 32 +++++--------
 src/types/inline_query_result_voice.rs        | 14 ++----
 src/types/input_file.rs                       | 15 +++---
 src/types/login_url.rs                        | 35 +++++++++++---
 src/types/message.rs                          | 19 +++++---
 src/types/message_entity.rs                   | 12 ++---
 src/types/passport_file.rs                    |  6 ++-
 src/types/poll.rs                             |  9 ++--
 src/types/update.rs                           |  7 ++-
 src/types/voice_chat_scheduled.rs             |  8 ++--
 src/types/webhook_info.rs                     | 11 +++--
 34 files changed, 246 insertions(+), 215 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4c12199..637e5e48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 
 - Add `EditedMessageIsTooLong` error [#109][pr109]
+- Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
+[pr115]: https://github.com/teloxide/teloxide-core/pull/115
 
 ## 0.3.3
 
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index 5bdce22b..c3d3f139 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -485,7 +485,8 @@ impl Serializer for PartSerializer {
                 let part = Part::text(format!("attach://{}", uuid));
                 Ok((part, vec![(uuid, f)]))
             }
-            InputFile::FileId(s) | InputFile::Url(s) => Ok((Part::text(s), Vec::new())),
+            InputFile::FileId(s) => Ok((Part::text(s), Vec::new())),
+            InputFile::Url(s) => Ok((Part::text(String::from(s)), Vec::new())),
         }
     }
 
@@ -586,7 +587,8 @@ impl SerializeStructVariant for PartFromFile {
 
                 Ok((part, vec![(uuid, f)]))
             }
-            InputFile::FileId(s) | InputFile::Url(s) => Ok((Part::text(s), vec![])),
+            InputFile::FileId(s) => Ok((Part::text(s), vec![])),
+            InputFile::Url(s) => Ok((Part::text(String::from(s)), vec![])),
         }
     }
 }
@@ -615,9 +617,12 @@ impl SerializeSeq for InnerPartSerializer {
                 value["media"] = serde_json::Value::String(format!("attach://{}", uuid));
                 self.files.push((uuid, f));
             }
-            InputFile::FileId(s) | InputFile::Url(s) => {
+            InputFile::FileId(s) => {
                 value["media"] = serde_json::Value::String(s);
             }
+            InputFile::Url(s) => {
+                value["media"] = serde_json::Value::String(String::from(s));
+            }
         }
 
         self.array_json_parts.push(value);
@@ -673,10 +678,14 @@ impl SerializeStruct for PartSerializerStruct {
 
                     self.2.push((uuid, f));
                 }
-                InputFile::FileId(s) | InputFile::Url(s) => {
+                InputFile::FileId(s) => {
                     SerializeStruct::serialize_field(&mut ser, key, &s)?;
                     self.1 = get_state(ser)
                 }
+                InputFile::Url(s) => {
+                    SerializeStruct::serialize_field(&mut ser, key, s.as_str())?;
+                    self.1 = get_state(ser)
+                }
             }
         } else {
             SerializeStruct::serialize_field(&mut ser, key, value)?;
diff --git a/src/serde_multipart/unserializers.rs b/src/serde_multipart/unserializers.rs
index 1068f211..07903d80 100644
--- a/src/serde_multipart/unserializers.rs
+++ b/src/serde_multipart/unserializers.rs
@@ -84,7 +84,7 @@ fn test() {
     let value = String::from("test");
     assert_eq!(value.serialize(StringUnserializer), Ok(value));
 
-    let value = InputFile::Url(String::from("url"));
+    let value = InputFile::Url(reqwest::Url::parse("http://example.com").unwrap());
     assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
 
     let value = InputFile::FileId(String::from("file_id"));
diff --git a/src/serde_multipart/unserializers/input_file.rs b/src/serde_multipart/unserializers/input_file.rs
index bcdd11ff..efc6c194 100644
--- a/src/serde_multipart/unserializers/input_file.rs
+++ b/src/serde_multipart/unserializers/input_file.rs
@@ -62,7 +62,9 @@ impl Serializer for InputFileUnserializer {
         // TODO
         match variant {
             "File" => Ok(InputFile::File(value.serialize(StringUnserializer)?.into())),
-            "Url" => Ok(InputFile::Url(value.serialize(StringUnserializer)?)),
+            "Url" => Ok(InputFile::Url(
+                reqwest::Url::parse(&value.serialize(StringUnserializer)?).unwrap(),
+            )),
             "FileId" => Ok(InputFile::FileId(value.serialize(StringUnserializer)?)),
             name => Err(UnserializerError::UnexpectedVariant {
                 name,
diff --git a/src/types.rs b/src/types.rs
index ee88a831..1167cc22 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -221,8 +221,8 @@ mod non_telegram_types {
 }
 
 pub(crate) mod serde_opt_date_from_unix_timestamp {
-    use chrono::{DateTime, Utc};
-    use serde::{Serialize, Serializer};
+    use chrono::{DateTime, NaiveDateTime, Utc};
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     pub(crate) fn serialize<S>(
         this: &Option<DateTime<Utc>>,
@@ -234,14 +234,42 @@ pub(crate) mod serde_opt_date_from_unix_timestamp {
         this.map(|dt| dt.timestamp()).serialize(serializer)
     }
 
-    // pub(crate) fn deserialize<'de, D>(deserializer: D) ->
-    // Result<Option<DateTime<Utc>>, D::Error> where
-    //     D: Deserializer<'de>,
-    // {
-    //     Ok(Option::<i64>::deserialize(deserializer)?
-    //         .map(|timestamp|
-    // DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)))
-    // }
+    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<Option<DateTime<Utc>>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(Option::<i64>::deserialize(deserializer)?
+            .map(|timestamp| DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)))
+    }
+
+    pub(crate) fn none<T>() -> Option<T> {
+        None
+    }
+
+    #[test]
+    fn test() {
+        #[derive(Serialize, Deserialize)]
+        struct Struct {
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+            date: Option<DateTime<Utc>>,
+        }
+
+        {
+            let json = r#"{"date":1}"#;
+            let expected = DateTime::from_utc(NaiveDateTime::from_timestamp(1, 0), Utc);
+
+            let Struct { date } = serde_json::from_str(json).unwrap();
+            assert_eq!(date, Some(expected));
+        }
+
+        {
+            let json = r#"{}"#;
+
+            let Struct { date } = serde_json::from_str(json).unwrap();
+            assert_eq!(date, None);
+        }
+    }
 }
 
 pub(crate) mod serde_date_from_unix_timestamp {
diff --git a/src/types/chat_invite_link.rs b/src/types/chat_invite_link.rs
index 4488dfbc..2638adad 100644
--- a/src/types/chat_invite_link.rs
+++ b/src/types/chat_invite_link.rs
@@ -1,3 +1,4 @@
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::User;
@@ -13,9 +14,11 @@ pub struct ChatInviteLink {
     pub is_primary: bool,
     /// `true`, if the link is revoked
     pub is_revoked: bool,
-    /// Point in time (Unix timestamp) when the link will expire or has been
+    /// Point in time when the link will expire or has been
     /// expired
-    pub expire_date: Option<i64>,
+    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    pub expire_date: Option<DateTime<Utc>>,
     /// Maximum number of users that can be members of the chat simultaneously
     /// after joining the chat via this invite link; 1-99999
     pub member_limit: Option<u32>,
diff --git a/src/types/chat_member_updated.rs b/src/types/chat_member_updated.rs
index 7f4b3a95..86094d2e 100644
--- a/src/types/chat_member_updated.rs
+++ b/src/types/chat_member_updated.rs
@@ -1,3 +1,4 @@
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::{Chat, ChatInviteLink, ChatMember, User};
@@ -8,8 +9,9 @@ pub struct ChatMemberUpdated {
     pub chat: Chat,
     /// Performer of the action, which resulted in the change
     pub from: User,
-    /// Date the change was done in Unix time
-    pub date: i64,
+    /// Date the change was done
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub date: DateTime<Utc>,
     /// Previous information about the chat member
     pub old_chat_member: ChatMember,
     /// New information about the chat member
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 86a5af04..9da2182c 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -42,7 +42,7 @@ impl InlineKeyboardButton {
 #[serde(rename_all = "snake_case")]
 pub enum InlineKeyboardButtonKind {
     /// HTTP or tg:// url to be opened when button is pressed.
-    Url(String),
+    Url(reqwest::Url),
 
     /// An HTTP URL used to automatically authorize the user. Can be used as a
     /// replacement for the [Telegram Login Widget]().
@@ -104,10 +104,11 @@ pub enum InlineKeyboardButtonKind {
 /// ```
 /// use teloxide_core::types::InlineKeyboardButton;
 ///
-/// let url_button = InlineKeyboardButton::url("Text".to_string(), "http://url.com".to_string());
+/// let url = url::Url::parse("https://example.com").unwrap();
+/// let url_button = InlineKeyboardButton::url("Text".to_string(), url);
 /// ```
 impl InlineKeyboardButton {
-    pub fn url(text: String, url: String) -> InlineKeyboardButton {
+    pub fn url(text: String, url: reqwest::Url) -> InlineKeyboardButton {
         InlineKeyboardButton {
             text,
             kind: InlineKeyboardButtonKind::Url(url),
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index 10828a80..21365f4f 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -26,7 +26,8 @@ pub struct InlineKeyboardMarkup {
 /// ```
 /// use teloxide_core::types::{InlineKeyboardButton, InlineKeyboardMarkup};
 ///
-/// let url_button = InlineKeyboardButton::url("text".to_string(), "http://url.com".to_string());
+/// let url = url::Url::parse("https://example.com").unwrap();
+/// let url_button = InlineKeyboardButton::url("text".to_string(), url);
 /// let keyboard = InlineKeyboardMarkup::default().append_row(vec![url_button]);
 /// ```
 impl InlineKeyboardMarkup {
@@ -78,10 +79,14 @@ impl InlineKeyboardMarkup {
 mod tests {
     use super::*;
 
+    fn url(n: u32) -> reqwest::Url {
+        reqwest::Url::parse(&format!("https://example.com/{n}", n = n)).unwrap()
+    }
+
     #[test]
     fn append_row() {
-        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
-        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), url(1));
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), url(2));
 
         let markup =
             InlineKeyboardMarkup::default().append_row(vec![button1.clone(), button2.clone()]);
@@ -95,8 +100,8 @@ mod tests {
 
     #[test]
     fn append_to_row_existent_row() {
-        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
-        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), url(1));
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), url(2));
 
         let markup = InlineKeyboardMarkup::default()
             .append_row(vec![button1.clone()])
@@ -111,8 +116,8 @@ mod tests {
 
     #[test]
     fn append_to_row_nonexistent_row() {
-        let button1 = InlineKeyboardButton::url("text 1".to_string(), "url 1".to_string());
-        let button2 = InlineKeyboardButton::url("text 2".to_string(), "url 2".to_string());
+        let button1 = InlineKeyboardButton::url("text 1".to_string(), url(1));
+        let button2 = InlineKeyboardButton::url("text 2".to_string(), url(2));
 
         let markup = InlineKeyboardMarkup::default()
             .append_row(vec![button1.clone()])
diff --git a/src/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
index a4445d73..f25dd1d9 100644
--- a/src/types/inline_query_result_article.rs
+++ b/src/types/inline_query_result_article.rs
@@ -21,7 +21,7 @@ pub struct InlineQueryResultArticle {
     pub reply_markup: Option<InlineKeyboardMarkup>,
 
     /// URL of the result.
-    pub url: Option<String>,
+    pub url: Option<reqwest::Url>,
 
     /// Pass `true`, if you don't want the URL to be shown in the
     /// message.
@@ -31,7 +31,7 @@ pub struct InlineQueryResultArticle {
     pub description: Option<String>,
 
     /// Url of the thumbnail for the result.
-    pub thumb_url: Option<String>,
+    pub thumb_url: Option<reqwest::Url>,
 
     /// Thumbnail width.
     pub thumb_width: Option<i32>,
@@ -86,11 +86,8 @@ impl InlineQueryResultArticle {
         self
     }
 
-    pub fn url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.url = Some(val.into());
+    pub fn url(mut self, val: reqwest::Url) -> Self {
+        self.url = Some(val);
         self
     }
 
@@ -107,11 +104,8 @@ impl InlineQueryResultArticle {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = Some(val.into());
+    pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = Some(val);
         self
     }
 
diff --git a/src/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
index a1712079..9e2fbd99 100644
--- a/src/types/inline_query_result_audio.rs
+++ b/src/types/inline_query_result_audio.rs
@@ -16,7 +16,7 @@ pub struct InlineQueryResultAudio {
     pub id: String,
 
     /// A valid URL for the audio file.
-    pub audio_url: String,
+    pub audio_url: reqwest::Url,
 
     /// Title.
     pub title: String,
@@ -52,15 +52,14 @@ pub struct InlineQueryResultAudio {
 }
 
 impl InlineQueryResultAudio {
-    pub fn new<S1, S2, S3>(id: S1, audio_url: S2, title: S3) -> Self
+    pub fn new<S1, S2>(id: S1, audio_url: reqwest::Url, title: S2) -> Self
     where
         S1: Into<String>,
         S2: Into<String>,
-        S3: Into<String>,
     {
         Self {
             id: id.into(),
-            audio_url: audio_url.into(),
+            audio_url,
             title: title.into(),
             caption: None,
             parse_mode: None,
@@ -80,11 +79,8 @@ impl InlineQueryResultAudio {
         self
     }
 
-    pub fn audio_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.audio_url = val.into();
+    pub fn audio_url(mut self, val: reqwest::Url) -> Self {
+        self.audio_url = val;
         self
     }
 
diff --git a/src/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
index 5b630f66..79de0b16 100644
--- a/src/types/inline_query_result_cached_document.rs
+++ b/src/types/inline_query_result_cached_document.rs
@@ -108,7 +108,7 @@ impl InlineQueryResultCachedDocument {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
index 2714ac7e..05ccb521 100644
--- a/src/types/inline_query_result_cached_mpeg4_gif.rs
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -88,7 +88,7 @@ impl InlineQueryResultCachedMpeg4Gif {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
index 2be3d4cf..2a9c2bad 100644
--- a/src/types/inline_query_result_cached_photo.rs
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -107,7 +107,7 @@ impl InlineQueryResultCachedPhoto {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
index cb9ab93d..50bad2c0 100644
--- a/src/types/inline_query_result_cached_video.rs
+++ b/src/types/inline_query_result_cached_video.rs
@@ -108,7 +108,7 @@ impl InlineQueryResultCachedVideo {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
index 0567b897..50733059 100644
--- a/src/types/inline_query_result_cached_voice.rs
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -96,7 +96,7 @@ impl InlineQueryResultCachedVoice {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_contact.rs b/src/types/inline_query_result_contact.rs
index cffb96f0..8b41f239 100644
--- a/src/types/inline_query_result_contact.rs
+++ b/src/types/inline_query_result_contact.rs
@@ -39,7 +39,7 @@ pub struct InlineQueryResultContact {
     pub input_message_content: Option<InputMessageContent>,
 
     /// Url of the thumbnail for the result.
-    pub thumb_url: Option<String>,
+    pub thumb_url: Option<reqwest::Url>,
 
     /// Thumbnail width.
     pub thumb_width: Option<i32>,
@@ -119,11 +119,8 @@ impl InlineQueryResultContact {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = Some(val.into());
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = Some(val);
         self
     }
 
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
index e44342ad..959469b1 100644
--- a/src/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -36,7 +36,7 @@ pub struct InlineQueryResultDocument {
     pub caption_entities: Option<Vec<MessageEntity>>,
 
     /// A valid URL for the file.
-    pub document_url: String,
+    pub document_url: reqwest::Url,
 
     /// Mime type of the content of the file, either `application/pdf` or
     /// `application/zip`.
@@ -53,7 +53,7 @@ pub struct InlineQueryResultDocument {
     pub input_message_content: Option<InputMessageContent>,
 
     /// URL of the thumbnail (jpeg only) for the file.
-    pub thumb_url: Option<String>,
+    pub thumb_url: Option<reqwest::Url>,
 
     /// Thumbnail width.
     pub thumb_width: Option<i32>,
@@ -87,7 +87,7 @@ impl InlineQueryResultDocument {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
@@ -100,11 +100,8 @@ impl InlineQueryResultDocument {
         self
     }
 
-    pub fn document_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.document_url = val.into();
+    pub fn document_url(mut self, val: reqwest::Url) -> Self {
+        self.document_url = val;
         self
     }
 
@@ -131,11 +128,8 @@ impl InlineQueryResultDocument {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = Some(val.into());
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = Some(val);
         self
     }
 
diff --git a/src/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
index fdfad686..0154bbf2 100644
--- a/src/types/inline_query_result_gif.rs
+++ b/src/types/inline_query_result_gif.rs
@@ -16,7 +16,7 @@ pub struct InlineQueryResultGif {
     pub id: String,
 
     /// A valid URL for the GIF file. File size must not exceed 1MB.
-    pub gif_url: String,
+    pub gif_url: reqwest::Url,
 
     /// Width of the GIF.
     pub gif_width: Option<i32>,
@@ -28,7 +28,7 @@ pub struct InlineQueryResultGif {
     pub gif_duration: Option<i32>,
 
     /// URL of the static thumbnail for the result (jpeg or gif).
-    pub thumb_url: String,
+    pub thumb_url: reqwest::Url,
 
     /// Title for the result.
     pub title: Option<String>,
@@ -58,19 +58,17 @@ pub struct InlineQueryResultGif {
 }
 
 impl InlineQueryResultGif {
-    pub fn new<S1, S2, S3>(id: S1, gif_url: S2, thumb_url: S3) -> Self
+    pub fn new<S>(id: S, gif_url: reqwest::Url, thumb_url: reqwest::Url) -> Self
     where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
+        S: Into<String>,
     {
         Self {
             id: id.into(),
-            gif_url: gif_url.into(),
+            gif_url,
             gif_width: None,
             gif_height: None,
             gif_duration: None,
-            thumb_url: thumb_url.into(),
+            thumb_url,
             title: None,
             caption: None,
             parse_mode: None,
@@ -88,11 +86,8 @@ impl InlineQueryResultGif {
         self
     }
 
-    pub fn gif_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.gif_url = val.into();
+    pub fn gif_url(mut self, val: reqwest::Url) -> Self {
+        self.gif_url = val;
         self
     }
 
@@ -111,11 +106,8 @@ impl InlineQueryResultGif {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = val.into();
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = val;
         self
     }
 
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
index 733d84f4..25f64365 100644
--- a/src/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -49,7 +49,7 @@ pub struct InlineQueryResultLocation {
     pub input_message_content: Option<InputMessageContent>,
 
     /// Url of the thumbnail for the result.
-    pub thumb_url: Option<String>,
+    pub thumb_url: Option<reqwest::Url>,
 
     /// Thumbnail width.
     pub thumb_width: Option<u32>,
@@ -137,11 +137,8 @@ impl InlineQueryResultLocation {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = Some(val.into());
+    pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = Some(val);
         self
     }
 
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
index b8284243..2b700fac 100644
--- a/src/types/inline_query_result_mpeg4_gif.rs
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -17,7 +17,7 @@ pub struct InlineQueryResultMpeg4Gif {
     pub id: String,
 
     /// A valid URL for the MP4 file. File size must not exceed 1MB.
-    pub mpeg4_url: String,
+    pub mpeg4_url: reqwest::Url,
 
     /// Video width.
     pub mpeg4_width: Option<i32>,
@@ -29,7 +29,7 @@ pub struct InlineQueryResultMpeg4Gif {
     pub mpeg4_duration: Option<i32>,
 
     /// URL of the static thumbnail (jpeg or gif) for the result.
-    pub thumb_url: String,
+    pub thumb_url: reqwest::Url,
 
     /// Title for the result.
     pub title: Option<String>,
@@ -59,16 +59,14 @@ pub struct InlineQueryResultMpeg4Gif {
 }
 
 impl InlineQueryResultMpeg4Gif {
-    pub fn new<S1, S2, S3>(id: S1, mpeg4_url: S2, thumb_url: S3) -> Self
+    pub fn new<S>(id: S, mpeg4_url: reqwest::Url, thumb_url: reqwest::Url) -> Self
     where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
+        S: Into<String>,
     {
         Self {
             id: id.into(),
-            mpeg4_url: mpeg4_url.into(),
-            thumb_url: thumb_url.into(),
+            mpeg4_url,
+            thumb_url,
             mpeg4_width: None,
             mpeg4_height: None,
             mpeg4_duration: None,
@@ -89,11 +87,8 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
-    pub fn mpeg4_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.mpeg4_url = val.into();
+    pub fn mpeg4_url(mut self, val: reqwest::Url) -> Self {
+        self.mpeg4_url = val;
         self
     }
 
@@ -112,11 +107,8 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = val.into();
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = val;
         self
     }
 
@@ -136,7 +128,7 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
index 51402e63..69cdf7ab 100644
--- a/src/types/inline_query_result_photo.rs
+++ b/src/types/inline_query_result_photo.rs
@@ -17,10 +17,10 @@ pub struct InlineQueryResultPhoto {
 
     /// A valid URL of the photo. Photo must be in **jpeg** format. Photo size
     /// must not exceed 5MB.
-    pub photo_url: String,
+    pub photo_url: reqwest::Url,
 
     /// URL of the thumbnail for the photo.
-    pub thumb_url: String,
+    pub thumb_url: reqwest::Url,
 
     /// Width of the photo.
     pub photo_width: Option<i32>,
@@ -59,16 +59,14 @@ pub struct InlineQueryResultPhoto {
 }
 
 impl InlineQueryResultPhoto {
-    pub fn new<S1, S2, S3>(id: S1, photo_url: S2, thumb_url: S3) -> Self
+    pub fn new<S>(id: S, photo_url: reqwest::Url, thumb_url: reqwest::Url) -> Self
     where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
+        S: Into<String>,
     {
         Self {
             id: id.into(),
-            photo_url: photo_url.into(),
-            thumb_url: thumb_url.into(),
+            photo_url,
+            thumb_url,
             photo_width: None,
             photo_height: None,
             title: None,
@@ -89,28 +87,22 @@ impl InlineQueryResultPhoto {
         self
     }
 
-    pub fn photo_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.photo_url = val.into();
+    pub fn photo_url(mut self, val: reqwest::Url) -> Self {
+        self.photo_url = val;
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = val.into();
+    pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = val;
         self
     }
 
-    pub fn photo_width<S>(mut self, val: i32) -> Self {
+    pub fn photo_width(mut self, val: i32) -> Self {
         self.photo_width = Some(val);
         self
     }
 
-    pub fn photo_height<S>(mut self, val: i32) -> Self {
+    pub fn photo_height(mut self, val: i32) -> Self {
         self.photo_height = Some(val);
         self
     }
@@ -139,7 +131,7 @@ impl InlineQueryResultPhoto {
         self
     }
 
-    pub fn parse_mode<S>(mut self, val: ParseMode) -> Self {
+    pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
index ac013ad0..6b6820bf 100644
--- a/src/types/inline_query_result_venue.rs
+++ b/src/types/inline_query_result_venue.rs
@@ -52,7 +52,7 @@ pub struct InlineQueryResultVenue {
     pub input_message_content: Option<InputMessageContent>,
 
     /// Url of the thumbnail for the result.
-    pub thumb_url: Option<String>,
+    pub thumb_url: Option<reqwest::Url>,
 
     /// Thumbnail width.
     pub thumb_width: Option<i32>,
@@ -162,11 +162,8 @@ impl InlineQueryResultVenue {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = Some(val.into());
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = Some(val);
         self
     }
 
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
index aa887cae..51e53a3b 100644
--- a/src/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -18,14 +18,14 @@ pub struct InlineQueryResultVideo {
     pub id: String,
 
     /// A valid URL for the embedded video player or video file.
-    pub video_url: String,
+    pub video_url: reqwest::Url,
 
     /// Mime type of the content of video url, `text/html` or `video/mp4`.
     #[serde(with = "crate::types::non_telegram_types::mime::deser")]
     pub mime_type: Mime,
 
     /// URL of the thumbnail (jpeg only) for the video.
-    pub thumb_url: String,
+    pub thumb_url: reqwest::Url,
 
     /// Title for the result.
     pub title: String,
@@ -72,24 +72,22 @@ pub struct InlineQueryResultVideo {
 }
 
 impl InlineQueryResultVideo {
-    pub fn new<S1, S2, S3, S4>(
+    pub fn new<S1, S2>(
         id: S1,
-        video_url: S2,
+        video_url: reqwest::Url,
         mime_type: Mime,
-        thumb_url: S3,
-        title: S4,
+        thumb_url: reqwest::Url,
+        title: S2,
     ) -> Self
     where
         S1: Into<String>,
         S2: Into<String>,
-        S3: Into<String>,
-        S4: Into<String>,
     {
         Self {
             id: id.into(),
-            video_url: video_url.into(),
+            video_url,
             mime_type,
-            thumb_url: thumb_url.into(),
+            thumb_url,
             title: title.into(),
             caption: None,
             parse_mode: None,
@@ -111,11 +109,8 @@ impl InlineQueryResultVideo {
         self
     }
 
-    pub fn video_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.video_url = val.into();
+    pub fn video_url(mut self, val: reqwest::Url) -> Self {
+        self.video_url = val;
         self
     }
 
@@ -124,11 +119,8 @@ impl InlineQueryResultVideo {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.thumb_url = val.into();
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
+        self.thumb_url = val;
         self
     }
 
diff --git a/src/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
index c2765a61..7b9cc1bc 100644
--- a/src/types/inline_query_result_voice.rs
+++ b/src/types/inline_query_result_voice.rs
@@ -17,7 +17,7 @@ pub struct InlineQueryResultVoice {
     pub id: String,
 
     /// A valid URL for the voice recording.
-    pub voice_url: String,
+    pub voice_url: reqwest::Url,
 
     /// Recording title.
     pub title: String,
@@ -50,15 +50,14 @@ pub struct InlineQueryResultVoice {
 }
 
 impl InlineQueryResultVoice {
-    pub fn new<S1, S2, S3>(id: S1, voice_url: S2, title: S3) -> Self
+    pub fn new<S1, S2>(id: S1, voice_url: reqwest::Url, title: S2) -> Self
     where
         S1: Into<String>,
         S2: Into<String>,
-        S3: Into<String>,
     {
         Self {
             id: id.into(),
-            voice_url: voice_url.into(),
+            voice_url,
             title: title.into(),
             caption: None,
             parse_mode: None,
@@ -77,11 +76,8 @@ impl InlineQueryResultVoice {
         self
     }
 
-    pub fn voice_url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.voice_url = val.into();
+    pub fn voice_url(mut self, val: reqwest::Url) -> Self {
+        self.voice_url = val;
         self
     }
 
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 4ace6e85..6565b254 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -1,3 +1,4 @@
+use reqwest::Url;
 use serde::{Deserialize, Serialize};
 
 use std::{borrow::Cow, path::PathBuf};
@@ -13,7 +14,7 @@ pub enum InputFile {
         file_name: String,
         data: Cow<'static, [u8]>,
     },
-    Url(String),
+    Url(Url),
     FileId(String),
 }
 
@@ -36,11 +37,8 @@ impl InputFile {
         }
     }
 
-    pub fn url<T>(url: T) -> Self
-    where
-        T: Into<String>,
-    {
-        Self::Url(url.into())
+    pub fn url(url: Url) -> Self {
+        Self::Url(url)
     }
 
     pub fn file_id<T>(file_id: T) -> Self
@@ -57,7 +55,7 @@ impl InputFile {
         }
     }
 
-    pub fn as_url(&self) -> Option<&String> {
+    pub fn as_url(&self) -> Option<&Url> {
         match self {
             Self::Url(url) => Some(url),
             _ => None,
@@ -118,7 +116,8 @@ impl InputFile {
                 Ok(Part::stream(Body::wrap_stream(file)).file_name(file_name))
             }
             Self::Memory { file_name, data } => Ok(Part::bytes(data).file_name(file_name)),
-            Self::Url(s) | Self::FileId(s) => Ok(Part::text(s)),
+            Self::Url(s) => Ok(Part::text(String::from(s))),
+            Self::FileId(s) => Ok(Part::text(s)),
         }
     }
 }
diff --git a/src/types/login_url.rs b/src/types/login_url.rs
index e0e647eb..ba2c0d78 100644
--- a/src/types/login_url.rs
+++ b/src/types/login_url.rs
@@ -15,18 +15,39 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct LoginUrl {
-    pub url: String,
+    /// An HTTP URL to be opened with user authorization data added to the query
+    /// string when the button is pressed. If the user refuses to provide
+    /// authorization data, the original URL without information about the user
+    /// will be opened. The data added is the same as described in [Receiving
+    /// authorization data].
+    ///
+    /// [Receiving authorization data]: https://core.telegram.org/widgets/login#receiving-authorization-data
+    ///
+    /// NOTE: You must always check the hash of the received data to verify the
+    /// authentication and the integrity of the data as described in [Checking
+    /// authorization].
+    ///
+    /// [Checking authorization]: https://core.telegram.org/widgets/login#checking-authorization
+    pub url: reqwest::Url,
+    /// New text of the button in forwarded messages.
     pub forward_text: Option<String>,
+    /// Username of a bot, which will be used for user authorization. See
+    /// [Setting up a bot] for more details. If not specified, the current bot's
+    /// username will be assumed. The url's domain must be the same as the
+    /// domain linked with the bot. See [Linking your domain to the bot] for
+    /// more details.
+    ///
+    /// [Setting up a bot]: https://core.telegram.org/widgets/login#setting-up-a-bot
+    /// [Linking your domain to the bot]: https://core.telegram.org/widgets/login#linking-your-domain-to-the-bot
     pub bot_username: Option<String>,
+    /// Pass `true` to request the permission for your bot to send messages to
+    /// the user.
     pub request_write_access: Option<bool>,
 }
 
 impl LoginUrl {
-    pub fn url<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.url = val.into();
+    pub fn url(mut self, val: reqwest::Url) -> Self {
+        self.url = val;
         self
     }
 
@@ -46,7 +67,7 @@ impl LoginUrl {
         self
     }
 
-    pub fn request_write_access<S>(mut self, val: bool) -> Self {
+    pub fn request_write_access(mut self, val: bool) -> Self {
         self.request_write_access = Some(val);
         self
     }
diff --git a/src/types/message.rs b/src/types/message.rs
index 0cb29a5f..fdb626af 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1,5 +1,6 @@
 #![allow(clippy::large_enum_variant)]
 
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
@@ -19,7 +20,8 @@ pub struct Message {
     pub id: i32,
 
     /// Date the message was sent in Unix time.
-    pub date: i32,
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub date: DateTime<Utc>,
 
     /// Conversation the message belongs to.
     pub chat: Chat,
@@ -78,7 +80,9 @@ pub struct MessageCommon {
     pub forward_kind: ForwardKind,
 
     /// Date the message was last edited in Unix time.
-    pub edit_date: Option<i32>,
+    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    pub edit_date: Option<DateTime<Utc>>,
 
     #[serde(flatten)]
     pub media_kind: MediaKind,
@@ -234,7 +238,8 @@ pub enum ForwardKind {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ForwardChannel {
     #[serde(rename = "forward_date")]
-    pub date: i32,
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub date: DateTime<Utc>,
 
     #[serde(rename = "forward_from_chat")]
     pub chat: Chat,
@@ -249,7 +254,8 @@ pub struct ForwardChannel {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ForwardNonChannel {
     #[serde(rename = "forward_date")]
-    pub date: i32,
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub date: DateTime<Utc>,
 
     #[serde(flatten)]
     pub from: ForwardedFrom,
@@ -480,6 +486,7 @@ pub struct MessageVoiceChatParticipantsInvited {
 }
 
 mod getters {
+    use chrono::{DateTime, Utc};
     use std::ops::Deref;
 
     use crate::types::{
@@ -570,7 +577,7 @@ mod getters {
             }
         }
 
-        pub fn forward_date(&self) -> Option<&i32> {
+        pub fn forward_date(&self) -> Option<&DateTime<Utc>> {
             match &self.kind {
                 Common(MessageCommon {
                     forward_kind: ForwardKind::Channel(ForwardChannel { date, .. }),
@@ -597,7 +604,7 @@ mod getters {
             }
         }
 
-        pub fn edit_date(&self) -> Option<&i32> {
+        pub fn edit_date(&self) -> Option<&DateTime<Utc>> {
             match &self.kind {
                 Common(MessageCommon { edit_date, .. }) => edit_date.as_ref(),
                 _ => None,
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index a74fe6b1..1f4873c8 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -59,7 +59,7 @@ pub enum MessageEntityKind {
     Italic,
     Code,
     Pre { language: Option<String> },
-    TextLink { url: String },
+    TextLink { url: reqwest::Url },
     TextMention { user: User },
     Underline,
     Strikethrough,
@@ -76,13 +76,13 @@ mod tests {
         assert_eq!(
             MessageEntity {
                 kind: MessageEntityKind::TextLink {
-                    url: "ya.ru".into()
+                    url: reqwest::Url::parse("https://example.com").unwrap(),
                 },
                 offset: 1,
                 length: 2,
             },
             from_str::<MessageEntity>(
-                r#"{"type":"text_link","url":"ya.ru","offset":1,"length":2}"#
+                r#"{"type":"text_link","url":"https://example.com","offset":1,"length":2}"#
             )
             .unwrap()
         );
@@ -100,10 +100,8 @@ mod tests {
                 offset: 1,
                 length: 2,
             },
-            from_str::<MessageEntity>(
-                r#"{"type":"pre","url":"ya.ru","offset":1,"length":2,"language":"rust"}"#
-            )
-            .unwrap()
+            from_str::<MessageEntity>(r#"{"type":"pre","offset":1,"length":2,"language":"rust"}"#)
+                .unwrap()
         );
     }
 }
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index 18f1a5d4..c3c057cd 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -1,3 +1,4 @@
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 /// This object represents a file uploaded to Telegram Passport.
@@ -19,6 +20,7 @@ pub struct PassportFile {
     /// File size.
     pub file_size: u64,
 
-    /// Unix time when the file was uploaded.
-    pub file_date: u64,
+    /// Time when the file was uploaded.
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub file_date: DateTime<Utc>,
 }
diff --git a/src/types/poll.rs b/src/types/poll.rs
index 23bb9409..caf6af5e 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -1,4 +1,6 @@
 use crate::types::{MessageEntity, PollType};
+
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 /// This object contains information about a poll.
@@ -48,9 +50,10 @@ pub struct Poll {
     /// Amount of time in seconds the poll will be active after creation.
     pub open_period: Option<i32>,
 
-    /// Point in time (Unix timestamp) when the poll will be automatically
-    /// closed.
-    pub close_date: Option<i32>,
+    /// Point in time when the poll will be automatically closed.
+    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    pub close_date: Option<DateTime<Utc>>,
 }
 
 /// This object contains information about one answer option in a poll.
diff --git a/src/types/update.rs b/src/types/update.rs
index 5a1c1355..4767fcb0 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -144,9 +144,14 @@ mod test {
         MessageCommon, MessageKind, Update, UpdateKind, User,
     };
 
+    use chrono::{DateTime, NaiveDateTime, Utc};
+
     // TODO: more tests for deserialization
     #[test]
     fn message() {
+        let timestamp = 1_569_518_342;
+        let date = DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc);
+
         let json = r#"{
             "update_id":892252934,
             "message":{
@@ -174,7 +179,7 @@ mod test {
             kind: UpdateKind::Message(Message {
                 via_bot: None,
                 id: 6557,
-                date: 1_569_518_342,
+                date,
                 chat: Chat {
                     id: 218_485_655,
                     kind: ChatKind::Private(ChatPrivate {
diff --git a/src/types/voice_chat_scheduled.rs b/src/types/voice_chat_scheduled.rs
index c33a5ad8..06ca85cf 100644
--- a/src/types/voice_chat_scheduled.rs
+++ b/src/types/voice_chat_scheduled.rs
@@ -1,10 +1,12 @@
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 /// This object represents a service message about a voice chat scheduled in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VoiceChatScheduled {
-    /// Point in time (Unix timestamp) when the voice chat is supposed to be
-    /// started by a chat administrator.
-    pub start_date: u64,
+    /// Point in time when the voice chat is supposed to be started by a chat
+    /// administrator.
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub start_date: DateTime<Utc>,
 }
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index d725264a..6a96beb1 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -1,3 +1,4 @@
+use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 /// Contains information about the current status of a webhook.
@@ -6,8 +7,8 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct WebhookInfo {
-    /// Webhook URL, may be empty if webhook is not set up.
-    pub url: String,
+    /// Webhook URL, `None` if webhook is not set up.
+    pub url: Option<reqwest::Url>,
 
     /// `true`, if a custom certificate was provided for webhook certificate
     /// checks.
@@ -19,9 +20,11 @@ pub struct WebhookInfo {
     /// Currently used webhook IP address.
     pub ip_address: Option<String>,
 
-    /// Unix time for the most recent error that happened when trying to
+    /// Time of the most recent error that happened when trying to
     /// deliver an update via webhook.
-    pub last_error_date: Option<u64>,
+    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    pub last_error_date: Option<DateTime<Utc>>,
 
     /// Error message in human-readable format for the most recent error that
     /// happened when trying to deliver an update via webhook.

From 35bfdd2c72012d90a7cfa2121c5a9add8289ffa2 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 31 Aug 2021 17:59:49 +0300
Subject: [PATCH 367/755] Fix date of the 0.3.3 release in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637e5e48..33af1212 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 
-## 0.3.3
+## 0.3.3 - 2021-08-03
 
 ### Fixed
 

From 17fa764f11ba40e9bff9051a3ca32e54079ff30e Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 31 Aug 2021 18:36:20 +0300
Subject: [PATCH 368/755] Remove square brackets from changelog

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33af1212..2cf3bc9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,7 +96,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr94]: https://github.com/teloxide/teloxide-core/pull/94
 [pr100]: https://github.com/teloxide/teloxide-core/pull/100
 
-## [0.2.2] - 2020-03-22
+## 0.2.2 - 2020-03-22
 
 ### Fixed
 
@@ -105,7 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr69]: https://github.com/teloxide/teloxide-core/pull/69
 
-## [0.2.1] - 2020-03-19
+## 0.2.1 - 2020-03-19
 
 ### Fixed 
 
@@ -117,7 +117,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr68]: https://github.com/teloxide/teloxide-core/pull/68
 
-## [0.2.0] - 2020-03-16
+## 0.2.0 - 2020-03-16
 
 ### Changed
 
@@ -164,7 +164,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
  - `NonStrictVec` -> `SemiparsedVec`.
 
-## [0.1.1] - 2020-02-17
+## 0.1.1 - 2020-02-17
 
 ### Fixed
 
@@ -172,7 +172,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr53]: https://github.com/teloxide/teloxide-core/pull/53
 
-## [0.1.0] - 2020-02-17
+## 0.1.0 - 2020-02-17
 
 ### Added
 

From f7faf737da38ea80190ab54409b2e213ecc4b4f1 Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 31 Aug 2021 18:39:02 +0300
Subject: [PATCH 369/755] Remove square brackets from changelog (2)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cf3bc9b..6d16f9fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## unreleased
 
 - Add `EditedMessageIsTooLong` error [#109][pr109]
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])

From 0e55b41961722394e5036dace00da326cf1c85e5 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 2 Sep 2021 17:18:27 +0300
Subject: [PATCH 370/755] Patch `BanChatMember::until_date`: `u64` ->
 `DateTime<Utc>`

---
 src/payloads/ban_chat_member.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/payloads/ban_chat_member.rs b/src/payloads/ban_chat_member.rs
index 9225d3a0..b91a5c70 100644
--- a/src/payloads/ban_chat_member.rs
+++ b/src/payloads/ban_chat_member.rs
@@ -6,6 +6,7 @@
 //
 // [cg]: https://github.com/teloxide/cg
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use chrono::{DateTime, Utc};
 use serde::Serialize;
 
 use crate::types::{ChatId, True};
@@ -24,7 +25,8 @@ impl_payload! {
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
-            pub until_date: u64,
+            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
+            pub until_date: DateTime<Utc> [into],
             /// Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.
             pub revoke_messages: bool,
         }

From 842315150bd3dc996f46ecd468741883b4d125d9 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 2 Sep 2021 18:14:54 +0300
Subject: [PATCH 371/755] Add `UntilDate` enum and use it for `{Restricted,
 Banned}::until_date`

---
 CHANGELOG.md                               | 16 ++++++-
 src/types.rs                               |  3 +-
 src/types/chat_member.rs                   | 11 ++---
 src/types/non_telegram_types/until_date.rs | 56 ++++++++++++++++++++++
 4 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 src/types/non_telegram_types/until_date.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637e5e48..aa154022 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- Add `EditedMessageIsTooLong` error [#109][pr109]
-- Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
+### Added
+
+- `EditedMessageIsTooLong` error [#109][pr109]
+- `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
+[pr116]: https://github.com/teloxide/teloxide-core/pull/116
+
+### Changed
+
+- Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
+
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 
+### Fixed
+
+- Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#116][pr116])
+
 ## 0.3.3
 
 ### Fixed
diff --git a/src/types.rs b/src/types.rs
index 1167cc22..9bf5fd1f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -212,12 +212,13 @@ mod passport_data;
 mod passport_element_error;
 mod passport_file;
 
-pub use non_telegram_types::{country_code::*, currency::*, semiparsed_vec::*};
+pub use non_telegram_types::{country_code::*, currency::*, semiparsed_vec::*, until_date::*};
 mod non_telegram_types {
     pub(super) mod country_code;
     pub(super) mod currency;
     pub(crate) mod mime;
     pub(super) mod semiparsed_vec;
+    pub(super) mod until_date;
 }
 
 pub(crate) mod serde_opt_date_from_unix_timestamp {
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index b0d7c68f..ed577bac 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -1,9 +1,8 @@
 use std::ops::Deref;
 
-use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::types::User;
+use crate::types::{UntilDate, User};
 
 /// This object contains information about one member of the chat.
 ///
@@ -100,8 +99,7 @@ pub struct Administrator {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Restricted {
     /// Date when restrictions will be lifted for this user.
-    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
-    pub until_date: DateTime<Utc>,
+    pub until_date: UntilDate,
 
     /// `true` if the user can send text messages, contacts, locations and
     /// venues.
@@ -125,8 +123,7 @@ pub struct Restricted {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Banned {
     /// Date when restrictions will be lifted for this user.
-    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
-    pub until_date: DateTime<Utc>,
+    pub until_date: UntilDate,
 }
 
 /// This allows calling [`ChatMemberKind`]'s methods directly on [`ChatMember`].
@@ -273,7 +270,7 @@ impl ChatMemberKind {
     }
 
     /// Getter for [`Restricted::until_date`] and [`Banned::until_date`] fields.
-    pub fn until_date(&self) -> Option<DateTime<Utc>> {
+    pub fn until_date(&self) -> Option<UntilDate> {
         match &self {
             Self::Owner(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
             Self::Restricted(Restricted { until_date, .. })
diff --git a/src/types/non_telegram_types/until_date.rs b/src/types/non_telegram_types/until_date.rs
new file mode 100644
index 00000000..01dea584
--- /dev/null
+++ b/src/types/non_telegram_types/until_date.rs
@@ -0,0 +1,56 @@
+use chrono::{DateTime, NaiveDateTime, Utc};
+use serde::{de::Visitor, Deserialize, Serialize};
+
+/// A range of time, before some date (for example a time before a restrictions
+/// will be lifted from a member of a chat).
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
+pub enum UntilDate {
+    /// The range is bound by a given date and time.
+    Date(DateTime<Utc>),
+    /// There is no end date, the range is unbounded.
+    Forever,
+}
+
+impl<'de> Deserialize<'de> for UntilDate {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct UntilDateVisitor;
+
+        impl<'v> Visitor<'v> for UntilDateVisitor {
+            type Value = UntilDate;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                formatter.write_str("an integer representing a UNIX timestamp or a 0")
+            }
+
+            fn visit_i64<E>(self, v: i64) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                match v {
+                    0 => Ok(UntilDate::Forever),
+                    timestamp => Ok(UntilDate::Date(DateTime::from_utc(
+                        NaiveDateTime::from_timestamp(timestamp, 0),
+                        Utc,
+                    ))),
+                }
+            }
+        }
+
+        deserializer.deserialize_i64(UntilDateVisitor)
+    }
+}
+
+impl Serialize for UntilDate {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_i64(match self {
+            UntilDate::Date(dt) => dt.timestamp(),
+            UntilDate::Forever => 0,
+        })
+    }
+}

From 6d4ad2932cb66a89d5387d925a9914be4638e58e Mon Sep 17 00:00:00 2001
From: Andrew <luminosoda@10ip.ru>
Date: Tue, 7 Sep 2021 15:32:00 +0500
Subject: [PATCH 372/755] Fix type of `Poll::correct_option_id` field: `i32` =>
 `u8`

---
 src/types/poll.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/poll.rs b/src/types/poll.rs
index caf6af5e..ac244a0b 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -37,7 +37,7 @@ pub struct Poll {
     /// 0-based identifier of the correct answer option. Available only for
     /// polls in the quiz mode, which are closed, or was sent (not
     /// forwarded) by the bot or to the private chat with the bot.
-    pub correct_option_id: Option<i32>,
+    pub correct_option_id: Option<u8>,
 
     /// Text that is shown when a user chooses an incorrect answer or taps on
     /// the lamp icon in a quiz-style poll, 0-200 characters.

From 602c573b92a3b13db293a5396d634f7e7c869a9d Mon Sep 17 00:00:00 2001
From: Andrew <luminosoda@10ip.ru>
Date: Tue, 7 Sep 2021 15:35:07 +0500
Subject: [PATCH 373/755]  Fix type of `Poll::open_period` field: `i32` =>
 `u16`

---
 src/types/poll.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/poll.rs b/src/types/poll.rs
index ac244a0b..a0946ca5 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -48,7 +48,7 @@ pub struct Poll {
     pub explanation_entities: Option<Vec<MessageEntity>>,
 
     /// Amount of time in seconds the poll will be active after creation.
-    pub open_period: Option<i32>,
+    pub open_period: Option<u16>,
 
     /// Point in time when the poll will be automatically closed.
     #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]

From c461eac259d63a0d803ae2a4010af097afd4df10 Mon Sep 17 00:00:00 2001
From: Andrew <luminosoda@10ip.ru>
Date: Tue, 7 Sep 2021 19:24:13 +0500
Subject: [PATCH 374/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaf3afb7..6ce3b9b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#116][pr116])
+- Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
+- Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
 
 ## 0.3.3 - 2021-08-03
 

From 9261d8cfd2dc915ed01b5d8af3ec3310d8cba66a Mon Sep 17 00:00:00 2001
From: Waffle Lapkin <waffle.lapkin@gmail.com>
Date: Tue, 7 Sep 2021 17:47:10 +0300
Subject: [PATCH 375/755] changelog: link pr119

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ce3b9b3..d146e494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
 
+[pr119]: https://github.com/teloxide/teloxide-core/pull/119
 ## 0.3.3 - 2021-08-03
 
 ### Fixed

From 86a478dd1d86193331307dcd2e052b2360fba3ae Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Sep 2021 00:04:01 +0300
Subject: [PATCH 376/755] Throttle: fix limit check

Previously both `messages_per_sec_chat` and `messages_per_min_chat` were
checked against last second message count.
---
 src/adaptors/throttle.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 36d6d880..6eefbf5d 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -465,9 +465,11 @@ async fn worker(
 
         while let Some(entry) = queue_removing.next() {
             let chat = &entry.value().0;
-            let requests_sent_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
-            let limits_not_exceeded = requests_sent_count < limits.messages_per_sec_chat
-                && requests_sent_count < limits.messages_per_min_chat;
+            let requests_sent_per_sec_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
+            let requests_sent_per_min_count = requests_sent.per_min.get(chat).copied().unwrap_or(0);
+
+            let limits_not_exceeded = requests_sent_per_sec_count < limits.messages_per_sec_chat
+                && requests_sent_per_min_count < limits.messages_per_min_chat;
 
             if limits_not_exceeded {
                 *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;

From 00b83770a79afca13f5f2e81765b3ab32c447669 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Sep 2021 02:37:38 +0300
Subject: [PATCH 377/755] Throttle: correct limits for channels

This commits adds `Limits::messages_per_min_channel` field
---
 src/adaptors/throttle.rs | 24 ++++++++++++++++++++++--
 src/types/chat_id.rs     | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 6eefbf5d..7cae78ac 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -203,11 +203,15 @@ pub struct Limits {
     /// Allowed messages in one chat per minute.
     pub messages_per_min_chat: u32,
 
+    /// Allowed messages in one channel per minute.
+    pub messages_per_min_channel: u32,
+
     /// Allowed messages per second.
     pub messages_per_sec_overall: u32,
 }
 
-/// Defaults are taken from [telegram documentation][tgdoc].
+/// Defaults are taken from [telegram documentation][tgdoc] (except for
+/// `messages_per_min_channel`).
 ///
 /// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
 impl Default for Limits {
@@ -216,6 +220,7 @@ impl Default for Limits {
             messages_per_sec_chat: 1,
             messages_per_sec_overall: 30,
             messages_per_min_chat: 20,
+            messages_per_min_channel: 10,
         }
     }
 }
@@ -468,8 +473,14 @@ async fn worker(
             let requests_sent_per_sec_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
             let requests_sent_per_min_count = requests_sent.per_min.get(chat).copied().unwrap_or(0);
 
+            let messages_per_min_limit = if chat.is_channel() {
+                limits.messages_per_min_channel
+            } else {
+                limits.messages_per_min_chat
+            };
+
             let limits_not_exceeded = requests_sent_per_sec_count < limits.messages_per_sec_chat
-                && requests_sent_per_min_count < limits.messages_per_min_chat;
+                && requests_sent_per_min_count < messages_per_min_limit;
 
             if limits_not_exceeded {
                 *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
@@ -629,6 +640,15 @@ enum ChatIdHash {
     ChannelUsernameHash(u64),
 }
 
+impl ChatIdHash {
+    fn is_channel(&self) -> bool {
+        match self {
+            &Self::Id(id) => ChatId::Id(id).is_channel(),
+            Self::ChannelUsernameHash(_) => true,
+        }
+    }
+}
+
 impl From<&ChatId> for ChatIdHash {
     fn from(value: &ChatId) -> Self {
         match value {
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index f4e57e98..026715c2 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -15,6 +15,39 @@ pub enum ChatId {
     ChannelUsername(String),
 }
 
+impl ChatId {
+    pub(crate) fn is_channel(&self) -> bool {
+        matches!(self.unmark(), None | Some(UnmarkedChatId::Channel(_)))
+    }
+
+    pub(crate) fn unmark(&self) -> Option<UnmarkedChatId> {
+        use UnmarkedChatId::*;
+
+        const MAX_CHANNEL_ID: i64 = -(10i64.pow(12));
+        const MIN_CHANNEL_ID: i64 = MAX_CHANNEL_ID - (i32::MAX as i64);
+        const MAX_USER_ID: i64 = i32::MAX as _;
+        const MIN_CHAT_ID: i64 = -MAX_USER_ID;
+
+        let res = match self {
+            &Self::Id(id @ MIN_CHAT_ID..=-1) => Chat(-id as _),
+            &Self::Id(id @ MIN_CHANNEL_ID..=MAX_CHANNEL_ID) => Channel((MAX_CHANNEL_ID - id) as _),
+            &Self::Id(id) => {
+                debug_assert!(0 < id && id < MAX_USER_ID, "malformed chat id");
+                User(id as _)
+            }
+            Self::ChannelUsername(_) => return None,
+        };
+
+        Some(res)
+    }
+}
+
+pub(crate) enum UnmarkedChatId {
+    User(u32),
+    Chat(u32),
+    Channel(u32),
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From b18a06403b2768d492e95c7f40285b5413fd9a60 Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Sep 2021 02:57:30 +0300
Subject: [PATCH 378/755] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d146e494..ae179b83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `EditedMessageIsTooLong` error [#109][pr109]
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
+- `Limits::messages_per_min_channel` ([#121][pr121])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
+[pr121]: https://github.com/teloxide/teloxide-core/pull/121
 
 ### Changed
 
@@ -26,8 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#116][pr116])
 - Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
+- `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
+
 ## 0.3.3 - 2021-08-03
 
 ### Fixed

From d3be288ebaa8ac0b1ede2fb9d3170967238f9834 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Oct 2021 14:25:49 +0300
Subject: [PATCH 379/755] Add `NotEnoughRightsToPostMessages` error

---
 src/errors.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index 7241dbb7..9fd05a58 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -434,6 +434,11 @@ pub enum ApiError {
     #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
     NotEnoughRightsToRestrict,
 
+    /// Occurs when bot tries to post a message in a channel without "Post
+    /// Messages" admin right.
+    #[serde(rename = "Bad Request: need administrator rights in the channel chat")]
+    NotEnoughRightsToPostMessages,
+
     /// Occurs when bot tries set webhook to protocol other than HTTPS.
     ///
     /// May happen in methods:

From 037e0eaf41bf4da8d30bab4b3119210dbefaaf67 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Oct 2021 16:33:40 +0300
Subject: [PATCH 380/755] Add some sticker errors

---
 src/errors.rs | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index 9fd05a58..67ce9f8d 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -379,6 +379,41 @@ pub enum ApiError {
     #[serde(rename = "Bad Request: STICKERSET_INVALID")]
     InvalidStickersSet,
 
+    /// Occurs when bot tries to create a sticker set with a name that is
+    /// already used by another sticker set.
+    ///
+    /// May happen in methods:
+    /// 1. [`CreateNewStickerSet`]
+    ///
+    /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
+    #[serde(rename = "Bad Request: sticker set name is already occupied")]
+    StickerSetNameOccupied,
+
+    /// Occurs when bot tries to create a sticker set with user id of a bot.
+    ///
+    /// May happen in methods:
+    /// 1. [`CreateNewStickerSet`]
+    ///
+    /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
+    #[serde(rename = "Bad Request: USER_IS_BOT")]
+    StickerSetOwnerIsBot,
+
+    /// Occurs when bot tries to create a sticker set with invalid name.
+    ///
+    /// From documentation of [`CreateNewStickerSet`]:
+    /// > Short name of sticker set, to be used in `t.me/addstickers/` URLs
+    /// (e.g., _animals_). Can contain only english letters, digits and
+    /// underscores. Must begin with a letter, can't contain consecutive
+    /// underscores and must end in “\_by\_<bot\_username>”. <bot\_username>
+    /// is case insensitive. 1-64 characters.
+    ///
+    /// May happen in methods:
+    /// 1. [`CreateNewStickerSet`]
+    ///
+    /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
+    #[serde(rename = "Bad Request: invalid sticker set name is specified")]
+    InvalidStickerName,
+
     /// Occurs when bot tries to pin a message without rights to pin in this
     /// chat.
     ///

From 25db4901e23281fc857969a7c22502c874ac4ba4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Oct 2021 16:40:31 +0300
Subject: [PATCH 381/755] Mark `ApiError` as `non_exhaustive`

---
 src/errors.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/errors.rs b/src/errors.rs
index 9fd05a58..92141876 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -61,6 +61,7 @@ pub enum RequestError {
 /// A kind of an API error.
 #[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
 #[serde(field_identifier)]
+#[non_exhaustive]
 pub enum ApiError {
     /// Occurs when the bot tries to send message to user who blocked the bot.
     #[serde(rename = "Forbidden: bot was blocked by the user")]

From 0999efa96b2d3316331e3584ca244801b9cebe4c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 11 Oct 2021 10:44:06 +0300
Subject: [PATCH 382/755] Update to changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae179b83..5ef432d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,8 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
+- Mark `ApiError` as `non_exhaustive` ([#125][pr125])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
+[pr125]: https://github.com/teloxide/teloxide-core/pull/125
 
 ### Fixed
 

From 62d21d1c583a6ef2a160debba44411d438bd8505 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 11 Oct 2021 16:56:05 +0300
Subject: [PATCH 383/755] Remove explicit doc(cfg) as it's now implied

---
 src/adaptors.rs               | 40 -----------------------------------
 src/requests/requester_ext.rs | 22 -------------------
 2 files changed, 62 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 3f8463db..4f1b7406 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -14,10 +14,6 @@
 /// [`AutoSend`]: auto_send::AutoSend
 /// [`send`]: crate::requests::Request::send
 #[cfg(feature = "auto_send")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "auto_send"))
-)]
 pub mod auto_send;
 
 /// [`CacheMe`] bot adaptor which caches [`GetMe`] requests.
@@ -25,20 +21,12 @@ pub mod auto_send;
 /// [`CacheMe`]: cache_me::CacheMe
 /// [`GetMe`]: crate::payloads::GetMe
 #[cfg(feature = "cache_me")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "cache_me"))
-)]
 pub mod cache_me;
 
 /// [`Trace`] bot adaptor which traces requests.
 ///
 /// [`Trace`]: trace::Trace
 #[cfg(feature = "trace_adaptor")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "trace_adaptor"))
-)]
 pub mod trace;
 
 /// [`ErasedRequester`] bot adaptor which allows to erase type of
@@ -47,10 +35,6 @@ pub mod trace;
 /// [`ErasedRequester`]: erased::ErasedRequester
 /// [`Requester`]: crate::requests::Requester
 #[cfg(feature = "erased")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "erased"))
-)]
 pub mod erased;
 
 /// [`Throttle`] bot adaptor which allows automatically throttle when hitting
@@ -58,43 +42,19 @@ pub mod erased;
 ///
 /// [`Throttle`]: throttle::Throttle
 #[cfg(feature = "throttle")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "throttle"))
-)]
 pub mod throttle;
 
 mod parse_mode;
 
 #[cfg(feature = "auto_send")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "auto_send"))
-)]
 pub use auto_send::AutoSend;
 #[cfg(feature = "cache_me")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "cache_me"))
-)]
 pub use cache_me::CacheMe;
 #[cfg(feature = "erased")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "erased"))
-)]
 pub use erased::ErasedRequester;
 #[cfg(feature = "throttle")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "throttle"))
-)]
 pub use throttle::Throttle;
 #[cfg(feature = "trace_adaptor")]
-#[cfg_attr(
-    all(any(docsrs, dep_docsrs), feature = "nightly"),
-    doc(cfg(feature = "trace_adaptor"))
-)]
 pub use trace::Trace;
 
 pub use parse_mode::DefaultParseMode;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 24926ee7..919296fc 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -18,13 +18,7 @@ use crate::adaptors::throttle::{Limits, Throttle};
 /// Extensions methods for [`Requester`].
 pub trait RequesterExt: Requester {
     /// Add `get_me` caching ability, see [`CacheMe`] for more.
-    ///
-    /// [`CacheMe`]:
     #[cfg(feature = "cache_me")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "cache_me"))
-    )]
     fn cache_me(self) -> CacheMe<Self>
     where
         Self: Sized,
@@ -34,10 +28,6 @@ pub trait RequesterExt: Requester {
 
     /// Send requests automatically, see [`AutoSend`] for more.
     #[cfg(feature = "auto_send")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "auto_send"))
-    )]
     fn auto_send(self) -> AutoSend<Self>
     where
         Self: Sized,
@@ -47,10 +37,6 @@ pub trait RequesterExt: Requester {
 
     /// Erase requester type.
     #[cfg(feature = "erased")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "erased"))
-    )]
     fn erase<'a>(self) -> ErasedRequester<'a, Self::Err>
     where
         Self: 'a,
@@ -61,10 +47,6 @@ pub trait RequesterExt: Requester {
 
     /// Trace requests, see [`Trace`] for more.
     #[cfg(feature = "trace_adaptor")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "trace_adaptor"))
-    )]
     fn trace(self, settings: Settings) -> Trace<Self>
     where
         Self: Sized,
@@ -76,10 +58,6 @@ pub trait RequesterExt: Requester {
     ///
     /// Note: this spawns the worker, just as [`Throttle::new_spawn`].
     #[cfg(feature = "throttle")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "throttle"))
-    )]
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
         Self: Sized,

From 73235682a34a2c020cbc4f1c83600479a23efe8b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 15 Oct 2021 19:03:50 +0300
Subject: [PATCH 384/755] Add `#[must_use]` attrs to payload setters, request
 wrappers and send* methods

---
 src/adaptors/auto_send.rs | 1 +
 src/adaptors/cache_me.rs  | 1 +
 src/adaptors/erased.rs    | 1 +
 src/adaptors/throttle.rs  | 1 +
 src/adaptors/trace.rs     | 1 +
 src/local_macros.rs       | 6 ++++++
 src/requests/json.rs      | 2 +-
 src/requests/multipart.rs | 2 +-
 src/requests/request.rs   | 6 ++----
 9 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 21db37b8..7732c5db 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -116,6 +116,7 @@ download_forward! {
     { this => this.inner() }
 }
 
+#[must_use = "Futures are lazy and do nothing unless polled or awaited"]
 #[pin_project::pin_project]
 pub struct AutoRequest<R: Request>(#[pin] Inner<R>);
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 1d3b696c..e8e2e27f 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -123,6 +123,7 @@ download_forward! {
     { this => this.inner() }
 }
 
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct CachedMeRequest<R: Request<Payload = GetMe>>(Inner<R>, GetMe);
 
 enum Inner<R: Request<Payload = GetMe>> {
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index cd92c122..038b052d 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -35,6 +35,7 @@ impl<'a, E> ErasedRequester<'a, E> {
 }
 
 /// [`Request`] with erased type.
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct ErasedRequest<'a, T, E> {
     inner: Box<dyn ErasableRequest<'a, Payload = T, Err = E> + 'a>,
 }
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 7cae78ac..31b70074 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -663,6 +663,7 @@ impl From<&ChatId> for ChatIdHash {
     }
 }
 
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct ThrottlingRequest<R: HasPayload> {
     request: R,
     chat_id: fn(&R::Payload) -> ChatIdHash,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 80cf7ac9..1f59c826 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -141,6 +141,7 @@ where
     }
 }
 
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct TraceRequest<R> {
     inner: R,
     settings: Settings,
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 27238be0..ec8d7f8d 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -255,6 +255,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: Into<$FTy>,
@@ -276,6 +277,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
@@ -297,6 +299,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field(mut self, value: $FTy) -> Self {
                 self.payload_mut().$field = Some(value);
                 self
@@ -315,6 +318,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: Into<$FTy>,
@@ -336,6 +340,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field<T>(mut self, value: T) -> Self
             where
                 T: ::core::iter::IntoIterator<Item = <$FTy as ::core::iter::IntoIterator>::Item>,
@@ -357,6 +362,7 @@ macro_rules! impl_payload {
                 ") field."
             )]
             #[allow(clippy::wrong_self_convention)]
+            #[must_use = "Payloads and requests do nothing unless sent"]
             fn $field(mut self, value: $FTy) -> Self {
                 self.payload_mut().$field = value;
                 self
diff --git a/src/requests/json.rs b/src/requests/json.rs
index bda409e5..18517bd2 100644
--- a/src/requests/json.rs
+++ b/src/requests/json.rs
@@ -9,7 +9,7 @@ use crate::{
 /// A ready-to-send Telegram request whose payload is sent using [JSON].
 ///
 /// [JSON]: https://core.telegram.org/bots/api#making-requests
-#[must_use = "requests do nothing until sent"]
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct JsonRequest<P> {
     bot: Bot,
     payload: P,
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 87d5f884..1b873e62 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -10,7 +10,7 @@ use crate::{
 /// [multipart/form-data].
 ///
 /// [multipart/form-data]: https://core.telegram.org/bots/api#making-requests
-#[must_use = "requests do nothing until sent"]
+#[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct MultipartRequest<P> {
     bot: Bot,
     payload: P,
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 3913dcb3..0dd99e86 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -59,6 +59,7 @@ pub trait Request: HasPayload {
     /// let _: Me = request.send().await.unwrap();
     /// # };
     /// ```
+    #[must_use = "Futures are lazy and do nothing unless polled or awaited"]
     fn send(self) -> Self::Send;
 
     /// Send this request by reference.
@@ -86,13 +87,10 @@ pub trait Request: HasPayload {
     /// }
     /// # };
     /// ```
+    #[must_use = "Futures are lazy and do nothing unless polled or awaited"]
     fn send_ref(&self) -> Self::SendRef;
 
     #[cfg(feature = "erased")]
-    #[cfg_attr(
-        all(any(docsrs, dep_docsrs), feature = "nightly"),
-        doc(cfg(feature = "erased"))
-    )]
     fn erase<'a>(self) -> crate::adaptors::erased::ErasedRequest<'a, Self::Payload, Self::Err>
     where
         Self: Sized + 'a,

From bd8bafd03b9b2264e8886e527c38602dbbc0637a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Oct 2021 13:47:02 +0300
Subject: [PATCH 385/755] Fix *_inline methods (release v0.3.4)

---
 Cargo.toml         |  2 +-
 src/net/request.rs | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 58a2e6a7..2d5e6a68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.3.3"
+version = "0.3.4"
 edition = "2018"
 authors = [
     "Temirkhan Myrzamadi <hirrolot@gmail.com>",
diff --git a/src/net/request.rs b/src/net/request.rs
index b8726001..fac6f61d 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -20,6 +20,19 @@ pub async fn request_multipart<T>(
 where
     T: DeserializeOwned,
 {
+    // Workaround for [#460]
+    //
+    // Telegram has some methods that return either `Message` or `True` depending on
+    // the used arguments we model this as `...` and `..._inline` pairs of methods.
+    //
+    // Currently inline versions have wrong Payload::NAME (ie with the "Inline"
+    // sufix). This removes the sufix allowing to call the right telegram method.
+    // Note that currently there are no normal telegram methods ending in "Inline",
+    // so this is fine.
+    //
+    // [#460]: https://github.com/teloxide/teloxide/issues/460
+    let method_name = method_name.trim_end_matches("Inline");
+
     let response = client
         .post(crate::net::method_url(api_url, token, method_name))
         .multipart(params)
@@ -40,6 +53,19 @@ pub async fn request_json<T>(
 where
     T: DeserializeOwned,
 {
+    // Workaround for [#460]
+    //
+    // Telegram has some methods that return either `Message` or `True` depending on
+    // the used arguments we model this as `...` and `..._inline` pairs of methods.
+    //
+    // Currently inline versions have wrong Payload::NAME (ie with the "Inline"
+    // sufix). This removes the sufix allowing to call the right telegram method.
+    // Note that currently there are no normal telegram methods ending in "Inline",
+    // so this is fine.
+    //
+    // [#460]: https://github.com/teloxide/teloxide/issues/460
+    let method_name = method_name.trim_end_matches("Inline");
+
     let response = client
         .post(crate::net::method_url(api_url, token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))

From 1d9811918b1034a570831c982dcf6c65d501712f Mon Sep 17 00:00:00 2001
From: Dominic <git@msrd0.de>
Date: Sat, 23 Oct 2021 17:36:42 +0200
Subject: [PATCH 386/755] disable default features of chrono

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2d5e6a68..aa1da107 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.5.0"
 never = "0.1.0"
-chrono = "0.4.19"
+chrono = { version = "0.4.19", default-features = false }
 either = "1.6.1"
 
 vecrem = { version = "0.1", optional = true }

From f868152e2fb43898b71fe2436918a3a6e92b4dc7 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sun, 31 Oct 2021 00:37:56 +0300
Subject: [PATCH 387/755] fix: Add missing derive(Debug) on adapters

---
 src/adaptors/auto_send.rs  | 2 +-
 src/adaptors/cache_me.rs   | 2 +-
 src/adaptors/erased.rs     | 6 ++++++
 src/adaptors/parse_mode.rs | 2 +-
 src/adaptors/throttle.rs   | 2 +-
 src/adaptors/trace.rs      | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 21db37b8..7ecf8792 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -38,7 +38,7 @@ use crate::{
 /// let myself: Me = bot.get_me().await?; // No .send()!
 /// # Ok::<_, teloxide_core::RequestError>(()) };
 /// ```
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct AutoSend<B> {
     bot: B,
 }
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 1d3b696c..2f096d9a 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -19,7 +19,7 @@ use crate::{
 ///
 /// Bot's user is hardly ever changed, so sometimes it's reasonable to cache
 /// response from `get_me` method.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct CacheMe<B> {
     bot: B,
     me: Arc<OnceCell<Me>>,
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index cd92c122..9c19fcab 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -34,6 +34,12 @@ impl<'a, E> ErasedRequester<'a, E> {
     }
 }
 
+impl<E> std::fmt::Debug for ErasedRequester<'_, E> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.debug_struct("ErasedRequester").finish_non_exhaustive()
+    }
+}
+
 /// [`Request`] with erased type.
 pub struct ErasedRequest<'a, T, E> {
     inner: Box<dyn ErasableRequest<'a, Payload = T, Err = E> + 'a>,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index ddef2661..0adce419 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -8,7 +8,7 @@ use crate::{
 
 /// Default parse mode adaptor, see
 /// [`RequesterExt::parse_mode`](crate::requests::RequesterExt::parse_mode).
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct DefaultParseMode<B> {
     bot: B,
     mode: ParseMode,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 7cae78ac..94652dad 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -63,7 +63,7 @@ use crate::{
 ///
 /// As such, we encourage not to use `ChatId::ChannelUsername(u)` with this bot
 /// wrapper.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Throttle<B> {
     bot: B,
     // `RequestLock` allows to unlock requests (allowing them to be sent).
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 80cf7ac9..adc09bf3 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -25,7 +25,7 @@ use crate::{
 /// TRACE teloxide_core::adaptors::trace > Sending `SendDice` request: SendDice { chat_id: Id(0), emoji: Some(Dice), disable_notification: None, reply_to_message_id: None, allow_sending_without_reply: None, reply_markup: None }
 /// TRACE teloxide_core::adaptors::trace > Got response from `SendDice` request: Ok(Message { id: 13812, date: 1625926524, chat: Chat { .. }, via_bot: None, kind: Dice(MessageDice { dice: Dice { emoji: Dice, value: 3 } }) })
 /// ```
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Trace<B> {
     inner: B,
     settings: Settings,

From 27e1b90c6e64d317c6e39072de2d3d38502accdc Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 7 Nov 2021 23:55:38 +0300
Subject: [PATCH 388/755] Refactor errors

---
 CHANGELOG.md                 |  7 +++
 src/errors.rs                | 85 +++++++++++++++++++++++++++++++-----
 src/net/request.rs           |  6 +--
 src/net/telegram_response.rs | 31 +++++--------
 4 files changed, 94 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ef432d5..e1e9475c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,11 +19,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Refactor errors ([#134][pr134])
+  - Rename `DownloadError::NetworkError` to `Network`
+  - Rename `RequestError::ApiError` to `Api`
+  - Remove `RequestError::Api::status_code` and rename `RequestError::Api::kind` to `0` (struct to tuple struct)
+  - Rename `RequestError::NetworkError` to `Network`
+  - Implement `Error` for `ApiError`
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
 - Mark `ApiError` as `non_exhaustive` ([#125][pr125])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
+[pr134]: https://github.com/teloxide/teloxide-core/pull/134
 
 ### Fixed
 
diff --git a/src/errors.rs b/src/errors.rs
index d50945e5..3a50fa6c 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,7 +1,6 @@
 use std::io;
 
 use derive_more::From;
-use reqwest::StatusCode;
 use serde::Deserialize;
 use thiserror::Error;
 
@@ -10,7 +9,7 @@ use thiserror::Error;
 pub enum DownloadError {
     /// A network error while downloading a file from Telegram.
     #[error("A network error: {0}")]
-    NetworkError(#[source] reqwest::Error),
+    Network(#[source] reqwest::Error),
 
     /// An I/O error while writing a file to destination.
     #[error("An I/O error: {0}")]
@@ -21,14 +20,8 @@ pub enum DownloadError {
 #[derive(Debug, Error)]
 pub enum RequestError {
     /// A Telegram API error.
-    #[error("A Telegram's error #{status_code}: {kind:?}")]
-    ApiError {
-        /// A kind of an API error.
-        kind: ApiError,
-
-        /// An HTTP code returned by Telegram, not very useful in practice.
-        status_code: StatusCode,
-    },
+    #[error("A Telegram's error: {0}")]
+    Api(#[source] ApiError),
 
     /// The group has been migrated to a supergroup with the specified
     /// identifier.
@@ -42,7 +35,7 @@ pub enum RequestError {
 
     /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
-    NetworkError(#[source] reqwest::Error),
+    Network(#[source] reqwest::Error),
 
     /// Error while parsing a response from Telegram.
     ///
@@ -59,12 +52,13 @@ pub enum RequestError {
 }
 
 /// A kind of an API error.
-#[derive(Debug, Deserialize, PartialEq, Hash, Eq, Clone)]
+#[derive(Debug, Error, Deserialize, PartialEq, Hash, Eq, Clone)]
 #[serde(field_identifier)]
 #[non_exhaustive]
 pub enum ApiError {
     /// Occurs when the bot tries to send message to user who blocked the bot.
     #[serde(rename = "Forbidden: bot was blocked by the user")]
+    #[error("Forbidden: bot was blocked by the user")]
     BotBlocked,
 
     /// Occurs when bot tries to modify a message without modification content.
@@ -77,6 +71,10 @@ pub enum ApiError {
         rename = "Bad Request: message is not modified: specified new message content and reply \
                   markup are exactly the same as a current content and reply markup of the message"
     )]
+    #[error(
+        "Bad Request: message is not modified: specified new message content and reply markup are \
+         exactly the same as a current content and reply markup of the message"
+    )]
     MessageNotModified,
 
     /// Occurs when bot tries to forward or delete a message which was deleted.
@@ -88,6 +86,7 @@ pub enum ApiError {
     /// [`ForwardMessage`]: crate::payloads::ForwardMessage
     /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: MESSAGE_ID_INVALID")]
+    #[error("Bad Request: MESSAGE_ID_INVALID")]
     MessageIdInvalid,
 
     /// Occurs when bot tries to forward a message which does not exists.
@@ -97,6 +96,7 @@ pub enum ApiError {
     ///
     /// [`ForwardMessage`]: crate::payloads::ForwardMessage
     #[serde(rename = "Bad Request: message to forward not found")]
+    #[error("Bad Request: message to forward not found")]
     MessageToForwardNotFound,
 
     /// Occurs when bot tries to delete a message which does not exists.
@@ -106,6 +106,7 @@ pub enum ApiError {
     ///
     /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: message to delete not found")]
+    #[error("Bad Request: message to delete not found")]
     MessageToDeleteNotFound,
 
     /// Occurs when bot tries to send a text message without text.
@@ -115,6 +116,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: message text is empty")]
+    #[error("Bad Request: message text is empty")]
     MessageTextIsEmpty,
 
     /// Occurs when bot tries to edit a message after long time.
@@ -124,6 +126,7 @@ pub enum ApiError {
     ///
     /// [`EditMessageText`]: crate::payloads::EditMessageText
     #[serde(rename = "Bad Request: message can't be edited")]
+    #[error("Bad Request: message can't be edited")]
     MessageCantBeEdited,
 
     /// Occurs when bot tries to delete a someone else's message in group where
@@ -134,6 +137,7 @@ pub enum ApiError {
     ///
     /// [`DeleteMessage`]: crate::payloads::DeleteMessage
     #[serde(rename = "Bad Request: message can't be deleted")]
+    #[error("Bad Request: message can't be deleted")]
     MessageCantBeDeleted,
 
     /// Occurs when bot tries to edit a message which does not exists.
@@ -143,6 +147,7 @@ pub enum ApiError {
     ///
     /// [`EditMessageText`]: crate::payloads::EditMessageText
     #[serde(rename = "Bad Request: message to edit not found")]
+    #[error("Bad Request: message to edit not found")]
     MessageToEditNotFound,
 
     /// Occurs when bot tries to reply to a message which does not exists.
@@ -152,10 +157,12 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: reply message not found")]
+    #[error("Bad Request: reply message not found")]
     MessageToReplyNotFound,
 
     /// Occurs when bot tries to
     #[serde(rename = "Bad Request: message identifier is not specified")]
+    #[error("Bad Request: message identifier is not specified")]
     MessageIdentifierNotSpecified,
 
     /// Occurs when bot tries to send a message with text size greater then
@@ -166,6 +173,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: message is too long")]
+    #[error("Bad Request: message is too long")]
     MessageIsTooLong,
 
     /// Occurs when bot tries to edit a message with text size greater then
@@ -182,6 +190,7 @@ pub enum ApiError {
     /// [`EditMessageCaption`]: crate::payloads::EditMessageCaption
     /// [`EditMessageCaptionInline`]: crate::payloads::EditMessageCaptionInline
     #[serde(rename = "Bad Request: MESSAGE_TOO_LONG")]
+    #[error("Bad Request: MESSAGE_TOO_LONG")]
     EditedMessageIsTooLong,
 
     /// Occurs when bot tries to send media group with more than 10 items.
@@ -191,6 +200,7 @@ pub enum ApiError {
     ///
     /// [`SendMediaGroup`]: crate::payloads::SendMediaGroup
     #[serde(rename = "Bad Request: Too much messages to send as an album")]
+    #[error("Bad Request: Too much messages to send as an album")]
     ToMuchMessages,
 
     /// Occurs when bot tries to stop poll that has already been stopped.
@@ -200,6 +210,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll has already been closed")]
+    #[error("Bad Request: poll has already been closed")]
     PollHasAlreadyClosed,
 
     /// Occurs when bot tries to send poll with less than 2 options.
@@ -209,6 +220,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll must have at least 2 option")]
+    #[error("Bad Request: poll must have at least 2 option")]
     PollMustHaveMoreOptions,
 
     /// Occurs when bot tries to send poll with more than 10 options.
@@ -218,6 +230,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll can't have more than 10 options")]
+    #[error("Bad Request: poll can't have more than 10 options")]
     PollCantHaveMoreOptions,
 
     /// Occurs when bot tries to send poll with empty option (without text).
@@ -227,6 +240,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll options must be non-empty")]
+    #[error("Bad Request: poll options must be non-empty")]
     PollOptionsMustBeNonEmpty,
 
     /// Occurs when bot tries to send poll with empty question (without text).
@@ -236,6 +250,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll question must be non-empty")]
+    #[error("Bad Request: poll question must be non-empty")]
     PollQuestionMustBeNonEmpty,
 
     /// Occurs when bot tries to send poll with total size of options more than
@@ -246,6 +261,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll options length must not exceed 100")]
+    #[error("Bad Request: poll options length must not exceed 100")]
     PollOptionsLengthTooLong,
 
     /// Occurs when bot tries to send poll with question size more than 255
@@ -256,6 +272,7 @@ pub enum ApiError {
     ///
     /// [`SendPoll`]: crate::payloads::SendPoll
     #[serde(rename = "Bad Request: poll question length must not exceed 255")]
+    #[error("Bad Request: poll question length must not exceed 255")]
     PollQuestionLengthTooLong,
 
     /// Occurs when bot tries to stop poll with message without poll.
@@ -265,6 +282,7 @@ pub enum ApiError {
     ///
     /// [`StopPoll`]: crate::payloads::StopPoll
     #[serde(rename = "Bad Request: message with poll to stop not found")]
+    #[error("Bad Request: message with poll to stop not found")]
     MessageWithPollNotFound,
 
     /// Occurs when bot tries to stop poll with message without poll.
@@ -274,6 +292,7 @@ pub enum ApiError {
     ///
     /// [`StopPoll`]: crate::payloads::StopPoll
     #[serde(rename = "Bad Request: message is not a poll")]
+    #[error("Bad Request: message is not a poll")]
     MessageIsNotAPoll,
 
     /// Occurs when bot tries to send a message to chat in which it is not a
@@ -284,6 +303,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: chat not found")]
+    #[error("Bad Request: chat not found")]
     ChatNotFound,
 
     /// Occurs when bot tries to send method with unknown user_id.
@@ -294,6 +314,7 @@ pub enum ApiError {
     /// [`getUserProfilePhotos`]:
     /// crate::payloads::GetUserProfilePhotos
     #[serde(rename = "Bad Request: user not found")]
+    #[error("Bad Request: user not found")]
     UserNotFound,
 
     /// Occurs when bot tries to send [`SetChatDescription`] with same text as
@@ -304,6 +325,7 @@ pub enum ApiError {
     ///
     /// [`SetChatDescription`]: crate::payloads::SetChatDescription
     #[serde(rename = "Bad Request: chat description is not modified")]
+    #[error("Bad Request: chat description is not modified")]
     ChatDescriptionIsNotModified,
 
     /// Occurs when bot tries to answer to query after timeout expire.
@@ -316,6 +338,7 @@ pub enum ApiError {
         rename = "Bad Request: query is too old and response timeout expired or query id is \
                   invalid"
     )]
+    #[error("Bad Request: query is too old and response timeout expired or query id is invalid")]
     InvalidQueryId,
 
     /// Occurs when bot tries to send InlineKeyboardMarkup with invalid button
@@ -326,6 +349,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: BUTTON_URL_INVALID")]
+    #[error("Bad Request: BUTTON_URL_INVALID")]
     ButtonUrlInvalid,
 
     /// Occurs when bot tries to send button with data size more than 64 bytes.
@@ -335,6 +359,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: BUTTON_DATA_INVALID")]
+    #[error("Bad Request: BUTTON_DATA_INVALID")]
     ButtonDataInvalid,
 
     /// Occurs when bot tries to send button with data size == 0.
@@ -347,6 +372,10 @@ pub enum ApiError {
         rename = "Bad Request: can't parse inline keyboard button: Text buttons are unallowed in \
                   the inline keyboard"
     )]
+    #[error(
+        "Bad Request: can't parse inline keyboard button: Text buttons are unallowed in the \
+         inline keyboard"
+    )]
     TextButtonsAreUnallowed,
 
     /// Occurs when bot tries to get file by wrong file id.
@@ -356,10 +385,12 @@ pub enum ApiError {
     ///
     /// [`GetFile`]: crate::payloads::GetFile
     #[serde(rename = "Bad Request: wrong file id")]
+    #[error("Bad Request: wrong file id")]
     WrongFileId,
 
     /// Occurs when bot tries to do some with group which was deactivated.
     #[serde(rename = "Bad Request: group is deactivated")]
+    #[error("Bad Request: group is deactivated")]
     GroupDeactivated,
 
     /// Occurs when bot tries to set chat photo from file ID
@@ -369,6 +400,7 @@ pub enum ApiError {
     ///
     /// [`SetChatPhoto`]: crate::payloads::SetChatPhoto
     #[serde(rename = "Bad Request: Photo should be uploaded as an InputFile")]
+    #[error("Bad Request: Photo should be uploaded as an InputFile")]
     PhotoAsInputFileRequired,
 
     /// Occurs when bot tries to add sticker to stickerset by invalid name.
@@ -378,6 +410,7 @@ pub enum ApiError {
     ///
     /// [`AddStickerToSet`]: crate::payloads::AddStickerToSet
     #[serde(rename = "Bad Request: STICKERSET_INVALID")]
+    #[error("Bad Request: STICKERSET_INVALID")]
     InvalidStickersSet,
 
     /// Occurs when bot tries to create a sticker set with a name that is
@@ -388,6 +421,7 @@ pub enum ApiError {
     ///
     /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
     #[serde(rename = "Bad Request: sticker set name is already occupied")]
+    #[error("Bad Request: sticker set name is already occupied")]
     StickerSetNameOccupied,
 
     /// Occurs when bot tries to create a sticker set with user id of a bot.
@@ -397,6 +431,7 @@ pub enum ApiError {
     ///
     /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
     #[serde(rename = "Bad Request: USER_IS_BOT")]
+    #[error("Bad Request: USER_IS_BOT")]
     StickerSetOwnerIsBot,
 
     /// Occurs when bot tries to create a sticker set with invalid name.
@@ -413,6 +448,7 @@ pub enum ApiError {
     ///
     /// [`CreateNewStickerSet`]: crate::payloads::CreateNewStickerSet
     #[serde(rename = "Bad Request: invalid sticker set name is specified")]
+    #[error("Bad Request: invalid sticker set name is specified")]
     InvalidStickerName,
 
     /// Occurs when bot tries to pin a message without rights to pin in this
@@ -423,6 +459,7 @@ pub enum ApiError {
     ///
     /// [`PinChatMessage`]: crate::payloads::PinChatMessage
     #[serde(rename = "Bad Request: not enough rights to pin a message")]
+    #[error("Bad Request: not enough rights to pin a message")]
     NotEnoughRightsToPinMessage,
 
     /// Occurs when bot tries to pin or unpin a message without rights to pin
@@ -435,11 +472,13 @@ pub enum ApiError {
     /// [`PinChatMessage`]: crate::payloads::PinChatMessage
     /// [`UnpinChatMessage`]: crate::payloads::UnpinChatMessage
     #[serde(rename = "Bad Request: not enough rights to manage pinned messages in the chat")]
+    #[error("Bad Request: not enough rights to manage pinned messages in the chat")]
     NotEnoughRightsToManagePins,
 
     /// Occurs when bot tries to use method in group which is allowed only in a
     /// supergroup or channel.
     #[serde(rename = "Bad Request: method is available only for supergroups and channel")]
+    #[error("Bad Request: method is available only for supergroups and channel")]
     MethodNotAvailableInPrivateChats,
 
     /// Occurs when bot tries to demote chat creator.
@@ -449,6 +488,7 @@ pub enum ApiError {
     ///
     /// [`PromoteChatMember`]: crate::payloads::PromoteChatMember
     #[serde(rename = "Bad Request: can't demote chat creator")]
+    #[error("Bad Request: can't demote chat creator")]
     CantDemoteChatCreator,
 
     /// Occurs when bot tries to restrict self in group chats.
@@ -458,6 +498,7 @@ pub enum ApiError {
     ///
     /// [`RestrictChatMember`]: crate::payloads::RestrictChatMember
     #[serde(rename = "Bad Request: can't restrict self")]
+    #[error("Bad Request: can't restrict self")]
     CantRestrictSelf,
 
     /// Occurs when bot tries to restrict chat member without rights to
@@ -468,11 +509,13 @@ pub enum ApiError {
     ///
     /// [`RestrictChatMember`]: crate::payloads::RestrictChatMember
     #[serde(rename = "Bad Request: not enough rights to restrict/unrestrict chat member")]
+    #[error("Bad Request: not enough rights to restrict/unrestrict chat member")]
     NotEnoughRightsToRestrict,
 
     /// Occurs when bot tries to post a message in a channel without "Post
     /// Messages" admin right.
     #[serde(rename = "Bad Request: need administrator rights in the channel chat")]
+    #[error("Bad Request: need administrator rights in the channel chat")]
     NotEnoughRightsToPostMessages,
 
     /// Occurs when bot tries set webhook to protocol other than HTTPS.
@@ -482,6 +525,7 @@ pub enum ApiError {
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: bad webhook: HTTPS url must be provided for webhook")]
+    #[error("Bad Request: bad webhook: HTTPS url must be provided for webhook")]
     WebhookRequireHttps,
 
     /// Occurs when bot tries to set webhook to port other than 80, 88, 443 or
@@ -495,6 +539,7 @@ pub enum ApiError {
         rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 or \
                   8443"
     )]
+    #[error("Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 or 8443")]
     BadWebhookPort,
 
     /// Occurs when bot tries to set webhook to unknown host.
@@ -506,6 +551,7 @@ pub enum ApiError {
     #[serde(
         rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known"
     )]
+    #[error("Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
     UnknownHost,
 
     /// Occurs when bot tries to set webhook to invalid URL.
@@ -515,6 +561,7 @@ pub enum ApiError {
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
     #[serde(rename = "Bad Request: can't parse URL")]
+    #[error("Bad Request: can't parse URL")]
     CantParseUrl,
 
     /// Occurs when bot tries to send message with unfinished entities.
@@ -524,6 +571,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: can't parse entities")]
+    #[error("Bad Request: can't parse entities")]
     CantParseEntities,
 
     /// Occurs when bot tries to use getUpdates while webhook is active.
@@ -533,6 +581,7 @@ pub enum ApiError {
     ///
     /// [`GetUpdates`]: crate::payloads::GetUpdates
     #[serde(rename = "can't use getUpdates method while webhook is active")]
+    #[error("can't use getUpdates method while webhook is active")]
     CantGetUpdates,
 
     /// Occurs when bot tries to do some in group where bot was kicked.
@@ -542,6 +591,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot was kicked from a chat")]
+    #[error("Unauthorized: bot was kicked from a chat")]
     BotKicked,
 
     /// Occurs when bot tries to do something in a supergroup the bot was
@@ -552,6 +602,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Forbidden: bot was kicked from the supergroup chat")]
+    #[error("Forbidden: bot was kicked from the supergroup chat")]
     BotKickedFromSupergroup,
 
     /// Occurs when bot tries to send message to deactivated user.
@@ -561,6 +612,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: user is deactivated")]
+    #[error("Unauthorized: user is deactivated")]
     UserDeactivated,
 
     /// Occurs when you tries to initiate conversation with a user.
@@ -570,6 +622,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot can't initiate conversation with a user")]
+    #[error("Unauthorized: bot can't initiate conversation with a user")]
     CantInitiateConversation,
 
     /// Occurs when you tries to send message to bot.
@@ -579,6 +632,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Unauthorized: bot can't send messages to bots")]
+    #[error("Unauthorized: bot can't send messages to bots")]
     CantTalkWithBots,
 
     /// Occurs when bot tries to send button with invalid http url.
@@ -588,6 +642,7 @@ pub enum ApiError {
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
     #[serde(rename = "Bad Request: wrong HTTP URL")]
+    #[error("Bad Request: wrong HTTP URL")]
     WrongHttpUrl,
 
     /// Occurs when bot tries GetUpdate before the timeout. Make sure that only
@@ -601,6 +656,10 @@ pub enum ApiError {
         rename = "Conflict: terminated by other getUpdates request; make sure that only one bot \
                   instance is running"
     )]
+    #[error(
+        "Conflict: terminated by other getUpdates request; make sure that only one bot instance \
+         is running"
+    )]
     TerminatedByOtherGetUpdates,
 
     /// Occurs when bot tries to get file by invalid file id.
@@ -610,6 +669,7 @@ pub enum ApiError {
     ///
     /// [`GetFile`]: crate::payloads::GetFile
     #[serde(rename = "Bad Request: invalid file id")]
+    #[error("Bad Request: invalid file id")]
     FileIdInvalid,
 
     /// Error which is not known to `teloxide`.
@@ -618,5 +678,6 @@ pub enum ApiError {
     /// description of the error.
     ///
     /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
+    #[error("Unknown error: {0:?}")]
     Unknown(String),
 }
diff --git a/src/net/request.rs b/src/net/request.rs
index b8726001..31445ab1 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -25,7 +25,7 @@ where
         .multipart(params)
         .send()
         .await
-        .map_err(RequestError::NetworkError)?;
+        .map_err(RequestError::Network)?;
 
     process_response(response).await
 }
@@ -46,7 +46,7 @@ where
         .body(params)
         .send()
         .await
-        .map_err(RequestError::NetworkError)?;
+        .map_err(RequestError::Network)?;
 
     process_response(response).await
 }
@@ -60,7 +60,7 @@ where
     }
 
     serde_json::from_str::<TelegramResponse<T>>(
-        &response.text().await.map_err(RequestError::NetworkError)?,
+        &response.text().await.map_err(RequestError::Network)?,
     )
     .map_err(RequestError::InvalidJson)?
     .into()
diff --git a/src/net/telegram_response.rs b/src/net/telegram_response.rs
index f074f8b4..2c99235e 100644
--- a/src/net/telegram_response.rs
+++ b/src/net/telegram_response.rs
@@ -1,4 +1,3 @@
-use reqwest::StatusCode;
 use serde::Deserialize;
 
 use crate::{
@@ -14,6 +13,7 @@ pub(crate) enum TelegramResponse<R> {
         /// A dummy field. Used only for deserialization.
         #[allow(dead_code)]
         ok: True,
+
         #[serde(rename = "result")]
         response: R,
     },
@@ -24,7 +24,10 @@ pub(crate) enum TelegramResponse<R> {
 
         #[serde(rename = "description")]
         error: ApiError,
-        error_code: u16,
+
+        // // This field is present in the json sent by telegram, but isn't currently used anywhere
+        // // and as such - ignored
+        // error_code: u16,
         #[serde(rename = "parameters")]
         response_parameters: Option<ResponseParameters>,
     },
@@ -35,25 +38,13 @@ impl<R> From<TelegramResponse<R>> for ResponseResult<R> {
         match this {
             TelegramResponse::Ok { response, .. } => Ok(response),
             TelegramResponse::Err {
-                error,
-                error_code,
-                response_parameters,
+                response_parameters: Some(params),
                 ..
-            } => {
-                if let Some(params) = response_parameters {
-                    match params {
-                        ResponseParameters::RetryAfter(i) => Err(RequestError::RetryAfter(i)),
-                        ResponseParameters::MigrateToChatId(to) => {
-                            Err(RequestError::MigrateToChatId(to))
-                        }
-                    }
-                } else {
-                    Err(RequestError::ApiError {
-                        kind: error,
-                        status_code: StatusCode::from_u16(error_code).unwrap(),
-                    })
-                }
-            }
+            } => Err(match params {
+                ResponseParameters::RetryAfter(i) => RequestError::RetryAfter(i),
+                ResponseParameters::MigrateToChatId(to) => RequestError::MigrateToChatId(to),
+            }),
+            TelegramResponse::Err { error, .. } => Err(RequestError::Api(error)),
         }
     }
 }

From 8d1dd8d444da7ce3af10db51d63058dd63385156 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 9 Nov 2021 21:16:56 +0300
Subject: [PATCH 389/755] Add `ApiError::TooMuchInlineQueryResults`

---
 CHANGELOG.md  |  2 ++
 src/errors.rs | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ef432d5..45128882 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
 - `EditedMessageIsTooLong` error [#109][pr109]
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
@@ -16,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
 [pr121]: https://github.com/teloxide/teloxide-core/pull/121
+[pr135]: https://github.com/teloxide/teloxide-core/pull/135
 
 ### Changed
 
diff --git a/src/errors.rs b/src/errors.rs
index d50945e5..96f0f6f7 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -193,6 +193,18 @@ pub enum ApiError {
     #[serde(rename = "Bad Request: Too much messages to send as an album")]
     ToMuchMessages,
 
+    /// Occurs when bot tries to answer an inline query with more than 50
+    /// results.
+    ///
+    /// Consider using offsets to paginate results.
+    ///
+    /// May happen in methods:
+    /// 1. [`AnswerInlineQuery`]
+    ///
+    /// [`AnswerInlineQuery`]: crate::payloads::AnswerInlineQuery
+    #[serde(rename = "Bad Request: RESULTS_TOO_MUCH")]
+    TooMuchInlineQueryResults,
+
     /// Occurs when bot tries to stop poll that has already been stopped.
     ///
     /// May happen in methods:

From af54d6db7a48e5a0d84e28a975ee07dfac6b1a1d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 13 Nov 2021 20:16:13 +0300
Subject: [PATCH 390/755] Fix conflict between PRs 134 and 135

---
 src/errors.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/errors.rs b/src/errors.rs
index 43569bda..4b6c8082 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -213,6 +213,7 @@ pub enum ApiError {
     ///
     /// [`AnswerInlineQuery`]: crate::payloads::AnswerInlineQuery
     #[serde(rename = "Bad Request: RESULTS_TOO_MUCH")]
+    #[error("Bad Request: RESULTS_TOO_MUCH")]
     TooMuchInlineQueryResults,
 
     /// Occurs when bot tries to stop poll that has already been stopped.

From 9bcdd37be0022ddc335fe392e5661271fbe5bc5c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 14:29:30 +0300
Subject: [PATCH 391/755] Remove `PartialEq, Eq, Hash` derives from `InputFile`

...and tg-method-structs holding it
---
 src/payloads/add_sticker_to_set.rs        |  2 +-
 src/payloads/create_new_sticker_set.rs    |  2 +-
 src/payloads/edit_message_media.rs        |  2 +-
 src/payloads/edit_message_media_inline.rs |  2 +-
 src/payloads/send_animation.rs            |  2 +-
 src/payloads/send_audio.rs                |  2 +-
 src/payloads/send_document.rs             |  2 +-
 src/payloads/send_media_group.rs          |  2 +-
 src/payloads/send_photo.rs                |  2 +-
 src/payloads/send_sticker.rs              |  2 +-
 src/payloads/send_video.rs                |  2 +-
 src/payloads/send_video_note.rs           |  2 +-
 src/payloads/send_voice.rs                |  2 +-
 src/payloads/set_chat_photo.rs            |  2 +-
 src/payloads/set_sticker_set_thumb.rs     |  2 +-
 src/payloads/set_webhook.rs               |  2 +-
 src/payloads/upload_sticker_file.rs       |  2 +-
 src/types/input_file.rs                   |  2 +-
 src/types/input_media.rs                  | 12 ++++++------
 src/types/input_sticker.rs                |  2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 7d58a7ea..0d7a1c7d 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -13,7 +13,7 @@ use crate::types::{InputSticker, MaskPosition, True};
 impl_payload! {
     @[multipart]
     /// Use this method to add a new sticker to a set created by the bot. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns _True_ on success.
-    #[derive(Debug, PartialEq, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub AddStickerToSet (AddStickerToSetSetters) => True {
         required {
             /// User identifier of sticker file owner
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index cd043718..1bdd2b77 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -13,7 +13,7 @@ use crate::types::{InputSticker, MaskPosition, True};
 impl_payload! {
     @[multipart]
     /// Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\_sticker_ or _tgs\_sticker_. Returns _True_ on success.
-    #[derive(Debug, PartialEq, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
         required {
             /// User identifier of sticker file owner
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index b8d59e9c..e2e99dba 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -14,7 +14,7 @@ impl_payload! {
     /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, the edited Message is returned.
     ///
     /// See also: [`EditMessageMediaInline`](crate::payloads::EditMessageMediaInline)
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub EditMessageMedia (EditMessageMediaSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index 69c28718..fd50e50f 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -14,7 +14,7 @@ impl_payload! {
     /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, _True_ is returned.
     ///
     /// See also: [`EditMessageMedia`](crate::payloads::EditMessageMedia)
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub EditMessageMediaInline (EditMessageMediaInlineSetters) => True {
         required {
             /// Identifier of the inline message
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 115dc8b0..6e05aa5b 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -15,7 +15,7 @@ impl_payload! {
     /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). On success, the sent [`Message`] is returned. Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendAnimation (SendAnimationSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index bbfb8734..2097ccd3 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -18,7 +18,7 @@ impl_payload! {
     ///
     /// [`Message`]: crate::types::Message
     /// [`SendVoice`]: crate::payloads::SendVoice
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendAudio (SendAudioSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 82c72606..3ca72ba4 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -15,7 +15,7 @@ impl_payload! {
     /// Use this method to send general files. On success, the sent [`Message`] is returned. Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendDocument (SendDocumentSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 7da96386..66d9f619 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -14,7 +14,7 @@ impl_payload! {
     /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Message`]s that were sent is returned.
     ///
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendMediaGroup (SendMediaGroupSetters) => Vec<Message> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 64339696..a5dffae2 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -15,7 +15,7 @@ impl_payload! {
     /// Use this method to send photos. On success, the sent [`Message`] is returned.
     ///
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendPhoto (SendPhotoSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index b40e46e3..357e10c3 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -15,7 +15,7 @@ impl_payload! {
     /// Use this method to send static .WEBP or [animated] .TGS stickers. On success, the sent Message is returned.
     ///
     /// [animated]: https://telegram.org/blog/animated-stickers
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendSticker (SendStickerSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 49e03a73..c815e255 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -16,7 +16,7 @@ impl_payload! {
     ///
     /// [`Document`]: crate::types::Document
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendVideo (SendVideoSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index de68d364..417bc1ac 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -16,7 +16,7 @@ impl_payload! {
     ///
     /// [v.4.0]: https://core.telegram.org/bots/api#document
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendVideoNote (SendVideoNoteSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index e6900f63..71ad7243 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -17,7 +17,7 @@ impl_payload! {
     /// [`Document`]: crate::types::Document
     /// [`Audio`]: crate::types::Audio
     /// [`Message`]: crate::types::Message
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SendVoice (SendVoiceSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 67b6fc32..5733e382 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -13,7 +13,7 @@ use crate::types::{ChatId, InputFile, True};
 impl_payload! {
     @[multipart]
     /// Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SetChatPhoto (SetChatPhotoSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index a73f687a..4e0021ea 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -13,7 +13,7 @@ use crate::types::{InputFile, True};
 impl_payload! {
     @[multipart]
     /// Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns _True_ on success.
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SetStickerSetThumb (SetStickerSetThumbSetters) => True {
         required {
             /// Name of the sticker set
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index 954d059a..bd70d444 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -18,7 +18,7 @@ impl_payload! {
     /// If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. `https://www.example.com/<token>`. Since nobody else knows your bot's token, you can be pretty sure it's us.
     ///
     /// [`Update`]: crate::types::Update
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub SetWebhook (SetWebhookSetters) => True {
         required {
             /// HTTPS url to send updates to. Use an empty string to remove webhook integration
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 05a49f86..e003bcfc 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -13,7 +13,7 @@ use crate::types::{File, InputFile};
 impl_payload! {
     @[multipart]
     /// Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success.
-    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    #[derive(Debug, Clone, Serialize)]
     pub UploadStickerFile (UploadStickerFileSetters) => File {
         required {
             /// User identifier of sticker file owner
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 6565b254..baf487c0 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -6,7 +6,7 @@ use std::{borrow::Cow, path::PathBuf};
 /// This object represents the contents of a file to be uploaded.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputfile).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[non_exhaustive]
 pub enum InputFile {
     File(PathBuf),
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 9da6e6a9..eaaab951 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -5,7 +5,7 @@ use crate::types::{InputFile, MessageEntity, ParseMode};
 /// This object represents the content of a media message to be sent.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmedia).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "snake_case")]
 pub enum InputMedia {
@@ -20,7 +20,7 @@ pub enum InputMedia {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaphoto).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InputMediaPhoto {
     /// File to send.
     pub media: InputFile,
@@ -74,7 +74,7 @@ impl InputMediaPhoto {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediavideo).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InputMediaVideo {
     // File to send.
     pub media: InputFile,
@@ -186,7 +186,7 @@ impl InputMediaVideo {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaanimation).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InputMediaAnimation {
     /// File to send.
     pub media: InputFile,
@@ -288,7 +288,7 @@ impl InputMediaAnimation {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaaudio).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InputMediaAudio {
     /// File to send.
     pub media: InputFile,
@@ -396,7 +396,7 @@ impl InputMediaAudio {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediadocument).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct InputMediaDocument {
     /// File to send.
     pub media: InputFile,
diff --git a/src/types/input_sticker.rs b/src/types/input_sticker.rs
index 4e82f0ba..3ef26694 100644
--- a/src/types/input_sticker.rs
+++ b/src/types/input_sticker.rs
@@ -3,7 +3,7 @@ use serde::Serialize;
 use crate::types::InputFile;
 
 /// Sticker file that may be uploaded to telegram.
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub enum InputSticker {
     /// PNG image with the sticker, must be up to 512 kilobytes in size,
     /// dimensions must not exceed 512px, and either width or height must be

From 9fb6c20f23f53839b4fd35d1739130f90a009883 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 14:31:15 +0300
Subject: [PATCH 392/755] Make `SendPoll::type_` optional

(fix from schema)
---
 src/adaptors/erased.rs     |  6 ++----
 src/adaptors/parse_mode.rs | 10 ++--------
 src/bot/api.rs             | 10 ++--------
 src/local_macros.rs        |  4 ++--
 src/payloads/send_poll.rs  |  4 ++--
 src/requests/requester.rs  | 10 ++--------
 6 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 9e7cbf00..eb7ca217 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -8,7 +8,7 @@ use crate::{
     requests::{HasPayload, Output, Payload, Request, Requester},
     types::{
         BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, PollType, TargetMessage,
+        InputSticker, LabeledPrice, PassportElementError, TargetMessage,
     },
 };
 
@@ -330,7 +330,6 @@ trait ErasableRequester<'a> {
         chat_id: ChatId,
         question: String,
         options: Vec<String>,
-        type_: PollType,
     ) -> ErasedRequest<'a, SendPoll, Self::Err>;
 
     fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err>;
@@ -869,9 +868,8 @@ where
         chat_id: ChatId,
         question: String,
         options: Vec<String>,
-        type_: PollType,
     ) -> ErasedRequest<'a, SendPoll, Self::Err> {
-        Requester::send_poll(self, chat_id, question, options, type_).erase()
+        Requester::send_poll(self, chat_id, question, options).erase()
     }
 
     fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err> {
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 0adce419..298e263f 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -84,19 +84,13 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
 
     type SendPoll = B::SendPoll;
 
-    fn send_poll<C, Q, O>(
-        &self,
-        chat_id: C,
-        question: Q,
-        options: O,
-        type_: PollType,
-    ) -> Self::SendPoll
+    fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
         C: Into<ChatId>,
         Q: Into<String>,
         O: IntoIterator<Item = String>,
     {
-        let mut req = self.inner().send_poll(chat_id, question, options, type_);
+        let mut req = self.inner().send_poll(chat_id, question, options);
         req.payload_mut().explanation_parse_mode = Some(self.mode);
         req
     }
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 2bc2f85e..21ee33e1 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -270,13 +270,7 @@ impl Requester for Bot {
 
     type SendPoll = JsonRequest<payloads::SendPoll>;
 
-    fn send_poll<C, Q, O>(
-        &self,
-        chat_id: C,
-        question: Q,
-        options: O,
-        type_: crate::types::PollType,
-    ) -> Self::SendPoll
+    fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
         C: Into<ChatId>,
         Q: Into<String>,
@@ -284,7 +278,7 @@ impl Requester for Bot {
     {
         Self::SendPoll::new(
             self.clone(),
-            payloads::SendPoll::new(chat_id, question, options, type_),
+            payloads::SendPoll::new(chat_id, question, options),
         )
     }
 
diff --git a/src/local_macros.rs b/src/local_macros.rs
index ec8d7f8d..062d80fd 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -651,11 +651,11 @@ macro_rules! requester_forward {
     (@method send_poll $body:ident $ty:ident) => {
         type SendPoll = $ty![SendPoll];
 
-        fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O, type_: PollType) -> Self::SendPoll where C: Into<ChatId>,
+        fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll where C: Into<ChatId>,
         Q: Into<String>,
         O: IntoIterator<Item = String> {
             let this = self;
-            $body!(send_poll this (chat_id: C, question: Q, options: O, type_: PollType))
+            $body!(send_poll this (chat_id: C, question: Q, options: O))
         }
     };
     (@method send_dice $body:ident $ty:ident) => {
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 213ead71..88ecf6a8 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -24,12 +24,12 @@ impl_payload! {
             pub question: String [into],
             /// A JSON-serialized list of answer options, 2-10 strings 1-100 characters each
             pub options: Vec<String> [collect],
-            /// Poll type, “quiz” or “regular”, defaults to “regular”
-            pub type_: PollType,
         }
         optional {
             /// True, if the poll needs to be anonymous, defaults to True
             pub is_anonymous: bool,
+            /// Poll type, “quiz” or “regular”, defaults to “regular”
+            pub type_: PollType,
             /// True, if the poll allows multiple answers, ignored for polls in quiz mode, defaults to False
             pub allows_multiple_answers: bool,
             /// 0-based identifier of the correct answer option, required for polls in quiz mode
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 47337b51..318669f0 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -8,7 +8,7 @@ use crate::{
     requests::Request,
     types::{
         BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, PollType, TargetMessage,
+        InputSticker, LabeledPrice, PassportElementError, TargetMessage,
     },
 };
 
@@ -280,13 +280,7 @@ pub trait Requester {
     type SendPoll: Request<Payload = SendPoll, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendPoll`].
-    fn send_poll<C, Q, O>(
-        &self,
-        chat_id: C,
-        question: Q,
-        options: O,
-        type_: PollType,
-    ) -> Self::SendPoll
+    fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
         C: Into<ChatId>,
         Q: Into<String>,

From 094211e6a167f743777028a898b5b4d49ff878e9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 14:32:16 +0300
Subject: [PATCH 393/755] Add TBA v5.4 methods and params

(schema update)
---
 src/adaptors/auto_send.rs                 |  1 +
 src/adaptors/cache_me.rs                  |  1 +
 src/adaptors/erased.rs                    | 33 +++++++++++++++++++++++
 src/adaptors/parse_mode.rs                |  1 +
 src/adaptors/throttle.rs                  |  1 +
 src/adaptors/trace.rs                     |  1 +
 src/bot/api.rs                            | 26 ++++++++++++++++++
 src/local_macros.rs                       | 16 +++++++++++
 src/payloads.rs                           |  4 +++
 src/payloads/approve_chat_join_request.rs | 24 +++++++++++++++++
 src/payloads/create_chat_invite_link.rs   |  4 +++
 src/payloads/decline_chat_join_request.rs | 24 +++++++++++++++++
 src/payloads/edit_chat_invite_link.rs     |  4 +++
 src/payloads/send_chat_action.rs          |  5 ++--
 src/payloads/setters.rs                   | 11 ++++----
 src/requests/requester.rs                 | 24 +++++++++++++++++
 16 files changed, 173 insertions(+), 7 deletions(-)
 create mode 100644 src/payloads/approve_chat_join_request.rs
 create mode 100644 src/payloads/decline_chat_join_request.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index bed3f8a0..5e9c7285 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -105,6 +105,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => f, fty
     }
 }
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index b7e009db..b38101b8 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -112,6 +112,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => f, fty
     }
 }
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index eb7ca217..c30ebbd5 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -181,6 +181,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => fwd_erased, fty
     }
 }
@@ -413,6 +414,20 @@ trait ErasableRequester<'a> {
         invite_link: String,
     ) -> ErasedRequest<'a, RevokeChatInviteLink, Self::Err>;
 
+    /// For Telegram documentation see [`ApproveChatJoinRequest`].
+    fn approve_chat_join_request(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err>;
+
+    /// For Telegram documentation see [`DeclineChatJoinRequest`].
+    fn decline_chat_join_request(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err>;
+
     fn set_chat_photo(
         &self,
         chat_id: ChatId,
@@ -983,6 +998,24 @@ where
         Requester::revoke_chat_invite_link(self, chat_id, invite_link).erase()
     }
 
+    /// For Telegram documentation see [`ApproveChatJoinRequest`].
+    fn approve_chat_join_request(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err> {
+        Requester::approve_chat_join_request(self, chat_id, user_id).erase()
+    }
+
+    /// For Telegram documentation see [`DeclineChatJoinRequest`].
+    fn decline_chat_join_request(
+        &self,
+        chat_id: ChatId,
+        user_id: i64,
+    ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err> {
+        Requester::decline_chat_join_request(self, chat_id, user_id).erase()
+    }
+
     fn set_chat_photo(
         &self,
         chat_id: ChatId,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 298e263f..12ba2ff6 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -116,6 +116,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => fid, fty
     }
 }
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 44c571c6..96073954 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -619,6 +619,7 @@ where
         add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
         set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
         set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
+        approve_chat_join_request, decline_chat_join_request,
         get_game_high_scores, get_updates_fault_tolerant => fid, ftyid
     }
 }
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index d2480c9a..9f7ded47 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -137,6 +137,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => fwd_inner, fty
     }
 }
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 21ee33e1..03cf9009 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -463,6 +463,32 @@ impl Requester for Bot {
         )
     }
 
+    type ApproveChatJoinRequest = JsonRequest<payloads::ApproveChatJoinRequest>;
+
+    /// For Telegram documentation see [`ApproveChatJoinRequest`].
+    fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest
+    where
+        C: Into<ChatId>,
+    {
+        Self::ApproveChatJoinRequest::new(
+            self.clone(),
+            payloads::ApproveChatJoinRequest::new(chat_id, user_id),
+        )
+    }
+
+    type DeclineChatJoinRequest = JsonRequest<payloads::DeclineChatJoinRequest>;
+
+    /// For Telegram documentation see [`DeclineChatJoinRequest`].
+    fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest
+    where
+        C: Into<ChatId>,
+    {
+        Self::DeclineChatJoinRequest::new(
+            self.clone(),
+            payloads::DeclineChatJoinRequest::new(chat_id, user_id),
+        )
+    }
+
     type SetChatPhoto = MultipartRequest<payloads::SetChatPhoto>;
 
     fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 062d80fd..b278c285 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -781,6 +781,22 @@ macro_rules! requester_forward {
             $body!(revoke_chat_invite_link this (chat_id: C, invite_link: I))
         }
     };
+    (@method approve_chat_join_request $body:ident $ty:ident) => {
+        type ApproveChatJoinRequest = $ty![ApproveChatJoinRequest];
+
+        fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest where C: Into<ChatId> {
+            let this = self;
+            $body!(approve_chat_join_request this (chat_id: C, user_id: i64))
+        }
+    };
+    (@method decline_chat_join_request $body:ident $ty:ident) => {
+        type DeclineChatJoinRequest = $ty![DeclineChatJoinRequest];
+
+        fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest where C: Into<ChatId> {
+            let this = self;
+            $body!(decline_chat_join_request this (chat_id: C, user_id: i64))
+        }
+    };
     (@method set_chat_photo $body:ident $ty:ident) => {
         type SetChatPhoto = $ty![SetChatPhoto];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index 83622734..5f386927 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -25,11 +25,13 @@ mod answer_callback_query;
 mod answer_inline_query;
 mod answer_pre_checkout_query;
 mod answer_shipping_query;
+mod approve_chat_join_request;
 mod ban_chat_member;
 mod close;
 mod copy_message;
 mod create_chat_invite_link;
 mod create_new_sticker_set;
+mod decline_chat_join_request;
 mod delete_chat_photo;
 mod delete_chat_sticker_set;
 mod delete_message;
@@ -113,11 +115,13 @@ pub use answer_callback_query::{AnswerCallbackQuery, AnswerCallbackQuerySetters}
 pub use answer_inline_query::{AnswerInlineQuery, AnswerInlineQuerySetters};
 pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQuerySetters};
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
+pub use approve_chat_join_request::{ApproveChatJoinRequest, ApproveChatJoinRequestSetters};
 pub use ban_chat_member::{BanChatMember, BanChatMemberSetters};
 pub use close::{Close, CloseSetters};
 pub use copy_message::{CopyMessage, CopyMessageSetters};
 pub use create_chat_invite_link::{CreateChatInviteLink, CreateChatInviteLinkSetters};
 pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters};
+pub use decline_chat_join_request::{DeclineChatJoinRequest, DeclineChatJoinRequestSetters};
 pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
 pub use delete_chat_sticker_set::{DeleteChatStickerSet, DeleteChatStickerSetSetters};
 pub use delete_message::{DeleteMessage, DeleteMessageSetters};
diff --git a/src/payloads/approve_chat_join_request.rs b/src/payloads/approve_chat_join_request.rs
new file mode 100644
index 00000000..fc62df1f
--- /dev/null
+++ b/src/payloads/approve_chat_join_request.rs
@@ -0,0 +1,24 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to approve a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub ApproveChatJoinRequest (ApproveChatJoinRequestSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: i64,
+        }
+    }
+}
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
index ca68f41e..0e3f1929 100644
--- a/src/payloads/create_chat_invite_link.rs
+++ b/src/payloads/create_chat_invite_link.rs
@@ -23,11 +23,15 @@ impl_payload! {
             pub chat_id: ChatId [into],
         }
         optional {
+            /// Invite link name; 0-32 characters
+            pub name: String [into],
             /// Point in time (Unix timestamp) when the link will expire
             #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
             pub expire_date: DateTime<Utc> [into],
             /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
             pub member_limit: u32,
+            /// True, if users joining the chat via the link need to be approved by chat administrators. If True, member_limit can't be specified
+            pub creates_join_request: bool,
         }
     }
 }
diff --git a/src/payloads/decline_chat_join_request.rs b/src/payloads/decline_chat_join_request.rs
new file mode 100644
index 00000000..7d96d17d
--- /dev/null
+++ b/src/payloads/decline_chat_join_request.rs
@@ -0,0 +1,24 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to decline a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub DeclineChatJoinRequest (DeclineChatJoinRequestSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target user
+            pub user_id: i64,
+        }
+    }
+}
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
index 6d683113..cc0cd110 100644
--- a/src/payloads/edit_chat_invite_link.rs
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -24,11 +24,15 @@ impl_payload! {
             pub invite_link: String [into],
         }
         optional {
+            /// Invite link name; 0-32 characters
+            pub name: String [into],
             /// Point in time (Unix timestamp) when the link will expire
             #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
             pub expire_date: DateTime<Utc> [into],
             /// Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999
             pub member_limit: u32,
+            /// True, if users joining the chat via the link need to be approved by chat administrators. If True, member_limit can't be specified
+            pub creates_join_request: bool,
         }
     }
 }
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 21de091c..7167f1e5 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -23,15 +23,16 @@ impl_payload! {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], find_location for [location data], record_video_note or upload_video_note for [video notes].
+            /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], choose_sticker for [`Stickers`], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
             /// [text messages]: crate::payloads::SendMessage
             /// [photos]: crate::payloads::SendPhoto
             /// [videos]: crate::payloads::SendVideo
             /// [audio files]: crate::payloads::SendAudio
             /// [general files]: crate::payloads::SendDocument
-            /// [location data]: crate::payloads::SendLocation
             /// [video notes]: crate::payloads::SendVideoNote
+            /// [location data]: crate::payloads::SendLocation
+            /// [`Stickers`]: crate::payloads::Stickers
             pub action: ChatAction,
         }
     }
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index d407de97..88623f6c 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -9,11 +9,12 @@
 #[doc(no_inline)]
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
-    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _, BanChatMemberSetters as _,
-    CloseSetters as _, CopyMessageSetters as _, CreateChatInviteLinkSetters as _,
-    CreateNewStickerSetSetters as _, DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _,
-    DeleteMessageSetters as _, DeleteMyCommandsSetters as _, DeleteStickerFromSetSetters as _,
-    DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
+    AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
+    ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _, CloseSetters as _,
+    CopyMessageSetters as _, CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
+    DeclineChatJoinRequestSetters as _, DeleteChatPhotoSetters as _,
+    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteMyCommandsSetters as _,
+    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
     EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
     EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
     EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 318669f0..c26660d1 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -413,6 +413,28 @@ pub trait Requester {
         C: Into<ChatId>,
         I: Into<String>;
 
+    type ApproveChatJoinRequest: Request<Payload = ApproveChatJoinRequest, Err = Self::Err>;
+
+    /// For Telegram documentation see [`ApproveChatJoinRequest`].
+    fn approve_chat_join_request<C>(
+        &self,
+        chat_id: C,
+        user_id: i64,
+    ) -> Self::ApproveChatJoinRequest
+    where
+        C: Into<ChatId>;
+
+    type DeclineChatJoinRequest: Request<Payload = DeclineChatJoinRequest, Err = Self::Err>;
+
+    /// For Telegram documentation see [`DeclineChatJoinRequest`].
+    fn decline_chat_join_request<C>(
+        &self,
+        chat_id: C,
+        user_id: i64,
+    ) -> Self::DeclineChatJoinRequest
+    where
+        C: Into<ChatId>;
+
     type SetChatPhoto: Request<Payload = SetChatPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetChatPhoto`].
@@ -860,6 +882,7 @@ macro_rules! forward_all {
             set_sticker_set_thumb, send_invoice, answer_shipping_query,
             answer_pre_checkout_query, set_passport_data_errors, send_game,
             set_game_score, set_game_score_inline, get_game_high_scores,
+            approve_chat_join_request, decline_chat_join_request,
             get_updates_fault_tolerant => fwd_deref, fty
         }
     };
@@ -955,6 +978,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
+        approve_chat_join_request, decline_chat_join_request,
         get_updates_fault_tolerant => fwd_either, fty_either
     }
 }

From 8002f98ef7aed829732b65aef7d2103ed4011a8d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 15:00:11 +0300
Subject: [PATCH 394/755] Add TBA 5.4 types

---
 src/types.rs                   |  2 ++
 src/types/chat_invite_link.rs  |  7 +++++++
 src/types/chat_join_request.rs | 20 ++++++++++++++++++++
 src/types/update.rs            |  9 +++++++--
 4 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 src/types/chat_join_request.rs

diff --git a/src/types.rs b/src/types.rs
index 9bf5fd1f..06fdf594 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -11,6 +11,7 @@ pub use chat::*;
 pub use chat_action::*;
 pub use chat_id::*;
 pub use chat_invite_link::*;
+pub use chat_join_request::*;
 pub use chat_location::*;
 pub use chat_member::*;
 pub use chat_member_updated::*;
@@ -116,6 +117,7 @@ mod chat;
 mod chat_action;
 mod chat_id;
 mod chat_invite_link;
+mod chat_join_request;
 mod chat_location;
 mod chat_member;
 mod chat_member_updated;
diff --git a/src/types/chat_invite_link.rs b/src/types/chat_invite_link.rs
index 2638adad..10ed8ac0 100644
--- a/src/types/chat_invite_link.rs
+++ b/src/types/chat_invite_link.rs
@@ -10,10 +10,15 @@ pub struct ChatInviteLink {
     pub invite_link: String,
     /// Creator of the link
     pub creator: User,
+    /// `true`, if users joining the chat via the link need to be approved by
+    /// chat administrators
+    pub creates_join_request: bool,
     /// `true`, if the link is primary
     pub is_primary: bool,
     /// `true`, if the link is revoked
     pub is_revoked: bool,
+    /// Invite link name
+    pub name: Option<String>,
     /// Point in time when the link will expire or has been
     /// expired
     #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
@@ -22,4 +27,6 @@ pub struct ChatInviteLink {
     /// Maximum number of users that can be members of the chat simultaneously
     /// after joining the chat via this invite link; 1-99999
     pub member_limit: Option<u32>,
+    /// Number of pending join requests created using this link
+    pub pending_join_request_count: u32,
 }
diff --git a/src/types/chat_join_request.rs b/src/types/chat_join_request.rs
new file mode 100644
index 00000000..ec5210d7
--- /dev/null
+++ b/src/types/chat_join_request.rs
@@ -0,0 +1,20 @@
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+
+use crate::types::{Chat, ChatInviteLink, User};
+
+/// Represents a join request sent to a chat.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct ChatJoinRequest {
+    /// Chat to which the request was sent
+    pub chat: Chat,
+    /// User that sent the join request
+    pub from: User,
+    /// Date the request was sent in Unix time
+    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
+    pub date: DateTime<Utc>,
+    /// Bio of the user.
+    pub bio: Option<String>,
+    /// Chat invite link that was used by the user to send the join request
+    pub invite_link: Option<ChatInviteLink>,
+}
diff --git a/src/types/update.rs b/src/types/update.rs
index 4767fcb0..56311400 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -3,8 +3,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    CallbackQuery, Chat, ChatMemberUpdated, ChosenInlineResult, InlineQuery, Message, Poll,
-    PollAnswer, PreCheckoutQuery, ShippingQuery, User,
+    CallbackQuery, Chat, ChatJoinRequest, ChatMemberUpdated, ChosenInlineResult, InlineQuery,
+    Message, Poll, PollAnswer, PreCheckoutQuery, ShippingQuery, User,
 };
 use serde_json::Value;
 
@@ -108,6 +108,11 @@ pub enum UpdateKind {
     ///
     /// [`AllowedUpdate::ChatMember`]: crate::types::AllowedUpdate::ChatMember
     ChatMember(ChatMemberUpdated),
+
+    /// A request to join the chat has been sent. The bot must have the
+    /// can_invite_users administrator right in the chat to receive these
+    /// updates.
+    ChatJoinRequest(ChatJoinRequest),
 }
 
 impl Update {

From ca69b6385c7c42556cb541482563c311d024a15c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 15:36:29 +0300
Subject: [PATCH 395/755] Update changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ac189f..1c591f43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
-- `EditedMessageIsTooLong` error [#109][pr109]
+- Support for 5.4 telegram bot API ([#133][pr133])
+- `EditedMessageIsTooLong` error ([#109][pr109])
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
 
@@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Implement `Error` for `ApiError`
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
 - Mark `ApiError` as `non_exhaustive` ([#125][pr125])
+- `InputFile` and related structures now do **not** implement `PartialEq`, `Eq` and `Hash` ([#133][pr133])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
@@ -40,8 +42,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
+- Make `SendPoll::poll_` optional ([#133][pr133])
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
+[pr133]: https://github.com/teloxide/teloxide-core/pull/133
 
 ## 0.3.3 - 2021-08-03
 

From 45183d4dcd615f728aa9ec008ff48925e27d1d35 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 6 Nov 2021 20:34:55 +0300
Subject: [PATCH 396/755] fix test

---
 src/serde_multipart/unserializers.rs | 34 +++++++++++++++++++---------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/serde_multipart/unserializers.rs b/src/serde_multipart/unserializers.rs
index 07903d80..d6b020d3 100644
--- a/src/serde_multipart/unserializers.rs
+++ b/src/serde_multipart/unserializers.rs
@@ -73,29 +73,41 @@ impl std::error::Error for UnserializerError {}
 
 #[test]
 fn test() {
-    use crate::serde_multipart::unserializers::string::StringUnserializer;
+    use crate::{
+        serde_multipart::unserializers::{
+            input_file::InputFileUnserializer, string::StringUnserializer,
+        },
+        types::InputFile,
+    };
+
     use serde::Serialize;
 
-    use crate::{
-        serde_multipart::unserializers::input_file::InputFileUnserializer, types::InputFile,
-    };
-    use std::borrow::Cow;
+    use std::{borrow::Cow, path::Path};
 
     let value = String::from("test");
-    assert_eq!(value.serialize(StringUnserializer), Ok(value));
+    assert!(matches!(value.serialize(StringUnserializer), Ok(v) if v == value));
 
-    let value = InputFile::Url(reqwest::Url::parse("http://example.com").unwrap());
-    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+    let url = reqwest::Url::parse("http://example.com").unwrap();
+    let value = InputFile::Url(url.clone());
+    assert!(
+        matches!(value.serialize(InputFileUnserializer::NotMem), Ok(InputFile::Url(v)) if v == url)
+    );
 
     let value = InputFile::FileId(String::from("file_id"));
-    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+    assert!(
+        matches!(value.serialize(InputFileUnserializer::NotMem), Ok(InputFile::FileId(v)) if v == "file_id")
+    );
 
     let value = InputFile::Memory {
         file_name: String::from("name"),
         data: Cow::Owned(vec![1, 2, 3]),
     };
-    assert_eq!(value.serialize(InputFileUnserializer::memory()), Ok(value));
+    assert!(
+        matches!(value.serialize(InputFileUnserializer::memory()), Ok(InputFile::Memory { file_name, data }) if file_name == "name" && *data == [1, 2, 3])
+    );
 
     let value = InputFile::File("a/b/c".into());
-    assert_eq!(value.serialize(InputFileUnserializer::NotMem), Ok(value));
+    assert!(
+        matches!(value.serialize(InputFileUnserializer::NotMem), Ok(InputFile::File(v)) if v == Path::new("a/b/c"))
+    );
 }

From 706bd08c6b29384e376517d1a1dfca179aec2ec5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 7 Nov 2021 13:44:09 +0300
Subject: [PATCH 397/755] Fix docs

---
 src/bot/api.rs                   | 2 --
 src/payloads/send_chat_action.rs | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 03cf9009..c03a19fd 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -465,7 +465,6 @@ impl Requester for Bot {
 
     type ApproveChatJoinRequest = JsonRequest<payloads::ApproveChatJoinRequest>;
 
-    /// For Telegram documentation see [`ApproveChatJoinRequest`].
     fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest
     where
         C: Into<ChatId>,
@@ -478,7 +477,6 @@ impl Requester for Bot {
 
     type DeclineChatJoinRequest = JsonRequest<payloads::DeclineChatJoinRequest>;
 
-    /// For Telegram documentation see [`DeclineChatJoinRequest`].
     fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest
     where
         C: Into<ChatId>,
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 7167f1e5..35e5ea51 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -23,16 +23,16 @@ impl_payload! {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],
-            /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], choose_sticker for [`Stickers`], find_location for [location data], record_video_note or upload_video_note for [video notes].
+            /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], choose_sticker for [stickers], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
             /// [text messages]: crate::payloads::SendMessage
             /// [photos]: crate::payloads::SendPhoto
             /// [videos]: crate::payloads::SendVideo
             /// [audio files]: crate::payloads::SendAudio
             /// [general files]: crate::payloads::SendDocument
-            /// [video notes]: crate::payloads::SendVideoNote
+            /// [stickers]: crate::payloads::SendSticker
             /// [location data]: crate::payloads::SendLocation
-            /// [`Stickers`]: crate::payloads::Stickers
+            /// [video notes]: crate::payloads::SendVideoNote
             pub action: ChatAction,
         }
     }

From 3ccf6241683f1961ee02025e3b63e35088123612 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 20 Nov 2021 19:18:35 +0300
Subject: [PATCH 398/755] Fix multipart `MessageEntity` serialization

---
 src/serde_multipart/serializers.rs | 33 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index c3d3f139..05b04d1f 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -60,9 +60,10 @@ impl From<Error> for RequestError {
             Error::Io(ioerr) => RequestError::Io(ioerr),
             // this should be ok since we don't write request those may trigger errors and
             // Error is internal.
-            _ => unreachable!(
+            e => unreachable!(
                 "we don't create requests those fail to serialize (if you see this, open an issue \
-                 :|)"
+                 :|): {}",
+                e
             ),
         }
     }
@@ -609,19 +610,23 @@ impl SerializeSeq for InnerPartSerializer {
         // NOTE: this is probably highly inefficient (especially for ::Memory),
         //       but at least it works
         let mut value = serde_json::to_value(value)?;
-        let file: InputFile = serde_json::from_value(value["media"].take())?;
 
-        match file {
-            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
-                let uuid = uuid::Uuid::new_v4().to_string();
-                value["media"] = serde_json::Value::String(format!("attach://{}", uuid));
-                self.files.push((uuid, f));
-            }
-            InputFile::FileId(s) => {
-                value["media"] = serde_json::Value::String(s);
-            }
-            InputFile::Url(s) => {
-                value["media"] = serde_json::Value::String(String::from(s));
+        // Update value if it contains InputFile in a `media` field (i.e.: `InputMedia`)
+        if let Some(file) = value.get_mut("media") {
+            let file: InputFile = serde_json::from_value(file.take())?;
+
+            match file {
+                f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
+                    let uuid = uuid::Uuid::new_v4().to_string();
+                    value["media"] = serde_json::Value::String(format!("attach://{}", uuid));
+                    self.files.push((uuid, f));
+                }
+                InputFile::FileId(s) => {
+                    value["media"] = serde_json::Value::String(s);
+                }
+                InputFile::Url(s) => {
+                    value["media"] = serde_json::Value::String(String::from(s));
+                }
             }
         }
 

From c4b148459df3ec501e297c0b46c0eaced5143490 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 20 Nov 2021 19:33:22 +0300
Subject: [PATCH 399/755] Add regression test for issue 473

---
 Cargo.toml                 |  1 +
 src/serde_multipart/mod.rs | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index aa1da107..399f3d0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,7 @@ bitflags = { version = "1.2", optional = true }
 
 [dev-dependencies]
 pretty_env_logger = "0.4"
+tokio = { version = "1.8.0", features = ["fs", "macros"] }
 
 [features]
 default = ["native-tls"]
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index dcee7ef1..3eae3aa9 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -29,3 +29,22 @@ pub(crate) fn to_form<T: ?Sized + Serialize>(val: &T) -> impl Future<Output = Re
     let fut = val.serialize(MultipartTopLvlSerializer {});
     async { Ok(fut?.await?) }
 }
+
+// https://github.com/teloxide/teloxide/issues/473
+#[tokio::test]
+async fn issue_473() {
+    use crate::{
+        payloads::{self, SendPhotoSetters},
+        types::{InputFile, MessageEntity, MessageEntityKind},
+    };
+
+    to_form(
+        &payloads::SendPhoto::new(0, InputFile::file_id("0")).caption_entities([MessageEntity {
+            kind: MessageEntityKind::Url,
+            offset: 0,
+            length: 0,
+        }]),
+    )
+    .await
+    .unwrap();
+}

From b34b4369c7597d4ec2f1100fdf0b290a539321e0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 20 Nov 2021 19:36:52 +0300
Subject: [PATCH 400/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c591f43..7158a966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,9 +43,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
 - Make `SendPoll::poll_` optional ([#133][pr133])
+- Bug with `caption_entities`, see issue [#473][issue473]
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
+[issue473]: https://github.com/teloxide/teloxide/issues/473
 
 ## 0.3.3 - 2021-08-03
 

From fc0dc9b2b9a3188e67d257a0e8c82685d3a5b3df Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 24 Nov 2021 00:58:43 +0300
Subject: [PATCH 401/755] Enable clippy to warn on dbg/print usage

Also remove old #![allow] that was used to supress clippy bug.
---
 src/lib.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8ac08e86..333dafac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -86,9 +86,7 @@
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
-
-// https://github.com/rust-lang/rust-clippy/issues/7422
-#![allow(clippy::nonstandard_macro_braces)]
+#![warn(clippy::print_stdout, clippy::dbg_macro)]
 
 // The internal helper macros.
 #[macro_use]

From abfd92a102ac94f8c280a2ac989e2c3e450fa5a1 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sat, 27 Nov 2021 17:11:18 +0800
Subject: [PATCH 402/755] Add the missing field `media_group_id` to
 `MediaDocument` & `MediaAudio`

---
 src/types/message.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/types/message.rs b/src/types/message.rs
index ed78f507..0afd73f4 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -319,6 +319,10 @@ pub struct MediaAudio {
     /// bot commands, etc. that appear in the caption.
     #[serde(default = "Vec::new")]
     pub caption_entities: Vec<MessageEntity>,
+
+    /// The unique identifier of a media message group this message belongs
+    /// to.
+    pub media_group_id: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -340,6 +344,10 @@ pub struct MediaDocument {
     /// bot commands, etc. that appear in the caption.
     #[serde(default = "Vec::new")]
     pub caption_entities: Vec<MessageEntity>,
+
+    /// The unique identifier of a media message group this message belongs
+    /// to.
+    pub media_group_id: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -620,6 +628,14 @@ mod getters {
                 | Common(MessageCommon {
                     media_kind: MediaKind::Photo(MediaPhoto { media_group_id, .. }),
                     ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Document(MediaDocument { media_group_id, .. }),
+                    ..
+                })
+                | Common(MessageCommon {
+                    media_kind: MediaKind::Audio(MediaAudio { media_group_id, .. }),
+                    ..
                 }) => media_group_id.as_ref().map(Deref::deref),
                 _ => None,
             }

From 30154f6fba6bc457c2c6e32959b666c0681efdc7 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sat, 27 Nov 2021 17:50:03 +0800
Subject: [PATCH 403/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7158a966..709fbe0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,11 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `EditedMessageIsTooLong` error ([#109][pr109])
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
+- `media_group_id` field to `MediaDocument` and `MediaAudio` ([#139][pr139])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
 [pr121]: https://github.com/teloxide/teloxide-core/pull/121
 [pr135]: https://github.com/teloxide/teloxide-core/pull/135
+[pr139]: https://github.com/teloxide/teloxide-core/pull/139
 
 ### Changed
 

From 0724964682b0297bc5a81c23fb07e3d3153d4bae Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sun, 28 Nov 2021 02:21:46 +0800
Subject: [PATCH 404/755] Add the missing method `caption_entities` to
 `InputMediaPhoto`

---
 src/types/input_media.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index eaaab951..1cae6649 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -68,6 +68,14 @@ impl InputMediaPhoto {
         self.parse_mode = Some(val);
         self
     }
+
+    pub fn caption_entities<C>(mut self, val: C) -> Self
+    where
+        C: IntoIterator<Item = MessageEntity>,
+    {
+        self.caption_entities = Some(val.into_iter().collect());
+        self
+    }
 }
 
 /// Represents a video to be sent.

From a33588a14b16dcf46da01b8ed3b8416803f88e8c Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sun, 28 Nov 2021 02:33:33 +0800
Subject: [PATCH 405/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 709fbe0e..d49827aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,12 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
 - `media_group_id` field to `MediaDocument` and `MediaAudio` ([#139][pr139])
+- `caption_entities` method to `InputMediaPhoto` ([#140][pr140])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
 [pr121]: https://github.com/teloxide/teloxide-core/pull/121
 [pr135]: https://github.com/teloxide/teloxide-core/pull/135
 [pr139]: https://github.com/teloxide/teloxide-core/pull/139
+[pr140]: https://github.com/teloxide/teloxide-core/pull/140
 
 ### Changed
 

From a5a1277636045b018879588bd397a342b7361579 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Tue, 7 Dec 2021 03:39:02 +0800
Subject: [PATCH 406/755] Fix the incorrect response type of `CopyMessage`
 method

---
 src/types/message_id.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/types/message_id.rs b/src/types/message_id.rs
index 05079c95..fe3eb9ab 100644
--- a/src/types/message_id.rs
+++ b/src/types/message_id.rs
@@ -1,4 +1,7 @@
+use serde::{Deserialize, Serialize};
+
 /// This object represents a unique message identifier.
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageId {
     /// Unique message identifier
     pub message_id: i32,

From 7a65d52fb713f80ff69ac4ab39b5909179a7366f Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Tue, 7 Dec 2021 03:51:51 +0800
Subject: [PATCH 407/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 709fbe0e..63b7bb63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,9 +46,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
 - Make `SendPoll::poll_` optional ([#133][pr133])
 - Bug with `caption_entities`, see issue [#473][issue473]
+- Type of response for `CopyMessage` method ([#141](pr141))
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
+[pr141]: https://github.com/teloxide/teloxide-core/pull/141
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 
 ## 0.3.3 - 2021-08-03

From 560fa36e4133aef033d3fbab843b56140445230d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 7 Dec 2021 01:31:49 +0300
Subject: [PATCH 408/755] re-run payloads codegen

---
 CHANGELOG.md                 | 3 ++-
 src/payloads/copy_message.rs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1640452..f3ef54d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,11 +48,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
 - Make `SendPoll::poll_` optional ([#133][pr133])
 - Bug with `caption_entities`, see issue [#473][issue473]
-- Type of response for `CopyMessage` method ([#141](pr141))
+- Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
 [pr141]: https://github.com/teloxide/teloxide-core/pull/141
+[pr142]: https://github.com/teloxide/teloxide-core/pull/142
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 
 ## 0.3.3 - 2021-08-03
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index 4a6cbbc1..b003fcf8 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -8,14 +8,14 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{ChatId, MessageEntity, MessageId, ParseMode, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to copy messages of any kind. The method is analogous to the method forwardMessage, but the copied message doesn't have a link to the original message. Returns the [`MessageId`] of the sent message on success.
     ///
     /// [`MessageId`]: crate::types::MessageId
     #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
-    pub CopyMessage (CopyMessageSetters) => Message {
+    pub CopyMessage (CopyMessageSetters) => MessageId {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: ChatId [into],

From c566494b7d773a120d70ab1b8cb5cbcc0a45e702 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 8 Dec 2021 00:49:24 +0300
Subject: [PATCH 409/755] Add TBA v5.5 methods

---
 src/adaptors/auto_send.rs              |  3 ++-
 src/adaptors/cache_me.rs               |  3 ++-
 src/adaptors/erased.rs                 | 31 +++++++++++++++++++++++++-
 src/adaptors/parse_mode.rs             |  3 ++-
 src/adaptors/throttle.rs               |  3 ++-
 src/adaptors/trace.rs                  |  3 ++-
 src/bot/api.rs                         | 28 +++++++++++++++++++++++
 src/local_macros.rs                    | 17 ++++++++++++++
 src/payloads.rs                        |  4 ++++
 src/payloads/ban_chat_sender_chat.rs   | 24 ++++++++++++++++++++
 src/payloads/setters.rs                | 26 ++++++++++-----------
 src/payloads/unban_chat_sender_chat.rs | 24 ++++++++++++++++++++
 src/requests/requester.rs              | 24 ++++++++++++++++++--
 13 files changed, 172 insertions(+), 21 deletions(-)
 create mode 100644 src/payloads/ban_chat_sender_chat.rs
 create mode 100644 src/payloads/unban_chat_sender_chat.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 5e9c7285..c496d899 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -90,7 +90,8 @@ where
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index b38101b8..99f8c5d5 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -97,7 +97,8 @@ where
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index c30ebbd5..585f199e 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -166,7 +166,8 @@ where
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
@@ -386,6 +387,18 @@ trait ErasableRequester<'a> {
         custom_title: String,
     ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err>;
 
+    fn ban_chat_sender_chat(
+        &self,
+        chat_id: ChatId,
+        sender_chat_id: i64,
+    ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err>;
+
+    fn unban_chat_sender_chat(
+        &self,
+        chat_id: ChatId,
+        sender_chat_id: i64,
+    ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err>;
+
     fn set_chat_permissions(
         &self,
         chat_id: ChatId,
@@ -960,6 +973,22 @@ where
         Requester::set_chat_administrator_custom_title(self, chat_id, user_id, custom_title).erase()
     }
 
+    fn ban_chat_sender_chat(
+        &self,
+        chat_id: ChatId,
+        sender_chat_id: i64,
+    ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err> {
+        Requester::ban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
+    }
+
+    fn unban_chat_sender_chat(
+        &self,
+        chat_id: ChatId,
+        sender_chat_id: i64,
+    ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err> {
+        Requester::unban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
+    }
+
     fn set_chat_permissions(
         &self,
         chat_id: ChatId,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 12ba2ff6..c347c428 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -102,7 +102,8 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 96073954..291e389a 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -605,7 +605,8 @@ where
         stop_message_live_location, stop_message_live_location_inline,
         send_chat_action, get_user_profile_photos, get_file, kick_chat_member, ban_chat_member,
         unban_chat_member, restrict_chat_member, promote_chat_member,
-        set_chat_administrator_custom_title, set_chat_permissions,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 9f7ded47..6139070c 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -122,7 +122,8 @@ where
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index c03a19fd..750a8f1a 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -399,6 +399,34 @@ impl Requester for Bot {
         )
     }
 
+    type BanChatSenderChat = JsonRequest<payloads::BanChatSenderChat>;
+
+    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
+    where
+        C: Into<ChatId>,
+    {
+        Self::BanChatSenderChat::new(
+            self.clone(),
+            payloads::BanChatSenderChat::new(chat_id, sender_chat_id),
+        )
+    }
+
+    type UnbanChatSenderChat = JsonRequest<payloads::UnbanChatSenderChat>;
+
+    fn unban_chat_sender_chat<C>(
+        &self,
+        chat_id: C,
+        sender_chat_id: i64,
+    ) -> Self::UnbanChatSenderChat
+    where
+        C: Into<ChatId>,
+    {
+        Self::UnbanChatSenderChat::new(
+            self.clone(),
+            payloads::UnbanChatSenderChat::new(chat_id, sender_chat_id),
+        )
+    }
+
     type SetChatPermissions = JsonRequest<payloads::SetChatPermissions>;
 
     fn set_chat_permissions<C>(
diff --git a/src/local_macros.rs b/src/local_macros.rs
index b278c285..626789de 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -739,6 +739,22 @@ macro_rules! requester_forward {
             $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i64, custom_title: Cu))
         }
     };
+    (@method ban_chat_sender_chat $body:ident $ty:ident) => {
+        type BanChatSenderChat = $ty![BanChatSenderChat];
+
+        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat where C: Into<ChatId> {
+            let this = self;
+            $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
+        }
+    };
+    (@method unban_chat_sender_chat $body:ident $ty:ident) => {
+        type UnbanChatSenderChat = $ty![UnbanChatSenderChat];
+
+        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::UnbanChatSenderChat where C: Into<ChatId> {
+            let this = self;
+            $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
+        }
+    };
     (@method set_chat_permissions $body:ident $ty:ident) => {
         type SetChatPermissions = $ty![SetChatPermissions];
 
@@ -1187,4 +1203,5 @@ macro_rules! requester_forward {
             $body!(get_updates_fault_tolerant this ())
         }
     };
+
 }
diff --git a/src/payloads.rs b/src/payloads.rs
index 5f386927..d069ce5f 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -27,6 +27,7 @@ mod answer_pre_checkout_query;
 mod answer_shipping_query;
 mod approve_chat_join_request;
 mod ban_chat_member;
+mod ban_chat_sender_chat;
 mod close;
 mod copy_message;
 mod create_chat_invite_link;
@@ -106,6 +107,7 @@ mod stop_message_live_location;
 mod stop_message_live_location_inline;
 mod stop_poll;
 mod unban_chat_member;
+mod unban_chat_sender_chat;
 mod unpin_all_chat_messages;
 mod unpin_chat_message;
 mod upload_sticker_file;
@@ -117,6 +119,7 @@ pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQue
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
 pub use approve_chat_join_request::{ApproveChatJoinRequest, ApproveChatJoinRequestSetters};
 pub use ban_chat_member::{BanChatMember, BanChatMemberSetters};
+pub use ban_chat_sender_chat::{BanChatSenderChat, BanChatSenderChatSetters};
 pub use close::{Close, CloseSetters};
 pub use copy_message::{CopyMessage, CopyMessageSetters};
 pub use create_chat_invite_link::{CreateChatInviteLink, CreateChatInviteLinkSetters};
@@ -204,6 +207,7 @@ pub use stop_message_live_location_inline::{
 };
 pub use stop_poll::{StopPoll, StopPollSetters};
 pub use unban_chat_member::{UnbanChatMember, UnbanChatMemberSetters};
+pub use unban_chat_sender_chat::{UnbanChatSenderChat, UnbanChatSenderChatSetters};
 pub use unpin_all_chat_messages::{UnpinAllChatMessages, UnpinAllChatMessagesSetters};
 pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
diff --git a/src/payloads/ban_chat_sender_chat.rs b/src/payloads/ban_chat_sender_chat.rs
new file mode 100644
index 00000000..d46e5def
--- /dev/null
+++ b/src/payloads/ban_chat_sender_chat.rs
@@ -0,0 +1,24 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to ban a channel chat in a supergroup or a channel. The owner of the chat will not be able to send messages and join live streams on behalf of the chat, unless it is unbanned first. The bot must be an administrator in the supergroup or channel for this to work and must have the appropriate administrator rights.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub BanChatSenderChat (BanChatSenderChatSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target sender chat
+            pub sender_chat_id: i64,
+        }
+    }
+}
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 88623f6c..1fb5ead2 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -10,17 +10,17 @@
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
     AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
-    ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _, CloseSetters as _,
-    CopyMessageSetters as _, CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
-    DeclineChatJoinRequestSetters as _, DeleteChatPhotoSetters as _,
-    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteMyCommandsSetters as _,
-    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
-    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
-    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
-    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
-    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
-    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
-    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _, BanChatSenderChatSetters as _,
+    CloseSetters as _, CopyMessageSetters as _, CreateChatInviteLinkSetters as _,
+    CreateNewStickerSetSetters as _, DeclineChatJoinRequestSetters as _,
+    DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _, DeleteMessageSetters as _,
+    DeleteMyCommandsSetters as _, DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _,
+    EditChatInviteLinkSetters as _, EditMessageCaptionInlineSetters as _,
+    EditMessageCaptionSetters as _, EditMessageLiveLocationInlineSetters as _,
+    EditMessageLiveLocationSetters as _, EditMessageMediaInlineSetters as _,
+    EditMessageMediaSetters as _, EditMessageReplyMarkupInlineSetters as _,
+    EditMessageReplyMarkupSetters as _, EditMessageTextInlineSetters as _,
+    EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberCountSetters as _, GetChatMemberSetters as _,
     GetChatMembersCountSetters as _, GetChatSetters as _, GetFileSetters as _,
     GetGameHighScoresSetters as _, GetMeSetters as _, GetMyCommandsSetters as _,
@@ -39,6 +39,6 @@ pub use crate::payloads::{
     SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
     SetStickerPositionInSetSetters as _, SetStickerSetThumbSetters as _, SetWebhookSetters as _,
     StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
-    StopPollSetters as _, UnbanChatMemberSetters as _, UnpinAllChatMessagesSetters as _,
-    UnpinChatMessageSetters as _, UploadStickerFileSetters as _,
+    StopPollSetters as _, UnbanChatMemberSetters as _, UnbanChatSenderChatSetters as _,
+    UnpinAllChatMessagesSetters as _, UnpinChatMessageSetters as _, UploadStickerFileSetters as _,
 };
diff --git a/src/payloads/unban_chat_sender_chat.rs b/src/payloads/unban_chat_sender_chat.rs
new file mode 100644
index 00000000..17f5d9db
--- /dev/null
+++ b/src/payloads/unban_chat_sender_chat.rs
@@ -0,0 +1,24 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, True};
+
+impl_payload! {
+    /// Use this method to unban a previously banned channel chat in a supergroup or channel. The bot must be an administrator for this to work and must have the appropriate administrator rights.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub UnbanChatSenderChat (UnbanChatSenderChatSetters) => True {
+        required {
+            /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
+            pub chat_id: ChatId [into],
+            /// Unique identifier of the target sender chat
+            pub sender_chat_id: i64,
+        }
+    }
+}
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index c26660d1..342e1fb4 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -368,6 +368,24 @@ pub trait Requester {
         Ch: Into<ChatId>,
         Cu: Into<String>;
 
+    type BanChatSenderChat: Request<Payload = BanChatSenderChat, Err = Self::Err>;
+
+    /// For Telegram documentation see [`BanChatSenderChat`].
+    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
+    where
+        C: Into<ChatId>;
+
+    type UnbanChatSenderChat: Request<Payload = UnbanChatSenderChat, Err = Self::Err>;
+
+    /// For Telegram documentation see [`UnbanChatSenderChat`].
+    fn unban_chat_sender_chat<C>(
+        &self,
+        chat_id: C,
+        sender_chat_id: i64,
+    ) -> Self::UnbanChatSenderChat
+    where
+        C: Into<ChatId>;
+
     type SetChatPermissions: Request<Payload = SetChatPermissions, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetChatPermissions`].
@@ -867,7 +885,8 @@ macro_rules! forward_all {
             stop_message_live_location, stop_message_live_location_inline, send_venue,
             send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
             get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-            promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+            promote_chat_member, set_chat_administrator_custom_title,
+            ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
             export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
             revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
             set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
@@ -963,7 +982,8 @@ where
         stop_message_live_location, stop_message_live_location_inline, send_venue,
         send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
         get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title, set_chat_permissions,
+        promote_chat_member, set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
         export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
         revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,

From 604a5cc91bcb9314575f0bfeb090b9a8a3cc85f5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 8 Dec 2021 21:30:03 +0300
Subject: [PATCH 410/755] TBA 5.5 types updates

---
 src/types/chat.rs                   | 22 +++++++++++++++++++++-
 src/types/inline_keyboard_button.rs |  8 +++++++-
 src/types/message.rs                | 29 +++++++++++++++++++++++++++++
 src/types/update.rs                 |  3 +++
 4 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index aaedc5d2..e46f06ae 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{ChatLocation, ChatPermissions, ChatPhoto, Message};
+use crate::types::{ChatLocation, ChatPermissions, ChatPhoto, Message, True};
 
 /// This object represents a chat.
 ///
@@ -95,6 +95,13 @@ pub struct ChatPrivate {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub bio: Option<String>,
+
+    /// `True`, if privacy settings of the other party in the private chat
+    /// allows to use tg://user?id=<user_id> links only in chats with the
+    /// user. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub has_private_forwards: Option<True>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -407,6 +414,18 @@ impl Chat {
             _ => None,
         }
     }
+
+    /// `True`, if privacy settings of the other party in the private chat
+    /// allows to use tg://user?id=<user_id> links only in chats with the
+    /// user. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn has_private_forwards(&self) -> Option<True> {
+        match &self.kind {
+            ChatKind::Private(this) => this.has_private_forwards,
+            _ => None,
+        }
+    }
 }
 
 #[cfg(test)]
@@ -447,6 +466,7 @@ mod tests {
                     first_name: Some("Anon".into()),
                     last_name: None,
                     bio: None,
+                    has_private_forwards: None
                 }),
                 photo: None,
                 pinned_message: None,
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 9da2182c..06a70850 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -41,7 +41,13 @@ impl InlineKeyboardButton {
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum InlineKeyboardButtonKind {
-    /// HTTP or tg:// url to be opened when button is pressed.
+    /// HTTP or `tg://` url to be opened when button is pressed.
+    ///
+    /// Links in the form of `tg://user?id=<user_id>` can be used to mention a
+    /// user by their ID without using a username, if this is allowed by
+    /// their privacy settings. This will only work in Telegram versions
+    /// released after December 7, 2021. Older clients will display _unsupported
+    /// message_.
     Url(reqwest::Url),
 
     /// An HTTP URL used to automatically authorize the user. Can be used as a
diff --git a/src/types/message.rs b/src/types/message.rs
index 0afd73f4..99378eb4 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -90,6 +90,15 @@ pub struct MessageCommon {
     /// Inline keyboard attached to the message. `login_url` buttons are
     /// represented as ordinary `url` buttons.
     pub reply_markup: Option<InlineKeyboardMarkup>,
+
+    /// `true`, if the message is a channel post that was automatically
+    /// forwarded to the connected discussion group.
+    #[serde(default)]
+    pub is_automatic_forward: bool,
+
+    /// `true`, if the message can't be forwarded.
+    #[serde(default)]
+    pub has_protected_content: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -1006,6 +1015,26 @@ mod getters {
                 _ => None,
             }
         }
+
+        pub fn is_automatic_forward(&self) -> bool {
+            match &self.kind {
+                Common(MessageCommon {
+                    is_automatic_forward,
+                    ..
+                }) => *is_automatic_forward,
+                _ => false,
+            }
+        }
+
+        pub fn has_protected_content(&self) -> bool {
+            match &self.kind {
+                Common(MessageCommon {
+                    has_protected_content,
+                    ..
+                }) => *has_protected_content,
+                _ => false,
+            }
+        }
     }
 }
 
diff --git a/src/types/update.rs b/src/types/update.rs
index 56311400..a4ef8817 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -193,6 +193,7 @@ mod test {
                         first_name: Some(String::from("Waffle")),
                         last_name: None,
                         bio: None,
+                        has_private_forwards: None,
                     }),
                     photo: None,
                     pinned_message: None,
@@ -218,6 +219,8 @@ mod test {
                     reply_markup: None,
                     sender_chat: None,
                     author_signature: None,
+                    is_automatic_forward: false,
+                    has_protected_content: false,
                 }),
             }),
         };

From df5487a04b16d7ad4bb4edc8bd6056c5b8d6ec52 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 9 Dec 2021 13:03:46 +0300
Subject: [PATCH 411/755] fix clippy

Use chars, instead of strings when using `str::replace` in tests.
---
 src/types/encrypted_credentials.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
index 583821e7..50d87c73 100644
--- a/src/types/encrypted_credentials.rs
+++ b/src/types/encrypted_credentials.rs
@@ -43,8 +43,8 @@ mod tests {
             "hash":"1122",
             "secret":"secret"
         }"#
-        .replace("\n", "")
-        .replace(" ", "");
+        .replace('\n', "")
+        .replace(' ', "");
         let encrypted_credentials = EncryptedCredentials {
             data: "someData".to_string(),
             hash: "1122".to_string(),

From 6c1c58573349fddd3ac0f8c944240f42f6f6292f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 10 Dec 2021 16:02:28 +0300
Subject: [PATCH 412/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ef54d8..d91b2501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
 - Support for 5.4 telegram bot API ([#133][pr133])
+- Support for 5.5 telegram bot API ([#143][pr143])
 - `EditedMessageIsTooLong` error ([#109][pr109])
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
@@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr135]: https://github.com/teloxide/teloxide-core/pull/135
 [pr139]: https://github.com/teloxide/teloxide-core/pull/139
 [pr140]: https://github.com/teloxide/teloxide-core/pull/140
+[pr143]: https://github.com/teloxide/teloxide-core/pull/143
 
 ### Changed
 

From f42c1a6098a3eab75173e101d2e25a480c480aee Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 10 Dec 2021 17:00:49 +0300
Subject: [PATCH 413/755] Fix deserialization of chat migrations

---
 CHANGELOG.md         |   3 ++
 src/types/message.rs | 116 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ef54d8..5fc64a20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Deserialization of chat migrations, see issue [#427][issue427] ([#143][pr143])
 - Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#116][pr116])
 - Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
@@ -54,7 +55,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
 [pr141]: https://github.com/teloxide/teloxide-core/pull/141
 [pr142]: https://github.com/teloxide/teloxide-core/pull/142
+[pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [issue473]: https://github.com/teloxide/teloxide/issues/473
+[issue427]: https://github.com/teloxide/teloxide/issues/427
 
 ## 0.3.3 - 2021-08-03
 
diff --git a/src/types/message.rs b/src/types/message.rs
index 0afd73f4..c9a4ed48 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -46,7 +46,6 @@ pub enum MessageKind {
     SupergroupChatCreated(MessageSupergroupChatCreated),
     ChannelChatCreated(MessageChannelChatCreated),
     MessageAutoDeleteTimerChanged(MessageMessageAutoDeleteTimerChanged),
-    Migrate(MessageMigrate),
     Pinned(MessagePinned),
     Invoice(MessageInvoice),
     SuccessfulPayment(MessageSuccessfulPayment),
@@ -157,23 +156,32 @@ pub struct MessageMessageAutoDeleteTimerChanged {
     pub message_auto_delete_timer_changed: MessageAutoDeleteTimerChanged,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageMigrate {
+/// Represents group migration to a supergroup or a supergroup migration from a
+/// group.
+///
+/// Note that bot receives **both** updates. For example: a group with id `0`
+/// migrates to a supergroup with id `1` bots in that group will receive 2
+/// updates:
+/// - `message.chat.id = 0`, `message.chat_migration() = ChatMigration::To {
+///   chat_id: 1 }`
+/// - `message.chat.id = 1`, `message.chat_migration() = ChatMigration::From {
+///   chat_id: 0 }`
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum ChatMigration {
     /// The group has been migrated to a supergroup with the specified
-    /// identifier. This number may be greater than 32 bits and some
-    /// programming languages may have difficulty/silent defects in
-    /// interpreting it. But it is smaller than 52 bits, so a signed 64 bit
-    /// integer or double-precision float type are safe for storing this
-    /// identifier.
-    pub migrate_to_chat_id: i64,
+    /// identifier `chat_id`.
+    To {
+        #[serde(rename = "migrate_to_chat_id")]
+        chat_id: i64,
+    },
 
     /// The supergroup has been migrated from a group with the specified
-    /// identifier. This number may be greater than 32 bits and some
-    /// programming languages may have difficulty/silent defects in
-    /// interpreting it. But it is smaller than 52 bits, so a signed 64 bit
-    /// integer or double-precision float type are safe for storing this
-    /// identifier.
-    pub migrate_from_chat_id: i64,
+    /// identifier `chat_id`.
+    From {
+        #[serde(rename = "migrate_from_chat_id")]
+        chat_id: i64,
+    },
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -283,6 +291,7 @@ pub enum MediaKind {
     VideoNote(MediaVideoNote),
     Voice(MediaVoice),
     Venue(MediaVenue),
+    Migration(ChatMigration),
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -500,15 +509,15 @@ mod getters {
     use crate::types::{
         self,
         message::{ForwardKind::NonChannel, MessageKind::*},
-        Chat, ForwardChannel, ForwardKind, ForwardNonChannel, ForwardOrigin, ForwardedFrom,
-        MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind,
-        MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo,
-        MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
+        Chat, ChatMigration, ForwardChannel, ForwardKind, ForwardNonChannel, ForwardOrigin,
+        ForwardedFrom, MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame,
+        MediaKind, MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue,
+        MediaVideo, MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
         MessageConnectedWebsite, MessageDeleteChatPhoto, MessageDice, MessageEntity,
-        MessageGroupChatCreated, MessageInvoice, MessageLeftChatMember, MessageMigrate,
-        MessageNewChatMembers, MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData,
-        MessagePinned, MessageProximityAlertTriggered, MessageSuccessfulPayment,
-        MessageSupergroupChatCreated, PhotoSize, True, User,
+        MessageGroupChatCreated, MessageInvoice, MessageLeftChatMember, MessageNewChatMembers,
+        MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessagePinned,
+        MessageProximityAlertTriggered, MessageSuccessfulPayment, MessageSupergroupChatCreated,
+        PhotoSize, True, User,
     };
 
     /// Getters for [Message] fields from [telegram docs].
@@ -926,21 +935,32 @@ mod getters {
             }
         }
 
+        pub fn chat_migration(&self) -> Option<ChatMigration> {
+            match &self.kind {
+                Common(MessageCommon {
+                    media_kind: MediaKind::Migration(chat_migration),
+                    ..
+                }) => Some(*chat_migration),
+                _ => None,
+            }
+        }
+
         pub fn migrate_to_chat_id(&self) -> Option<i64> {
             match &self.kind {
-                Migrate(MessageMigrate {
-                    migrate_to_chat_id, ..
-                }) => Some(*migrate_to_chat_id),
+                Common(MessageCommon {
+                    media_kind: MediaKind::Migration(ChatMigration::To { chat_id }),
+                    ..
+                }) => Some(*chat_id),
                 _ => None,
             }
         }
 
         pub fn migrate_from_chat_id(&self) -> Option<i64> {
             match &self.kind {
-                Migrate(MessageMigrate {
-                    migrate_from_chat_id,
+                Common(MessageCommon {
+                    media_kind: MediaKind::Migration(ChatMigration::From { chat_id }),
                     ..
-                }) => Some(*migrate_from_chat_id),
+                }) => Some(*chat_id),
                 _ => None,
             }
         }
@@ -1252,4 +1272,42 @@ mod tests {
         let message = from_str::<Message>(json);
         assert!(message.is_ok());
     }
+
+    /// Regression test for <https://github.com/teloxide/teloxide/issues/427>
+    #[test]
+    fn issue_427() {
+        let old = -599075523;
+        let new = -1001555296434;
+
+        // Migration to a supergroup
+        let json = r#"{"chat":{"all_members_are_administrators":false,"id":-599075523,"title":"test","type":"group"},"date":1629404938,"from":{"first_name":"nullptr","id":729497414,"is_bot":false,"language_code":"en","username":"hex0x0000"},"message_id":16,"migrate_to_chat_id":-1001555296434}"#;
+        let message: Message = from_str(json).unwrap();
+
+        assert_eq!(message.chat.id, old);
+        assert_eq!(
+            message.chat_migration(),
+            Some(ChatMigration::To { chat_id: new })
+        );
+        assert_eq!(message.migrate_to_chat_id(), Some(new));
+
+        // The user who initialized the migration
+        assert!(message.from().is_some());
+
+        // Migration from a common group
+        let json = r#"{"chat":{"id":-1001555296434,"title":"test","type":"supergroup"},"date":1629404938,"from":{"first_name":"Group","id":1087968824,"is_bot":true,"username":"GroupAnonymousBot"},"message_id":1,"migrate_from_chat_id":-599075523,"sender_chat":{"id":-1001555296434,"title":"test","type":"supergroup"}}"#;
+        let message: Message = from_str(json).unwrap();
+
+        assert_eq!(message.chat.id, new);
+        assert_eq!(
+            message.chat_migration(),
+            Some(ChatMigration::From { chat_id: old })
+        );
+        assert_eq!(message.migrate_from_chat_id(), Some(old));
+
+        // Anonymous bot
+        assert!(message.from().is_some());
+
+        // The chat to which the group migrated
+        assert!(message.sender_chat().is_some());
+    }
 }

From ef0d2d3aeabd17ef2153e8b23af66b4e27a14545 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 9 Dec 2021 13:03:46 +0300
Subject: [PATCH 414/755] fix clippy

Use chars, instead of strings when using `str::replace` in tests.
---
 src/types/encrypted_credentials.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/encrypted_credentials.rs b/src/types/encrypted_credentials.rs
index 583821e7..50d87c73 100644
--- a/src/types/encrypted_credentials.rs
+++ b/src/types/encrypted_credentials.rs
@@ -43,8 +43,8 @@ mod tests {
             "hash":"1122",
             "secret":"secret"
         }"#
-        .replace("\n", "")
-        .replace(" ", "");
+        .replace('\n', "")
+        .replace(' ', "");
         let encrypted_credentials = EncryptedCredentials {
             data: "someData".to_string(),
             hash: "1122".to_string(),

From 59fc8709cd5db76aa5d7fff35f6fba119bf998c2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 19 Dec 2021 14:42:19 +0300
Subject: [PATCH 415/755] Pin tooling in the CI to a specific version

Both Clippy and Rustfmt are pinned to the current latest version (2021-10-19).

A `rust-toolchain.toml` file is also created, so the contributors also
have the same version.
---
 .github/workflows/ci.yml | 40 ++++++++++++++++++++--------------------
 rust-toolchain.toml      |  4 ++++
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 939b0930..87ad95ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,6 +9,25 @@ on:
 name: Continuous integration
 
 jobs:
+  style:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2021-12-19
+          override: true
+          components: rustfmt
+
+      - name: fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check 
+
   test:
     runs-on: ubuntu-latest
     strategy:
@@ -56,7 +75,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: nightly-2021-12-19
           override: true
           components: clippy
 
@@ -65,22 +84,3 @@ jobs:
         with:
           command: clippy
           args: --all-targets --all-features -- -D warnings
-
-  style:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - name: fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..a3a5f28c
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "nightly-2021-12-19"
+components = ["rustfmt", "clippy"]
+profile = "minimal"

From 40a58600855bd4148eb5f240f231262e9be0637e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 19 Dec 2021 14:56:20 +0300
Subject: [PATCH 416/755] Suppress clippy

---
 src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 333dafac..13d8a213 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -87,6 +87,8 @@
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 #![warn(clippy::print_stdout, clippy::dbg_macro)]
+// Unless this becomes machine applicable, I'm not adding 334 #[must_use]s (waffle)
+#![allow(clippy::return_self_not_must_use)]
 
 // The internal helper macros.
 #[macro_use]

From 06a21ba9e1e18dfa5cd91ecc24b820f47d11b7e4 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Thu, 16 Dec 2021 00:28:52 +0800
Subject: [PATCH 417/755] Skip the `language` field of `MessageEntityKind::Pre`
 if it is `None`

---
 src/types/message_entity.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 1f4873c8..55facb77 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -44,6 +44,7 @@ impl MessageEntity {
     }
 }
 
+#[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
@@ -104,4 +105,20 @@ mod tests {
                 .unwrap()
         );
     }
+
+    #[test]
+    fn pre_with_none_language() {
+        use serde_json::to_string;
+
+        assert_eq!(
+            to_string(&MessageEntity {
+                kind: MessageEntityKind::Pre { language: None },
+                offset: 1,
+                length: 2,
+            })
+            .unwrap()
+            .find("language"),
+            None
+        );
+    }
 }

From 234ac365db2bc2f8c688153d91b278a2b0517a91 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Thu, 16 Dec 2021 00:41:04 +0800
Subject: [PATCH 418/755] Update changelog and comment the PR link in the test

---
 CHANGELOG.md                | 2 ++
 src/types/message_entity.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 887e19ae..e63789b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,12 +52,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Make `SendPoll::poll_` optional ([#133][pr133])
 - Bug with `caption_entities`, see issue [#473][issue473]
 - Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
+- Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
 [pr141]: https://github.com/teloxide/teloxide-core/pull/141
 [pr142]: https://github.com/teloxide/teloxide-core/pull/142
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
+[pr145]: https://github.com/teloxide/teloxide-core/pull/145
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 [issue427]: https://github.com/teloxide/teloxide/issues/427
 
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 55facb77..cd8b6278 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -106,6 +106,7 @@ mod tests {
         );
     }
 
+    // https://github.com/teloxide/teloxide-core/pull/145
     #[test]
     fn pre_with_none_language() {
         use serde_json::to_string;

From 1e0b8b67342df4e45d49504960bff972a5cf6fc7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 19 Dec 2021 18:32:03 +0300
Subject: [PATCH 419/755] Fix deserialization of `MediaKind::Venue`

---
 src/types/message.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 3cf6d156..0fcb7a49 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -286,11 +286,20 @@ pub struct ForwardOrigin {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum MediaKind {
+    // Note:
+    // - `Venue` must be in front of `Location`
+    // - `Animation` must be in front of `Document`
+    //
+    // This is needed so serde doesn't parse `Venue` as `Location` or `Animation` as `Document`
+    // (for backward compatability telegram duplicates some fields)
+    //
+    // See <https://github.com/teloxide/teloxide/issues/481>
     Animation(MediaAnimation),
     Audio(MediaAudio),
     Contact(MediaContact),
     Document(MediaDocument),
     Game(MediaGame),
+    Venue(MediaVenue),
     Location(MediaLocation),
     Photo(MediaPhoto),
     Poll(MediaPoll),
@@ -299,7 +308,6 @@ pub enum MediaKind {
     Video(MediaVideo),
     VideoNote(MediaVideoNote),
     Voice(MediaVoice),
-    Venue(MediaVenue),
     Migration(ChatMigration),
 }
 
@@ -310,11 +318,6 @@ pub struct MediaAnimation {
     /// will also be set.
     pub animation: Animation,
 
-    #[doc(hidden)]
-    /// "For backward compatibility" (c) Telegram Docs.
-    #[serde(skip)]
-    pub document: (),
-
     /// Caption for the animation, 0-1024 characters.
     pub caption: Option<String>,
 
@@ -322,6 +325,7 @@ pub struct MediaAnimation {
     /// bot commands, etc. that appear in the caption.
     #[serde(default = "Vec::new")]
     pub caption_entities: Vec<MessageEntity>,
+    // Note: for backward compatibility telegram also sends `document` field, but we ignore it
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -472,6 +476,7 @@ pub struct MediaVoice {
 pub struct MediaVenue {
     /// Message is a venue, information about the venue.
     pub venue: Venue,
+    // Note: for backward compatibility telegram also sends `location` field, but we ignore it
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]

From 3f2d69702feaaaa02fd81d996eeeeda4a9692363 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 19 Dec 2021 18:52:03 +0300
Subject: [PATCH 420/755] Update changelog and add regression test for issue
 481

---
 CHANGELOG.md         |  2 ++
 src/types/message.rs | 49 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e63789b8..c8f3ad5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bug with `caption_entities`, see issue [#473][issue473]
 - Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
 - Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))
+- Deserialization of `MediaKind::Venue` ([#147][pr147])
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
@@ -60,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr142]: https://github.com/teloxide/teloxide-core/pull/142
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [pr145]: https://github.com/teloxide/teloxide-core/pull/145
+[pr147]: https://github.com/teloxide/teloxide-core/pull/147
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 [issue427]: https://github.com/teloxide/teloxide/issues/427
 
diff --git a/src/types/message.rs b/src/types/message.rs
index 0fcb7a49..3da9f02b 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1344,4 +1344,53 @@ mod tests {
         // The chat to which the group migrated
         assert!(message.sender_chat().is_some());
     }
+
+    /// Regression test for <https://github.com/teloxide/teloxide/issues/481>
+    #[test]
+    fn issue_481() {
+        let json = r#"
+{
+  "message_id": 0,
+  "date": 0,
+  "location": {
+   "latitude": 0.0,
+   "longitude": 0.0
+  },
+  "chat": {
+   "id": 0,
+   "first_name": "f",
+   "type": "private"
+  },
+  "venue": {
+   "location": {
+    "latitude": 0.0,
+    "longitude": 0.0
+   },
+   "title": "Title",
+   "address": "Address",
+   "foursquare_id": "some_foursquare_id"
+  }
+ }
+"#;
+        let message: Message = from_str(json).unwrap();
+        assert_eq!(
+            message.venue().unwrap(),
+            &Venue {
+                location: Location {
+                    longitude: 0.0,
+                    latitude: 0.0,
+                    horizontal_accuracy: None,
+                    live_period: None,
+                    heading: None,
+                    proximity_alert_radius: None
+                },
+                title: "Title".to_owned(),
+                address: "Address".to_owned(),
+                foursquare_id: Some("some_foursquare_id".to_owned()),
+                foursquare_type: None,
+                google_place_id: None,
+                google_place_type: None,
+            }
+        )
+    }
 }

From a976bd8a33cd5239dbc169f180699fedb2a16bb6 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 23 Dec 2021 16:35:53 +0600
Subject: [PATCH 421/755] Remove the `authors` field from `Cargo.toml`

---
 Cargo.toml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 987af2b2..35c8ec4a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,16 +3,6 @@ name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
 version = "0.3.1"
 edition = "2018"
-authors = [
-    "Temirkhan Myrzamadi <hirrolot@gmail.com>",
-    "Waffle Lapkin <waffle.lapkin@gmail.com>",
-    "p0lunin <dmytro.polunin@gmail.com>",
-    "Mishko torop'izhko",
-    "Mr-Andersen",
-    "Sergey Levitin <selevit@gmail.com>",
-    "Rustem B. <bakirov.com@yandex.ru>",
-    "Alexey Fedechkin <aleksey-fedechkin@rambler.ru>"
-]
 
 license = "MIT"
 repository = "https://github.com/teloxide/teloxide-core/"

From 1bcb062d889c31ab3849b9dcc962898a5419b679 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 24 Dec 2021 15:47:54 +0300
Subject: [PATCH 422/755] Add `RequestError::InvalidJson::raw` field

---
 CHANGELOG.md       |  2 ++
 src/errors.rs      |  9 +++++++--
 src/net/request.rs | 13 ++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f3ad5d..4926aa9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,10 +37,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
 - Mark `ApiError` as `non_exhaustive` ([#125][pr125])
 - `InputFile` and related structures now do **not** implement `PartialEq`, `Eq` and `Hash` ([#133][pr133])
+- `RequestError::InvalidJson` now has a `raw` field with raw json for easier debugability ([#150][pr150])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
 [pr134]: https://github.com/teloxide/teloxide-core/pull/134
+[pr150]: https://github.com/teloxide/teloxide-core/pull/150
 
 ### Fixed
 
diff --git a/src/errors.rs b/src/errors.rs
index 4b6c8082..03fcffd9 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -43,8 +43,13 @@ pub enum RequestError {
     /// description of the error.
     ///
     /// [open an issue]: https://github.com/teloxide/teloxide/issues/new
-    #[error("An error while parsing JSON: {0}")]
-    InvalidJson(#[source] serde_json::Error),
+    #[error("An error while parsing JSON: {source} (raw: {raw:?})")]
+    InvalidJson {
+        #[source]
+        source: serde_json::Error,
+        /// The raw string JSON that couldn't been parsed
+        raw: Box<str>,
+    },
 
     /// Occurs when trying to send a file to Telegram.
     #[error("An I/O error: {0}")]
diff --git a/src/net/request.rs b/src/net/request.rs
index 3b3bd4e6..9edae5c6 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -85,9 +85,12 @@ where
         tokio::time::sleep(DELAY_ON_SERVER_ERROR).await;
     }
 
-    serde_json::from_str::<TelegramResponse<T>>(
-        &response.text().await.map_err(RequestError::Network)?,
-    )
-    .map_err(RequestError::InvalidJson)?
-    .into()
+    let text = response.text().await.map_err(RequestError::Network)?;
+
+    serde_json::from_str::<TelegramResponse<T>>(&text)
+        .map_err(|source| RequestError::InvalidJson {
+            source,
+            raw: text.into(),
+        })?
+        .into()
 }

From 2bd19a598e42d6f6459d720bd689ccaa03e7b117 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 25 Dec 2021 04:12:59 +0300
Subject: [PATCH 423/755] Add `User::is_anonymous` and `User::is_channel`
 functions

Also add documentation for `User::{full_name, mention, url}`
---
 CHANGELOG.md      |  2 ++
 src/types/user.rs | 44 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f3ad5d..8c2b0e92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Limits::messages_per_min_channel` ([#121][pr121])
 - `media_group_id` field to `MediaDocument` and `MediaAudio` ([#139][pr139])
 - `caption_entities` method to `InputMediaPhoto` ([#140][pr140])
+- `User::is_anonymous` and `User::is_channel` functions ([#151][pr151])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
@@ -25,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr139]: https://github.com/teloxide/teloxide-core/pull/139
 [pr140]: https://github.com/teloxide/teloxide-core/pull/140
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
+[pr151]: https://github.com/teloxide/teloxide-core/pull/151
 
 ### Changed
 
diff --git a/src/types/user.rs b/src/types/user.rs
index 24064d6f..9498c799 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -28,6 +28,8 @@ pub struct User {
 }
 
 impl User {
+    /// Returns full name of this user, ie first and last names joined with a
+    /// space.
     pub fn full_name(&self) -> String {
         match &self.last_name {
             Some(last_name) => (format!("{0} {1}", self.first_name, last_name)),
@@ -35,12 +37,52 @@ impl User {
         }
     }
 
+    /// Returns a username mention of this user. Returns `None` if
+    /// `self.username.is_none()`.
     pub fn mention(&self) -> Option<String> {
         Some(format!("@{}", self.username.as_ref()?))
     }
 
+    /// Returns an URL that links to this user in the form of
+    /// `tg://user/?id=<...>`
     pub fn url(&self) -> reqwest::Url {
-        reqwest::Url::parse(format!("tg://user/?id={}", self.id).as_str()).unwrap()
+        reqwest::Url::parse(&format!("tg://user/?id={}", self.id)).unwrap()
+    }
+
+    /// Returns `true` if this is special user used by telegram bot API to
+    /// denote an annonymous user that sends messages on behalf of a group.
+    pub fn is_anonymous(&self) -> bool {
+        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
+        const ANON_ID: i64 = 1087968824;
+
+        // Sanity check
+        debug_assert!(
+            (self.id != ANON_ID)
+                || (self.is_bot
+                    && self.first_name == "Group"
+                    && self.last_name.is_none()
+                    && self.username.as_deref() == Some("GroupAnonymousBot"))
+        );
+
+        self.id == ANON_ID
+    }
+
+    /// Returns `true` if this is special user used by telegram bot API to
+    /// denote an annonymous user that sends messages on behalf of a channel.
+    pub fn is_channel(&self) -> bool {
+        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
+        const ANON_CHANNEL_ID: i64 = 136817688;
+
+        // Sanity check
+        debug_assert!(
+            (self.id != ANON_CHANNEL_ID)
+                || (self.is_bot
+                    && self.first_name == "Group"
+                    && self.last_name.is_none()
+                    && self.username.as_deref() == Some("GroupAnonymousBot"))
+        );
+
+        self.id == ANON_CHANNEL_ID
     }
 }
 

From 078ee1d7ced97d92d2bf5f6f020dbfd7cb38fd15 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 25 Dec 2021 04:23:54 +0300
Subject: [PATCH 424/755] Refactor forwarded messages

---
 CHANGELOG.md         |   1 +
 src/types/message.rs | 249 ++++++++++++++++++++++++++-----------------
 src/types/update.rs  |   9 +-
 3 files changed, 154 insertions(+), 105 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c2b0e92..7b514b9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use `url::Url` for urls, use `chrono::DateTime<Utc>` for dates in types ([#115][pr115])
 - Mark `ApiError` as `non_exhaustive` ([#125][pr125])
 - `InputFile` and related structures now do **not** implement `PartialEq`, `Eq` and `Hash` ([#133][pr133])
+- How forwarded messages are represented ([#151][pr151])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
diff --git a/src/types/message.rs b/src/types/message.rs
index 3da9f02b..4e951ba0 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -75,8 +75,14 @@ pub struct MessageCommon {
     /// title of an anonymous group administrator.
     pub author_signature: Option<String>,
 
+    /// For forwarded messages, information about the forward
     #[serde(flatten)]
-    pub forward_kind: ForwardKind,
+    pub forward: Option<Forward>,
+
+    /// For replies, the original message. Note that the Message object in this
+    /// field will not contain further `reply_to_message` fields even if it
+    /// itself is a reply.
+    pub reply_to_message: Option<Box<Message>>,
 
     /// Date the message was last edited in Unix time.
     #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
@@ -236,51 +242,44 @@ pub struct MessagePassportData {
     pub passport_data: PassportData,
 }
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub enum ForwardedFrom {
-    #[serde(rename = "forward_from")]
-    User(User),
-    #[serde(rename = "forward_sender_name")]
-    SenderName(String),
-}
-
+/// Information about forwarded message.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ForwardKind {
-    Channel(ForwardChannel),
-    NonChannel(ForwardNonChannel),
-    Origin(ForwardOrigin),
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ForwardChannel {
-    #[serde(rename = "forward_date")]
-    #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
-    pub date: DateTime<Utc>,
-
-    #[serde(rename = "forward_from_chat")]
-    pub chat: Chat,
-
-    #[serde(rename = "forward_from_message_id")]
-    pub message_id: i32,
-
-    #[serde(rename = "forward_signature")]
-    pub signature: Option<String>,
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct ForwardNonChannel {
+pub struct Forward {
+    /// Date the original message was sent in Unix time.
     #[serde(rename = "forward_date")]
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
     pub date: DateTime<Utc>,
 
+    /// The entity that sent the original message.
     #[serde(flatten)]
     pub from: ForwardedFrom,
+
+    /// For messages forwarded from channels, signature of the post author if
+    /// present. For messages forwarded from anonymous admins, authors title, if
+    /// present.
+    #[serde(rename = "forward_signature")]
+    pub signature: Option<String>,
+
+    /// For messages forwarded from channels, identifier of the original message
+    /// in the channel
+    #[serde(rename = "forward_from_message_id")]
+    pub message_id: Option<i32>,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-pub struct ForwardOrigin {
-    pub reply_to_message: Option<Box<Message>>,
+/// The entity that sent the original message that later was forwarded.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub enum ForwardedFrom {
+    /// The message was sent by a user.
+    #[serde(rename = "forward_from")]
+    User(User),
+    /// The message was sent by an anonymous user on behalf of a group or
+    /// channel.
+    #[serde(rename = "forward_from_chat")]
+    Chat(Chat),
+    /// The message was sent by a user who disallow adding a link to their
+    /// account in forwarded messages.
+    #[serde(rename = "forward_sender_name")]
+    SenderName(String),
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -521,17 +520,14 @@ mod getters {
     use std::ops::Deref;
 
     use crate::types::{
-        self,
-        message::{ForwardKind::NonChannel, MessageKind::*},
-        Chat, ChatMigration, ForwardChannel, ForwardKind, ForwardNonChannel, ForwardOrigin,
-        ForwardedFrom, MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame,
-        MediaKind, MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue,
-        MediaVideo, MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
-        MessageConnectedWebsite, MessageDeleteChatPhoto, MessageDice, MessageEntity,
-        MessageGroupChatCreated, MessageInvoice, MessageLeftChatMember, MessageNewChatMembers,
-        MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessagePinned,
-        MessageProximityAlertTriggered, MessageSuccessfulPayment, MessageSupergroupChatCreated,
-        PhotoSize, True, User,
+        self, message::MessageKind::*, Chat, ChatMigration, Forward, ForwardedFrom, MediaAnimation,
+        MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind, MediaLocation, MediaPhoto,
+        MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo, MediaVideoNote, MediaVoice,
+        Message, MessageChannelChatCreated, MessageCommon, MessageConnectedWebsite,
+        MessageDeleteChatPhoto, MessageDice, MessageEntity, MessageGroupChatCreated,
+        MessageInvoice, MessageLeftChatMember, MessageNewChatMembers, MessageNewChatPhoto,
+        MessageNewChatTitle, MessagePassportData, MessagePinned, MessageProximityAlertTriggered,
+        MessageSuccessfulPayment, MessageSupergroupChatCreated, PhotoSize, True, User,
     };
 
     /// Getters for [Message] fields from [telegram docs].
@@ -566,73 +562,49 @@ mod getters {
             self.chat.id
         }
 
-        /// NOTE: this is getter for both `forward_from` and
-        /// `forward_sender_name`
+        pub fn forward(&self) -> Option<&Forward> {
+            self.common().and_then(|m| m.forward.as_ref())
+        }
+
+        pub fn forward_date(&self) -> Option<DateTime<Utc>> {
+            self.forward().map(|f| f.date)
+        }
+
         pub fn forward_from(&self) -> Option<&ForwardedFrom> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind: NonChannel(ForwardNonChannel { from, .. }),
-                    ..
-                }) => Some(from),
+            self.forward().map(|f| &f.from)
+        }
+
+        pub fn forward_from_user(&self) -> Option<&User> {
+            self.forward_from().and_then(|from| match from {
+                ForwardedFrom::User(user) => Some(user),
                 _ => None,
-            }
+            })
         }
 
         pub fn forward_from_chat(&self) -> Option<&Chat> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind: ForwardKind::Channel(ForwardChannel { chat, .. }),
-                    ..
-                }) => Some(chat),
+            self.forward_from().and_then(|from| match from {
+                ForwardedFrom::Chat(chat) => Some(chat),
                 _ => None,
-            }
+            })
         }
 
-        pub fn forward_from_message_id(&self) -> Option<&i32> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind: ForwardKind::Channel(ForwardChannel { message_id, .. }),
-                    ..
-                }) => Some(message_id),
+        pub fn forward_from_sender_name(&self) -> Option<&str> {
+            self.forward_from().and_then(|from| match from {
+                ForwardedFrom::SenderName(sender_name) => Some(&**sender_name),
                 _ => None,
-            }
+            })
+        }
+
+        pub fn forward_from_message_id(&self) -> Option<i32> {
+            self.forward().and_then(|f| f.message_id)
         }
 
         pub fn forward_signature(&self) -> Option<&str> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind: ForwardKind::Channel(ForwardChannel { signature, .. }),
-                    ..
-                }) => signature.as_ref().map(Deref::deref),
-                _ => None,
-            }
-        }
-
-        pub fn forward_date(&self) -> Option<&DateTime<Utc>> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind: ForwardKind::Channel(ForwardChannel { date, .. }),
-                    ..
-                })
-                | Common(MessageCommon {
-                    forward_kind: ForwardKind::NonChannel(ForwardNonChannel { date, .. }),
-                    ..
-                }) => Some(date),
-                _ => None,
-            }
+            self.forward().and_then(|f| f.signature.as_deref())
         }
 
         pub fn reply_to_message(&self) -> Option<&Message> {
-            match &self.kind {
-                Common(MessageCommon {
-                    forward_kind:
-                        ForwardKind::Origin(ForwardOrigin {
-                            reply_to_message, ..
-                        }),
-                    ..
-                }) => reply_to_message.as_ref().map(Deref::deref),
-                _ => None,
-            }
+            self.common().and_then(|m| m.reply_to_message.as_deref())
         }
 
         pub fn edit_date(&self) -> Option<&DateTime<Utc>> {
@@ -1060,6 +1032,14 @@ mod getters {
                 _ => false,
             }
         }
+
+        /// Common message (text, image, etc)
+        fn common(&self) -> Option<&MessageCommon> {
+            match &self.kind {
+                Common(message) => Some(message),
+                _ => None,
+            }
+        }
     }
 }
 
@@ -1307,6 +1287,75 @@ mod tests {
         assert!(message.is_ok());
     }
 
+    /// Regression test for <https://github.com/teloxide/teloxide/issues/419>
+    #[test]
+    fn issue_419() {
+        let json = r#"{
+            "message_id": 1,
+            "from": {
+                "id": 1087968824,
+                "is_bot": true,
+                "first_name": "Group",
+                "username": "GroupAnonymousBot"
+            },
+            "author_signature": "TITLE2",
+            "sender_chat": {
+                "id": -1001160242915,
+                "title": "a",
+                "type": "supergroup"
+            },
+            "chat": {
+                "id": -1001160242915,
+                "title": "a",
+                "type": "supergroup"
+            },
+            "date": 1640359576,
+            "forward_from_chat": {
+                "id": -1001160242915,
+                "title": "a",
+                "type": "supergroup"
+            },
+            "forward_signature": "TITLE",
+            "forward_date": 1640359544,
+            "text": "text"
+        }"#;
+
+        // Anonymous admin with title "TITLE2" forwards a message from anonymous
+        // admin with title "TITLE" with text "a", everything is happening in
+        // the same group.
+        let message: Message = serde_json::from_str(json).unwrap();
+
+        let group = Chat {
+            id: -1001160242915,
+            kind: ChatKind::Public(ChatPublic {
+                title: Some("a".to_owned()),
+                kind: PublicChatKind::Supergroup(PublicChatSupergroup {
+                    username: None,
+                    sticker_set_name: None,
+                    can_set_sticker_set: None,
+                    permissions: None,
+                    slow_mode_delay: None,
+                    linked_chat_id: None,
+                    location: None,
+                }),
+                description: None,
+                invite_link: None,
+            }),
+            photo: None,
+            pinned_message: None,
+            message_auto_delete_time: None,
+        };
+
+        assert!(message.from().unwrap().is_anonymous());
+        assert_eq!(message.author_signature().unwrap(), "TITLE2");
+        assert_eq!(message.sender_chat().unwrap(), &group);
+        assert_eq!(&message.chat, &group);
+        assert_eq!(message.forward_from_chat().unwrap(), &group);
+        assert_eq!(message.forward_signature().unwrap(), "TITLE");
+        assert!(message.forward_date().is_some());
+        assert_eq!(message.text().unwrap(), "text");
+    }
+
     /// Regression test for <https://github.com/teloxide/teloxide/issues/427>
     #[test]
     fn issue_427() {
diff --git a/src/types/update.rs b/src/types/update.rs
index a4ef8817..bfaa7aed 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -145,8 +145,8 @@ impl Update {
 #[cfg(test)]
 mod test {
     use crate::types::{
-        Chat, ChatKind, ChatPrivate, ForwardKind, ForwardOrigin, MediaKind, MediaText, Message,
-        MessageCommon, MessageKind, Update, UpdateKind, User,
+        Chat, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon, MessageKind,
+        Update, UpdateKind, User,
     };
 
     use chrono::{DateTime, NaiveDateTime, Utc};
@@ -208,9 +208,8 @@ mod test {
                         username: Some(String::from("WaffleLapkin")),
                         language_code: Some(String::from("en")),
                     }),
-                    forward_kind: ForwardKind::Origin(ForwardOrigin {
-                        reply_to_message: None,
-                    }),
+                    reply_to_message: None,
+                    forward: None,
                     edit_date: None,
                     media_kind: MediaKind::Text(MediaText {
                         text: String::from("hello there"),

From 34647c7a382940598d127934bbcf4c3c2926513e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 25 Dec 2021 04:34:05 +0300
Subject: [PATCH 425/755] Improve `debug_assert!` message in `ChatId::unmark`

---
 src/types/chat_id.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 026715c2..c996c7f3 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -32,7 +32,7 @@ impl ChatId {
             &Self::Id(id @ MIN_CHAT_ID..=-1) => Chat(-id as _),
             &Self::Id(id @ MIN_CHANNEL_ID..=MAX_CHANNEL_ID) => Channel((MAX_CHANNEL_ID - id) as _),
             &Self::Id(id) => {
-                debug_assert!(0 < id && id < MAX_USER_ID, "malformed chat id");
+                debug_assert!(0 < id && id < MAX_USER_ID, "malformed chat id: {}", id);
                 User(id as _)
             }
             Self::ChannelUsername(_) => return None,

From 9ce53a2b0269ca711a74c9cd9c79445be215e8fb Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 25 Dec 2021 04:48:44 +0300
Subject: [PATCH 426/755] Fix deserialization of `VoiceChat{Started,Ended}`
 messages

---
 CHANGELOG.md                    |  2 ++
 src/types/message.rs            | 14 ++++++++++++++
 src/types/voice_chat_ended.rs   |  2 +-
 src/types/voice_chat_started.rs |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f3ad5d..6cc47b8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
 - Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))
 - Deserialization of `MediaKind::Venue` ([#147][pr147])
+- Deserialization of `VoiceChat{Started,Ended}` messages ([#153][pr153])
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
@@ -62,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [pr145]: https://github.com/teloxide/teloxide-core/pull/145
 [pr147]: https://github.com/teloxide/teloxide-core/pull/147
+[pr153]: https://github.com/teloxide/teloxide-core/pull/153
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 [issue427]: https://github.com/teloxide/teloxide/issues/427
 
diff --git a/src/types/message.rs b/src/types/message.rs
index 3da9f02b..cac6e307 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1393,4 +1393,18 @@ mod tests {
             }
         )
     }
+
+    /// Regression test for <https://github.com/teloxide/teloxide/issues/475>
+    #[test]
+    fn issue_475() {
+        let json = r#"{"message_id":198295,"from":{"id":1087968824,"is_bot":true,"first_name":"Group","username":"GroupAnonymousBot"},"sender_chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"date":1638236631,"voice_chat_started":{}}"#;
+
+        let message: Message = serde_json::from_str(json).unwrap();
+
+        assert!(matches!(message.kind, MessageKind::VoiceChatStarted { .. }));
+
+        // FIXME(waffle): it seems like we are losing `sender_chat` in some
+        // cases inclusing this
+        // assert!(message.sender_chat().is_some());
+    }
 }
diff --git a/src/types/voice_chat_ended.rs b/src/types/voice_chat_ended.rs
index 8ca83332..1c8ef3d6 100644
--- a/src/types/voice_chat_ended.rs
+++ b/src/types/voice_chat_ended.rs
@@ -3,4 +3,4 @@ use serde::{Deserialize, Serialize};
 /// This object represents a service message about a voice chat ended in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatEnded;
+pub struct VoiceChatEnded {}
diff --git a/src/types/voice_chat_started.rs b/src/types/voice_chat_started.rs
index 82bb2f30..1aeec86f 100644
--- a/src/types/voice_chat_started.rs
+++ b/src/types/voice_chat_started.rs
@@ -3,4 +3,4 @@ use serde::{Deserialize, Serialize};
 /// This object represents a service message about a voice chat started in the
 /// chat. Currently holds no information.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatStarted;
+pub struct VoiceChatStarted {}

From f65617e7639367f625f99cff26ef71314ec9f2a7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 28 Dec 2021 16:09:40 +0300
Subject: [PATCH 427/755] Fix serialization of
 `BotCommandScope::Chat{,Administrators}`

---
 CHANGELOG.md                   |  2 ++
 src/types/bot_command_scope.rs | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 312cb3dd..ebe6b7f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))
 - Deserialization of `MediaKind::Venue` ([#147][pr147])
 - Deserialization of `VoiceChat{Started,Ended}` messages ([#153][pr153])
+- Serialization of `BotCommandScope::Chat{,Administrators}` ([#154][pr154])
 
 [pr119]: https://github.com/teloxide/teloxide-core/pull/119
 [pr133]: https://github.com/teloxide/teloxide-core/pull/133
@@ -66,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr145]: https://github.com/teloxide/teloxide-core/pull/145
 [pr147]: https://github.com/teloxide/teloxide-core/pull/147
 [pr153]: https://github.com/teloxide/teloxide-core/pull/153
+[pr154]: https://github.com/teloxide/teloxide-core/pull/154
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 [issue427]: https://github.com/teloxide/teloxide/issues/427
 
diff --git a/src/types/bot_command_scope.rs b/src/types/bot_command_scope.rs
index 47bc5b94..d6051941 100644
--- a/src/types/bot_command_scope.rs
+++ b/src/types/bot_command_scope.rs
@@ -49,7 +49,20 @@ pub enum BotCommandScope {
     AllPrivateChats,
     AllGroupChats,
     AllChatAdministrators,
-    Chat(#[serde(rename = "chat_id")] ChatId),
-    ChatAdministrators(#[serde(rename = "chat_id")] ChatId),
+    Chat { chat_id: ChatId },
+    ChatAdministrators { chat_id: ChatId },
     ChatMember { chat_id: ChatId, user_id: i64 },
 }
+
+#[test]
+fn issue_486() {
+    serde_json::to_string(&BotCommandScope::Chat {
+        chat_id: ChatId::Id(0),
+    })
+    .unwrap();
+
+    serde_json::to_string(&BotCommandScope::ChatAdministrators {
+        chat_id: ChatId::Id(0),
+    })
+    .unwrap();
+}

From f456ab110ad07b950de59cd4389cef8936eec0ef Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 28 Dec 2021 16:57:47 +0300
Subject: [PATCH 428/755] Add
 `ApiError::NotEnoughRightsToChangeChatPermissions`

---
 CHANGELOG.md  |  2 ++
 src/errors.rs | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 500d867e..e9a97f28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
+- `ApiError::NotEnoughRightsToChangeChatPermissions` ([#155][pr155])
 - Support for 5.4 telegram bot API ([#133][pr133])
 - Support for 5.5 telegram bot API ([#143][pr143])
 - `EditedMessageIsTooLong` error ([#109][pr109])
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr140]: https://github.com/teloxide/teloxide-core/pull/140
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [pr151]: https://github.com/teloxide/teloxide-core/pull/151
+[pr155]: https://github.com/teloxide/teloxide-core/pull/155
 
 ### Changed
 
diff --git a/src/errors.rs b/src/errors.rs
index 03fcffd9..27d1afb6 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -493,6 +493,17 @@ pub enum ApiError {
     #[error("Bad Request: not enough rights to manage pinned messages in the chat")]
     NotEnoughRightsToManagePins,
 
+    /// Occurs when bot tries change default chat permissions without "Ban
+    /// Users" permission in this chat.
+    ///
+    /// May happen in methods:
+    /// 1. [`SetChatPermissions`]
+    ///
+    /// [`SetChatPermissions`]: crate::payloads::SetChatPermissions
+    #[serde(rename = "Bad Request: not enough rights to change chat permissions")]
+    #[error("Bad Request: not enough rights to change chat permissions")]
+    NotEnoughRightsToChangeChatPermissions,
+
     /// Occurs when bot tries to use method in group which is allowed only in a
     /// supergroup or channel.
     #[serde(rename = "Bad Request: method is available only for supergroups and channel")]

From 05fa8885b590d14a9b5a3fc7e0f962f6fa293831 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 29 Dec 2021 14:22:52 +0200
Subject: [PATCH 429/755] add dialogue_state.rs

---
 src/dialogue_state.rs | 172 ++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs            |  13 ++++
 2 files changed, 185 insertions(+)
 create mode 100644 src/dialogue_state.rs

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
new file mode 100644
index 00000000..fc2ff643
--- /dev/null
+++ b/src/dialogue_state.rs
@@ -0,0 +1,172 @@
+use proc_macro2::{Ident, Span, TokenStream};
+use quote::{quote, ToTokens};
+use syn::{
+    parse::{Parse, ParseStream},
+    spanned::Spanned,
+    Fields, GenericParam, ItemEnum, Path, Type,
+};
+
+pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
+    let enum_ident = &item.ident;
+    let self_params_with_bounds = {
+        let params = &item.generics.params;
+        if params.len() != 0 {
+            quote! { < #params > }
+        } else {
+            quote! {}
+        }
+    };
+    let self_params = {
+        let params = &item.generics.params;
+        if params.len() != 0 {
+            let mut params = quote! { < };
+            item.generics.params.iter().for_each(|param| match param {
+                GenericParam::Type(ty) => {
+                    let ident = &ty.ident;
+                    params.extend(quote! { #ident, });
+                }
+                GenericParam::Lifetime(li) => {
+                    let li = &li.lifetime;
+                    params.extend(quote! { #li, })
+                }
+                GenericParam::Const(_par) => todo!(),
+            });
+            params.extend(quote! { > });
+            params
+        } else {
+            quote! {}
+        }
+    };
+    let where_clause = match item.generics.where_clause.clone() {
+        Some(mut clause) => {
+            let predicate = quote! { Self: Clone + Send + Sync + 'static };
+            clause.predicates.push(syn::parse2(predicate).unwrap());
+            Some(clause)
+        }
+        x => x,
+    };
+    let out = parse_out_type(item.ident.span(), &item.attrs)?;
+
+    let mut branches = quote! {};
+    for variant in item.variants.iter() {
+        let handler = {
+            let handler_attr = variant
+                .attrs
+                .iter()
+                .find(|attr| attr.path.is_ident("handler"))
+                .ok_or_else(|| {
+                    syn::Error::new(
+                        variant.span(),
+                        "Expected `handler` attribute.",
+                    )
+                })?;
+            handler_attr.parse_args::<HandlerAttr>()?
+        };
+
+        branches.extend(match &variant.fields {
+            Fields::Named(_) => {
+                return Err(syn::Error::new(
+                    variant.span(),
+                    "Named fields does not allowed",
+                ))
+            }
+            Fields::Unnamed(fields) => match fields.unnamed.len() {
+                1 => create_branch_one_field(
+                    &enum_ident,
+                    &self_params,
+                    &variant.ident,
+                    &handler.func,
+                ),
+                len => {
+                    return Err(syn::Error::new(
+                        fields.span(),
+                        format!("Expected 1 field, found {}", len),
+                    ));
+                }
+            },
+            Fields::Unit => create_branch_no_fields(
+                &enum_ident,
+                &self_params,
+                &variant.ident,
+                &handler.func,
+            ),
+        });
+    }
+
+    Ok(quote! {const _: () = {
+        fn assert_clone<T: Clone>() {}
+
+        use teloxide::dptree;
+        use teloxide::dispatching2::dialogue::Dialogue;
+
+        impl #self_params_with_bounds teloxide::dispatching2::HandlerFactory for #enum_ident #self_params #where_clause {
+        type Out = #out;
+
+        fn handler() -> dptree::Handler<'static, dptree::di::DependencyMap, Self::Out> {
+            assert_clone::<#enum_ident #self_params>();
+
+            dptree::entry()
+                #branches
+        }
+    }
+    };})
+}
+
+fn create_branch_no_fields(
+    state: &Ident,
+    state_generics: impl ToTokens,
+    kind: &Ident,
+    handler: &Path,
+) -> TokenStream {
+    quote! {
+        .branch(
+            dptree::filter(|state: #state #state_generics| async move {
+                match state { #state::#kind => true, _ => false }
+            }).endpoint(#handler)
+        )
+    }
+}
+
+fn create_branch_one_field(
+    state: &Ident,
+    state_generics: impl ToTokens,
+    kind: &Ident,
+    handler: &Path,
+) -> TokenStream {
+    quote! {
+        .branch(
+            dptree::filter_map(|state: #state #state_generics| async move {
+                match state { #state::#kind(arg) => Some(arg), _ => None }
+            }).endpoint(#handler)
+        )
+    }
+}
+
+fn parse_out_type(
+    span: Span,
+    attrs: &[syn::Attribute],
+) -> Result<Type, syn::Error> {
+    let mut out = None;
+    for x in attrs {
+        if x.path.is_ident("out") {
+            out = Some(x.parse_args::<Type>()?);
+        }
+    }
+    if let Some(out) = out {
+        return Ok(out);
+    }
+    Err(syn::Error::new(
+        span,
+        "There are must be 2 attributes: `out` and `store`",
+    ))
+}
+
+pub struct HandlerAttr {
+    func: Path,
+}
+
+impl Parse for HandlerAttr {
+    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
+        Ok(Self { func: input.parse::<Path>()? })
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 5744c436..02576212 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,6 +3,7 @@
 mod attr;
 mod command;
 mod command_enum;
+mod dialogue_state;
 mod fields_parse;
 mod rename_rules;
 
@@ -24,6 +25,18 @@ use syn::{
 
 use std::fmt::Write;
 
+#[proc_macro_derive(DialogueState, attributes(handler, out, store))]
+pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
+    let input = parse_macro_input!(item as ItemEnum);
+    match dialogue_state::expand(input) {
+        Ok(s) => {
+            let s = s.into();
+            s
+        }
+        Err(e) => e.into_compile_error().into(),
+    }
+}
+
 /// The docs is below.
 ///
 /// The only accepted form at the current moment is `#[teloxide(subtransition)]`

From 8a022edfb556b31b9512eeadcc9ce899c5dbd0ed Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Wed, 29 Dec 2021 14:33:46 +0200
Subject: [PATCH 430/755] fix error message

---
 src/dialogue_state.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index fc2ff643..00440e03 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -157,7 +157,8 @@ fn parse_out_type(
     }
     Err(syn::Error::new(
         span,
-        "There are must be 2 attributes: `out` and `store`",
+        "You must specify #[out()] argument in which declare output type of \
+         handlers. For example, #[out(Result<(), Error>)]",
     ))
 }
 

From 648b5b7377066e433f6c41379e2af45d7825e12c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Dec 2021 18:06:28 +0300
Subject: [PATCH 431/755] Make `UpdateKind` deserialization fault tolerant

---
 src/types/update.rs | 248 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 205 insertions(+), 43 deletions(-)

diff --git a/src/types/update.rs b/src/types/update.rs
index bfaa7aed..22969b77 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -1,12 +1,11 @@
 #![allow(clippy::large_enum_variant)]
-
-use serde::{Deserialize, Serialize};
+use serde::{de::MapAccess, Deserialize, Serialize, Serializer};
+use serde_json::Value;
 
 use crate::types::{
     CallbackQuery, Chat, ChatJoinRequest, ChatMemberUpdated, ChosenInlineResult, InlineQuery,
     Message, Poll, PollAnswer, PreCheckoutQuery, ShippingQuery, User,
 };
-use serde_json::Value;
 
 /// This [object] represents an incoming update.
 ///
@@ -30,28 +29,33 @@ pub struct Update {
 }
 
 impl Update {
-    /// Tries to parse `value` into `Update`, logging an error on failure.
-    ///
-    /// It is used to implement update listeners.
-    pub fn try_parse(value: &Value) -> Result<Self, serde_json::Error> {
-        match serde_json::from_value(value.clone()) {
-            Ok(update) => Ok(update),
-            Err(error) => {
-                log::error!(
-                    "Cannot parse an update.\nError: {:?}\nValue: {}\n\
-                    This is a bug in teloxide-core, please open an issue here: \
-                    https://github.com/teloxide/teloxide-core/issues.",
-                    error,
-                    value
-                );
-                Err(error)
-            }
+    pub fn user(&self) -> Option<&User> {
+        match &self.kind {
+            UpdateKind::Message(m) => m.from(),
+            UpdateKind::EditedMessage(m) => m.from(),
+            UpdateKind::CallbackQuery(query) => Some(&query.from),
+            UpdateKind::ChosenInlineResult(chosen) => Some(&chosen.from),
+            UpdateKind::InlineQuery(query) => Some(&query.from),
+            UpdateKind::ShippingQuery(query) => Some(&query.from),
+            UpdateKind::PreCheckoutQuery(query) => Some(&query.from),
+            UpdateKind::PollAnswer(answer) => Some(&answer.user),
+            _ => None,
+        }
+    }
+
+    pub fn chat(&self) -> Option<&Chat> {
+        match &self.kind {
+            UpdateKind::Message(m) => Some(&m.chat),
+            UpdateKind::EditedMessage(m) => Some(&m.chat),
+            UpdateKind::ChannelPost(p) => Some(&p.chat),
+            UpdateKind::EditedChannelPost(p) => Some(&p.chat),
+            UpdateKind::CallbackQuery(q) => Some(&q.message.as_ref()?.chat),
+            _ => None,
         }
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
+#[derive(Clone, Debug, PartialEq)]
 pub enum UpdateKind {
     /// New incoming message of any kind — text, photo, sticker, etc.
     Message(Message),
@@ -113,31 +117,173 @@ pub enum UpdateKind {
     /// can_invite_users administrator right in the chat to receive these
     /// updates.
     ChatJoinRequest(ChatJoinRequest),
+
+    /// An error that happened during deserialization.
+    ///
+    /// This allows `teloxide` to continue working even if telegram adds a new
+    /// kind of updates.
+    Error(Value),
 }
 
-impl Update {
-    pub fn user(&self) -> Option<&User> {
-        match &self.kind {
-            UpdateKind::Message(m) => m.from(),
-            UpdateKind::EditedMessage(m) => m.from(),
-            UpdateKind::CallbackQuery(query) => Some(&query.from),
-            UpdateKind::ChosenInlineResult(chosen) => Some(&chosen.from),
-            UpdateKind::InlineQuery(query) => Some(&query.from),
-            UpdateKind::ShippingQuery(query) => Some(&query.from),
-            UpdateKind::PreCheckoutQuery(query) => Some(&query.from),
-            UpdateKind::PollAnswer(answer) => Some(&answer.user),
-            _ => None,
-        }
-    }
+impl<'de> Deserialize<'de> for UpdateKind {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct Visitor;
 
-    pub fn chat(&self) -> Option<&Chat> {
-        match &self.kind {
-            UpdateKind::Message(m) => Some(&m.chat),
-            UpdateKind::EditedMessage(m) => Some(&m.chat),
-            UpdateKind::ChannelPost(p) => Some(&p.chat),
-            UpdateKind::EditedChannelPost(p) => Some(&p.chat),
-            UpdateKind::CallbackQuery(q) => Some(&q.message.as_ref()?.chat),
-            _ => None,
+        impl<'de> serde::de::Visitor<'de> for Visitor {
+            type Value = UpdateKind;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                formatter.write_str("a map")
+            }
+
+            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+            where
+                A: MapAccess<'de>,
+            {
+                let mut tmp = None;
+
+                // Try to deserialize a borrowed-str key, or else try deserializing an owned
+                // string key
+                let k = map.next_key::<&str>().or_else(|_| {
+                    map.next_key::<String>().map(|k| {
+                        tmp = k;
+                        tmp.as_deref()
+                    })
+                });
+
+                if let Ok(Some(k)) = k {
+                    let res = match k {
+                        "message" => dbg!(map
+                            .next_value::<Message>()
+                            .map(UpdateKind::Message)
+                            .map_err(|_| false)),
+                        "edited_message" => map
+                            .next_value::<Message>()
+                            .map(UpdateKind::EditedMessage)
+                            .map_err(|_| false),
+                        "channel_post" => map
+                            .next_value::<Message>()
+                            .map(UpdateKind::ChannelPost)
+                            .map_err(|_| false),
+                        "edited_channel_post" => map
+                            .next_value::<Message>()
+                            .map(UpdateKind::EditedChannelPost)
+                            .map_err(|_| false),
+                        "inline_query" => map
+                            .next_value::<InlineQuery>()
+                            .map(UpdateKind::InlineQuery)
+                            .map_err(|_| false),
+                        "chosen_inline_result" => map
+                            .next_value::<ChosenInlineResult>()
+                            .map(UpdateKind::ChosenInlineResult)
+                            .map_err(|_| false),
+                        "callback_query" => map
+                            .next_value::<CallbackQuery>()
+                            .map(UpdateKind::CallbackQuery)
+                            .map_err(|_| false),
+                        "shipping_query" => map
+                            .next_value::<ShippingQuery>()
+                            .map(UpdateKind::ShippingQuery)
+                            .map_err(|_| false),
+                        "pre_checkout_query" => map
+                            .next_value::<PreCheckoutQuery>()
+                            .map(UpdateKind::PreCheckoutQuery)
+                            .map_err(|_| false),
+                        "poll" => map
+                            .next_value::<Poll>()
+                            .map(UpdateKind::Poll)
+                            .map_err(|_| false),
+                        "poll_answer" => map
+                            .next_value::<PollAnswer>()
+                            .map(UpdateKind::PollAnswer)
+                            .map_err(|_| false),
+                        "my_chat_member" => map
+                            .next_value::<ChatMemberUpdated>()
+                            .map(UpdateKind::MyChatMember)
+                            .map_err(|_| false),
+                        "chat_member" => map
+                            .next_value::<ChatMemberUpdated>()
+                            .map(UpdateKind::ChatMember)
+                            .map_err(|_| false),
+                        "chat_join_request" => map
+                            .next_value::<ChatJoinRequest>()
+                            .map(UpdateKind::ChatJoinRequest)
+                            .map_err(|_| false),
+
+                        _ => Err(true),
+                    };
+
+                    let value_available = match res {
+                        Ok(ok) => return Ok(ok),
+                        Err(e) => e,
+                    };
+
+                    let mut value = serde_json::Map::new();
+                    value.insert(
+                        k.to_owned(),
+                        if value_available {
+                            map.next_value::<Value>().unwrap_or(Value::Null)
+                        } else {
+                            Value::Null
+                        },
+                    );
+
+                    while let Ok(Some((k, v))) = map.next_entry::<_, Value>() {
+                        value.insert(k, v);
+                    }
+
+                    return Ok(UpdateKind::Error(Value::Object(value)));
+                }
+
+                Ok(UpdateKind::Error(Value::Object(<_>::default())))
+            }
+        }
+
+        deserializer.deserialize_any(Visitor)
+    }
+}
+
+impl Serialize for UpdateKind {
+    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let name = "UpdateKind";
+        match self {
+            UpdateKind::Message(v) => s.serialize_newtype_variant(name, 0, "message", v),
+            UpdateKind::EditedMessage(v) => {
+                s.serialize_newtype_variant(name, 1, "edited_message", v)
+            }
+            UpdateKind::ChannelPost(v) => s.serialize_newtype_variant(name, 2, "channel_post", v),
+            UpdateKind::EditedChannelPost(v) => {
+                s.serialize_newtype_variant(name, 3, "edited_channel_post", v)
+            }
+            UpdateKind::InlineQuery(v) => s.serialize_newtype_variant(name, 4, "inline_query", v),
+            UpdateKind::ChosenInlineResult(v) => {
+                s.serialize_newtype_variant(name, 5, "chosen_inline_result", v)
+            }
+            UpdateKind::CallbackQuery(v) => {
+                s.serialize_newtype_variant(name, 6, "callback_query", v)
+            }
+            UpdateKind::ShippingQuery(v) => {
+                s.serialize_newtype_variant(name, 7, "shipping_query", v)
+            }
+            UpdateKind::PreCheckoutQuery(v) => {
+                s.serialize_newtype_variant(name, 8, "pre_checkout_query", v)
+            }
+            UpdateKind::Poll(v) => s.serialize_newtype_variant(name, 9, "poll", v),
+            UpdateKind::PollAnswer(v) => s.serialize_newtype_variant(name, 10, "poll_answer", v),
+            UpdateKind::MyChatMember(v) => {
+                s.serialize_newtype_variant(name, 11, "my_chat_member", v)
+            }
+            UpdateKind::ChatMember(v) => s.serialize_newtype_variant(name, 12, "chat_member", v),
+            UpdateKind::ChatJoinRequest(v) => {
+                s.serialize_newtype_variant(name, 13, "chat_join_request", v)
+            }
+            UpdateKind::Error(v) => v.serialize(s),
         }
     }
 }
@@ -330,4 +476,20 @@ mod test {
 
         serde_json::from_str::<Update>(json).unwrap();
     }
+
+    #[test]
+    fn new_update_kind_error() {
+        let json = r#"{
+            "new_update_kind": {"some_field_idk": 1},
+            "update_id": 1
+        }"#;
+
+        let Update { kind, .. } = serde_json::from_str(json).unwrap();
+
+        match kind {
+            // Deserialization failed successfully
+            UpdateKind::Error(_) => {}
+            _ => panic!("Expected error"),
+        }
+    }
 }

From 62e9e8afd445b0f062a02428744401e193083a06 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Dec 2021 20:36:08 +0300
Subject: [PATCH 432/755] Make ChatPermissions into bitflags

---
 CHANGELOG.md                  |   2 +
 Cargo.toml                    |   4 +-
 src/types/chat_permissions.rs | 252 +++++++++++++++++++++++-----------
 3 files changed, 178 insertions(+), 80 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d772e23f..fa1bb419 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,11 +43,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `InputFile` and related structures now do **not** implement `PartialEq`, `Eq` and `Hash` ([#133][pr133])
 - How forwarded messages are represented ([#151][pr151])
 - `RequestError::InvalidJson` now has a `raw` field with raw json for easier debugability ([#150][pr150])
+- `ChatPermissions` is now bitflags ([#157][pr157])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
 [pr134]: https://github.com/teloxide/teloxide-core/pull/134
 [pr150]: https://github.com/teloxide/teloxide-core/pull/150
+[pr157]: https://github.com/teloxide/teloxide-core/pull/157
 
 ### Fixed
 
diff --git a/Cargo.toml b/Cargo.toml
index ad4bb0b8..baa83bfd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,9 +42,9 @@ once_cell = "1.5.0"
 never = "0.1.0"
 chrono = { version = "0.4.19", default-features = false }
 either = "1.6.1"
+bitflags = { version = "1.2" }
 
 vecrem = { version = "0.1", optional = true }
-bitflags = { version = "1.2", optional = true }
 
 [dev-dependencies]
 pretty_env_logger = "0.4"
@@ -66,7 +66,7 @@ nightly = []
 throttle = ["vecrem"]
 
 # Trace bot adaptor
-trace_adaptor = ["bitflags"]
+trace_adaptor = []
 
 # Erased bot adaptor
 erased = []
diff --git a/src/types/chat_permissions.rs b/src/types/chat_permissions.rs
index d95b6643..fa27bffa 100644
--- a/src/types/chat_permissions.rs
+++ b/src/types/chat_permissions.rs
@@ -1,96 +1,192 @@
 use serde::{Deserialize, Serialize};
+use std::ops::Not;
 
-/// Describes actions that a non-administrator user is allowed to take in a
-/// chat.
-///
-/// [The official docs](https://core.telegram.org/bots/api#chatpermissions).
-#[serde_with_macros::skip_serializing_none]
-#[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct ChatPermissions {
-    /// `true`, if the user is allowed to send text messages, contacts,
-    /// locations and venues.
-    pub can_send_messages: Option<bool>,
+bitflags::bitflags! {
+    /// Describes actions that a non-administrator user is allowed to take in a
+    /// chat.
+    ///
+    /// [The official docs](https://core.telegram.org/bots/api#chatpermissions).
+    ///
+    /// ## Examples
+    ///
+    /// ```
+    /// use teloxide_core::types::ChatPermissions;
+    ///
+    /// // No permissions, nothing is allowed
+    /// let _ = ChatPermissions::empty();
+    ///
+    /// // All permissions, everything is allowed
+    /// let _ = ChatPermissions::all();
+    ///
+    /// // One particular permission
+    /// let permissions_v0 = ChatPermissions::INVITE_USERS;
+    ///
+    /// // Check what is permitted
+    /// assert!(permissions_v0.contains(ChatPermissions::INVITE_USERS));
+    /// assert!(!permissions_v0.contains(ChatPermissions::SEND_MESSAGES));
+    ///
+    /// // Union, add permissions
+    /// let permissions_v1 = permissions_v0 | ChatPermissions::SEND_MEDIA_MESSAGES;
+    /// assert!(permissions_v1.contains(ChatPermissions::INVITE_USERS));
+    /// assert!(permissions_v1.contains(ChatPermissions::SEND_MEDIA_MESSAGES));
+    ///
+    /// // Implied by `SEND_MEDIA_MESSAGES`
+    /// assert!(permissions_v1.contains(ChatPermissions::SEND_MESSAGES));
+    ///
+    /// // Difference, remove permissions
+    /// let permissions_v2 = permissions_v1 - ChatPermissions::SEND_MEDIA_MESSAGES;
+    /// assert!(!permissions_v2.contains(ChatPermissions::SEND_MEDIA_MESSAGES));
+    ///
+    /// // Removing `SEND_MEDIA_MESSAGES` also removes `SEND_MESSAGES` and vice versa
+    /// // because `SEND_MESSAGES` is implied by `SEND_MEDIA_MESSAGES`
+    /// assert!(!permissions_v2.contains(ChatPermissions::SEND_MESSAGES));
+    ///
+    /// let permissions_v3 = permissions_v1 - ChatPermissions::SEND_MESSAGES;
+    /// assert!(!permissions_v3.contains(ChatPermissions::SEND_MEDIA_MESSAGES));
+    /// ```
+    #[derive(Serialize, Deserialize)]
+    #[serde(from = "ChatPermissionsRaw", into = "ChatPermissionsRaw")]
+    pub struct ChatPermissions: u8 {
+        /// Set if the user is allowed to send text messages, contacts,
+        /// locations and venues.
+        const SEND_MESSAGES = 1;
 
-    /// `true`, if the user is allowed to send audios, documents,
-    /// photos, videos, video notes and voice notes, implies
-    /// `can_send_messages`.
-    pub can_send_media_messages: Option<bool>,
+        /// Set if the user is allowed to send audios, documents,
+        /// photos, videos, video notes and voice notes, implies
+        /// `SEND_MESSAGES`.
+        const SEND_MEDIA_MESSAGES = (1 << 1) | Self::SEND_MESSAGES.bits;
 
-    /// `true`, if the user is allowed to send polls, implies
-    /// `can_send_messages`.
-    pub can_send_polls: Option<bool>,
+        /// Set if the user is allowed to send polls, implies
+        /// `SEND_MESSAGES`.
+        const SEND_POLLS = (1 << 2) | Self::SEND_MESSAGES.bits;
 
-    /// `true`, if the user is allowed to send animations, games, stickers and
-    /// use inline bots, implies `can_send_media_messages`.
-    pub can_send_other_messages: Option<bool>,
+        /// Set if the user is allowed to send animations, games, stickers and
+        /// use inline bots, implies `SEND_MEDIA_MESSAGES`.
+        const SEND_OTHER_MESSAGES = (1 << 3) | Self::SEND_MEDIA_MESSAGES.bits;
 
-    /// `true`, if the user is allowed to add web page previews to
-    /// their messages, implies `can_send_media_messages`.
-    pub can_add_web_page_previews: Option<bool>,
+        /// Set if the user is allowed to add web page previews to
+        /// their messages, implies `SEND_MEDIA_MESSAGES`.
+        const ADD_WEB_PAGE_PREVIEWS = (1 << 4) | Self::SEND_MEDIA_MESSAGES.bits;
 
-    /// `true`, if the user is allowed to change the chat title, photo and
-    /// other settings. Ignored in public supergroups.
-    pub can_change_info: Option<bool>,
+        /// Set if the user is allowed to change the chat title, photo and
+        /// other settings. Ignored in public supergroups.
+        const CHANGE_INFO = (1 << 5);
 
-    /// `true`, if the user is allowed to invite new users to the chat.
-    pub can_invite_users: Option<bool>,
+        /// Set if the user is allowed to invite new users to the chat.
+        const INVITE_USERS = (1 << 6);
 
-    /// `true`, if the user is allowed to pin messages. Ignored in public
-    /// supergroups.
-    pub can_pin_messages: Option<bool>,
+        /// Set if the user is allowed to pin messages. Ignored in public
+        /// supergroups.
+        const PIN_MESSAGES = (1 << 7);
+    }
 }
 
-impl ChatPermissions {
-    pub const fn new() -> Self {
-        Self {
-            can_send_messages: None,
-            can_send_media_messages: None,
-            can_send_polls: None,
-            can_send_other_messages: None,
-            can_add_web_page_previews: None,
-            can_change_info: None,
-            can_invite_users: None,
-            can_pin_messages: None,
+/// Helper for (de)serialization
+#[derive(Serialize, Deserialize)]
+struct ChatPermissionsRaw {
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_send_messages: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_send_media_messages: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_send_polls: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_send_other_messages: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_add_web_page_previews: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_change_info: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_invite_users: bool,
+
+    #[serde(default, skip_serializing_if = "Not::not")]
+    can_pin_messages: bool,
+}
+
+impl Into<ChatPermissionsRaw> for ChatPermissions {
+    fn into(self) -> ChatPermissionsRaw {
+        ChatPermissionsRaw {
+            can_send_messages: self.contains(ChatPermissions::SEND_MESSAGES),
+            can_send_media_messages: self.contains(ChatPermissions::SEND_MEDIA_MESSAGES),
+            can_send_polls: self.contains(ChatPermissions::SEND_POLLS),
+            can_send_other_messages: self.contains(ChatPermissions::SEND_OTHER_MESSAGES),
+            can_add_web_page_previews: self.contains(ChatPermissions::ADD_WEB_PAGE_PREVIEWS),
+            can_change_info: self.contains(ChatPermissions::CHANGE_INFO),
+            can_invite_users: self.contains(ChatPermissions::INVITE_USERS),
+            can_pin_messages: self.contains(ChatPermissions::PIN_MESSAGES),
         }
     }
+}
 
-    pub const fn can_send_messages(mut self, val: bool) -> Self {
-        self.can_send_messages = Some(val);
-        self
-    }
+impl From<ChatPermissionsRaw> for ChatPermissions {
+    fn from(
+        ChatPermissionsRaw {
+            can_send_messages,
+            can_send_media_messages,
+            can_send_polls,
+            can_send_other_messages,
+            can_add_web_page_previews,
+            can_change_info,
+            can_invite_users,
+            can_pin_messages,
+        }: ChatPermissionsRaw,
+    ) -> Self {
+        let mut this = Self::empty();
 
-    pub const fn can_send_media_messages(mut self, val: bool) -> Self {
-        self.can_send_media_messages = Some(val);
-        self
-    }
+        if can_send_messages {
+            this |= Self::SEND_MESSAGES;
+        }
+        if can_send_media_messages {
+            this |= Self::SEND_MEDIA_MESSAGES
+        }
+        if can_send_polls {
+            this |= Self::SEND_POLLS;
+        }
+        if can_send_other_messages {
+            this |= Self::SEND_OTHER_MESSAGES;
+        }
+        if can_add_web_page_previews {
+            this |= Self::ADD_WEB_PAGE_PREVIEWS;
+        }
+        if can_change_info {
+            this |= Self::CHANGE_INFO;
+        }
+        if can_invite_users {
+            this |= Self::INVITE_USERS;
+        }
+        if can_pin_messages {
+            this |= Self::PIN_MESSAGES;
+        }
 
-    pub const fn can_send_polls(mut self, val: bool) -> Self {
-        self.can_send_polls = Some(val);
-        self
-    }
-
-    pub const fn can_send_other_messages(mut self, val: bool) -> Self {
-        self.can_send_other_messages = Some(val);
-        self
-    }
-
-    pub const fn can_add_web_page_previews(mut self, val: bool) -> Self {
-        self.can_add_web_page_previews = Some(val);
-        self
-    }
-
-    pub const fn can_change_info(mut self, val: bool) -> Self {
-        self.can_change_info = Some(val);
-        self
-    }
-
-    pub const fn can_invite_users(mut self, val: bool) -> Self {
-        self.can_invite_users = Some(val);
-        self
-    }
-
-    pub const fn can_pin_messages(mut self, val: bool) -> Self {
-        self.can_pin_messages = Some(val);
-        self
+        this
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ChatPermissions;
+
+    #[test]
+    fn serialization() {
+        let permissions = ChatPermissions::SEND_MEDIA_MESSAGES | ChatPermissions::PIN_MESSAGES;
+        let expected =
+            r#"{"can_send_messages":true,"can_send_media_messages":true,"can_pin_messages":true}"#;
+        let actual = serde_json::to_string(&permissions).unwrap();
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn deserialization() {
+        let json =
+            r#"{"can_send_messages":true,"can_send_media_messages":true,"can_pin_messages":true}"#;
+        let expected = ChatPermissions::SEND_MEDIA_MESSAGES | ChatPermissions::PIN_MESSAGES;
+        let actual = serde_json::from_str(json).unwrap();
+        assert_eq!(expected, actual);
     }
 }

From 59720c1e0bf840598bd000b098c4d7435500d3a2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Dec 2021 18:34:06 +0300
Subject: [PATCH 433/755] Remove `get_updates_fault_tolerant` and
 `SemiparsedVec`

---
 src/adaptors/auto_send.rs                     |  3 +-
 src/adaptors/cache_me.rs                      |  3 +-
 src/adaptors/erased.rs                        |  9 +--
 src/adaptors/parse_mode.rs                    |  3 +-
 src/adaptors/throttle.rs                      |  2 +-
 src/adaptors/trace.rs                         |  3 +-
 src/bot/api.rs                                |  9 ---
 src/local_macros.rs                           |  9 ---
 src/payloads.rs                               |  4 --
 src/payloads/get_updates_fault_tolerant.rs    | 18 ------
 src/requests/requester.rs                     | 11 +---
 src/types.rs                                  |  3 +-
 .../non_telegram_types/semiparsed_vec.rs      | 55 -------------------
 13 files changed, 9 insertions(+), 123 deletions(-)
 delete mode 100644 src/payloads/get_updates_fault_tolerant.rs
 delete mode 100644 src/types/non_telegram_types/semiparsed_vec.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index c496d899..b1312b95 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -106,8 +106,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => f, fty
+        approve_chat_join_request, decline_chat_join_request => f, fty
     }
 }
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 99f8c5d5..65fd207e 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -113,8 +113,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => f, fty
+        approve_chat_join_request, decline_chat_join_request => f, fty
     }
 }
 
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 585f199e..65f89f2f 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -182,8 +182,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => fwd_erased, fty
+        approve_chat_join_request, decline_chat_join_request => fwd_erased, fty
     }
 }
 
@@ -692,8 +691,6 @@ trait ErasableRequester<'a> {
         user_id: i64,
         target: TargetMessage,
     ) -> ErasedRequest<'a, GetGameHighScores, Self::Err>;
-
-    fn get_updates_fault_tolerant(&self) -> ErasedRequest<'a, GetUpdatesFaultTolerant, Self::Err>;
 }
 
 impl<'a, B> ErasableRequester<'a> for B
@@ -1401,8 +1398,4 @@ where
     ) -> ErasedRequest<'a, GetGameHighScores, Self::Err> {
         Requester::get_game_high_scores(self, user_id, target).erase()
     }
-
-    fn get_updates_fault_tolerant(&self) -> ErasedRequest<'a, GetUpdatesFaultTolerant, Self::Err> {
-        Requester::get_updates_fault_tolerant(self).erase()
-    }
 }
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index c347c428..2433765e 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -117,8 +117,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => fid, fty
+        approve_chat_join_request, decline_chat_join_request => fid, fty
     }
 }
 
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 291e389a..3e8ef88b 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -621,7 +621,7 @@ where
         set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
         set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
         approve_chat_join_request, decline_chat_join_request,
-        get_game_high_scores, get_updates_fault_tolerant => fid, ftyid
+        get_game_high_scores => fid, ftyid
     }
 }
 
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 6139070c..eedeea3f 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -138,8 +138,7 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => fwd_inner, fty
+        approve_chat_join_request, decline_chat_join_request => fwd_inner, fty
     }
 }
 
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 750a8f1a..580fc0db 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1106,13 +1106,4 @@ impl Requester for Bot {
     {
         Self::UnpinAllChatMessages::new(self.clone(), payloads::UnpinAllChatMessages::new(chat_id))
     }
-
-    type GetUpdatesFaultTolerant = JsonRequest<payloads::GetUpdatesFaultTolerant>;
-
-    fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant {
-        Self::GetUpdatesFaultTolerant::new(
-            self.clone(),
-            payloads::GetUpdatesFaultTolerant(payloads::GetUpdates::new()),
-        )
-    }
 }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 626789de..dd26e196 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1195,13 +1195,4 @@ macro_rules! requester_forward {
             $body!(get_game_high_scores this (user_id: i64, target: T))
         }
     };
-    (@method get_updates_fault_tolerant $body:ident $ty:ident) => {
-        type GetUpdatesFaultTolerant = $ty![GetUpdatesFaultTolerant];
-
-        fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant {
-            let this = self;
-            $body!(get_updates_fault_tolerant this ())
-        }
-    };
-
 }
diff --git a/src/payloads.rs b/src/payloads.rs
index d069ce5f..5e8d33cb 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -213,7 +213,3 @@ pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
 
 // end of auto generated block
-
-mod get_updates_fault_tolerant;
-
-pub use get_updates_fault_tolerant::GetUpdatesFaultTolerant;
diff --git a/src/payloads/get_updates_fault_tolerant.rs b/src/payloads/get_updates_fault_tolerant.rs
deleted file mode 100644
index 1d3276e0..00000000
--- a/src/payloads/get_updates_fault_tolerant.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use serde::Serialize;
-
-use crate::{
-    payloads::GetUpdates,
-    requests::Payload,
-    types::{SemiparsedVec, Update},
-};
-
-/// The fault tolerant version of [`GetUpdates`].
-#[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
-#[serde(transparent)]
-pub struct GetUpdatesFaultTolerant(pub GetUpdates);
-
-impl Payload for GetUpdatesFaultTolerant {
-    type Output = SemiparsedVec<Update>;
-
-    const NAME: &'static str = GetUpdates::NAME;
-}
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 342e1fb4..899342ed 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -856,11 +856,6 @@ pub trait Requester {
     fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;
-
-    type GetUpdatesFaultTolerant: Request<Payload = GetUpdatesFaultTolerant, Err = Self::Err>;
-
-    /// For Telegram documentation see [`GetUpdatesFaultTolerant`].
-    fn get_updates_fault_tolerant(&self) -> Self::GetUpdatesFaultTolerant;
 }
 
 macro_rules! fty {
@@ -901,8 +896,7 @@ macro_rules! forward_all {
             set_sticker_set_thumb, send_invoice, answer_shipping_query,
             answer_pre_checkout_query, set_passport_data_errors, send_game,
             set_game_score, set_game_score_inline, get_game_high_scores,
-            approve_chat_join_request, decline_chat_join_request,
-            get_updates_fault_tolerant => fwd_deref, fty
+            approve_chat_join_request, decline_chat_join_request => fwd_deref, fty
         }
     };
 }
@@ -998,7 +992,6 @@ where
         set_sticker_set_thumb, send_invoice, answer_shipping_query,
         answer_pre_checkout_query, set_passport_data_errors, send_game,
         set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request,
-        get_updates_fault_tolerant => fwd_either, fty_either
+        approve_chat_join_request, decline_chat_join_request => fwd_either, fty_either
     }
 }
diff --git a/src/types.rs b/src/types.rs
index 06fdf594..d4ba801e 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -214,12 +214,11 @@ mod passport_data;
 mod passport_element_error;
 mod passport_file;
 
-pub use non_telegram_types::{country_code::*, currency::*, semiparsed_vec::*, until_date::*};
+pub use non_telegram_types::{country_code::*, currency::*, until_date::*};
 mod non_telegram_types {
     pub(super) mod country_code;
     pub(super) mod currency;
     pub(crate) mod mime;
-    pub(super) mod semiparsed_vec;
     pub(super) mod until_date;
 }
 
diff --git a/src/types/non_telegram_types/semiparsed_vec.rs b/src/types/non_telegram_types/semiparsed_vec.rs
deleted file mode 100644
index 6d2e5916..00000000
--- a/src/types/non_telegram_types/semiparsed_vec.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use serde::de::DeserializeOwned;
-use serde_json::{from_value, Value};
-
-/// A vector of possibly unparsed JSON objects.
-///
-/// Similar to `Vec<T>` but if it fails to deserialize element, it just saves
-/// `Err((serde_json::Value, serde_json::Error))`.
-#[derive(Debug, serde::Deserialize)]
-#[serde(from = "Vec<serde_json::Value>")]
-#[serde(bound = "T: DeserializeOwned")]
-pub struct SemiparsedVec<T>(pub Vec<Result<T, (serde_json::Value, serde_json::Error)>>);
-
-impl<T: DeserializeOwned> From<Vec<serde_json::Value>> for SemiparsedVec<T> {
-    fn from(vec: Vec<Value>) -> Self {
-        Self(
-            vec.into_iter()
-                .map(|val| from_value(val.clone()).map_err(|e| (val, e)))
-                .collect(),
-        )
-    }
-}
-
-#[test]
-fn test() {
-    use crate::types::Update;
-
-    let x: SemiparsedVec<Update> = serde_json::from_str(
-        r#"[{
-         "update_id": 923808447,
-         "message": {
-          "message_id": 361678,
-          "from": {
-           "id": 218485655,
-           "is_bot": false,
-           "first_name": "вафель",
-           "last_name": "🧇",
-           "username": "WaffleLapkin",
-           "language_code": "en"
-          },
-          "chat": {
-           "id": 218485655,
-           "first_name": "вафель",
-           "last_name": "🧇",
-           "username": "WaffleLapkin",
-           "type": "private"
-          },
-          "date": 1595860067,
-          "text": "s"
-         }
-        }]"#,
-    )
-    .unwrap();
-
-    assert!(x.0.first().unwrap().is_ok())
-}

From 5d743f165b6ced7bc4168ea6a97f4418fc463cc0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Dec 2021 18:37:36 +0300
Subject: [PATCH 434/755] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d772e23f..755a9793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `media_group_id` field to `MediaDocument` and `MediaAudio` ([#139][pr139])
 - `caption_entities` method to `InputMediaPhoto` ([#140][pr140])
 - `User::is_anonymous` and `User::is_channel` functions ([#151][pr151])
+- `UpdateKind::Error` ([#156][pr156])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
 [pr116]: https://github.com/teloxide/teloxide-core/pull/116
@@ -29,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [pr151]: https://github.com/teloxide/teloxide-core/pull/151
 [pr155]: https://github.com/teloxide/teloxide-core/pull/155
+[pr156]: https://github.com/teloxide/teloxide-core/pull/156
 
 ### Changed
 
@@ -76,6 +78,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [issue473]: https://github.com/teloxide/teloxide/issues/473
 [issue427]: https://github.com/teloxide/teloxide/issues/427
 
+### Removed
+
+- `get_updates_fault_tolerant` method and `SemiparsedVec` ([#156][pr156])
+
 ## 0.3.3 - 2021-08-03
 
 ### Fixed

From ea67c634ade09e2d6dd1f572d4c747a37ddfb9e8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Dec 2021 23:15:38 +0300
Subject: [PATCH 435/755] Fix clippy

---
 src/types/chat_permissions.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/types/chat_permissions.rs b/src/types/chat_permissions.rs
index fa27bffa..77585d70 100644
--- a/src/types/chat_permissions.rs
+++ b/src/types/chat_permissions.rs
@@ -109,17 +109,17 @@ struct ChatPermissionsRaw {
     can_pin_messages: bool,
 }
 
-impl Into<ChatPermissionsRaw> for ChatPermissions {
-    fn into(self) -> ChatPermissionsRaw {
-        ChatPermissionsRaw {
-            can_send_messages: self.contains(ChatPermissions::SEND_MESSAGES),
-            can_send_media_messages: self.contains(ChatPermissions::SEND_MEDIA_MESSAGES),
-            can_send_polls: self.contains(ChatPermissions::SEND_POLLS),
-            can_send_other_messages: self.contains(ChatPermissions::SEND_OTHER_MESSAGES),
-            can_add_web_page_previews: self.contains(ChatPermissions::ADD_WEB_PAGE_PREVIEWS),
-            can_change_info: self.contains(ChatPermissions::CHANGE_INFO),
-            can_invite_users: self.contains(ChatPermissions::INVITE_USERS),
-            can_pin_messages: self.contains(ChatPermissions::PIN_MESSAGES),
+impl From<ChatPermissions> for ChatPermissionsRaw {
+    fn from(this: ChatPermissions) -> Self {
+        Self {
+            can_send_messages: this.contains(ChatPermissions::SEND_MESSAGES),
+            can_send_media_messages: this.contains(ChatPermissions::SEND_MEDIA_MESSAGES),
+            can_send_polls: this.contains(ChatPermissions::SEND_POLLS),
+            can_send_other_messages: this.contains(ChatPermissions::SEND_OTHER_MESSAGES),
+            can_add_web_page_previews: this.contains(ChatPermissions::ADD_WEB_PAGE_PREVIEWS),
+            can_change_info: this.contains(ChatPermissions::CHANGE_INFO),
+            can_invite_users: this.contains(ChatPermissions::INVITE_USERS),
+            can_pin_messages: this.contains(ChatPermissions::PIN_MESSAGES),
         }
     }
 }

From 19bd13207581201ef4438eb9b968f90d2192f7df Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 2 Jan 2022 02:53:34 +0600
Subject: [PATCH 436/755] Update the license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 84a1b0b0..3bc0c2bb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 teloxide
+Copyright (c) 2020-2022 teloxide
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 93690a34175253caf4f5a66640b5ee55b9c27e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=92=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2?= <aavlasov_3@miem.hse.ru>
Date: Sun, 2 Jan 2022 18:33:15 +0300
Subject: [PATCH 437/755] Fix "no `test` in `tokio`"

---
 src/serde_multipart/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index 3eae3aa9..42ffa7f7 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -31,6 +31,7 @@ pub(crate) fn to_form<T: ?Sized + Serialize>(val: &T) -> impl Future<Output = Re
 }
 
 // https://github.com/teloxide/teloxide/issues/473
+#[cfg(test)]
 #[tokio::test]
 async fn issue_473() {
     use crate::{

From db8175e9f9ed9d582a87c9e483cdb223317513ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=92=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2?= <aavlasov_3@miem.hse.ru>
Date: Sun, 2 Jan 2022 18:34:49 +0300
Subject: [PATCH 438/755] Fix deserializing Document

---
 src/types/document.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/document.rs b/src/types/document.rs
index 3ea3c861..c3b51792 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -29,7 +29,7 @@ pub struct Document {
     pub file_name: Option<String>,
 
     /// A MIME type of the file as defined by a sender.
-    #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
+    #[serde(default, with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
     /// A size of a file.

From 19bcd8a6ba01a1a55faf67e9fa85255cba96264b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=92=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2?= <aavlasov_3@miem.hse.ru>
Date: Sun, 2 Jan 2022 18:35:14 +0300
Subject: [PATCH 439/755] Remove unnecessary code

---
 src/types/message.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 95a58ea4..f486dec6 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -363,7 +363,7 @@ pub struct MediaDocument {
 
     /// For messages with a caption, special entities like usernames, URLs,
     /// bot commands, etc. that appear in the caption.
-    #[serde(default = "Vec::new")]
+    #[serde(default)]
     pub caption_entities: Vec<MessageEntity>,
 
     /// The unique identifier of a media message group this message belongs

From 4d0ed1605446af188d4d4541994de8fd695553f8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Jan 2022 19:20:56 +0300
Subject: [PATCH 440/755] Fix `doc(cfg)` implication

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

diff --git a/src/lib.rs b/src/lib.rs
index 13d8a213..dd7b59a1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -81,7 +81,7 @@
 // (see: `teloxide`). We can't use `docsrs` as it breaks tokio compilation in this case.
 #![cfg_attr(
     all(any(docsrs, dep_docsrs), feature = "nightly"),
-    feature(doc_cfg, doc_notable_trait)
+    feature(doc_cfg, doc_auto_cfg, doc_notable_trait)
 )]
 #![cfg_attr(feature = "nightly", feature(type_alias_impl_trait))]
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]

From 3047bea3ab381dcadb0a1c7761703f45acf36bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=92=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2?= <aavlasov_3@miem.hse.ru>
Date: Sun, 2 Jan 2022 19:17:32 +0300
Subject: [PATCH 441/755] Use `serde(default)` where applicable

---
 src/types.rs                  | 7 +------
 src/types/chat_invite_link.rs | 3 +--
 src/types/message.rs          | 3 +--
 src/types/poll.rs             | 3 +--
 src/types/webhook_info.rs     | 3 +--
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 06fdf594..fd8f3556 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -245,16 +245,11 @@ pub(crate) mod serde_opt_date_from_unix_timestamp {
             .map(|timestamp| DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc)))
     }
 
-    pub(crate) fn none<T>() -> Option<T> {
-        None
-    }
-
     #[test]
     fn test() {
         #[derive(Serialize, Deserialize)]
         struct Struct {
-            #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
-            #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+            #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
             date: Option<DateTime<Utc>>,
         }
 
diff --git a/src/types/chat_invite_link.rs b/src/types/chat_invite_link.rs
index 10ed8ac0..077d5d76 100644
--- a/src/types/chat_invite_link.rs
+++ b/src/types/chat_invite_link.rs
@@ -21,8 +21,7 @@ pub struct ChatInviteLink {
     pub name: Option<String>,
     /// Point in time when the link will expire or has been
     /// expired
-    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
-    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
     pub expire_date: Option<DateTime<Utc>>,
     /// Maximum number of users that can be members of the chat simultaneously
     /// after joining the chat via this invite link; 1-99999
diff --git a/src/types/message.rs b/src/types/message.rs
index f486dec6..93d44aed 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -85,8 +85,7 @@ pub struct MessageCommon {
     pub reply_to_message: Option<Box<Message>>,
 
     /// Date the message was last edited in Unix time.
-    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
-    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
     pub edit_date: Option<DateTime<Utc>>,
 
     #[serde(flatten)]
diff --git a/src/types/poll.rs b/src/types/poll.rs
index a0946ca5..4a35a7d5 100644
--- a/src/types/poll.rs
+++ b/src/types/poll.rs
@@ -51,8 +51,7 @@ pub struct Poll {
     pub open_period: Option<u16>,
 
     /// Point in time when the poll will be automatically closed.
-    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
-    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
     pub close_date: Option<DateTime<Utc>>,
 }
 
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 6a96beb1..f90e2a53 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -22,8 +22,7 @@ pub struct WebhookInfo {
 
     /// Time of the most recent error that happened when trying to
     /// deliver an update via webhook.
-    #[serde(with = "crate::types::serde_opt_date_from_unix_timestamp")]
-    #[serde(default = "crate::types::serde_opt_date_from_unix_timestamp::none")]
+    #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
     pub last_error_date: Option<DateTime<Utc>>,
 
     /// Error message in human-readable format for the most recent error that

From 7223270b327520e5948664cecaf202d7ed70ac47 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 3 Jan 2022 21:41:57 +0300
Subject: [PATCH 442/755] Add support for TBA 5.6

---
 README.md                        |  2 +-
 src/payloads/copy_message.rs     |  2 ++
 src/payloads/forward_message.rs  |  2 ++
 src/payloads/send_animation.rs   |  2 ++
 src/payloads/send_audio.rs       |  2 ++
 src/payloads/send_contact.rs     |  2 ++
 src/payloads/send_dice.rs        |  2 ++
 src/payloads/send_document.rs    |  2 ++
 src/payloads/send_game.rs        |  2 ++
 src/payloads/send_invoice.rs     |  2 ++
 src/payloads/send_location.rs    |  2 ++
 src/payloads/send_media_group.rs |  2 ++
 src/payloads/send_message.rs     |  2 ++
 src/payloads/send_photo.rs       |  2 ++
 src/payloads/send_poll.rs        |  2 ++
 src/payloads/send_sticker.rs     |  2 ++
 src/payloads/send_venue.rs       |  2 ++
 src/payloads/send_video.rs       |  2 ++
 src/payloads/send_video_note.rs  |  2 ++
 src/types/message_entity.rs      |  1 +
 src/types/parse_mode.rs          | 23 ++++++++++++++++-------
 21 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 186621c4..02d3faef 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.3%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.6%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index b003fcf8..6eec57d5 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -37,6 +37,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 2ccad51e..9c34f0b7 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -29,6 +29,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
         }
     }
 }
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 6e05aa5b..e5c69e98 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -48,6 +48,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 2097ccd3..61dd6c01 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -51,6 +51,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 01852e8f..ab530447 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -35,6 +35,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index fc19d585..426154ac 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -27,6 +27,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 3ca72ba4..71f5103a 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -44,6 +44,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index eaa8e9e9..8d30f29c 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -27,6 +27,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 3ffe3b93..503ddfb6 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -72,6 +72,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 96c7e4c4..ba482dc2 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -39,6 +39,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 66d9f619..95fd7886 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -27,6 +27,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index e3ff3dab..e27ddfc1 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -35,6 +35,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index a5dffae2..d54e912d 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -38,6 +38,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 88ecf6a8..52d19938 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -53,6 +53,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 357e10c3..a66f4ba2 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -30,6 +30,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index b3181b78..78a901a2 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -43,6 +43,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index c815e255..0dae2154 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -51,6 +51,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 417bc1ac..a8c69ce7 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -39,6 +39,8 @@ impl_payload! {
             ///
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
+            /// Protects the contents of sent messages from forwarding and saving
+            pub protect_content: bool,
             /// If the message is a reply, ID of the original message
             pub reply_to_message_id: i32,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index cd8b6278..7fe19381 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -64,6 +64,7 @@ pub enum MessageEntityKind {
     TextMention { user: User },
     Underline,
     Strikethrough,
+    Spoiler,
 }
 
 #[cfg(test)]
diff --git a/src/types/parse_mode.rs b/src/types/parse_mode.rs
index 88a42c48..edd652fe 100644
--- a/src/types/parse_mode.rs
+++ b/src/types/parse_mode.rs
@@ -12,13 +12,20 @@ use serde::{Deserialize, Serialize};
 /// Formatting options.
 ///
 /// The Bot API supports basic formatting for messages. You can use bold,
-/// italic, underlined and strikethrough text, as well as inline links and
-/// pre-formatted code in your bots' messages. Telegram clients will render
+/// italic, underlined, strikethrough, and spoiler text, as well as inline links
+/// and pre-formatted code in your bots' messages. Telegram clients will render
 /// them accordingly. You can use either markdown-style or HTML-style
 /// formatting.
 ///
 /// Note that Telegram clients will display an **alert** to the user before
-/// opening an inline link (‘Open this link?’ together with the full URL).
+/// opening an inline link ('Open this link?' together with the full URL).
+///
+/// Message entities can be nested, providing following restrictions are met:
+/// - If two entities have common characters then one of them is fully contained
+///   inside another.
+/// - bold, italic, underline, strikethrough, and spoiler entities can contain
+///   and can be part of any other entities, except pre and code.
+/// - All other entities can't contain each other.
 ///
 /// Links `tg://user?id=<user_id>` can be used to mention a user by their ID
 /// without using a username. Please note:
@@ -39,7 +46,8 @@ use serde::{Deserialize, Serialize};
 /// _italic \*text_
 /// __underline__
 /// ~strikethrough~
-/// *bold _italic bold ~italic bold strikethrough~ __underline italic bold___ bold*
+/// ||spoiler||
+/// *bold _italic bold ~italic bold strikethrough ||italic bold strikethrough spoiler||~ __underline italic bold___ bold*
 /// [inline URL](http://www.example.com/)
 /// [inline mention of a user](tg://user?id=123456789)
 /// `inline fixed-width code`
@@ -77,9 +85,10 @@ use serde::{Deserialize, Serialize};
 /// <i>italic</i>, <em>italic</em>
 /// <u>underline</u>, <ins>underline</ins>
 /// <s>strikethrough</s>, <strike>strikethrough</strike>, <del>strikethrough</del>
-/// <b>bold <i>italic bold <s>italic bold strikethrough</s> <u>underline italic bold</u></i> bold</b>
-/// <a href="http:// www.example.com/">inline URL</a>
-/// <a href="tg:// user?id=123456789">inline mention of a user</a>
+/// <span class="tg-spoiler">spoiler</span>, <tg-spoiler>spoiler</tg-spoiler>
+/// <b>bold <i>italic bold <s>italic bold strikethrough <span class="tg-spoiler">italic bold strikethrough spoiler</span></s> <u>underline italic bold</u></i> bold</b>
+/// <a href="http://www.example.com/">inline URL</a>
+/// <a href="tg://user?id=123456789">inline mention of a user</a>
 /// <code>inline fixed-width code</code>
 /// <pre>pre-formatted fixed-width code block</pre>
 #[doc = "<pre><code class=\"language-rust\">pre-formatted fixed-width code block written in the \

From 1d0ff0a0f6258ed4f4718e29d2d8b43572e6fd11 Mon Sep 17 00:00:00 2001
From: zggff <gigamaximwachau@gmail.com>
Date: Tue, 4 Jan 2022 23:21:48 +0300
Subject: [PATCH 443/755] make OrderInfo use Option<String> instead of String

---
 src/types/order_info.rs         | 8 ++++----
 src/types/pre_checkout_query.rs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/types/order_info.rs b/src/types/order_info.rs
index e5b35bbc..8353cc6c 100644
--- a/src/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -8,14 +8,14 @@ use crate::types::ShippingAddress;
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct OrderInfo {
     /// User's name.
-    pub name: String,
+    pub name: Option<String>,
 
     /// User's phone number.
-    pub phone_number: String,
+    pub phone_number: Option<String>,
 
     /// User's email.
-    pub email: String,
+    pub email: Option<String>,
 
     /// User's shipping address.
-    pub shipping_address: ShippingAddress,
+    pub shipping_address: Option<ShippingAddress>,
 }
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
index 172e5e8f..6038c514 100644
--- a/src/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -35,5 +35,5 @@ pub struct PreCheckoutQuery {
     pub shipping_option_id: Option<String>,
 
     /// Order info provided by the user.
-    pub order_info: Option<OrderInfo>,
+    pub order_info: OrderInfo,
 }

From 25090dc72c77a4b89a922e45dd7eb389876cbd5e Mon Sep 17 00:00:00 2001
From: zggff <gigamaximwachau@gmail.com>
Date: Wed, 5 Jan 2022 00:54:45 +0300
Subject: [PATCH 444/755] make successful payment use OrderInfo; derive Default
 on OrderInfo

---
 src/types/order_info.rs         | 2 +-
 src/types/pre_checkout_query.rs | 1 +
 src/types/successful_payment.rs | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/types/order_info.rs b/src/types/order_info.rs
index 8353cc6c..a512b7ac 100644
--- a/src/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -5,7 +5,7 @@ use crate::types::ShippingAddress;
 /// This object represents information about an order.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#orderinfo).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
 pub struct OrderInfo {
     /// User's name.
     pub name: Option<String>,
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
index 6038c514..75fb909c 100644
--- a/src/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -35,5 +35,6 @@ pub struct PreCheckoutQuery {
     pub shipping_option_id: Option<String>,
 
     /// Order info provided by the user.
+    #[serde(default)]
     pub order_info: OrderInfo,
 }
diff --git a/src/types/successful_payment.rs b/src/types/successful_payment.rs
index d38a36b5..270768c4 100644
--- a/src/types/successful_payment.rs
+++ b/src/types/successful_payment.rs
@@ -29,7 +29,8 @@ pub struct SuccessfulPayment {
     pub shipping_option_id: Option<String>,
 
     /// Order info provided by the user.
-    pub order_info: Option<OrderInfo>,
+    #[serde(default)]
+    pub order_info: OrderInfo,
 
     /// Telegram payment identifier.
     pub telegram_payment_charge_id: String,

From b72df9b657ef51e70f56d53f45ddb42c5374fbaf Mon Sep 17 00:00:00 2001
From: zggff <gigamaximwachau@gmail.com>
Date: Wed, 5 Jan 2022 00:54:45 +0300
Subject: [PATCH 445/755] make successful payment use OrderInfo; derive Default
 on OrderInfo

---
 src/types/order_info.rs         | 2 +-
 src/types/pre_checkout_query.rs | 1 +
 src/types/successful_payment.rs | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/types/order_info.rs b/src/types/order_info.rs
index 8353cc6c..a512b7ac 100644
--- a/src/types/order_info.rs
+++ b/src/types/order_info.rs
@@ -5,7 +5,7 @@ use crate::types::ShippingAddress;
 /// This object represents information about an order.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#orderinfo).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Default)]
 pub struct OrderInfo {
     /// User's name.
     pub name: Option<String>,
diff --git a/src/types/pre_checkout_query.rs b/src/types/pre_checkout_query.rs
index 6038c514..75fb909c 100644
--- a/src/types/pre_checkout_query.rs
+++ b/src/types/pre_checkout_query.rs
@@ -35,5 +35,6 @@ pub struct PreCheckoutQuery {
     pub shipping_option_id: Option<String>,
 
     /// Order info provided by the user.
+    #[serde(default)]
     pub order_info: OrderInfo,
 }
diff --git a/src/types/successful_payment.rs b/src/types/successful_payment.rs
index d38a36b5..270768c4 100644
--- a/src/types/successful_payment.rs
+++ b/src/types/successful_payment.rs
@@ -29,7 +29,8 @@ pub struct SuccessfulPayment {
     pub shipping_option_id: Option<String>,
 
     /// Order info provided by the user.
-    pub order_info: Option<OrderInfo>,
+    #[serde(default)]
+    pub order_info: OrderInfo,
 
     /// Telegram payment identifier.
     pub telegram_payment_charge_id: String,

From ee959c04cf19ca04fa1a239b7921fbc3d6701987 Mon Sep 17 00:00:00 2001
From: p0lunin <dmytro.polunin@gmail.com>
Date: Thu, 6 Jan 2022 14:10:04 +0200
Subject: [PATCH 446/755] rename out -> handler_out

---
 src/dialogue_state.rs | 6 +++---
 src/lib.rs            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index 00440e03..fa74e3ae 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -148,7 +148,7 @@ fn parse_out_type(
 ) -> Result<Type, syn::Error> {
     let mut out = None;
     for x in attrs {
-        if x.path.is_ident("out") {
+        if x.path.is_ident("handler_out") {
             out = Some(x.parse_args::<Type>()?);
         }
     }
@@ -157,8 +157,8 @@ fn parse_out_type(
     }
     Err(syn::Error::new(
         span,
-        "You must specify #[out()] argument in which declare output type of \
-         handlers. For example, #[out(Result<(), Error>)]",
+        "You must specify #[handler_out()] argument in which declare output \
+         type of handlers. For example, #[handler_out(Result<(), Error>)]",
     ))
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index 02576212..88b3c819 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,7 +25,7 @@ use syn::{
 
 use std::fmt::Write;
 
-#[proc_macro_derive(DialogueState, attributes(handler, out, store))]
+#[proc_macro_derive(DialogueState, attributes(handler, handler_out, store))]
 pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     match dialogue_state::expand(input) {

From 22159867bb1f58ae9a8b19007a9fdfeb9486bd2a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 11 Jan 2022 15:38:42 +0300
Subject: [PATCH 447/755] Add `Chat::has_protected_content`

---
 CHANGELOG.md         |  3 ++-
 src/types/chat.rs    | 10 +++++++++-
 src/types/message.rs |  1 +
 src/types/update.rs  |  1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa1bb419..ce7be0c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
 - `ApiError::NotEnoughRightsToChangeChatPermissions` ([#155][pr155])
 - Support for 5.4 telegram bot API ([#133][pr133])
-- Support for 5.5 telegram bot API ([#143][pr143])
+- Support for 5.5 telegram bot API ([#143][pr143], [#164][pr164])
 - `EditedMessageIsTooLong` error ([#109][pr109])
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
 - `Limits::messages_per_min_channel` ([#121][pr121])
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr143]: https://github.com/teloxide/teloxide-core/pull/143
 [pr151]: https://github.com/teloxide/teloxide-core/pull/151
 [pr155]: https://github.com/teloxide/teloxide-core/pull/155
+[pr164]: https://github.com/teloxide/teloxide-core/pull/164
 
 ### Changed
 
diff --git a/src/types/chat.rs b/src/types/chat.rs
index e46f06ae..92a91516 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -34,6 +34,12 @@ pub struct Chat {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub message_auto_delete_time: Option<u32>,
+
+    /// `true`, if messages from the chat can't be forwarded to other chats.
+    /// Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub has_protected_content: Option<True>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -97,7 +103,7 @@ pub struct ChatPrivate {
     pub bio: Option<String>,
 
     /// `True`, if privacy settings of the other party in the private chat
-    /// allows to use tg://user?id=<user_id> links only in chats with the
+    /// allows to use `tg://user?id=<user_id>` links only in chats with the
     /// user. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
@@ -450,6 +456,7 @@ mod tests {
             photo: None,
             pinned_message: None,
             message_auto_delete_time: None,
+            has_protected_content: None,
         };
         let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
         assert_eq!(expected, actual);
@@ -471,6 +478,7 @@ mod tests {
                 photo: None,
                 pinned_message: None,
                 message_auto_delete_time: None,
+                has_protected_content: None,
             },
             from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
                 .unwrap()
diff --git a/src/types/message.rs b/src/types/message.rs
index 93d44aed..8951f1f1 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1343,6 +1343,7 @@ mod tests {
             photo: None,
             pinned_message: None,
             message_auto_delete_time: None,
+            has_protected_content: None,
         };
 
         assert!(message.from().unwrap().is_anonymous());
diff --git a/src/types/update.rs b/src/types/update.rs
index bfaa7aed..f00be127 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -198,6 +198,7 @@ mod test {
                     photo: None,
                     pinned_message: None,
                     message_auto_delete_time: None,
+                    has_protected_content: None,
                 },
                 kind: MessageKind::Common(MessageCommon {
                     from: Some(User {

From 488492e9e595f4acd9668910515316c27cce55bf Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 11 Jan 2022 16:12:02 +0300
Subject: [PATCH 448/755] Move `Chat::has_protected_content` to `ChatPublic`

---
 src/types/chat.rs    | 28 +++++++++++++++++++---------
 src/types/message.rs |  4 ++--
 src/types/update.rs  |  1 -
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index 92a91516..a3e6f3fa 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -34,12 +34,6 @@ pub struct Chat {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub message_auto_delete_time: Option<u32>,
-
-    /// `true`, if messages from the chat can't be forwarded to other chats.
-    /// Returned only in [`GetChat`].
-    ///
-    /// [`GetChat`]: crate::payloads::GetChat
-    pub has_protected_content: Option<True>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -76,6 +70,12 @@ pub struct ChatPublic {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub invite_link: Option<String>,
+
+    /// `True`, if messages from the chat can't be forwarded to other chats.
+    /// Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub has_protected_content: Option<True>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -395,6 +395,17 @@ impl Chat {
         }
     }
 
+    /// `True`, if messages from the chat can't be forwarded to other chats.
+    /// Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn has_protected_content(&self) -> Option<True> {
+        match &self.kind {
+            ChatKind::Public(this) => this.has_protected_content,
+            _ => None,
+        }
+    }
+
     /// A first name of the other party in a private chat.
     pub fn first_name(&self) -> Option<&str> {
         match &self.kind {
@@ -452,11 +463,11 @@ mod tests {
                 }),
                 description: None,
                 invite_link: None,
+                has_protected_content: None,
             }),
             photo: None,
             pinned_message: None,
             message_auto_delete_time: None,
-            has_protected_content: None,
         };
         let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
         assert_eq!(expected, actual);
@@ -473,12 +484,11 @@ mod tests {
                     first_name: Some("Anon".into()),
                     last_name: None,
                     bio: None,
-                    has_private_forwards: None
+                    has_private_forwards: None,
                 }),
                 photo: None,
                 pinned_message: None,
                 message_auto_delete_time: None,
-                has_protected_content: None,
             },
             from_str(r#"{"id":0,"type":"private","username":"username","first_name":"Anon"}"#)
                 .unwrap()
diff --git a/src/types/message.rs b/src/types/message.rs
index 8951f1f1..7405c7ad 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1339,11 +1339,11 @@ mod tests {
                 }),
                 description: None,
                 invite_link: None,
+                has_protected_content: None,
             }),
+            message_auto_delete_time: None,
             photo: None,
             pinned_message: None,
-            message_auto_delete_time: None,
-            has_protected_content: None,
         };
 
         assert!(message.from().unwrap().is_anonymous());
diff --git a/src/types/update.rs b/src/types/update.rs
index f00be127..bfaa7aed 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -198,7 +198,6 @@ mod test {
                     photo: None,
                     pinned_message: None,
                     message_auto_delete_time: None,
-                    has_protected_content: None,
                 },
                 kind: MessageKind::Common(MessageCommon {
                     from: Some(User {

From c92190e313738d586449e36345be89b913886b8e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Jan 2022 10:47:51 +0300
Subject: [PATCH 449/755] Un-seal `MultipartPayload`

---
 src/local_macros.rs               |  1 -
 src/requests/multipart_payload.rs | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index dd26e196..d7033335 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -389,7 +389,6 @@ macro_rules! impl_payload {
     };
     (@[multipart] $Method:ident req { $($reqf:ident),* } opt { $($optf:ident),*} ) => {
         impl crate::requests::MultipartPayload for $Method {}
-        impl crate::requests::multipart_payload::sealed::Sealed for $Method {}
     };
     (@[] $($ignored:tt)*) => {}
 }
diff --git a/src/requests/multipart_payload.rs b/src/requests/multipart_payload.rs
index 49c5d63d..d3b58457 100644
--- a/src/requests/multipart_payload.rs
+++ b/src/requests/multipart_payload.rs
@@ -1,19 +1,11 @@
 use crate::{payloads, requests::Payload};
 
-/// This is a future proof trait. It is `sealed` and can change at any time.
-pub trait MultipartPayload: Payload + sealed::Sealed {}
+/// Payloads that need to be sent as `multipart/form-data` because they contain
+/// files inside.
+pub trait MultipartPayload: Payload {}
 
-// HACK(waffle): Sealed trait allows us to change `MultipartPayload` without
-//               breaking changes & refactor multipart requests later.
-pub(crate) mod sealed {
-    pub trait Sealed {}
-}
-
-impl sealed::Sealed for payloads::SendMediaGroup {}
 impl MultipartPayload for payloads::SendMediaGroup {}
 
-impl sealed::Sealed for payloads::EditMessageMedia {}
 impl MultipartPayload for payloads::EditMessageMedia {}
 
-impl sealed::Sealed for payloads::EditMessageMediaInline {}
 impl MultipartPayload for payloads::EditMessageMediaInline {}

From 96266228d817181b5c0b4f4fc7db05e3f4acbabc Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Jan 2022 10:52:55 +0300
Subject: [PATCH 450/755] File refactor: InputMedia: remove
 derive(Deserialize)`, add `files`

---
 src/types/input_media.rs | 61 +++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 1cae6649..4ef04ab9 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -1,3 +1,5 @@
+use std::iter;
+
 use serde::{Deserialize, Serialize};
 
 use crate::types::{InputFile, MessageEntity, ParseMode};
@@ -5,7 +7,7 @@ use crate::types::{InputFile, MessageEntity, ParseMode};
 /// This object represents the content of a media message to be sent.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmedia).
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "snake_case")]
 pub enum InputMedia {
@@ -20,7 +22,7 @@ pub enum InputMedia {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaphoto).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct InputMediaPhoto {
     /// File to send.
     pub media: InputFile,
@@ -82,7 +84,7 @@ impl InputMediaPhoto {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediavideo).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct InputMediaVideo {
     // File to send.
     pub media: InputFile,
@@ -194,7 +196,7 @@ impl InputMediaVideo {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaanimation).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct InputMediaAnimation {
     /// File to send.
     pub media: InputFile,
@@ -296,7 +298,7 @@ impl InputMediaAnimation {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediaaudio).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct InputMediaAudio {
     /// File to send.
     pub media: InputFile,
@@ -404,7 +406,7 @@ impl InputMediaAudio {
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputmediadocument).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize)]
 pub struct InputMediaDocument {
     /// File to send.
     pub media: InputFile,
@@ -494,15 +496,34 @@ impl From<InputMedia> for InputFile {
 }
 
 impl InputMedia {
-    #[allow(dead_code)]
-    pub(crate) fn media(&self) -> &InputFile {
-        match self {
-            InputMedia::Photo(InputMediaPhoto { media, .. })
-            | InputMedia::Document(InputMediaDocument { media, .. })
-            | InputMedia::Audio(InputMediaAudio { media, .. })
-            | InputMedia::Animation(InputMediaAnimation { media, .. })
-            | InputMedia::Video(InputMediaVideo { media, .. }) => media,
-        }
+    /// Returns an iterator of all files in this input media
+    pub(crate) fn files(&self) -> impl Iterator<Item = &InputFile> {
+        use InputMedia::*;
+
+        let (media, thumb) = match self {
+            Photo(InputMediaPhoto { media, .. }) => (media, None),
+            Document(InputMediaDocument { media, thumb, .. })
+            | Audio(InputMediaAudio { media, thumb, .. })
+            | Animation(InputMediaAnimation { media, thumb, .. })
+            | Video(InputMediaVideo { media, thumb, .. }) => (media, thumb.as_ref()),
+        };
+
+        iter::once(media).chain(thumb)
+    }
+
+    /// Returns an iterator of all files in this input media
+    pub(crate) fn files_mut(&mut self) -> impl Iterator<Item = &mut InputFile> {
+        use InputMedia::*;
+
+        let (media, thumb) = match self {
+            Photo(InputMediaPhoto { media, .. }) => (media, None),
+            Document(InputMediaDocument { media, thumb, .. })
+            | Audio(InputMediaAudio { media, thumb, .. })
+            | Animation(InputMediaAnimation { media, thumb, .. })
+            | Video(InputMediaVideo { media, thumb, .. }) => (media, thumb.as_mut()),
+        };
+
+        iter::once(media).chain(thumb)
     }
 }
 
@@ -514,7 +535,7 @@ mod tests {
     fn photo_serialize() {
         let expected_json = r#"{"type":"photo","media":{"FileId":"123456"}}"#;
         let photo = InputMedia::Photo(InputMediaPhoto {
-            media: InputFile::FileId(String::from("123456")),
+            media: InputFile::file_id("123456"),
             caption: None,
             parse_mode: None,
             caption_entities: None,
@@ -528,7 +549,7 @@ mod tests {
     fn video_serialize() {
         let expected_json = r#"{"type":"video","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Video(InputMediaVideo {
-            media: InputFile::FileId(String::from("123456")),
+            media: InputFile::file_id("123456"),
             thumb: None,
             caption: None,
             parse_mode: None,
@@ -547,7 +568,7 @@ mod tests {
     fn animation_serialize() {
         let expected_json = r#"{"type":"animation","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Animation(InputMediaAnimation {
-            media: InputFile::FileId(String::from("123456")),
+            media: InputFile::file_id("123456"),
             thumb: None,
             caption: None,
             parse_mode: None,
@@ -565,7 +586,7 @@ mod tests {
     fn audio_serialize() {
         let expected_json = r#"{"type":"audio","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Audio(InputMediaAudio {
-            media: InputFile::FileId(String::from("123456")),
+            media: InputFile::file_id("123456"),
             thumb: None,
             caption: None,
             parse_mode: None,
@@ -583,7 +604,7 @@ mod tests {
     fn document_serialize() {
         let expected_json = r#"{"type":"document","media":{"FileId":"123456"}}"#;
         let video = InputMedia::Document(InputMediaDocument {
-            media: InputFile::FileId(String::from("123456")),
+            media: InputFile::file_id("123456"),
             thumb: None,
             caption: None,
             parse_mode: None,

From bed58056105105d221a54ba32eee5c2c409b0a08 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Jan 2022 11:31:55 +0300
Subject: [PATCH 451/755] File refactor: specify InputFile-ish fields for
 multipart payloads

---
 src/local_macros.rs                    | 6 +++---
 src/payloads/add_sticker_to_set.rs     | 2 +-
 src/payloads/create_new_sticker_set.rs | 2 +-
 src/payloads/send_animation.rs         | 2 +-
 src/payloads/send_audio.rs             | 2 +-
 src/payloads/send_document.rs          | 2 +-
 src/payloads/send_photo.rs             | 2 +-
 src/payloads/send_sticker.rs           | 2 +-
 src/payloads/send_video.rs             | 2 +-
 src/payloads/send_video_note.rs        | 2 +-
 src/payloads/send_voice.rs             | 2 +-
 src/payloads/set_chat_photo.rs         | 2 +-
 src/payloads/set_sticker_set_thumb.rs  | 2 +-
 src/payloads/set_webhook.rs            | 2 +-
 src/payloads/upload_sticker_file.rs    | 2 +-
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index d7033335..33c255d2 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -135,7 +135,7 @@ macro_rules! calculated_doc {
 macro_rules! impl_payload {
     (
         $(
-            @[$multipart_attr:ident]
+            @[multipart = $($multipart_attr:ident),*]
         )?
         $(
             #[ $($method_meta:tt)* ]
@@ -241,7 +241,7 @@ macro_rules! impl_payload {
 
         impl<P> $Setters for P where P: crate::requests::HasPayload<Payload = $Method> {}
 
-        impl_payload! { @[$($multipart_attr)?] $Method req { $($($fields),*)? } opt { $($($opt_fields),*)? } }
+        impl_payload! { @[$(multipart = $($multipart_attr),*)?] $Method req { $($($fields),*)? } opt { $($($opt_fields),*)? } }
     };
     (@setter_opt $Method:ident $field:ident : $FTy:ty [into]) => {
         calculated_doc! {
@@ -387,7 +387,7 @@ macro_rules! impl_payload {
     (@convert_map ($e:expr)) => {
         $e
     };
-    (@[multipart] $Method:ident req { $($reqf:ident),* } opt { $($optf:ident),*} ) => {
+    (@[multipart = $($multipart_attr:ident),*] $Method:ident req { $($reqf:ident),* } opt { $($optf:ident),*} ) => {
         impl crate::requests::MultipartPayload for $Method {}
     };
     (@[] $($ignored:tt)*) => {}
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 0d7a1c7d..0ea3907e 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{InputSticker, MaskPosition, True};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = sticker]
     /// Use this method to add a new sticker to a set created by the bot. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns _True_ on success.
     #[derive(Debug, Clone, Serialize)]
     pub AddStickerToSet (AddStickerToSetSetters) => True {
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 1bdd2b77..c3fa4abe 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{InputSticker, MaskPosition, True};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = sticker]
     /// Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\_sticker_ or _tgs\_sticker_. Returns _True_ on success.
     #[derive(Debug, Clone, Serialize)]
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index e5c69e98..8e718a8e 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = animation, thumb]
     /// Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). On success, the sent [`Message`] is returned. Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 61dd6c01..c8123ec9 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = audio, thumb]
     /// Use this method to send audio files, if you want Telegram clients to display them in the music player. Your audio must be in the .MP3 or .M4A format. On success, the sent [`Message`] is returned. Bots can currently send audio files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// For sending voice messages, use the [`SendVoice`] method instead.
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 71f5103a..7512f066 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = document, thumb]
     /// Use this method to send general files. On success, the sent [`Message`] is returned. Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index d54e912d..e3e28d5b 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = photo]
     /// Use this method to send photos. On success, the sent [`Message`] is returned.
     ///
     /// [`Message`]: crate::types::Message
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index a66f4ba2..e80d0ee3 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = sticker]
     /// Use this method to send static .WEBP or [animated] .TGS stickers. On success, the sent Message is returned.
     ///
     /// [animated]: https://telegram.org/blog/animated-stickers
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 0dae2154..75a7e652 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = video, thumb]
     /// Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send video files of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Document`]: crate::types::Document
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index a8c69ce7..54c5fd3f 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = video_note, thumb]
     /// As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [`Message`] is returned.
     ///
     /// [v.4.0]: https://core.telegram.org/bots/api#document
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 71ad7243..1d6c8035 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = voice]
     /// Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [`Audio`] or [`Document`]). On success, the sent [`Message`] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.
     ///
     /// [`Document`]: crate::types::Document
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 5733e382..d7f475eb 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{ChatId, InputFile, True};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = photo]
     /// Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
     #[derive(Debug, Clone, Serialize)]
     pub SetChatPhoto (SetChatPhotoSetters) => True {
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index 4e0021ea..022ab8e3 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{InputFile, True};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = thumb]
     /// Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns _True_ on success.
     #[derive(Debug, Clone, Serialize)]
     pub SetStickerSetThumb (SetStickerSetThumbSetters) => True {
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index bd70d444..b2ca66cf 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -12,7 +12,7 @@ use url::Url;
 use crate::types::{AllowedUpdate, InputFile, True};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = certificate]
     /// Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized [`Update`]. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
     ///
     /// If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. `https://www.example.com/<token>`. Since nobody else knows your bot's token, you can be pretty sure it's us.
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index e003bcfc..f1d190eb 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use crate::types::{File, InputFile};
 
 impl_payload! {
-    @[multipart]
+    @[multipart = png_sticker]
     /// Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success.
     #[derive(Debug, Clone, Serialize)]
     pub UploadStickerFile (UploadStickerFileSetters) => File {

From 4a047507909a4c2a260420121c6c2a2656be78b0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 12 Jan 2022 13:46:25 +0300
Subject: [PATCH 452/755] Remove stray generics

---
 src/types/inline_query_result_article.rs  | 2 +-
 src/types/inline_query_result_location.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
index f25dd1d9..2ec6daf3 100644
--- a/src/types/inline_query_result_article.rs
+++ b/src/types/inline_query_result_article.rs
@@ -104,7 +104,7 @@ impl InlineQueryResultArticle {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
index 25f64365..1ecb1dc5 100644
--- a/src/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -137,7 +137,7 @@ impl InlineQueryResultLocation {
         self
     }
 
-    pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
+    pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }

From ba2305dbe5bc0c3215a7886e1732ecf181d7438b Mon Sep 17 00:00:00 2001
From: Max Giga <gigamaximwachau@gmail.com>
Date: Wed, 12 Jan 2022 16:51:57 +0300
Subject: [PATCH 453/755] set empty url in WebhookInfo to None

---
 src/types/webhook_info.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index f90e2a53..0a59cfc6 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct WebhookInfo {
+    #[serde(deserialize_with = "empty_string_to_url")]
     /// Webhook URL, `None` if webhook is not set up.
     pub url: Option<reqwest::Url>,
 
@@ -37,3 +38,10 @@ pub struct WebhookInfo {
     /// types.
     pub allowed_updates: Option<Vec<String>>,
 }
+
+fn empty_string_to_url<'de, D>(deserializer: D) -> Result<Option<reqwest::Url>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    Ok(reqwest::Url::deserialize(deserializer).ok())
+}

From 834c54c1d6ede36f60a1f0a14d2f146c3879189a Mon Sep 17 00:00:00 2001
From: Max Giga <gigamaximwachau@gmail.com>
Date: Wed, 12 Jan 2022 19:35:07 +0300
Subject: [PATCH 454/755] refactor_serialization_deserialization_of_url

---
 src/types.rs              | 42 +++++++++++++++++++++++++++++++++++++++
 src/types/webhook_info.rs |  9 +--------
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 7c8f5a46..a970fec7 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -292,3 +292,45 @@ pub(crate) mod serde_date_from_unix_timestamp {
         ))
     }
 }
+
+pub(crate) mod option_url_from_string {
+    use reqwest::Url;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub(crate) fn serialize<S>(this: &Option<Url>, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        this.serialize(serializer)
+    }
+
+    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<Option<Url>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        Ok(reqwest::Url::deserialize(deserializer).ok())
+    }
+
+    #[test]
+    fn test() {
+        use std::str::FromStr;
+        #[derive(Serialize, Deserialize)]
+        struct Struct {
+            #[serde(with = "crate::types::option_url_from_string")]
+            url: Option<Url>,
+        }
+
+        {
+            let json = r#"{"url":""}"#;
+            let Struct { url } = serde_json::from_str(json).unwrap();
+            assert_eq!(url, None);
+
+            let json = r#"{"url":"https://github.com/token"}"#;
+            let Struct { url } = serde_json::from_str(json).unwrap();
+            assert_eq!(
+                url,
+                Some(Url::from_str("https://github.com/token").unwrap())
+            );
+        }
+    }
+}
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 0a59cfc6..151adbc7 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct WebhookInfo {
-    #[serde(deserialize_with = "empty_string_to_url")]
+    #[serde(with = "crate::types::option_url_from_string")]
     /// Webhook URL, `None` if webhook is not set up.
     pub url: Option<reqwest::Url>,
 
@@ -38,10 +38,3 @@ pub struct WebhookInfo {
     /// types.
     pub allowed_updates: Option<Vec<String>>,
 }
-
-fn empty_string_to_url<'de, D>(deserializer: D) -> Result<Option<reqwest::Url>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    Ok(reqwest::Url::deserialize(deserializer).ok())
-}

From f2d98fdb8ad8705d219ff88a654e630e35b7670e Mon Sep 17 00:00:00 2001
From: Max Giga <gigamaximwachau@gmail.com>
Date: Wed, 12 Jan 2022 19:47:35 +0300
Subject: [PATCH 455/755] fixed serialization error not returning empty string

---
 src/types.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index a970fec7..92fe7854 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -301,7 +301,10 @@ pub(crate) mod option_url_from_string {
     where
         S: Serializer,
     {
-        this.serialize(serializer)
+        match this {
+            Some(url) => url.serialize(serializer),
+            None => "".serialize(serializer),
+        }
     }
 
     pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<Option<Url>, D::Error>
@@ -322,15 +325,23 @@ pub(crate) mod option_url_from_string {
 
         {
             let json = r#"{"url":""}"#;
-            let Struct { url } = serde_json::from_str(json).unwrap();
-            assert_eq!(url, None);
+            let url: Struct = serde_json::from_str(json).unwrap();
+            assert_eq!(url.url, None);
+            assert_eq!(
+                serde_json::to_string(&url).unwrap(),
+                r#"{"url":""}"#.to_string()
+            );
 
             let json = r#"{"url":"https://github.com/token"}"#;
-            let Struct { url } = serde_json::from_str(json).unwrap();
+            let url: Struct = serde_json::from_str(json).unwrap();
             assert_eq!(
-                url,
+                url.url,
                 Some(Url::from_str("https://github.com/token").unwrap())
             );
+            assert_eq!(
+                serde_json::to_string(&url).unwrap(),
+                r#"{"url":"https://github.com/token"}"#.to_string()
+            );
         }
     }
 }

From f02ed38bb7ba5241db482692abae007b7a28afdb Mon Sep 17 00:00:00 2001
From: Giga Maxim <53095500+zggff@users.noreply.github.com>
Date: Wed, 12 Jan 2022 19:49:30 +0300
Subject: [PATCH 456/755] update comment in src/types/webhook_info.rs

Co-authored-by: Waffle Maybe <waffle.lapkin@gmail.com>
---
 src/types/webhook_info.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 151adbc7..9b52dc14 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -7,8 +7,8 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct WebhookInfo {
-    #[serde(with = "crate::types::option_url_from_string")]
     /// Webhook URL, `None` if webhook is not set up.
+    #[serde(with = "crate::types::option_url_from_string")]
     pub url: Option<reqwest::Url>,
 
     /// `true`, if a custom certificate was provided for webhook certificate

From cfb3c60a1c652d860c65d4c5ed4c25b5664865f3 Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 10:05:46 +0300
Subject: [PATCH 457/755] Apply suggestions from code review

---
 src/types.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 92fe7854..07c60a2f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -329,7 +329,7 @@ pub(crate) mod option_url_from_string {
             assert_eq!(url.url, None);
             assert_eq!(
                 serde_json::to_string(&url).unwrap(),
-                r#"{"url":""}"#.to_string()
+                json.to_owned()
             );
 
             let json = r#"{"url":"https://github.com/token"}"#;
@@ -340,7 +340,7 @@ pub(crate) mod option_url_from_string {
             );
             assert_eq!(
                 serde_json::to_string(&url).unwrap(),
-                r#"{"url":"https://github.com/token"}"#.to_string()
+                json.to_owned()
             );
         }
     }

From 7958f37c606e106e22a12cde7b344b8221021ad3 Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 10:28:33 +0300
Subject: [PATCH 458/755] Apply suggestions from code review

---
 src/types.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 07c60a2f..751b1842 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -327,10 +327,7 @@ pub(crate) mod option_url_from_string {
             let json = r#"{"url":""}"#;
             let url: Struct = serde_json::from_str(json).unwrap();
             assert_eq!(url.url, None);
-            assert_eq!(
-                serde_json::to_string(&url).unwrap(),
-                json.to_owned()
-            );
+            assert_eq!(serde_json::to_string(&url).unwrap(), json.to_owned());
 
             let json = r#"{"url":"https://github.com/token"}"#;
             let url: Struct = serde_json::from_str(json).unwrap();
@@ -338,10 +335,7 @@ pub(crate) mod option_url_from_string {
                 url.url,
                 Some(Url::from_str("https://github.com/token").unwrap())
             );
-            assert_eq!(
-                serde_json::to_string(&url).unwrap(),
-                json.to_owned()
-            );
+            assert_eq!(serde_json::to_string(&url).unwrap(), json.to_owned());
         }
     }
 }

From a84e897db9597dd8aba5c77f8056e66a6f29d053 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 15:11:50 +0300
Subject: [PATCH 459/755] Refactor multipart requests

This removes the logic in the multipart serializer that unserialized
`InputFile`s from serde. Now `InputFile`s  are serialized either as
their value (for `FileId` and `Url`) or as an `attach://<id>` string
where `<id>` is replaced with some id unique for the file. The file data
itself is acquired through `MultipartPayload` trait.

Since the `<id>` must be the same while serializing the file with serde
and while acquiring data through `MultipartPayload` trait, `InputFile`
needs to store said id. As such, `InputFile` is now a structure with
private fields and it's structure can't be observed by users. The only
things that `InputFile` provides are
- Constructors (`url`, `file_id`, `file`, `memory`)
- File name setter
- `Clone` and `Debug` implementations
---
 Cargo.toml                                  |   1 +
 src/bot.rs                                  |  32 +-
 src/local_macros.rs                         |  52 +-
 src/requests/multipart.rs                   |   4 +-
 src/requests/multipart_payload.rs           |  48 +-
 src/serde_multipart/error.rs                |  53 ++
 src/serde_multipart/mod.rs                  |  72 ++-
 src/serde_multipart/serializers.rs          | 607 +++++++-------------
 src/serde_multipart/unserializers/bytes.rs  | 145 -----
 src/serde_multipart/unserializers/string.rs |  61 --
 src/types/input_file.rs                     | 308 +++++++---
 src/types/input_media.rs                    |  12 +-
 12 files changed, 652 insertions(+), 743 deletions(-)
 create mode 100644 src/serde_multipart/error.rs
 delete mode 100644 src/serde_multipart/unserializers/bytes.rs
 delete mode 100644 src/serde_multipart/unserializers/string.rs

diff --git a/Cargo.toml b/Cargo.toml
index baa83bfd..1d22bbe2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,7 @@ derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.5.0"
+take_mut = "0.2"
 never = "0.1.0"
 chrono = { version = "0.4.19", default-features = false }
 either = "1.6.1"
diff --git a/src/bot.rs b/src/bot.rs
index a79c75a7..9e57d393 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -233,7 +233,7 @@ impl Bot {
 
     pub(crate) fn execute_multipart<P>(
         &self,
-        payload: &P,
+        payload: &mut P,
     ) -> impl Future<Output = ResponseResult<P::Output>>
     where
         P: MultipartPayload + Serialize,
@@ -247,7 +247,35 @@ impl Bot {
 
         // async move to capture client&token&api_url&params
         async move {
-            let params = params.await?;
+            let params = params?.await;
+            net::request_multipart(
+                &client,
+                token.as_ref(),
+                reqwest::Url::clone(&*api_url),
+                P::NAME,
+                params,
+            )
+            .await
+        }
+    }
+
+    pub(crate) fn execute_multipart_ref<P>(
+        &self,
+        payload: &P,
+    ) -> impl Future<Output = ResponseResult<P::Output>>
+    where
+        P: MultipartPayload + Serialize,
+        P::Output: DeserializeOwned,
+    {
+        let client = self.client.clone();
+        let token = Arc::clone(&self.token);
+        let api_url = self.api_url.clone();
+
+        let params = serde_multipart::to_form_ref(payload);
+
+        // async move to capture client&token&api_url&params
+        async move {
+            let params = params?.await;
             net::request_multipart(
                 &client,
                 token.as_ref(),
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 33c255d2..e4a786a2 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1,41 +1,3 @@
-macro_rules! forward_to_unsuported_ty {
-    (
-        supported: $supported:expr;
-        simple { $( $method:ident $arg:ty )* }
-        unit { $( $method1:ident $ty:expr )* }
-        compound {
-            $( $method2:ident $( <$T:ident: ?Sized + Serialize> )? ( $( $args:tt )* ) -> $ret:ty => $message:expr )*
-        }
-    ) => {
-        $(
-            fn $method(self, _: $arg) -> Result<Self::Ok, Self::Error> {
-                Err(Self::Error::UnsupportedType {
-                    ty: stringify!($arg),
-                    supported: $supported,
-                })
-            }
-        )+
-
-        $(
-            fn $method1(self) -> Result<Self::Ok, Self::Error> {
-                Err(Self::Error::UnsupportedType {
-                    ty: $ty,
-                    supported: $supported,
-                })
-            }
-        )+
-
-        $(
-            fn $method2 $( <$T: ?Sized + Serialize> )? (self, $( $args )*) -> Result<$ret, Self::Error> {
-                Err(Self::Error::UnsupportedType {
-                    ty: $message,
-                    supported: $supported,
-                })
-            }
-        )+
-    };
-}
-
 macro_rules! req_future {
     (
         $v2:vis def: | $( $arg:ident: $ArgTy:ty ),* $(,)? | $body:block
@@ -388,7 +350,19 @@ macro_rules! impl_payload {
         $e
     };
     (@[multipart = $($multipart_attr:ident),*] $Method:ident req { $($reqf:ident),* } opt { $($optf:ident),*} ) => {
-        impl crate::requests::MultipartPayload for $Method {}
+        impl crate::requests::MultipartPayload for $Method {
+            fn copy_files(&self, into: &mut dyn FnMut(crate::types::InputFile)) {
+                $(
+                    crate::types::InputFileLike::copy_into(&self.$multipart_attr, into);
+                )*
+            }
+
+            fn move_files(&mut self, into: &mut dyn FnMut(crate::types::InputFile)) {
+                $(
+                    crate::types::InputFileLike::move_into(&mut self.$multipart_attr, into);
+                )*
+            }
+        }
     };
     (@[] $($ignored:tt)*) => {}
 }
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 1b873e62..8ab398f7 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -90,7 +90,7 @@ where
 
 req_future! {
     def: |it: MultipartRequest<U>| {
-        it.bot.execute_multipart(&it.payload)
+        it.bot.execute_multipart(&mut {it.payload})
     }
     pub Send<U> (inner0) -> ResponseResult<U::Output>
     where
@@ -101,7 +101,7 @@ req_future! {
 
 req_future! {
     def: |it: &MultipartRequest<U>| {
-        it.bot.execute_multipart(&it.payload)
+        it.bot.execute_multipart_ref(&it.payload)
     }
     pub SendRef<U> (inner1) -> ResponseResult<U::Output>
     where
diff --git a/src/requests/multipart_payload.rs b/src/requests/multipart_payload.rs
index d3b58457..f55ee74c 100644
--- a/src/requests/multipart_payload.rs
+++ b/src/requests/multipart_payload.rs
@@ -1,11 +1,49 @@
-use crate::{payloads, requests::Payload};
+use crate::{
+    payloads,
+    requests::Payload,
+    types::{InputFile, InputFileLike, InputMedia},
+};
 
 /// Payloads that need to be sent as `multipart/form-data` because they contain
 /// files inside.
-pub trait MultipartPayload: Payload {}
+pub trait MultipartPayload: Payload {
+    fn copy_files(&self, into: &mut dyn FnMut(InputFile));
 
-impl MultipartPayload for payloads::SendMediaGroup {}
+    fn move_files(&mut self, into: &mut dyn FnMut(InputFile));
+}
 
-impl MultipartPayload for payloads::EditMessageMedia {}
+impl MultipartPayload for payloads::SendMediaGroup {
+    fn copy_files(&self, into: &mut dyn FnMut(InputFile)) {
+        self.media
+            .iter()
+            .flat_map(InputMedia::files)
+            .for_each(|f| f.copy_into(into))
+    }
 
-impl MultipartPayload for payloads::EditMessageMediaInline {}
+    fn move_files(&mut self, into: &mut dyn FnMut(InputFile)) {
+        self.media
+            .iter_mut()
+            .flat_map(InputMedia::files_mut)
+            .for_each(|f| f.move_into(into))
+    }
+}
+
+impl MultipartPayload for payloads::EditMessageMedia {
+    fn copy_files(&self, into: &mut dyn FnMut(InputFile)) {
+        self.media.files().for_each(|f| f.copy_into(into))
+    }
+
+    fn move_files(&mut self, into: &mut dyn FnMut(InputFile)) {
+        self.media.files_mut().for_each(|f| f.move_into(into))
+    }
+}
+
+impl MultipartPayload for payloads::EditMessageMediaInline {
+    fn copy_files(&self, into: &mut dyn FnMut(InputFile)) {
+        self.media.files().for_each(|f| f.copy_into(into))
+    }
+
+    fn move_files(&mut self, into: &mut dyn FnMut(InputFile)) {
+        self.media.files_mut().for_each(|f| f.move_into(into))
+    }
+}
diff --git a/src/serde_multipart/error.rs b/src/serde_multipart/error.rs
new file mode 100644
index 00000000..427f2da9
--- /dev/null
+++ b/src/serde_multipart/error.rs
@@ -0,0 +1,53 @@
+use std::fmt;
+
+use serde::ser;
+
+use crate::RequestError;
+
+#[derive(Debug, derive_more::From)]
+pub(crate) enum Error {
+    Custom(String),
+    TopLevelNotStruct,
+    Fmt(std::fmt::Error),
+    Io(std::io::Error),
+    Json(serde_json::Error),
+}
+
+impl ser::Error for Error {
+    fn custom<T>(msg: T) -> Self
+    where
+        T: fmt::Display,
+    {
+        Self::Custom(msg.to_string())
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Custom(s) => write!(f, "Custom serde error: {}", s),
+            Self::TopLevelNotStruct => write!(f, "Multipart supports only structs at top level"),
+            Self::Fmt(inner) => write!(f, "Formatting error: {}", inner),
+            Self::Io(inner) => write!(f, "Io error: {}", inner),
+            Self::Json(inner) => write!(f, "Json (de)serialization error: {}", inner),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
+
+impl From<Error> for RequestError {
+    fn from(err: Error) -> Self {
+        match err {
+            Error::Io(ioerr) => RequestError::Io(ioerr),
+
+            // This should be ok since we (hopefuly) don't write request those may trigger errors
+            // and `Error` is internal.
+            e => unreachable!(
+                "we don't create requests those fail to serialize (if you see this, open an issue \
+                 :|): {}",
+                e
+            ),
+        }
+    }
+}
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index 42ffa7f7..e4cf70a7 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -10,24 +10,74 @@
 //! This whole module is an awful hack and we'll probably stop using it in next
 //! versions (in favor of something less automatic, but more simple).
 
+mod error;
 mod serializers;
-mod unserializers;
 
 use std::future::Future;
 
 use reqwest::multipart::Form;
 use serde::Serialize;
 
-use serializers::MultipartTopLvlSerializer;
+use crate::requests::MultipartPayload;
+use error::Error;
+use serializers::MultipartSerializer;
 
-pub(crate) use serializers::Error;
-
-/// Serializes given value into [`Form`]
+/// Serializes given value into [`Form`] **taking all input files out**.
 ///
 /// [`Form`]:  reqwest::multipart::Form
-pub(crate) fn to_form<T: ?Sized + Serialize>(val: &T) -> impl Future<Output = Result<Form, Error>> {
-    let fut = val.serialize(MultipartTopLvlSerializer {});
-    async { Ok(fut?.await?) }
+pub(crate) fn to_form<T>(val: &mut T) -> Result<impl Future<Output = Form>, Error>
+where
+    T: Serialize + MultipartPayload,
+{
+    let mut form = val.serialize(MultipartSerializer::new())?;
+
+    let mut vec = Vec::with_capacity(1);
+    val.move_files(&mut |f| vec.push(f));
+    let iter = vec.into_iter();
+
+    let fut = async move {
+        for file in iter {
+            if file.needs_attach() {
+                let id = file.id().to_owned();
+                if let Some(part) = file.into_part() {
+                    form = form.part(id, part.await);
+                }
+            }
+        }
+
+        form
+    };
+
+    Ok(fut)
+}
+
+/// Serializes given value into [`Form`].
+///
+/// [`Form`]:  reqwest::multipart::Form
+pub(crate) fn to_form_ref<T: ?Sized>(val: &T) -> Result<impl Future<Output = Form>, Error>
+where
+    T: Serialize + MultipartPayload,
+{
+    let mut form = val.serialize(MultipartSerializer::new())?;
+    let mut vec = Vec::with_capacity(1);
+    val.copy_files(&mut |f| vec.push(f));
+
+    let iter = vec.into_iter();
+
+    let fut = async move {
+        for file in iter {
+            if file.needs_attach() {
+                let id = file.id().to_owned();
+                if let Some(part) = file.into_part() {
+                    form = form.part(id, part.await);
+                }
+            }
+        }
+
+        form
+    };
+
+    Ok(fut)
 }
 
 // https://github.com/teloxide/teloxide/issues/473
@@ -39,13 +89,13 @@ async fn issue_473() {
         types::{InputFile, MessageEntity, MessageEntityKind},
     };
 
-    to_form(
+    to_form_ref(
         &payloads::SendPhoto::new(0, InputFile::file_id("0")).caption_entities([MessageEntity {
             kind: MessageEntityKind::Url,
             offset: 0,
             length: 0,
         }]),
     )
-    .await
-    .unwrap();
+    .unwrap()
+    .await;
 }
diff --git a/src/serde_multipart/serializers.rs b/src/serde_multipart/serializers.rs
index 05b04d1f..cf3a4b98 100644
--- a/src/serde_multipart/serializers.rs
+++ b/src/serde_multipart/serializers.rs
@@ -1,87 +1,84 @@
-use crate::{
-    serde_multipart::unserializers::{InputFileUnserializer, StringUnserializer},
-    types::InputFile,
-    RequestError,
-};
-use futures::{
-    future::{ready, BoxFuture},
-    stream::FuturesUnordered,
-    FutureExt, StreamExt, TryStreamExt,
-};
+use crate::serde_multipart::error::Error;
+
 use reqwest::multipart::{Form, Part};
 use serde::{
-    ser,
-    ser::{Impossible, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant},
+    ser::{Impossible, SerializeMap, SerializeSeq, SerializeStruct},
     Serialize, Serializer,
 };
-use std::{fmt, fmt::Display, io};
 
-#[derive(Debug, derive_more::From)]
-pub(crate) enum Error {
-    Custom(String),
-    TopLevelNotStruct,
-    InputFileUnserializer(crate::serde_multipart::unserializers::UnserializerError),
-    Io(std::io::Error),
-    Json(serde_json::Error),
+/// The main serializer that serializes top-level and structures
+pub(super) struct MultipartSerializer(Form);
+
+/// Serializer for maps (support for `#[serde(flatten)]`)
+pub(super) struct MultipartMapSerializer {
+    form: Form,
+    key: Option<String>,
 }
 
-impl ser::Error for Error {
-    fn custom<T>(msg: T) -> Self
-    where
-        T: Display,
-    {
-        Self::Custom(msg.to_string())
+/// Serializer for single "fields" that are serialized as multipart "part"s.
+///
+/// - Integers serialized as their text decimal representation
+/// - Strings and byte slices are serialized as-is, without any changes
+/// - Structs are serialized with JSON
+/// - C-like enums are serialized as their names
+struct PartSerializer;
+
+/// Struct or Seq -> Json -> Part serializer
+struct JsonPartSerializer {
+    buf: String,
+    state: PartSerializerStructState,
+}
+
+/// State for `PartSerializerStruct`
+///
+/// Json doesn't allow trailing commas, so we need to know if we already
+/// serialized something and need to add a comma before next field
+enum PartSerializerStructState {
+    Empty,
+    Rest,
+}
+
+impl MultipartSerializer {
+    pub(super) fn new() -> Self {
+        Self(Form::new())
     }
 }
 
-impl Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Custom(s) => write!(f, "Custom serde error: {}", s),
-            Self::TopLevelNotStruct => write!(f, "Multipart supports only structs at top level"),
-            Self::InputFileUnserializer(inner) => {
-                write!(f, "Error while unserializing input file: {}", inner)
-            }
-            Self::Io(inner) => write!(f, "Io error: {}", inner),
-            Self::Json(inner) => write!(f, "Json (de)serialization error: {}", inner),
-        }
-    }
-}
-
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        None
-    }
-}
-
-impl From<Error> for RequestError {
-    fn from(err: Error) -> Self {
-        match err {
-            Error::Io(ioerr) => RequestError::Io(ioerr),
-            // this should be ok since we don't write request those may trigger errors and
-            // Error is internal.
-            e => unreachable!(
-                "we don't create requests those fail to serialize (if you see this, open an issue \
-                 :|): {}",
-                e
-            ),
-        }
-    }
-}
-
-pub(crate) struct MultipartTopLvlSerializer {}
-
-impl Serializer for MultipartTopLvlSerializer {
-    type Ok = <MultipartSerializer as SerializeStruct>::Ok;
+impl Serializer for MultipartSerializer {
+    type Ok = Form;
     type Error = Error;
+
+    // for `serde(flatten)` (e.g.: in CreateNewStickerSet)
+    type SerializeMap = MultipartMapSerializer;
+
+    // The main serializer - struct
+    type SerializeStruct = Self;
+
+    // Unimplemented
     type SerializeSeq = Impossible<Self::Ok, Self::Error>;
     type SerializeTuple = Impossible<Self::Ok, Self::Error>;
     type SerializeTupleStruct = Impossible<Self::Ok, Self::Error>;
     type SerializeTupleVariant = Impossible<Self::Ok, Self::Error>;
-    type SerializeMap = MultipartMapSerializer; // for `serde(flatten)` (e.g.: in CreateNewStickerSet)
-    type SerializeStruct = MultipartSerializer;
     type SerializeStructVariant = Impossible<Self::Ok, Self::Error>;
 
+    fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
+        Ok(MultipartMapSerializer {
+            form: Form::new(),
+            key: None,
+        })
+    }
+
+    fn serialize_struct(
+        self,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeStruct, Self::Error> {
+        Ok(self)
+    }
+
+    // Everything down below in this impl just returns
+    // `Err(Error::TopLevelNotStruct)`
+
     fn serialize_bool(self, _: bool) -> Result<Self::Ok, Self::Error> {
         Err(Error::TopLevelNotStruct)
     }
@@ -216,22 +213,6 @@ impl Serializer for MultipartTopLvlSerializer {
         Err(Error::TopLevelNotStruct)
     }
 
-    fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(MultipartMapSerializer {
-            parts: vec![],
-            files: vec![],
-            key: None,
-        })
-    }
-
-    fn serialize_struct(
-        self,
-        _: &'static str,
-        _: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        Ok(MultipartSerializer::new())
-    }
-
     fn serialize_struct_variant(
         self,
         _: &'static str,
@@ -243,22 +224,8 @@ impl Serializer for MultipartTopLvlSerializer {
     }
 }
 
-pub(crate) struct MultipartSerializer {
-    parts: Vec<(&'static str, Part)>, // TODO: Array vecs
-    files: Vec<(String, InputFile)>,
-}
-
-impl MultipartSerializer {
-    fn new() -> Self {
-        Self {
-            parts: Vec::new(),
-            files: vec![],
-        }
-    }
-}
-
 impl SerializeStruct for MultipartSerializer {
-    type Ok = BoxFuture<'static, io::Result<Form>>; // impl Future<Output = io::Result<Form>>
+    type Ok = Form;
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(
@@ -269,52 +236,29 @@ impl SerializeStruct for MultipartSerializer {
     where
         T: Serialize,
     {
-        let (part, file) = value.serialize(PartSerializer {})?;
-        self.parts.push((key, part));
-        self.files.extend(file);
+        let part = value.serialize(PartSerializer {})?;
+        take_mut::take(&mut self.0, |f| f.part(key, part));
 
         Ok(())
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let form = self
-            .parts
-            .into_iter()
-            .fold(Form::new(), |acc, (key, value)| acc.part(key, value));
-
-        if self.files.is_empty() {
-            //Ok(Either::Left(ready(Ok(form))))
-            Ok(Box::pin(ready(Ok(form))))
-        } else {
-            let fut = self
-                .files
-                .into_iter()
-                .map(|(k, f)| f.into_part().map(move |p| (k, p)))
-                .collect::<FuturesUnordered<_>>()
-                .map(Ok)
-                .try_fold(form, |acc, (k, p)| async { Ok(acc.part(k, p?)) });
-
-            //Ok(Either::Right(fut))
-            Ok(Box::pin(fut))
-        }
+        Ok(self.0)
     }
 }
 
-pub(crate) struct MultipartMapSerializer {
-    parts: Vec<(String, Part)>, // TODO: Array vecs
-    files: Vec<(String, InputFile)>,
-    key: Option<String>,
-}
-
 impl SerializeMap for MultipartMapSerializer {
-    type Ok = <MultipartSerializer as SerializeStruct>::Ok;
+    type Ok = Form;
     type Error = Error;
 
     fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
     where
         T: Serialize,
     {
-        self.key = Some(key.serialize(StringUnserializer)?);
+        if let Ok(serde_json::Value::String(s)) = serde_json::to_value(key) {
+            self.key = Some(s);
+        }
+
         Ok(())
     }
 
@@ -322,110 +266,90 @@ impl SerializeMap for MultipartMapSerializer {
     where
         T: Serialize,
     {
-        let key = self.key.take().unwrap();
+        let key = self
+            .key
+            .take()
+            .expect("Value serialized before key or key is not string");
 
-        let (part, file) = value.serialize(PartSerializer {})?;
-        self.parts.push((key, part));
-        self.files.extend(file);
+        let part = value.serialize(PartSerializer {})?;
 
+        take_mut::take(&mut self.form, |f| f.part(key, part));
         Ok(())
     }
 
     fn end(self) -> Result<Self::Ok, Self::Error> {
-        let form = self
-            .parts
-            .into_iter()
-            .fold(Form::new(), |acc, (key, value)| acc.part(key, value));
-
-        if self.files.is_empty() {
-            //Ok(Either::Left(ready(Ok(form))))
-            Ok(Box::pin(ready(Ok(form))))
-        } else {
-            let fut = self
-                .files
-                .into_iter()
-                .map(|(k, f)| f.into_part().map(move |p| (k, p)))
-                .collect::<FuturesUnordered<_>>()
-                .map(Ok)
-                .try_fold(form, |acc, (k, p)| async { Ok(acc.part(k, p?)) });
-
-            //Ok(Either::Right(fut))
-            Ok(Box::pin(fut))
-        }
+        Ok(self.form)
     }
 }
 
-struct PartSerializer {}
-
 impl Serializer for PartSerializer {
-    type Ok = (Part, Vec<(String, InputFile)>);
+    type Ok = Part;
     type Error = Error;
-    type SerializeSeq = InnerPartSerializer;
+
+    type SerializeStruct = JsonPartSerializer;
+    type SerializeSeq = JsonPartSerializer;
+
+    // Unimplemented
     type SerializeTuple = Impossible<Self::Ok, Self::Error>;
     type SerializeTupleStruct = Impossible<Self::Ok, Self::Error>;
     type SerializeTupleVariant = Impossible<Self::Ok, Self::Error>;
     type SerializeMap = Impossible<Self::Ok, Self::Error>;
-    type SerializeStruct = PartSerializerStruct;
-    type SerializeStructVariant = PartFromFile;
+    type SerializeStructVariant = Impossible<Self::Ok, Self::Error>;
 
     fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {
-        Ok((Part::text(v.to_string()), Vec::new()))
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_i8(self, _: i8) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_i16(self, _: i16) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
     fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {
-        Ok((Part::text(v.to_string()), Vec::new()))
+        Ok(Part::text(v.to_string()))
     }
 
     fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {
-        Ok((Part::text(v.to_string()), Vec::new()))
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_u8(self, _: u8) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_u16(self, _: u16) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_u32(self, _: u32) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_u64(self, _: u64) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_f32(self, _: f32) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_f32(self, v: f32) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_f64(self, _: f64) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_f64(self, v: f64) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
-    fn serialize_char(self, _: char) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::text(v.to_string()))
     }
 
     fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
-        Ok((Part::text(v.to_owned()), Vec::new()))
+        Ok(Part::text(v.to_owned()))
     }
 
-    fn serialize_bytes(self, _: &[u8]) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
-    }
-
-    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
+    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
+        Ok(Part::bytes(v.to_owned()))
     }
 
     fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>
@@ -435,21 +359,48 @@ impl Serializer for PartSerializer {
         value.serialize(self)
     }
 
-    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
-    }
-
-    fn serialize_unit_struct(self, _: &'static str) -> Result<Self::Ok, Self::Error> {
-        unimplemented!()
-    }
-
     fn serialize_unit_variant(
         self,
         _: &'static str,
         _: u32,
         variant_name: &'static str,
     ) -> Result<Self::Ok, Self::Error> {
-        Ok((Part::text(variant_name), Vec::new()))
+        Ok(Part::text(variant_name))
+    }
+
+    fn serialize_struct(
+        self,
+        _: &'static str,
+        _: usize,
+    ) -> Result<Self::SerializeStruct, Self::Error> {
+        Ok(JsonPartSerializer {
+            buf: String::new(),
+            state: PartSerializerStructState::Empty,
+        })
+    }
+
+    fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
+        Ok(JsonPartSerializer {
+            buf: String::new(),
+            state: PartSerializerStructState::Empty,
+        })
+    }
+
+    // Unimplemented
+
+    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
+        unimplemented!(
+            "We use `#[serde_with_macros::skip_serializing_none]` everywhere so `None`s are not \
+             serialized"
+        )
+    }
+
+    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
+    }
+
+    fn serialize_unit_struct(self, _: &'static str) -> Result<Self::Ok, Self::Error> {
+        unimplemented!()
     }
 
     fn serialize_newtype_struct<T: ?Sized>(
@@ -465,37 +416,15 @@ impl Serializer for PartSerializer {
 
     fn serialize_newtype_variant<T: ?Sized>(
         self,
-        name: &'static str,
-        variant_index: u32,
-        variant: &'static str,
-        value: &T,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+        _value: &T,
     ) -> Result<Self::Ok, Self::Error>
     where
         T: Serialize,
     {
-        let file: InputFile = InputFileUnserializer::NotMem.serialize_newtype_variant(
-            name,
-            variant_index,
-            variant,
-            value,
-        )?;
-
-        match file {
-            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
-                let uuid = uuid::Uuid::new_v4().to_string();
-                let part = Part::text(format!("attach://{}", uuid));
-                Ok((part, vec![(uuid, f)]))
-            }
-            InputFile::FileId(s) => Ok((Part::text(s), Vec::new())),
-            InputFile::Url(s) => Ok((Part::text(String::from(s)), Vec::new())),
-        }
-    }
-
-    fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(Self::SerializeSeq {
-            array_json_parts: vec![],
-            files: vec![],
-        })
+        unimplemented!()
     }
 
     fn serialize_tuple(self, _: usize) -> Result<Self::SerializeTuple, Self::Error> {
@@ -524,44 +453,19 @@ impl Serializer for PartSerializer {
         unimplemented!()
     }
 
-    fn serialize_struct(
-        self,
-        name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        let mut ser = serde_json::Serializer::new(Vec::new());
-        ser.serialize_struct(name, len)?;
-        Ok(PartSerializerStruct(
-            ser, // TODO: capcity
-            serde_json::ser::State::First,
-            Vec::new(),
-        ))
-    }
-
     fn serialize_struct_variant(
         self,
-        name: &'static str,
-        variant_index: u32,
-        variant: &'static str,
-        len: usize,
+        _name: &'static str,
+        _variant_index: u32,
+        _variant: &'static str,
+        _len: usize,
     ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Ok(PartFromFile {
-            inner: InputFileUnserializer::memory().serialize_struct_variant(
-                name,
-                variant_index,
-                variant,
-                len,
-            )?,
-        })
+        unimplemented!()
     }
 }
 
-struct PartFromFile {
-    inner: InputFileUnserializer,
-}
-
-impl SerializeStructVariant for PartFromFile {
-    type Ok = (Part, Vec<(String, InputFile)>);
+impl SerializeStruct for JsonPartSerializer {
+    type Ok = Part;
     type Error = Error;
 
     fn serialize_field<T: ?Sized>(
@@ -572,158 +476,71 @@ impl SerializeStructVariant for PartFromFile {
     where
         T: Serialize,
     {
-        self.inner
-            .serialize_field(key, value)
-            .map_err(Error::InputFileUnserializer)
-    }
+        use std::fmt::Write;
+        use PartSerializerStructState::*;
 
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        let file = self.inner.end()?;
+        let value = serde_json::to_string(value)?;
+        match self.state {
+            Empty => {
+                self.state = Rest;
 
-        // TODO: to method
-        match file {
-            f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
-                let uuid = uuid::Uuid::new_v4().to_string();
-                let part = Part::text(format!("attach://{}", uuid));
-
-                Ok((part, vec![(uuid, f)]))
+                write!(&mut self.buf, "{{\"{}\":{}", key, value)?
             }
-            InputFile::FileId(s) => Ok((Part::text(s), vec![])),
-            InputFile::Url(s) => Ok((Part::text(String::from(s)), vec![])),
-        }
-    }
-}
-
-struct InnerPartSerializer {
-    array_json_parts: Vec<serde_json::Value>, // using value is such a workaround :|
-    files: Vec<(String, InputFile)>,
-}
-
-impl SerializeSeq for InnerPartSerializer {
-    type Ok = (Part, Vec<(String, InputFile)>);
-    type Error = Error;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        // NOTE: this is probably highly inefficient (especially for ::Memory),
-        //       but at least it works
-        let mut value = serde_json::to_value(value)?;
-
-        // Update value if it contains InputFile in a `media` field (i.e.: `InputMedia`)
-        if let Some(file) = value.get_mut("media") {
-            let file: InputFile = serde_json::from_value(file.take())?;
-
-            match file {
-                f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
-                    let uuid = uuid::Uuid::new_v4().to_string();
-                    value["media"] = serde_json::Value::String(format!("attach://{}", uuid));
-                    self.files.push((uuid, f));
-                }
-                InputFile::FileId(s) => {
-                    value["media"] = serde_json::Value::String(s);
-                }
-                InputFile::Url(s) => {
-                    value["media"] = serde_json::Value::String(String::from(s));
-                }
-            }
-        }
-
-        self.array_json_parts.push(value);
-
-        Ok(())
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        let s = serde_json::to_string(&self.array_json_parts)?;
-        Ok((Part::text(s), self.files))
-    }
-}
-
-struct PartSerializerStruct(
-    serde_json::Serializer<Vec<u8>>,
-    serde_json::ser::State,
-    Vec<(String, InputFile)>,
-);
-
-impl SerializeStruct for PartSerializerStruct {
-    type Ok = (Part, Vec<(String, InputFile)>);
-    type Error = Error;
-
-    fn serialize_field<T: ?Sized>(
-        &mut self,
-        key: &'static str,
-        value: &T,
-    ) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        let state = match self.1 {
-            serde_json::ser::State::Empty => serde_json::ser::State::Empty,
-            serde_json::ser::State::First => serde_json::ser::State::First,
-            serde_json::ser::State::Rest => serde_json::ser::State::Rest,
-        };
-        let mut ser = serde_json::ser::Compound::Map {
-            ser: &mut self.0,
-            state,
-        };
-
-        // special case media (required for `edit_message_media` to work)
-        if key == "media" {
-            let file = value.serialize(InputFileUnserializer::NotMem)?;
-
-            match file {
-                f @ InputFile::Memory { .. } | f @ InputFile::File(_) => {
-                    let uuid = uuid::Uuid::new_v4().to_string();
-                    let attach = format!("attach://{}", uuid);
-
-                    SerializeStruct::serialize_field(&mut ser, key, attach.as_str())?;
-                    self.1 = get_state(ser);
-
-                    self.2.push((uuid, f));
-                }
-                InputFile::FileId(s) => {
-                    SerializeStruct::serialize_field(&mut ser, key, &s)?;
-                    self.1 = get_state(ser)
-                }
-                InputFile::Url(s) => {
-                    SerializeStruct::serialize_field(&mut ser, key, s.as_str())?;
-                    self.1 = get_state(ser)
-                }
-            }
-        } else {
-            SerializeStruct::serialize_field(&mut ser, key, value)?;
-            self.1 = get_state(ser);
+            Rest => write!(&mut self.buf, ",\"{}\":{}", key, value)?,
         }
 
         Ok(())
     }
 
     fn end(mut self) -> Result<Self::Ok, Self::Error> {
-        let state = match self.1 {
-            serde_json::ser::State::Empty => serde_json::ser::State::Empty,
-            serde_json::ser::State::First => serde_json::ser::State::First,
-            serde_json::ser::State::Rest => serde_json::ser::State::Rest,
-        };
-        let ser = serde_json::ser::Compound::Map {
-            ser: &mut self.0,
-            state,
-        };
-        SerializeStruct::end(ser)?;
+        use PartSerializerStructState::*;
 
-        let json = self.0.into_inner();
-        Ok((Part::bytes(json), self.2))
+        match self.state {
+            Empty => Ok(Part::text("{{}}")),
+            Rest => {
+                self.buf += "}";
+
+                Ok(Part::text(self.buf))
+            }
+        }
     }
 }
 
-fn get_state(
-    compound: serde_json::ser::Compound<Vec<u8>, serde_json::ser::CompactFormatter>,
-) -> serde_json::ser::State {
-    // Compound may have more variants under some serde_json features
-    #[allow(unreachable_patterns)]
-    match compound {
-        serde_json::ser::Compound::Map { ser: _, state } => state,
-        _ => unreachable!(),
+impl SerializeSeq for JsonPartSerializer {
+    type Ok = Part;
+
+    type Error = Error;
+
+    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
+    where
+        T: Serialize,
+    {
+        use std::fmt::Write;
+        use PartSerializerStructState::*;
+
+        let value = serde_json::to_string(value)?;
+        match self.state {
+            Empty => {
+                self.state = Rest;
+
+                write!(&mut self.buf, "[{}", value)?
+            }
+            Rest => write!(&mut self.buf, ",{}", value)?,
+        }
+
+        Ok(())
+    }
+
+    fn end(mut self) -> Result<Self::Ok, Self::Error> {
+        use PartSerializerStructState::*;
+
+        match self.state {
+            Empty => Ok(Part::text("[]")),
+            Rest => {
+                self.buf += "]";
+
+                Ok(Part::text(self.buf))
+            }
+        }
     }
 }
diff --git a/src/serde_multipart/unserializers/bytes.rs b/src/serde_multipart/unserializers/bytes.rs
deleted file mode 100644
index 182b9da7..00000000
--- a/src/serde_multipart/unserializers/bytes.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use crate::serde_multipart::unserializers::UnserializerError;
-use serde::{
-    ser::{Impossible, SerializeSeq},
-    Serialize, Serializer,
-};
-
-#[derive(Default)]
-pub(crate) struct BytesUnserializer(Vec<u8>);
-
-impl Serializer for BytesUnserializer {
-    type Ok = Vec<u8>;
-    type Error = UnserializerError;
-
-    type SerializeSeq = Self;
-    type SerializeTuple = Impossible<Vec<u8>, UnserializerError>;
-    type SerializeTupleStruct = Impossible<Vec<u8>, UnserializerError>;
-    type SerializeTupleVariant = Impossible<Vec<u8>, UnserializerError>;
-    type SerializeMap = Impossible<Vec<u8>, UnserializerError>;
-    type SerializeStruct = Impossible<Vec<u8>, UnserializerError>;
-    type SerializeStructVariant = Impossible<Vec<u8>, UnserializerError>;
-
-    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
-        Ok(v.to_owned())
-    }
-
-    fn serialize_seq(mut self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        if let Some(len) = len {
-            self.0.reserve_exact(len);
-        }
-        Ok(self)
-    }
-
-    forward_to_unsuported_ty! {
-        supported: "&[u8], Vec<u8>, Cow<[u8]>";
-        simple {
-            serialize_bool  bool
-            serialize_i8    i8
-            serialize_i16   i16
-            serialize_i32   i32
-            serialize_i64   i64
-            serialize_u8    u8
-            serialize_u16   u16
-            serialize_u32   u32
-            serialize_u64   u64
-            serialize_f32   f32
-            serialize_f64   f64
-            serialize_char  char
-            serialize_str   &str
-        }
-        unit {
-            serialize_none "None"
-            serialize_unit "unit"
-        }
-        compound {
-            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
-            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
-            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
-            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
-            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
-            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
-            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
-            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
-            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
-            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
-            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
-        }
-    }
-}
-
-impl SerializeSeq for BytesUnserializer {
-    type Ok = Vec<u8>;
-    type Error = UnserializerError;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-    where
-        T: Serialize,
-    {
-        value.serialize(BytesUnserializerPush(&mut self.0))
-    }
-
-    fn end(self) -> Result<Self::Ok, Self::Error> {
-        Ok(self.0)
-    }
-}
-
-pub(crate) struct BytesUnserializerPush<'a>(&'a mut Vec<u8>);
-
-impl Serializer for BytesUnserializerPush<'_> {
-    type Ok = ();
-    type Error = UnserializerError;
-
-    type SerializeSeq = Impossible<(), UnserializerError>;
-    type SerializeTuple = Impossible<(), UnserializerError>;
-    type SerializeTupleStruct = Impossible<(), UnserializerError>;
-    type SerializeTupleVariant = Impossible<(), UnserializerError>;
-    type SerializeMap = Impossible<(), UnserializerError>;
-    type SerializeStruct = Impossible<(), UnserializerError>;
-    type SerializeStructVariant = Impossible<(), UnserializerError>;
-
-    fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {
-        self.0.push(v);
-        Ok(())
-    }
-
-    fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
-        self.0.extend_from_slice(v);
-        Ok(())
-    }
-
-    forward_to_unsuported_ty! {
-        supported: "&[u8], Vec<u8>, Cow<[u8]>";
-        simple {
-            serialize_bool  bool
-            serialize_i8    i8
-            serialize_i16   i16
-            serialize_i32   i32
-            serialize_i64   i64
-            serialize_u16   u16
-            serialize_u32   u32
-            serialize_u64   u64
-            serialize_f32   f32
-            serialize_f64   f64
-            serialize_char  char
-            serialize_str   &str
-        }
-        unit {
-            serialize_none "None"
-            serialize_unit "unit"
-        }
-        compound {
-            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
-            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
-            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
-            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
-            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
-            serialize_seq(_: Option<usize>) -> Self::SerializeSeq => "sequence"
-            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
-            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
-            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
-            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
-            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
-            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
-        }
-    }
-}
diff --git a/src/serde_multipart/unserializers/string.rs b/src/serde_multipart/unserializers/string.rs
deleted file mode 100644
index 7d4a8548..00000000
--- a/src/serde_multipart/unserializers/string.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use crate::serde_multipart::unserializers::UnserializerError;
-use serde::{ser::Impossible, Serialize, Serializer};
-
-pub(crate) struct StringUnserializer;
-
-impl Serializer for StringUnserializer {
-    type Ok = String;
-    type Error = UnserializerError;
-
-    type SerializeSeq = Impossible<String, UnserializerError>;
-    type SerializeTuple = Impossible<String, UnserializerError>;
-    type SerializeTupleStruct = Impossible<String, UnserializerError>;
-    type SerializeTupleVariant = Impossible<String, UnserializerError>;
-    type SerializeMap = Impossible<String, UnserializerError>;
-    type SerializeStruct = Impossible<String, UnserializerError>;
-    type SerializeStructVariant = Impossible<String, UnserializerError>;
-
-    fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {
-        Ok(v.to_string())
-    }
-
-    fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {
-        Ok(v.to_owned())
-    }
-
-    forward_to_unsuported_ty! {
-        supported: "&str, String";
-        simple {
-            serialize_bool  bool
-            serialize_i8    i8
-            serialize_i16   i16
-            serialize_i32   i32
-            serialize_i64   i64
-            serialize_u8    u8
-            serialize_u16   u16
-            serialize_u32   u32
-            serialize_u64   u64
-            serialize_f32   f32
-            serialize_f64   f64
-            serialize_bytes &[u8]
-        }
-        unit {
-            serialize_none "None"
-            serialize_unit "unit"
-        }
-        compound {
-            serialize_some<T: ?Sized + Serialize>(_: &T) -> Self::Ok => "Some(_)"
-            serialize_unit_struct(_: &'static str) -> Self::Ok => "unit struct"
-            serialize_unit_variant(_: &'static str, _: u32, _: &'static str) -> Self::Ok => "unit variant"
-            serialize_newtype_struct<T: ?Sized + Serialize>(_: &'static str, _: &T) -> Self::Ok => "newtype struct"
-            serialize_newtype_variant<T: ?Sized + Serialize>(_: &'static str, _: u32, _: &'static str, _: &T) -> Self::Ok => "newtype variant"
-            serialize_seq(_: Option<usize>) -> Self::SerializeSeq => "sequence"
-            serialize_tuple(_: usize) -> Self::SerializeTuple => "tuple"
-            serialize_tuple_struct(_: &'static str, _: usize) -> Self::SerializeTupleStruct => "tuple struct"
-            serialize_tuple_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeTupleVariant => "tuple variant"
-            serialize_map(_: Option<usize>) -> Self::SerializeMap => "map"
-            serialize_struct(_: &'static str, _: usize) -> Self::SerializeStruct => "struct"
-            serialize_struct_variant(_: &'static str, _: u32, _: &'static str, _: usize) -> Self::SerializeStructVariant => "struct variant"
-        }
-    }
-}
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index baf487c0..26ee7b10 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -1,123 +1,277 @@
-use reqwest::Url;
-use serde::{Deserialize, Serialize};
+use bytes::{Bytes, BytesMut};
+use futures::{
+    future::{ready, Either},
+    stream,
+};
+use once_cell::sync::OnceCell;
+use reqwest::{multipart::Part, Body};
+use serde::Serialize;
+use tokio_util::codec::{Decoder, FramedRead};
 
-use std::{borrow::Cow, path::PathBuf};
+use std::{borrow::Cow, fmt, future::Future, io, mem, path::PathBuf, sync::Arc};
+
+use crate::types::InputSticker;
 
 /// This object represents the contents of a file to be uploaded.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#inputfile).
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[non_exhaustive]
-pub enum InputFile {
+#[derive(Debug, Clone)]
+pub struct InputFile {
+    id: OnceCell<Arc<str>>,
+    file_name: Option<Cow<'static, str>>,
+    inner: InnerFile,
+}
+
+#[derive(Clone)]
+enum InnerFile {
     File(PathBuf),
-    Memory {
-        file_name: String,
-        data: Cow<'static, [u8]>,
-    },
-    Url(Url),
+    Bytes(bytes::Bytes),
+    Url(url::Url),
     FileId(String),
 }
 
+use InnerFile::*;
+
 impl InputFile {
-    pub fn file<P>(path: P) -> Self
-    where
-        P: Into<PathBuf>,
-    {
-        Self::File(path.into())
+    /// Creates an `InputFile` from an url.
+    ///
+    /// Notes:
+    /// - When sending by URL the target file must have the correct MIME type
+    ///   (e.g., `audio/mpeg` for [`SendAudio`], etc.).
+    /// - In [`SendDocument`], sending by URL will currently only work for
+    ///   `GIF`, `PDF` and `ZIP` files.
+    /// - To use [`SendVoice`], the file must have the type audio/ogg and be no
+    ///   more than 1MB in size. 1-20MB voice notes will be sent as files.
+    /// - Other configurations may work but we can't guarantee that they will.
+    ///
+    /// [`SendAudio`]: crate::payloads::SendAudio
+    /// [`SendDocument`]: crate::payloads::SendDocument
+    /// [`SendVoice`]: crate::payloads::SendVoice
+    pub fn url(url: url::Url) -> Self {
+        Self::new(Url(url))
     }
 
-    pub fn memory<S, D>(file_name: S, data: D) -> Self
-    where
-        S: Into<String>,
-        D: Into<Cow<'static, [u8]>>,
-    {
-        Self::Memory {
-            file_name: file_name.into(),
-            data: data.into(),
+    /// Creates an `InputFile` from a file id.
+    ///
+    /// File id can be obtained from
+    ///
+    /// Notes:
+    /// - It is not possible to change the file type when resending by file id.
+    ///   I.e. a video can't be sent as a photo, a photo can't be sent as a
+    ///   document, etc.
+    /// - It is not possible to resend thumbnails.
+    /// - Resending a photo by file id will send all of its [sizes].
+    /// - file id is unique for each individual bot and can't be transferred
+    ///   from one bot to another.
+    /// - file id uniquely identifies a file, but a file can have different
+    ///   valid file_ids even for the same bot.
+    ///
+    /// [sizes]: crate::types::PhotoSize
+    pub fn file_id(file_id: impl Into<String>) -> Self {
+        Self::new(FileId(file_id.into()))
+    }
+
+    /// Creates an `InputFile` from a file path.
+    pub fn file(path: impl Into<PathBuf>) -> Self {
+        Self::new(File(path.into()))
+    }
+
+    /// Creates an `InputFile` from a in-memory bytes.
+    pub fn memory(data: impl Into<bytes::Bytes>) -> Self {
+        Self::new(Bytes(data.into()))
+    }
+
+    /// Set the file name for this file.
+    pub fn file_name(mut self, name: impl Into<Cow<'static, str>>) -> Self {
+        self.file_name = Some(name.into());
+        self
+    }
+
+    /// Shorthand for `Self { file_name: None, inner, id: default() }`
+    /// (private because `InnerFile` iы private implementation detail)
+    fn new(inner: InnerFile) -> Self {
+        Self {
+            file_name: None,
+            inner,
+            id: OnceCell::new(),
         }
     }
 
-    pub fn url(url: Url) -> Self {
-        Self::Url(url)
+    /// Returns id of this file.
+    ///
+    /// This is used to coordinate with `attach://`.
+    pub(crate) fn id(&self) -> &str {
+        // FIXME: remove extra alloc
+        self.id
+            .get_or_init(|| uuid::Uuid::new_v4().to_string().into())
     }
 
-    pub fn file_id<T>(file_id: T) -> Self
-    where
-        T: Into<String>,
-    {
-        Self::FileId(file_id.into())
+    /// Returns `true` if this file needs an attachment i.e. it's not a file_id
+    /// or url that can be serialized without any additional multipart parts.
+    pub(crate) fn needs_attach(&self) -> bool {
+        !matches!(self.inner, Url(_) | FileId(_))
     }
 
-    pub fn as_file(&self) -> Option<&PathBuf> {
-        match self {
-            Self::File(path) => Some(path),
-            _ => None,
+    /// Takes this file out.
+    ///
+    /// **Note**: this replaces `self` with a dummy value, this function should
+    /// only be used when the file is about to get dropped.
+    pub(crate) fn take(&mut self) -> Self {
+        mem::replace(self, InputFile::file_id(String::new()))
+    }
+
+    /// Returns an attach string for `multipart/form-data` in the form of
+    /// `"attach://{id}"` if this file should be uploaded via
+    /// `multipart/form-data`, or the value if it may be uploaded in any way (ie
+    /// it's an URL or file id).
+    fn attach_or_value(&self) -> String {
+        match &self.inner {
+            Url(url) => url.as_str().to_owned(),
+            FileId(file_id) => file_id.clone(),
+            _ => {
+                const PREFIX: &str = "attach://";
+
+                let id = self.id();
+                let mut s = String::with_capacity(PREFIX.len() + id.len());
+                s += PREFIX;
+                s += id;
+
+                s
+            }
         }
     }
 
-    pub fn as_url(&self) -> Option<&Url> {
-        match self {
-            Self::Url(url) => Some(url),
-            _ => None,
-        }
+    /// Takes the file name or tries to guess it based on file name in the path
+    /// if `File.0`. Returns an empty string if couldn't guess.
+    fn take_or_guess_filename(&mut self) -> Cow<'static, str> {
+        self.file_name.take().unwrap_or_else(|| match &self.inner {
+            File(path_to_file) => match path_to_file.file_name() {
+                Some(name) => Cow::Owned(name.to_string_lossy().into_owned()),
+                None => Cow::Borrowed(""),
+            },
+            _ => Cow::Borrowed(""),
+        })
     }
+}
 
-    pub fn as_file_id(&self) -> Option<&String> {
+impl fmt::Debug for InnerFile {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Self::FileId(id) => Some(id),
-            _ => None,
+            File(path) => f.debug_struct("File").field("path", path).finish(),
+            Bytes(bytes) if f.alternate() => f.debug_tuple("Memory").field(bytes).finish(),
+            Bytes(_) => f.debug_struct("Memory").finish_non_exhaustive(),
+            Url(url) => f.debug_tuple("Url").field(url).finish(),
+            FileId(file_id) => f.debug_tuple("FileId").field(file_id).finish(),
         }
     }
 }
 
-impl From<InputFile> for Option<PathBuf> {
-    fn from(file: InputFile) -> Self {
-        match file {
-            InputFile::File(path) => Some(path),
-            _ => None,
-        }
+impl Serialize for InputFile {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        self.attach_or_value().serialize(serializer)
     }
 }
 
 // internal api
 
-use reqwest::multipart::Part;
-
 impl InputFile {
-    pub(crate) async fn into_part(self) -> std::io::Result<Part> {
-        use bytes::{Bytes, BytesMut};
-        use reqwest::Body;
-        use tokio_util::codec::{Decoder, FramedRead};
+    pub(crate) fn into_part(mut self) -> Option<impl Future<Output = Part>> {
+        let filename = self.take_or_guess_filename();
 
-        struct FileDecoder;
+        let file_part = match self.inner {
+            // Url and FileId are serialized just as strings, they don't need additional parts
+            Url(_) | FileId(_) => None,
 
-        impl Decoder for FileDecoder {
-            type Item = Bytes;
-            type Error = std::io::Error;
+            File(path_to_file) => {
+                let fut = async {
+                    let body = match tokio::fs::File::open(path_to_file).await {
+                        Ok(file) => {
+                            let file = FramedRead::new(file, BytesDecoder);
 
-            fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
-                if src.is_empty() {
-                    return Ok(None);
-                }
-                Ok(Some(src.split().freeze()))
+                            Body::wrap_stream(file)
+                        }
+                        Err(err) => {
+                            // explicit type needed for `Bytes: From<?T>` in `wrap_stream`
+                            let err = Err::<Bytes, _>(err);
+                            Body::wrap_stream(stream::iter([err]))
+                        }
+                    };
+
+                    Part::stream(body).file_name(filename)
+                };
+
+                Some(Either::Left(fut))
             }
+            Bytes(data) => {
+                let stream = Part::stream(data).file_name(filename);
+                Some(Either::Right(ready(stream)))
+            }
+        };
+
+        file_part
+    }
+}
+
+struct BytesDecoder;
+
+impl Decoder for BytesDecoder {
+    type Item = Bytes;
+    type Error = io::Error;
+
+    fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
+        if src.is_empty() {
+            return Ok(None);
         }
+        Ok(Some(src.split().freeze()))
+    }
+}
 
-        match self {
-            Self::File(path_to_file) => {
-                let file_name = path_to_file
-                    .file_name()
-                    .unwrap()
-                    .to_string_lossy()
-                    .into_owned();
+/// An internal trait that is used in expansion of `impl_payload!` used to work
+/// with input-file-like things (`InputFile` itself, `Option<InputFile>`,
+/// `InputSticker`)
+pub(crate) trait InputFileLike {
+    fn copy_into(&self, into: &mut dyn FnMut(InputFile));
 
-                let file = FramedRead::new(tokio::fs::File::open(path_to_file).await?, FileDecoder);
+    fn move_into(&mut self, into: &mut dyn FnMut(InputFile));
+}
 
-                Ok(Part::stream(Body::wrap_stream(file)).file_name(file_name))
-            }
-            Self::Memory { file_name, data } => Ok(Part::bytes(data).file_name(file_name)),
-            Self::Url(s) => Ok(Part::text(String::from(s))),
-            Self::FileId(s) => Ok(Part::text(s)),
+impl InputFileLike for InputFile {
+    fn copy_into(&self, into: &mut dyn FnMut(InputFile)) {
+        into(self.clone())
+    }
+
+    fn move_into(&mut self, into: &mut dyn FnMut(InputFile)) {
+        into(self.take())
+    }
+}
+
+impl InputFileLike for Option<InputFile> {
+    fn copy_into(&self, into: &mut dyn FnMut(InputFile)) {
+        if let Some(this) = self {
+            this.copy_into(into)
+        }
+    }
+
+    fn move_into(&mut self, into: &mut dyn FnMut(InputFile)) {
+        if let Some(this) = self {
+            this.move_into(into)
         }
     }
 }
+
+impl InputFileLike for InputSticker {
+    fn copy_into(&self, into: &mut dyn FnMut(InputFile)) {
+        let (InputSticker::Png(input_file) | InputSticker::Tgs(input_file)) = self;
+
+        input_file.copy_into(into)
+    }
+
+    fn move_into(&mut self, into: &mut dyn FnMut(InputFile)) {
+        let (InputSticker::Png(input_file) | InputSticker::Tgs(input_file)) = self;
+
+        input_file.move_into(into)
+    }
+}
diff --git a/src/types/input_media.rs b/src/types/input_media.rs
index 4ef04ab9..fd4ec1d8 100644
--- a/src/types/input_media.rs
+++ b/src/types/input_media.rs
@@ -1,6 +1,6 @@
 use std::iter;
 
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 use crate::types::{InputFile, MessageEntity, ParseMode};
 
@@ -533,7 +533,7 @@ mod tests {
 
     #[test]
     fn photo_serialize() {
-        let expected_json = r#"{"type":"photo","media":{"FileId":"123456"}}"#;
+        let expected_json = r#"{"type":"photo","media":"123456"}"#;
         let photo = InputMedia::Photo(InputMediaPhoto {
             media: InputFile::file_id("123456"),
             caption: None,
@@ -547,7 +547,7 @@ mod tests {
 
     #[test]
     fn video_serialize() {
-        let expected_json = r#"{"type":"video","media":{"FileId":"123456"}}"#;
+        let expected_json = r#"{"type":"video","media":"123456"}"#;
         let video = InputMedia::Video(InputMediaVideo {
             media: InputFile::file_id("123456"),
             thumb: None,
@@ -566,7 +566,7 @@ mod tests {
 
     #[test]
     fn animation_serialize() {
-        let expected_json = r#"{"type":"animation","media":{"FileId":"123456"}}"#;
+        let expected_json = r#"{"type":"animation","media":"123456"}"#;
         let video = InputMedia::Animation(InputMediaAnimation {
             media: InputFile::file_id("123456"),
             thumb: None,
@@ -584,7 +584,7 @@ mod tests {
 
     #[test]
     fn audio_serialize() {
-        let expected_json = r#"{"type":"audio","media":{"FileId":"123456"}}"#;
+        let expected_json = r#"{"type":"audio","media":"123456"}"#;
         let video = InputMedia::Audio(InputMediaAudio {
             media: InputFile::file_id("123456"),
             thumb: None,
@@ -602,7 +602,7 @@ mod tests {
 
     #[test]
     fn document_serialize() {
-        let expected_json = r#"{"type":"document","media":{"FileId":"123456"}}"#;
+        let expected_json = r#"{"type":"document","media":"123456"}"#;
         let video = InputMedia::Document(InputMediaDocument {
             media: InputFile::file_id("123456"),
             thumb: None,

From 5b4ed3faa951b39b1e50062385f6c647bab0543a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 16:46:37 +0300
Subject: [PATCH 460/755] Allow sending `impl AsyncRead`

This commit adds `InputFile::read` constructor that creates `InputFile`
from an `impl AsyncRead + Send + Unpin + 'static`.

Internally this requires quite a bit of work, since we need to support
cloning `InputFile`s but the `AsyncRead` trait only allows us reading it
once.

To support this, if `InputFile` detects that it's shared, it reads the
contents of the `AsyncRead` into a buffer and then shares the buffer
(or an error if it has occured).
---
 Cargo.toml              |   2 +
 src/types/input_file.rs | 176 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1d22bbe2..d0b0923c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,9 @@ derive_more = "0.99.9"
 mime = "0.3.16"
 thiserror = "1.0.20"
 once_cell = "1.5.0"
+takecell = "0.1"
 take_mut = "0.2"
+rc-box = "1.1.1"
 never = "0.1.0"
 chrono = { version = "0.4.19", default-features = false }
 either = "1.6.1"
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 26ee7b10..aadfe568 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -4,11 +4,27 @@ use futures::{
     stream,
 };
 use once_cell::sync::OnceCell;
+use rc_box::ArcBox;
 use reqwest::{multipart::Part, Body};
 use serde::Serialize;
+use takecell::TakeCell;
+use tokio::{
+    io::{AsyncRead, AsyncReadExt, ReadBuf},
+    sync::watch,
+};
 use tokio_util::codec::{Decoder, FramedRead};
 
-use std::{borrow::Cow, fmt, future::Future, io, mem, path::PathBuf, sync::Arc};
+use std::{
+    borrow::Cow,
+    convert::{Infallible, TryFrom},
+    fmt,
+    future::Future,
+    io, iter, mem,
+    path::PathBuf,
+    pin::Pin,
+    sync::Arc,
+    task,
+};
 
 use crate::types::InputSticker;
 
@@ -24,6 +40,7 @@ pub struct InputFile {
 
 #[derive(Clone)]
 enum InnerFile {
+    Read(Read),
     File(PathBuf),
     Bytes(bytes::Bytes),
     Url(url::Url),
@@ -87,6 +104,14 @@ impl InputFile {
         self
     }
 
+    /// Creates an `InputFile` from a in-memory bytes.
+    ///
+    /// Note: in some cases (e.g. sending the same `InputFile` multiple times)
+    /// this may read the whole `impl AsyncRead` into memory.
+    pub fn read(it: impl AsyncRead + Send + Unpin + 'static) -> Self {
+        Self::new(Read(Read::new(Arc::new(TakeCell::new(it)))))
+    }
+
     /// Shorthand for `Self { file_name: None, inner, id: default() }`
     /// (private because `InnerFile` iы private implementation detail)
     fn new(inner: InnerFile) -> Self {
@@ -157,6 +182,7 @@ impl InputFile {
 impl fmt::Debug for InnerFile {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
+            Read(_) => f.debug_struct("Read").finish_non_exhaustive(),
             File(path) => f.debug_struct("File").field("path", path).finish(),
             Bytes(bytes) if f.alternate() => f.debug_tuple("Memory").field(bytes).finish(),
             Bytes(_) => f.debug_struct("Memory").finish_non_exhaustive(),
@@ -207,14 +233,160 @@ impl InputFile {
             }
             Bytes(data) => {
                 let stream = Part::stream(data).file_name(filename);
-                Some(Either::Right(ready(stream)))
+                Some(Either::Right(Either::Left(ready(stream))))
             }
+            Read(read) => Some(Either::Right(Either::Right(read.into_part(filename)))),
         };
 
         file_part
     }
 }
 
+/// Adaptor for `AsyncRead` that allows clonning and converting to
+/// `multipart/form-data`
+#[derive(Clone)]
+struct Read {
+    inner: Arc<TakeCell<dyn AsyncRead + Send + Unpin>>,
+    buf: Arc<OnceCell<Result<Vec<Bytes>, Arc<io::Error>>>>,
+    notify: Arc<watch::Sender<()>>,
+    wait: watch::Receiver<()>,
+}
+
+impl Read {
+    fn new(it: Arc<TakeCell<dyn AsyncRead + Send + Unpin>>) -> Self {
+        let (tx, rx) = watch::channel(());
+
+        Self {
+            inner: it,
+            buf: Arc::default(),
+            notify: Arc::new(tx),
+            wait: rx,
+        }
+    }
+
+    pub(crate) async fn into_part(mut self, filename: Cow<'static, str>) -> Part {
+        if !self.inner.is_taken() {
+            let res = ArcBox::<TakeCell<dyn AsyncRead + Send + Unpin>>::try_from(self.inner);
+            match res {
+                // Fast/easy path: this is the only file copy, so we can just forward the underlying
+                // `dyn AsynсRead` via some adaptors to reqwest.
+                Ok(arc_box) => {
+                    let fr = FramedRead::new(ExclusiveArcAsyncRead(arc_box), BytesDecoder);
+
+                    let body = Body::wrap_stream(fr);
+                    return Part::stream(body).file_name(filename);
+                }
+                // move the arc back into `self`
+                Err(i) => self.inner = i,
+            }
+        }
+
+        // Slow path: either wait until someone will read the whole `dyn AsynсRead` into
+        // a buffer, or be the one who reads
+        let body = self.into_shared_body().await;
+
+        Part::stream(body).file_name(filename)
+    }
+
+    async fn into_shared_body(mut self) -> Body {
+        match self.inner.take() {
+            // Read `dyn AsyncRead` into a buffer
+            Some(mut read_ref) => {
+                // Chunk size, arbitrary chosen to be 1KiB
+                const CHUNK: usize = 1024;
+
+                let mut chunks = Vec::new();
+                let mut bytes = BytesMut::with_capacity(CHUNK);
+
+                let res = loop {
+                    match (&mut read_ref).read_buf(&mut bytes).await {
+                        // eof
+                        Ok(0) if bytes.len() < bytes.capacity() => {
+                            chunks.push(bytes.freeze());
+
+                            break Ok(chunks);
+                        }
+
+                        // No space left in bytes, allocate a new chunk
+                        Ok(0) => {
+                            chunks.push(bytes.freeze());
+                            bytes = BytesMut::with_capacity(CHUNK);
+                        }
+
+                        // keep reading into the same chunk
+                        Ok(_) => {}
+
+                        // i/o error
+                        Err(err) => break Err(Arc::new(err)),
+                    }
+                };
+
+                // Initialize `buf` with the result.
+                // Error indicates that the `buf` was already initialized, but this can't happen
+                // since we synchronize through other means.
+                let r = self.buf.set(res);
+                debug_assert!(r.is_ok());
+
+                // Notify other tasks that `buf` is initialized.
+                // Error indicates that there is no one to notify anymore, but we don't care.
+                let _ = self.notify.send(());
+            }
+
+            // Wait until `dyn AsynсRead` is read into a buffer, if it hasn't been read yet
+            None if self.buf.get().is_none() => {
+                // Error indicates that the sender was dropped, by we hold `Arc<Sender>`, so
+                // this can't happen
+                let _ = self.wait.changed().await;
+            }
+
+            // Someone else has already initialized the buffer
+            None => {}
+        };
+
+        let buf = self.buf;
+        // unwrap: `OnceCell` is initialized in the match above before sending
+        // notification, so at this point it's already initialized.
+        match buf.get().unwrap() {
+            Ok(_) => {
+                // We can't use `.iter()` here, because the iterator must capture `buf`
+                let mut i = 0;
+                let iter = iter::from_fn(move || match buf.get().unwrap() {
+                    Ok(buf) if i >= buf.len() => None,
+                    Ok(buf) => {
+                        let res = buf[i].clone();
+                        i += 1;
+                        Some(Ok::<_, Infallible>(res))
+                    }
+                    // We've just checked in the above match, it's `Ok(_)`
+                    Err(_) => unreachable!(),
+                });
+
+                Body::wrap_stream(stream::iter(iter))
+            }
+
+            Err(err) => {
+                let err = Err::<Bytes, _>(Arc::clone(err));
+                Body::wrap_stream(stream::iter(iter::once(err)))
+            }
+        }
+    }
+}
+
+/// Wrapper over an `ArcBox` that implements `AsyncRead`.
+struct ExclusiveArcAsyncRead(ArcBox<TakeCell<dyn AsyncRead + Send + Unpin>>);
+
+impl AsyncRead for ExclusiveArcAsyncRead {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut task::Context<'_>,
+        buf: &mut ReadBuf<'_>,
+    ) -> task::Poll<io::Result<()>> {
+        let Self(inner) = Pin::get_mut(self);
+        let read: &mut (dyn AsyncRead + Unpin) = inner.get();
+        Pin::new(read).poll_read(cx, buf)
+    }
+}
+
 struct BytesDecoder;
 
 impl Decoder for BytesDecoder {

From ef33f9f66a81968ac8992da61fcbd82c95690fae Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 16:51:42 +0300
Subject: [PATCH 461/755] Add more tests for multipart request serialization

---
 src/serde_multipart/mod.rs | 125 ++++++++++++++++++++++++++++++++-----
 1 file changed, 111 insertions(+), 14 deletions(-)

diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index e4cf70a7..5e992595 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -80,22 +80,119 @@ where
     Ok(fut)
 }
 
-// https://github.com/teloxide/teloxide/issues/473
 #[cfg(test)]
-#[tokio::test]
-async fn issue_473() {
+mod tests {
+    use tokio::fs::File;
+
+    use super::to_form_ref;
     use crate::{
-        payloads::{self, SendPhotoSetters},
-        types::{InputFile, MessageEntity, MessageEntityKind},
+        payloads::{self, setters::*},
+        types::{
+            InputFile, InputMedia, InputMediaAnimation, InputMediaAudio, InputMediaDocument,
+            InputMediaPhoto, InputMediaVideo, InputSticker, MessageEntity, MessageEntityKind,
+            ParseMode,
+        },
     };
 
-    to_form_ref(
-        &payloads::SendPhoto::new(0, InputFile::file_id("0")).caption_entities([MessageEntity {
-            kind: MessageEntityKind::Url,
-            offset: 0,
-            length: 0,
-        }]),
-    )
-    .unwrap()
-    .await;
+    // https://github.com/teloxide/teloxide/issues/473
+    #[tokio::test]
+    async fn issue_473() {
+        to_form_ref(
+            &payloads::SendPhoto::new(0, InputFile::file_id("0")).caption_entities([
+                MessageEntity {
+                    kind: MessageEntityKind::Url,
+                    offset: 0,
+                    length: 0,
+                },
+            ]),
+        )
+        .unwrap()
+        .await;
+    }
+
+    #[tokio::test]
+    async fn test_send_media_group() {
+        const CAPTION: &str = "caption";
+
+        to_form_ref(&payloads::SendMediaGroup::new(
+            0,
+            [
+                InputMedia::Photo(
+                    InputMediaPhoto::new(InputFile::file("./media/logo.png"))
+                        .caption(CAPTION)
+                        .parse_mode(ParseMode::MarkdownV2)
+                        .caption_entities(entities()),
+                ),
+                InputMedia::Video(
+                    InputMediaVideo::new(InputFile::file_id("17")).supports_streaming(true),
+                ),
+                InputMedia::Animation(
+                    InputMediaAnimation::new(InputFile::read(
+                        File::open("./media/example.gif").await.unwrap(),
+                    ))
+                    .thumb(InputFile::read(
+                        File::open("./media/logo.png").await.unwrap(),
+                    ))
+                    .duration(17),
+                ),
+                InputMedia::Audio(
+                    InputMediaAudio::new(InputFile::url("https://example.com".parse().unwrap()))
+                        .performer("a"),
+                ),
+                InputMedia::Document(InputMediaDocument::new(InputFile::memory(
+                    &b"Hello world!"[..],
+                ))),
+            ],
+        ))
+        .unwrap()
+        .await;
+    }
+
+    #[tokio::test]
+    async fn test_add_sticker_to_set() {
+        to_form_ref(&payloads::AddStickerToSet::new(
+            0,
+            "name",
+            InputSticker::Png(InputFile::file("./media/logo.png")),
+            "✈️⚙️",
+        ))
+        .unwrap()
+        .await;
+    }
+
+    #[tokio::test]
+    async fn test_send_animation() {
+        to_form_ref(
+            &payloads::SendAnimation::new(0, InputFile::file("./media/logo.png"))
+                .caption_entities(entities())
+                .thumb(InputFile::read(
+                    File::open("./media/logo.png").await.unwrap(),
+                ))
+                .allow_sending_without_reply(true),
+        )
+        .unwrap()
+        .await;
+    }
+
+    fn entities() -> impl Iterator<Item = MessageEntity> {
+        <_>::into_iter([
+            MessageEntity::new(MessageEntityKind::Url, 0, 0),
+            MessageEntity::new(MessageEntityKind::Pre { language: None }, 0, 0),
+            MessageEntity::new(
+                MessageEntityKind::Pre {
+                    language: Some(String::new()),
+                },
+                0,
+                0,
+            ),
+            MessageEntity::new(MessageEntityKind::Url, 0, 0),
+            MessageEntity::new(
+                MessageEntityKind::TextLink {
+                    url: "https://example.com".parse().unwrap(),
+                },
+                0,
+                0,
+            ),
+        ])
+    }
 }

From bc440b9ea88e6f004a2cd8880ba8b63c0b7bae64 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 16:56:40 +0300
Subject: [PATCH 462/755] fix clippy

---
 src/types/input_file.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index aadfe568..33dcb31d 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -207,7 +207,7 @@ impl InputFile {
     pub(crate) fn into_part(mut self) -> Option<impl Future<Output = Part>> {
         let filename = self.take_or_guess_filename();
 
-        let file_part = match self.inner {
+        match self.inner {
             // Url and FileId are serialized just as strings, they don't need additional parts
             Url(_) | FileId(_) => None,
 
@@ -236,9 +236,7 @@ impl InputFile {
                 Some(Either::Right(Either::Left(ready(stream))))
             }
             Read(read) => Some(Either::Right(Either::Right(read.into_part(filename)))),
-        };
-
-        file_part
+        }
     }
 }
 

From 622b0d9232bc52a41c51af7e1be8ae439e8cafd5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 17:14:55 +0300
Subject: [PATCH 463/755] Remove `dbg!`

:/
---
 src/types/update.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/update.rs b/src/types/update.rs
index 22969b77..cf938187 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -156,10 +156,10 @@ impl<'de> Deserialize<'de> for UpdateKind {
 
                 if let Ok(Some(k)) = k {
                     let res = match k {
-                        "message" => dbg!(map
+                        "message" => map
                             .next_value::<Message>()
                             .map(UpdateKind::Message)
-                            .map_err(|_| false)),
+                            .map_err(|_| false),
                         "edited_message" => map
                             .next_value::<Message>()
                             .map(UpdateKind::EditedMessage)

From f13732cbb5350e2c37f08b03761bcb2372aa75a2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 17:19:02 +0300
Subject: [PATCH 464/755] Update readme

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2ed06c..7650870d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Refactor `InputFile` ([#167][pr167])
+  - Make it an opaque structure, instead of enum
+  - Add `read` constructor, that allows creating `InputFile` from `impl AsyncRead`
+  - Internal changes
 - Refactor errors ([#134][pr134])
   - Rename `DownloadError::NetworkError` to `Network`
   - Rename `RequestError::ApiError` to `Api`
@@ -53,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr134]: https://github.com/teloxide/teloxide-core/pull/134
 [pr150]: https://github.com/teloxide/teloxide-core/pull/150
 [pr157]: https://github.com/teloxide/teloxide-core/pull/157
+[pr167]: https://github.com/teloxide/teloxide-core/pull/167
 
 ### Fixed
 

From df88d83cfdbd6b0466d78d5e9fc28e6f6df240fe Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 13 Jan 2022 20:43:33 +0300
Subject: [PATCH 465/755] Fix documentation

---
 src/types/input_sticker.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/types/input_sticker.rs b/src/types/input_sticker.rs
index 3ef26694..8da456f6 100644
--- a/src/types/input_sticker.rs
+++ b/src/types/input_sticker.rs
@@ -9,14 +9,17 @@ pub enum InputSticker {
     /// dimensions must not exceed 512px, and either width or height must be
     /// exactly 512px.
     ///
-    /// Pass [`InputFile::File`] to send a file that exists on
-    /// the Telegram servers (recommended), pass an [`InputFile::Url`] for
+    /// Pass [`InputFile::file_id`] to send a file that exists on
+    /// the Telegram servers (recommended), pass an [`InputFile::url`] for
     /// Telegram to get a .webp file from the Internet, or upload a new one
-    /// using [`InputFile::FileId`]. [More info on Sending Files »].
+    /// using [`InputFile::file`], [`InputFile::memory`] or [`InputFile::read`].
+    /// [More info on Sending Files »].
     ///
-    /// [`InputFile::File`]: crate::types::InputFile::File
-    /// [`InputFile::Url`]: crate::types::InputFile::Url
-    /// [`InputFile::FileId`]: crate::types::InputFile::FileId
+    /// [`InputFile::file_id`]: InputFile::file_id
+    /// [`InputFile::url`]: InputFile::url
+    /// [`InputFile::file`]: InputFile::file
+    /// [`InputFile::memory`]: InputFile::memory
+    /// [`InputFile::read`]: InputFile::read
     ///
     /// [More info on Sending Files »]: https://core.telegram.org/bots/api#sending-files
     #[serde(rename = "png_sticker")]

From 219406f5c0861e46718442dcf6439d7b373f6ba8 Mon Sep 17 00:00:00 2001
From: Timo Lang <timolang@gmail.com>
Date: Mon, 17 Jan 2022 11:55:26 +0100
Subject: [PATCH 466/755] Generate impl for bot_commands() -> Vec<BotCommand>

---
 src/lib.rs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index f636d6fb..62d166fe 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -192,7 +192,7 @@ macro_rules! get_or_return {
         match $($some)* {
             Ok(elem) => elem,
             Err(e) => return e
-        };
+        }
     }
 }
 
@@ -257,17 +257,40 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
 
     let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
     let fn_parse = impl_parse(&variant_infos, &command_enum, &vec_impl_create);
+    let fn_commands = impl_commands(&variant_infos, &command_enum);
 
     let trait_impl = quote! {
         impl BotCommand for #ident {
             #fn_descriptions
             #fn_parse
+            #fn_commands
         }
     };
 
     TokenStream::from(trait_impl)
 }
 
+fn impl_commands(
+    infos: &[Command],
+    global: &CommandEnum,
+) -> quote::__private::TokenStream {
+    let commands_to_list = infos.iter().filter_map(|command| {
+        if command.description == Some("off".into()) {
+            None
+        } else {
+            let c = command.get_matched_value(global);
+            let d = command.description.as_deref().unwrap_or_default();
+            Some(quote! { BotCommand::new(#c,#d) })
+        }
+    });
+    quote! {
+        fn bot_commands() -> Vec<teloxide::types::BotCommand> {
+            use teloxide::types::BotCommand;
+            vec![#(#commands_to_list),*]
+        }
+    }
+}
+
 fn impl_descriptions(
     infos: &[Command],
     global: &CommandEnum,

From 75e0577b06bab52bf1643f3857d4979ad8e28040 Mon Sep 17 00:00:00 2001
From: Dmytro Polunin <48922415+p0lunin@users.noreply.github.com>
Date: Tue, 18 Jan 2022 16:29:30 +0200
Subject: [PATCH 467/755] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be1e910e..01dde8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Added
+- `BotCommand::bot_commands()` method that return `Vec<BotCommand>` ([PR #13](https://github.com/teloxide/teloxide-macros/pull/13))
+
 ## [0.4.1] - 2021-07-11
 
 ### Fixed

From 6598ed9f42e65300e35b46949b153fb80848123e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 19 Jan 2022 22:34:12 +0300
Subject: [PATCH 468/755] Remove redundant settings from
 `default_reqwest_settings`

---
 src/net.rs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/net.rs b/src/net.rs
index e7eec05c..75b41dad 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -55,12 +55,12 @@ pub fn client_from_env() -> reqwest::Client {
 /// durations, see the [issue 223].
 ///
 /// The current settings are:
-///  - The `connection/keep-alive` default header.
 ///  - A connection timeout of 5 seconds.
 ///  - A timeout of 17 seconds.
 ///  - `tcp_nodelay` is on.
 ///
 /// ## Notes
+///
 /// 1. The settings may change in the future.
 /// 2. If you are using the polling mechanism to get updates, the timeout
 ///    configured in the client should be bigger than the polling timeout.
@@ -69,19 +69,10 @@ pub fn client_from_env() -> reqwest::Client {
 ///
 /// [issue 223]: https://github.com/teloxide/teloxide/issues/223
 pub fn default_reqwest_settings() -> reqwest::ClientBuilder {
-    use reqwest::header::{HeaderMap, CONNECTION};
-
-    let mut headers = HeaderMap::new();
-    headers.insert(CONNECTION, "keep-alive".parse().unwrap());
-
-    let connect_timeout = Duration::from_secs(5);
-    let timeout = connect_timeout + Duration::from_secs(12);
-
     reqwest::Client::builder()
-        .connect_timeout(connect_timeout)
-        .timeout(timeout)
+        .connect_timeout(Duration::from_secs(5))
+        .timeout(Duration::from_secs(17))
         .tcp_nodelay(true)
-        .default_headers(headers)
 }
 
 /// Creates URL for making HTTPS requests. See the [Telegram documentation].

From cdc8047d8468350fed4fdde0a717f7a6fb4e02f8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 25 Jan 2022 00:36:19 +0300
Subject: [PATCH 469/755] Update clippy, rustfmt and toolchain

---
 .github/workflows/ci.yml | 4 ++--
 rust-toolchain.toml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87ad95ac..16523ee9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2021-12-19
+          toolchain: nightly-2022-01-17
           override: true
           components: rustfmt
 
@@ -75,7 +75,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2021-12-19
+          toolchain: nightly-2022-01-17
           override: true
           components: clippy
 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index a3a5f28c..66a1979e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2021-12-19"
+channel = "nightly-2022-01-17"
 components = ["rustfmt", "clippy"]
 profile = "minimal"

From 87a0718acbd5967dd014e8b63980601f78fc8330 Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Tue, 25 Jan 2022 15:15:04 +0300
Subject: [PATCH 470/755] fix typos in changelog

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a2ed06c..4f4ae3f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for 5.4 telegram bot API ([#133][pr133])
 - Support for 5.5 telegram bot API ([#143][pr143], [#164][pr164])
 - `EditedMessageIsTooLong` error ([#109][pr109])
-- `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
+- `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#117][pr117])
 - `Limits::messages_per_min_channel` ([#121][pr121])
 - `media_group_id` field to `MediaDocument` and `MediaAudio` ([#139][pr139])
 - `caption_entities` method to `InputMediaPhoto` ([#140][pr140])
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `UpdateKind::Error` ([#156][pr156])
 
 [pr109]: https://github.com/teloxide/teloxide-core/pull/109
-[pr116]: https://github.com/teloxide/teloxide-core/pull/116
+[pr117]: https://github.com/teloxide/teloxide-core/pull/117
 [pr121]: https://github.com/teloxide/teloxide-core/pull/121
 [pr135]: https://github.com/teloxide/teloxide-core/pull/135
 [pr139]: https://github.com/teloxide/teloxide-core/pull/139
@@ -57,11 +57,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Deserialization of chat migrations, see issue [#427][issue427] ([#143][pr143])
-- Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#116][pr116])
+- Type of `BanChatMember::until_date`: `u64` -> `chrono::DateTime<Utc>` ([#117][pr117])
 - Type of `Poll::correct_option_id`: `i32` -> `u8` ([#119][pr119])
 - Type of `Poll::open_period`: `i32` -> `u16` ([#119][pr119])
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
-- Make `SendPoll::poll_` optional ([#133][pr133])
+- Make `SendPoll::type_` optional ([#133][pr133])
 - Bug with `caption_entities`, see issue [#473][issue473]
 - Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
 - Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))

From 38f2a5fef2bc9e149258f7be6d7984c10dc23f86 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 27 Jan 2022 20:25:40 +0300
Subject: [PATCH 471/755] Make `WebhookInfo::ip_address` typed

---
 CHANGELOG.md              | 2 ++
 src/types/webhook_info.rs | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f4ae3f0..402292ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,12 +47,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - How forwarded messages are represented ([#151][pr151])
 - `RequestError::InvalidJson` now has a `raw` field with raw json for easier debugability ([#150][pr150])
 - `ChatPermissions` is now bitflags ([#157][pr157])
+- Type of `WebhookInfo::ip_address` from `String` to `std::net::IpAddr` ([#172][pr172])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
 [pr134]: https://github.com/teloxide/teloxide-core/pull/134
 [pr150]: https://github.com/teloxide/teloxide-core/pull/150
 [pr157]: https://github.com/teloxide/teloxide-core/pull/157
+[pr172]: https://github.com/teloxide/teloxide-core/pull/172
 
 ### Fixed
 
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 9b52dc14..7a3d2f91 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -1,3 +1,5 @@
+use std::net::IpAddr;
+
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
@@ -19,7 +21,7 @@ pub struct WebhookInfo {
     pub pending_update_count: u32,
 
     /// Currently used webhook IP address.
-    pub ip_address: Option<String>,
+    pub ip_address: Option<IpAddr>,
 
     /// Time of the most recent error that happened when trying to
     /// deliver an update via webhook.

From dde40e613f378b888da1ed6ca4cb88b56a1ffe45 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 31 Jan 2022 18:16:44 +0300
Subject: [PATCH 472/755] Change process of building docs

- introduce `docs` alias that does the right thing (tm)
- use `-Zrustdoc-scrape-examples`
---
 .cargo/config.toml | 13 +++++++++++++
 Cargo.toml         |  6 +++++-
 netlify.toml       |  3 +--
 src/lib.rs         |  5 +++--
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .cargo/config.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 00000000..b565a218
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,13 @@
+[alias]
+# Using `--features=full --features=nightly` instead of `--all-features` because of
+# https://github.com/rust-lang/cargo/issues/10333
+#
+# "tokio/macros" and "tokio/rt-multi-thread" are required for examples
+docs = """doc
+-Zrustdoc-scrape-examples=examples
+--features=full --features=nightly
+--features=tokio/macros --features=tokio/rt-multi-thread
+"""
+
+# We pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
+rustdocflags = ["--cfg", "docsrs", "-Znormalize-docs"]
diff --git a/Cargo.toml b/Cargo.toml
index d0b0923c..4a12bea8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,12 +80,16 @@ cache_me = []
 # AutoSend bot adaptor
 auto_send = []
 
+# All features except nightly and tls-related
 full = ["throttle", "trace_adaptor", "erased", "cache_me", "auto_send"]
 
 [package.metadata.docs.rs]
-all-features = true
+features = ["full", "nightly", "tokio/macros", "tokio/rt-multi-thread"]
 rustdoc-args = ["--cfg", "docsrs", "-Znormalize-docs"]
 
+# https://github.com/rust-lang/rust/issues/88791
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples=examples"]
+
 [[example]]
 name = "self_info"
 required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send"]
diff --git a/netlify.toml b/netlify.toml
index e55e0d1a..6493423a 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,6 +1,5 @@
 [build] 
-command = "rustup install nightly --profile minimal && cargo +nightly doc --all-features --no-deps && cp -r target/doc _netlify_out"
-environment = { RUSTDOCFLAGS= "--cfg docsrs -Znormalize-docs" } 
+command = "rustup install nightly --profile minimal && cargo +nightly docs --no-deps && cp -r target/doc _netlify_out"
 publish = "_netlify_out" 
 
 [[redirects]]
diff --git a/src/lib.rs b/src/lib.rs
index dd7b59a1..9f50eae5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -51,7 +51,7 @@
 //! - `erased` — enables [`ErasedRequester`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
 //! - `cache_me` — enables [`CacheMe`] bot adaptor
-//! - `full` — enables all features except `nigthly`
+//! - `full` — enables all features except `nigthly` and tls-related
 //! - `nightly` — enables nigthly-only features, currently:
 //!   - Removes some future boxing using `#![feature(type_alias_impl_trait)]`
 //!   - Used to built docs (`#![feature(doc_cfg, doc_notable_trait)]`)
@@ -74,8 +74,9 @@
 //
 // To properly build docs of this crate run
 // ```console
-// $ RUSTDOCFLAGS="--cfg docsrs -Znormalize-docs" cargo doc --open --all-features
+// $ cargo docs
 // ```
+// (docs alias is defined in `.cargo/config.toml`)
 //
 // `dep_docsrs` is used for the same purpose, but when `teloxide-core` is built as a dependency
 // (see: `teloxide`). We can't use `docsrs` as it breaks tokio compilation in this case.

From a36794c5d3bce9477f7f6424ed714686db4ff1f1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 18:30:40 +0300
Subject: [PATCH 473/755] Make `WebhookInfo::allowed_updates` typed

---
 CHANGELOG.md              | 4 +++-
 src/types/webhook_info.rs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2bb592..3422d890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,7 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - How forwarded messages are represented ([#151][pr151])
 - `RequestError::InvalidJson` now has a `raw` field with raw json for easier debugability ([#150][pr150])
 - `ChatPermissions` is now bitflags ([#157][pr157])
-- Type of `WebhookInfo::ip_address` from `String` to `std::net::IpAddr` ([#172][pr172])
+- Type of `WebhookInfo::ip_address` from `Option<String>` to `Option<std::net::IpAddr>` ([#172][pr172])
+- Type of `WebhookInfo::allowed_updates` from `Option<Vec<String>>` to `Option<Vec<AllowedUpdate>>` ([#174][pr174])
 
 [pr115]: https://github.com/teloxide/teloxide-core/pull/115
 [pr125]: https://github.com/teloxide/teloxide-core/pull/125
@@ -60,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr157]: https://github.com/teloxide/teloxide-core/pull/157
 [pr167]: https://github.com/teloxide/teloxide-core/pull/167
 [pr172]: https://github.com/teloxide/teloxide-core/pull/172
+[pr174]: https://github.com/teloxide/teloxide-core/pull/174
 
 ### Fixed
 
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 7a3d2f91..687d9f21 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -3,6 +3,8 @@ use std::net::IpAddr;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
+use crate::types::AllowedUpdate;
+
 /// Contains information about the current status of a webhook.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#webhookinfo).
@@ -38,5 +40,5 @@ pub struct WebhookInfo {
 
     /// A list of update types the bot is subscribed to. Defaults to all update
     /// types.
-    pub allowed_updates: Option<Vec<String>>,
+    pub allowed_updates: Option<Vec<AllowedUpdate>>,
 }

From 16630133db246224f5a40c7c1df2024e5cb78d05 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 18:31:04 +0300
Subject: [PATCH 474/755] Add regression test for `WebhookInfo` with an empty
 url

---
 src/types/webhook_info.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 687d9f21..6c9d031f 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -42,3 +42,25 @@ pub struct WebhookInfo {
     /// types.
     pub allowed_updates: Option<Vec<AllowedUpdate>>,
 }
+
+// Regression test for <https://github.com/teloxide/teloxide-core/pull/166>
+#[test]
+fn empty_url() {
+    let json = r#"{"url":"","has_custom_certificate":false,"pending_update_count":0,"allowed_updates":["message"]}"#;
+    let actual: WebhookInfo = serde_json::from_str(json).unwrap();
+    let expected = WebhookInfo {
+        url: None,
+        has_custom_certificate: false,
+        pending_update_count: 0,
+        ip_address: None,
+        last_error_date: None,
+        last_error_message: None,
+        max_connections: None,
+        allowed_updates: Some(vec![AllowedUpdate::Message]),
+    };
+
+    assert_eq!(actual, expected);
+
+    let json = r#"{"ok":true,"result":{"url":"","has_custom_certificate":false,"pending_update_count":0,"allowed_updates":["message"]}}"#;
+    serde_json::from_str::<crate::net::TelegramResponse<WebhookInfo>>(json).unwrap();
+}

From 638456019530dc08254cbd08c81b9bd78d7d6075 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 19:39:29 +0300
Subject: [PATCH 475/755] TBA 5.7: Add `InputSticker::Webm`

---
 src/types/input_file.rs    | 4 ++--
 src/types/input_sticker.rs | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index 33dcb31d..f36e5fc0 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -434,13 +434,13 @@ impl InputFileLike for Option<InputFile> {
 
 impl InputFileLike for InputSticker {
     fn copy_into(&self, into: &mut dyn FnMut(InputFile)) {
-        let (InputSticker::Png(input_file) | InputSticker::Tgs(input_file)) = self;
+        let (Self::Png(input_file) | Self::Tgs(input_file) | Self::Webm(input_file)) = self;
 
         input_file.copy_into(into)
     }
 
     fn move_into(&mut self, into: &mut dyn FnMut(InputFile)) {
-        let (InputSticker::Png(input_file) | InputSticker::Tgs(input_file)) = self;
+        let (Self::Png(input_file) | Self::Tgs(input_file) | Self::Webm(input_file)) = self;
 
         input_file.move_into(into)
     }
diff --git a/src/types/input_sticker.rs b/src/types/input_sticker.rs
index 8da456f6..827194ec 100644
--- a/src/types/input_sticker.rs
+++ b/src/types/input_sticker.rs
@@ -27,7 +27,12 @@ pub enum InputSticker {
 
     /// TGS animation with the sticker, uploaded using multipart/form-data.
     ///
-    /// See <https://core.telegram.org/animated_stickers#technical-requirements> for technical requirements
+    /// See <https://core.telegram.org/animated_stickers#technical-requirements> for technical requirements.
     #[serde(rename = "tgs_sticker")]
     Tgs(InputFile),
+
+    /// WEBM video with the sticker, uploaded using multipart/form-data.
+    ///
+    /// See <https://core.telegram.org/stickers#video-sticker-requirements> for technical requirements.
+    Webm(InputFile),
 }

From 044f33551eb6168085247a22dbb864021b0af550 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 20:12:26 +0300
Subject: [PATCH 476/755] TBA 5.7: Add `Sticker{,Set}::is_video`

---
 src/types/sticker.rs     | 5 +++++
 src/types/sticker_set.rs | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 235f774d..0f096727 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -27,6 +27,11 @@ pub struct Sticker {
     /// [animated]: https://telegram.org/blog/animated-stickers
     pub is_animated: bool,
 
+    /// `true`, if the sticker is a [video sticker].
+    ///
+    /// [video sticker]: https://telegram.org/blog/video-stickers-better-reactions
+    pub is_video: bool,
+
     /// Sticker thumbnail in the .webp or .jpg format.
     pub thumb: Option<PhotoSize>,
 
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index 5f501d60..3150518e 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -18,6 +18,11 @@ pub struct StickerSet {
     /// [animates stickers]: https://telegram.org/blog/animated-stickers
     pub is_animated: bool,
 
+    /// `true`, if the sticker is a [video sticker].
+    ///
+    /// [video sticker]: https://telegram.org/blog/video-stickers-better-reactions
+    pub is_video: bool,
+
     /// `true`, if the sticker set contains masks.
     pub contains_masks: bool,
 

From 1ae7544578aecad9f4a936a5cfeafe03d951fa06 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 20:22:20 +0300
Subject: [PATCH 477/755] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3422d890..9c8e6828 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `ApiError::NotEnoughRightsToChangeChatPermissions` ([#155][pr155])
 - Support for 5.4 telegram bot API ([#133][pr133])
 - Support for 5.5 telegram bot API ([#143][pr143], [#164][pr164])
+- Support for 5.6 telegram bot API ([#162][pr162])
+- Support for 5.7 telegram bot API ([#175][pr175])
 - `EditedMessageIsTooLong` error ([#109][pr109])
 - `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#117][pr117])
 - `Limits::messages_per_min_channel` ([#121][pr121])
@@ -31,7 +33,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [pr151]: https://github.com/teloxide/teloxide-core/pull/151
 [pr155]: https://github.com/teloxide/teloxide-core/pull/155
 [pr156]: https://github.com/teloxide/teloxide-core/pull/156
+[pr162]: https://github.com/teloxide/teloxide-core/pull/162
 [pr164]: https://github.com/teloxide/teloxide-core/pull/164
+[pr175]: https://github.com/teloxide/teloxide-core/pull/175
 
 ### Changed
 

From c34a1386df37e40c0afd99919bf22afd93b08cd9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Feb 2022 21:14:09 +0300
Subject: [PATCH 478/755] Fix test

---
 src/types/message.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 7405c7ad..454d721f 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1222,6 +1222,7 @@ mod tests {
            "emoji": "😡",
            "set_name": "AdvenTimeAnim",
            "is_animated": true,
+           "is_video": false,
            "thumb": {
             "file_id": "AAQCAAMjAAOw0PgMaabKAcaXKCBLubkPAAQBAAdtAAPGKwACFgQ",
             "file_unique_id":"",
@@ -1234,8 +1235,7 @@ mod tests {
            "file_size": 16639
           }
          }"#;
-        let message = from_str::<Message>(json);
-        assert!(message.is_ok());
+        from_str::<Message>(json).unwrap();
     }
 
     #[test]

From 82eb96b405be5bab198c5123616ad61b530c0dcd Mon Sep 17 00:00:00 2001
From: Flattergaster <kwkzver@gmail.com>
Date: Wed, 2 Feb 2022 22:35:14 +0300
Subject: [PATCH 479/755] Fix deserialization of
 `ChatInviteLink::pending_join_request_count`

---
 src/types/chat_invite_link.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/chat_invite_link.rs b/src/types/chat_invite_link.rs
index 077d5d76..190b0074 100644
--- a/src/types/chat_invite_link.rs
+++ b/src/types/chat_invite_link.rs
@@ -27,5 +27,5 @@ pub struct ChatInviteLink {
     /// after joining the chat via this invite link; 1-99999
     pub member_limit: Option<u32>,
     /// Number of pending join requests created using this link
-    pub pending_join_request_count: u32,
+    pub pending_join_request_count: Option<u32>,
 }

From 39bdab3754f08f3f084b005cd4b1ce2b1e8ee1d2 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 3 Feb 2022 02:34:19 +0600
Subject: [PATCH 480/755] Fix semicolon issues

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

diff --git a/src/lib.rs b/src/lib.rs
index 88b3c819..cf9399bb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -194,7 +194,7 @@ macro_rules! get_or_return {
         match $($some)* {
             Ok(elem) => elem,
             Err(e) => return e
-        };
+        }
     }
 }
 

From 59750612a2845603913dcb68ef969cb97fbfbcd6 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 3 Feb 2022 03:10:58 +0600
Subject: [PATCH 481/755] Support multiple fields in `DialogueState`

---
 src/dialogue_state.rs | 83 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index fa74e3ae..bd626bd9 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -1,9 +1,9 @@
 use proc_macro2::{Ident, Span, TokenStream};
-use quote::{quote, ToTokens};
+use quote::{format_ident, quote, ToTokens};
 use syn::{
     parse::{Parse, ParseStream},
     spanned::Spanned,
-    Fields, GenericParam, ItemEnum, Path, Type,
+    Fields, FieldsNamed, GenericParam, ItemEnum, Path, Type,
 };
 
 pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
@@ -64,12 +64,13 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
         };
 
         branches.extend(match &variant.fields {
-            Fields::Named(_) => {
-                return Err(syn::Error::new(
-                    variant.span(),
-                    "Named fields does not allowed",
-                ))
-            }
+            Fields::Named(fields) => create_branch_multiple_fields_named(
+                &enum_ident,
+                &self_params,
+                &variant.ident,
+                &handler.func,
+                fields,
+            ),
             Fields::Unnamed(fields) => match fields.unnamed.len() {
                 1 => create_branch_one_field(
                     &enum_ident,
@@ -77,12 +78,13 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
                     &variant.ident,
                     &handler.func,
                 ),
-                len => {
-                    return Err(syn::Error::new(
-                        fields.span(),
-                        format!("Expected 1 field, found {}", len),
-                    ));
-                }
+                len => create_branch_multiple_fields(
+                    &enum_ident,
+                    &self_params,
+                    &variant.ident,
+                    &handler.func,
+                    len,
+                ),
             },
             Fields::Unit => create_branch_no_fields(
                 &enum_ident,
@@ -142,6 +144,59 @@ fn create_branch_one_field(
     }
 }
 
+fn create_branch_multiple_fields(
+    state: &Ident,
+    state_generics: impl ToTokens,
+    kind: &Ident,
+    handler: &Path,
+    fields_count: usize,
+) -> TokenStream {
+    let fields = gen_variant_field_names(fields_count);
+
+    quote! {
+        .branch(
+            dptree::filter_map(|state: #state #state_generics| async move {
+                match state { #state::#kind(#fields) => Some((#fields)), _ => None }
+            }).endpoint(#handler)
+        )
+    }
+}
+
+fn gen_variant_field_names(len: usize) -> TokenStream {
+    let mut fields = quote! {};
+
+    for i in 0..len {
+        let idx = format_ident!("_{}", i);
+        fields.extend(quote! { #idx, });
+    }
+
+    return fields;
+}
+
+fn create_branch_multiple_fields_named(
+    state: &Ident,
+    state_generics: impl ToTokens,
+    kind: &Ident,
+    handler: &Path,
+    fields_named: &FieldsNamed,
+) -> TokenStream {
+    let mut fields = quote! {};
+
+    for field in fields_named.named.iter() {
+        let ident =
+            field.ident.as_ref().expect("Named fields must have identifiers");
+        fields.extend(quote! { #ident, });
+    }
+
+    quote! {
+        .branch(
+            dptree::filter_map(|state: #state #state_generics| async move {
+                match state { #state::#kind { #fields } => Some((#fields)), _ => None }
+            }).endpoint(#handler)
+        )
+    }
+}
+
 fn parse_out_type(
     span: Span,
     attrs: &[syn::Attribute],

From 4f85b8dc038aed87161e0826aa55994e6d3851cd Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Feb 2022 17:48:36 +0300
Subject: [PATCH 482/755] Dump version (-> 0.4.0)

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c8e6828..c1a26904 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.0 - 2022-02-03
+
 ### Added
 
 - `ApiError::TooMuchInlineQueryResults` ([#135][pr135])
diff --git a/Cargo.toml b/Cargo.toml
index 4a12bea8..19562188 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.3.4"
+version = "0.4.0"
 edition = "2018"
 
 license = "MIT"
diff --git a/README.md b/README.md
index 02d3faef..ec037397 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.6%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.7%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
@@ -28,7 +28,7 @@
 </div>
 
 ```toml
-teloxide-core = "0.3"
+teloxide-core = "0.4"
 ```
 _Compiler support: requires rustc 1.49+_.
 

From 57d3e266fa25a6ee2ccbfe140016cdb5d3223147 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Fri, 4 Feb 2022 23:59:52 +0600
Subject: [PATCH 483/755] Remove useless `async move { ... }`

---
 src/dialogue_state.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index bd626bd9..363aff10 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -122,7 +122,7 @@ fn create_branch_no_fields(
 ) -> TokenStream {
     quote! {
         .branch(
-            dptree::filter(|state: #state #state_generics| async move {
+            dptree::filter(|state: #state #state_generics| {
                 match state { #state::#kind => true, _ => false }
             }).endpoint(#handler)
         )
@@ -137,7 +137,7 @@ fn create_branch_one_field(
 ) -> TokenStream {
     quote! {
         .branch(
-            dptree::filter_map(|state: #state #state_generics| async move {
+            dptree::filter_map(|state: #state #state_generics| {
                 match state { #state::#kind(arg) => Some(arg), _ => None }
             }).endpoint(#handler)
         )
@@ -155,7 +155,7 @@ fn create_branch_multiple_fields(
 
     quote! {
         .branch(
-            dptree::filter_map(|state: #state #state_generics| async move {
+            dptree::filter_map(|state: #state #state_generics| {
                 match state { #state::#kind(#fields) => Some((#fields)), _ => None }
             }).endpoint(#handler)
         )
@@ -190,7 +190,7 @@ fn create_branch_multiple_fields_named(
 
     quote! {
         .branch(
-            dptree::filter_map(|state: #state #state_generics| async move {
+            dptree::filter_map(|state: #state #state_generics| {
                 match state { #state::#kind { #fields } => Some((#fields)), _ => None }
             }).endpoint(#handler)
         )

From 4ea14fba535e2cef2effbbc678e8f190868f687a Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sat, 5 Feb 2022 01:23:18 +0600
Subject: [PATCH 484/755] Fix Clippy

---
 src/dialogue_state.rs | 14 +++++++-------
 src/fields_parse.rs   |  2 +-
 src/lib.rs            |  5 +----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index 363aff10..9aa22c12 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -10,7 +10,7 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
     let enum_ident = &item.ident;
     let self_params_with_bounds = {
         let params = &item.generics.params;
-        if params.len() != 0 {
+        if !params.is_empty() {
             quote! { < #params > }
         } else {
             quote! {}
@@ -18,7 +18,7 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
     };
     let self_params = {
         let params = &item.generics.params;
-        if params.len() != 0 {
+        if !params.is_empty() {
             let mut params = quote! { < };
             item.generics.params.iter().for_each(|param| match param {
                 GenericParam::Type(ty) => {
@@ -65,7 +65,7 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
 
         branches.extend(match &variant.fields {
             Fields::Named(fields) => create_branch_multiple_fields_named(
-                &enum_ident,
+                enum_ident,
                 &self_params,
                 &variant.ident,
                 &handler.func,
@@ -73,13 +73,13 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
             ),
             Fields::Unnamed(fields) => match fields.unnamed.len() {
                 1 => create_branch_one_field(
-                    &enum_ident,
+                    enum_ident,
                     &self_params,
                     &variant.ident,
                     &handler.func,
                 ),
                 len => create_branch_multiple_fields(
-                    &enum_ident,
+                    enum_ident,
                     &self_params,
                     &variant.ident,
                     &handler.func,
@@ -87,7 +87,7 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
                 ),
             },
             Fields::Unit => create_branch_no_fields(
-                &enum_ident,
+                enum_ident,
                 &self_params,
                 &variant.ident,
                 &handler.func,
@@ -170,7 +170,7 @@ fn gen_variant_field_names(len: usize) -> TokenStream {
         fields.extend(quote! { #idx, });
     }
 
-    return fields;
+    fields
 }
 
 fn create_branch_multiple_fields_named(
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 440b45e5..f50c8eb4 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -89,7 +89,7 @@ fn create_parser<'a>(
             count_args,
         ),
         ParserType::Custom(s) => {
-            let ident = syn::Ident::new(&s, Span::call_site());
+            let ident = syn::Ident::new(s, Span::call_site());
             quote! { #ident }
         }
     };
diff --git a/src/lib.rs b/src/lib.rs
index cf9399bb..cf0f3840 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -29,10 +29,7 @@ use std::fmt::Write;
 pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     match dialogue_state::expand(input) {
-        Ok(s) => {
-            let s = s.into();
-            s
-        }
+        Ok(s) => s.into(),
         Err(e) => e.into_compile_error().into(),
     }
 }

From 057282574803d189a58313a3a10c1ab92ae1dc52 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sat, 5 Feb 2022 21:34:40 +0600
Subject: [PATCH 485/755] Update the changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01dde8ad..84c3c83d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [unreleased]
 
 ### Added
-- `BotCommand::bot_commands()` method that return `Vec<BotCommand>` ([PR #13](https://github.com/teloxide/teloxide-macros/pull/13))
+
+- The `BotCommand::bot_commands()` method that returns `Vec<BotCommand>` ([PR #13](https://github.com/teloxide/teloxide-macros/pull/13)).
+- `#[derive(DialogueState)]`, `#[handler_out(...)]`, `#[handler(...)]`.
 
 ## [0.4.1] - 2021-07-11
 

From b5ce3456480e808fa0e3fdb07111e109945a2bff Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sat, 5 Feb 2022 21:36:47 +0600
Subject: [PATCH 486/755] Bump the version to v0.5.0

---
 CHANGELOG.md | 32 +++++++++++++++++++++-----------
 Cargo.toml   |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84c3c83d..a857c853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,26 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## unreleased
+
+## 0.5.0 - 2022-02-05
 
 ### Added
 
 - The `BotCommand::bot_commands()` method that returns `Vec<BotCommand>` ([PR #13](https://github.com/teloxide/teloxide-macros/pull/13)).
 - `#[derive(DialogueState)]`, `#[handler_out(...)]`, `#[handler(...)]`.
 
-## [0.4.1] - 2021-07-11
+## 0.4.1 - 2021-07-11
 
 ### Fixed
 
  - Fix generics support for a variant's arguments ([PR #8](https://github.com/teloxide/teloxide-macros/issues/8)).
 
-## [0.4.0] - 2021-03-19
+## 0.4.0 - 2021-03-19
 
 ### Changed
 
  - Adjust dialogues with the latest teloxide (v0.4.0).
 
-## [0.3.2] - 2020-07-27
+## 0.3.2 - 2020-07-27
 
 ### Added
  - `#[derive(Transition)]` with `#[teloxide(subtransition)]`.
@@ -31,11 +33,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
  - The `dev` branch.
 
-## [0.3.1] - 2020-07-04
+## 0.3.1 - 2020-07-04
+
 ### Added
  - Now you can remove command from showing in descriptions by defining `description` attribute as `"off"`.
 
-## [0.3.0] - 2020-07-03
+## 0.3.0 - 2020-07-03
+
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
  - Now parsing of arguments happens using special function. There are 3 possible variants:
@@ -50,7 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - `#[parse_with]` attribute.
  - `#[separator='%sep%']` attribute.
 
-## [0.2.1] - 2020-02-25
+## 0.2.1 - 2020-02-25
+
 ### Changed
  - The description in `Cargo.toml` was changed to from "The teloxide's macros for internal usage" to "The teloxide's procedural macros".
 
@@ -59,23 +64,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - `.gitignore`.
  - The functionality to parse commands only with a correct bot's name (breaks backwards compatibility).
 
-## [0.1.2] - 2020-02-24
+## 0.1.2 - 2020-02-24
+
 ### Changed
  - The same as v0.1.1, but fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility.
 
 
-## [0.2.0] - [YANKED]
+## 0.2.0 - YANKED
+
 ### Changed
  - Fixes [the issue](https://github.com/teloxide/teloxide/issues/176) about backwards compatibility, but fairly soon I realised that semver recommends to use v0.1.2 instead.
 
 
-## [0.1.1] - 2020-02-23
+## 0.1.1 - 2020-02-23
+
 ### Added
  - The `LICENSE` file.
+
 ### Changed
  - Backwards compatibility is broken and was fixed in v0.1.2.
 
 
-## [0.1.0] - 2020-02-19
+## 0.1.0 - 2020-02-19
+
 ### Added
  - This project.
diff --git a/Cargo.toml b/Cargo.toml
index d924b669..f45b13b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.4.1"
+version = "0.5.0"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From fb523f153e35ebd14f3567aacaa1e25db9bd66d9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 13 Feb 2022 20:53:41 +0300
Subject: [PATCH 487/755] Fix deserialization of `UntilDate`

---
 CHANGELOG.md                               | 6 ++++++
 src/types/non_telegram_types/until_date.rs | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a26904..26ef87fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+- Deserialization of `UntilDate` ([#178][pr178])
+
+[pr178]: https://github.com/teloxide/teloxide-core/pull/178
+
 ## 0.4.0 - 2022-02-03
 
 ### Added
diff --git a/src/types/non_telegram_types/until_date.rs b/src/types/non_telegram_types/until_date.rs
index 01dea584..d499ef9c 100644
--- a/src/types/non_telegram_types/until_date.rs
+++ b/src/types/non_telegram_types/until_date.rs
@@ -37,6 +37,13 @@ impl<'de> Deserialize<'de> for UntilDate {
                     ))),
                 }
             }
+
+            fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                self.visit_i64(v as _)
+            }
         }
 
         deserializer.deserialize_i64(UntilDateVisitor)

From c0795f0dc9de978a5ee0f7e0e83e417e6374f4c8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 13 Feb 2022 20:53:58 +0300
Subject: [PATCH 488/755] Add regression test for issue 523

---
 src/types/update.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/types/update.rs b/src/types/update.rs
index cf938187..f3c3b5b7 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -492,4 +492,25 @@ mod test {
             _ => panic!("Expected error"),
         }
     }
+
+    #[test]
+    fn issue_523() {
+        let json = r#"{
+            "update_id":0,
+            "my_chat_member": {
+                "chat":{"id":0,"first_name":"FN","last_name":"LN","username":"UN","type":"private"},
+                "from":{"id":0,"is_bot":false,"first_name":"FN","last_name":"LN","username":"UN"},
+                "date":1644677726,
+                "old_chat_member":{"user":{"id":1,"is_bot":true,"first_name":"bot","username":"unBot"},"status":"member"},
+                "new_chat_member":{"user":{"id":1,"is_bot":true,"first_name":"bot","username":"unBot"},"status":"kicked","until_date":0}
+            }
+        }"#;
+
+        let Update { kind, .. } = serde_json::from_str(json).unwrap();
+
+        match kind {
+            UpdateKind::MyChatMember(_) => {}
+            _ => panic!("Expected `MyChatMember`"),
+        }
+    }
 }

From 8d89fdccbdaaab52ad82db383ebe4aae534184aa Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 13 Feb 2022 20:58:33 +0300
Subject: [PATCH 489/755] Fix `Update` de/serialization tests

---
 src/types/update.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/types/update.rs b/src/types/update.rs
index f3c3b5b7..832cd971 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -400,7 +400,11 @@ mod test {
   }
 "#;
 
-        assert!(serde_json::from_str::<Update>(text).is_ok());
+        let Update { kind, .. } = serde_json::from_str::<Update>(text).unwrap();
+        match kind {
+            UpdateKind::Message(_) => {}
+            _ => panic!("Expected `Message`"),
+        }
     }
 
     #[test]
@@ -442,7 +446,11 @@ mod test {
     "update_id": 845402291
 }"#;
 
-        serde_json::from_str::<Update>(json).unwrap();
+        let Update { kind, .. } = serde_json::from_str(json).unwrap();
+        match kind {
+            UpdateKind::Message(_) => {}
+            _ => panic!("Expected `Message`"),
+        }
     }
 
     #[test]
@@ -474,7 +482,11 @@ mod test {
 }
         "#;
 
-        serde_json::from_str::<Update>(json).unwrap();
+        let Update { kind, .. } = serde_json::from_str(json).unwrap();
+        match kind {
+            UpdateKind::Message(_) => {}
+            _ => panic!("Expected `Message`"),
+        }
     }
 
     #[test]

From bfb64665a6354d11f166a9a2a0a252c8b742f256 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 13 Feb 2022 21:08:40 +0300
Subject: [PATCH 490/755] Release `0.4.1`

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26ef87fb..07b4d37f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.1 - 2022-02-13
+
 ### Fixed
 
 - Deserialization of `UntilDate` ([#178][pr178])
diff --git a/Cargo.toml b/Cargo.toml
index 19562188..389d2623 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2018"
 
 license = "MIT"

From 2dc4a915bae3c6f83b27316d17e194f9a3281960 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 14 Feb 2022 19:15:30 +0300
Subject: [PATCH 491/755] Add a way for long-running requests to increase
 network timeout

---
 CHANGELOG.md            |  6 ++++++
 src/bot.rs              |  6 ++++++
 src/net/request.rs      | 26 ++++++++++++++++++++++----
 src/requests/payload.rs | 10 ++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07b4d37f..ad76632a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `Payload::timeout_hint` method to properly handle long running requests like `GetUpdates` ([#180][pr180])
+
+[pr180]: https://github.com/teloxide/teloxide-core/pull/180
+
 ## 0.4.1 - 2022-02-13
 
 ### Fixed
diff --git a/src/bot.rs b/src/bot.rs
index 9e57d393..0b7cb67e 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -214,6 +214,7 @@ impl Bot {
         let token = Arc::clone(&self.token);
         let api_url = Arc::clone(&self.api_url);
 
+        let timeout_hint = payload.timeout_hint();
         let params = serde_json::to_vec(payload)
             // this `expect` should be ok since we don't write request those may trigger error here
             .expect("serialization of request to be infallible");
@@ -226,6 +227,7 @@ impl Bot {
                 reqwest::Url::clone(&*api_url),
                 P::NAME,
                 params,
+                timeout_hint,
             )
             .await
         }
@@ -243,6 +245,7 @@ impl Bot {
         let token = Arc::clone(&self.token);
         let api_url = Arc::clone(&self.api_url);
 
+        let timeout_hint = payload.timeout_hint();
         let params = serde_multipart::to_form(payload);
 
         // async move to capture client&token&api_url&params
@@ -254,6 +257,7 @@ impl Bot {
                 reqwest::Url::clone(&*api_url),
                 P::NAME,
                 params,
+                timeout_hint,
             )
             .await
         }
@@ -271,6 +275,7 @@ impl Bot {
         let token = Arc::clone(&self.token);
         let api_url = self.api_url.clone();
 
+        let timeout_hint = payload.timeout_hint();
         let params = serde_multipart::to_form_ref(payload);
 
         // async move to capture client&token&api_url&params
@@ -282,6 +287,7 @@ impl Bot {
                 reqwest::Url::clone(&*api_url),
                 P::NAME,
                 params,
+                timeout_hint,
             )
             .await
         }
diff --git a/src/net/request.rs b/src/net/request.rs
index 9edae5c6..64c71f06 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -16,6 +16,7 @@ pub async fn request_multipart<T>(
     api_url: reqwest::Url,
     method_name: &str,
     params: reqwest::multipart::Form,
+    timeout_hint: Option<Duration>,
 ) -> ResponseResult<T>
 where
     T: DeserializeOwned,
@@ -33,10 +34,18 @@ where
     // [#460]: https://github.com/teloxide/teloxide/issues/460
     let method_name = method_name.trim_end_matches("Inline");
 
-    let response = client
+    let mut request = client
         .post(crate::net::method_url(api_url, token, method_name))
         .multipart(params)
-        .send()
+        .build()
+        .map_err(RequestError::Network)?;
+
+    if let Some(timeout) = timeout_hint {
+        *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
+    }
+
+    let response = client
+        .execute(request)
         .await
         .map_err(RequestError::Network)?;
 
@@ -49,6 +58,7 @@ pub async fn request_json<T>(
     api_url: reqwest::Url,
     method_name: &str,
     params: Vec<u8>,
+    timeout_hint: Option<Duration>,
 ) -> ResponseResult<T>
 where
     T: DeserializeOwned,
@@ -66,11 +76,19 @@ where
     // [#460]: https://github.com/teloxide/teloxide/issues/460
     let method_name = method_name.trim_end_matches("Inline");
 
-    let response = client
+    let mut request = client
         .post(crate::net::method_url(api_url, token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
         .body(params)
-        .send()
+        .build()
+        .map_err(RequestError::Network)?;
+
+    if let Some(timeout) = timeout_hint {
+        *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
+    }
+
+    let response = client
+        .execute(request)
         .await
         .map_err(RequestError::Network)?;
 
diff --git a/src/requests/payload.rs b/src/requests/payload.rs
index 8129164c..4148da33 100644
--- a/src/requests/payload.rs
+++ b/src/requests/payload.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 /// Payload of a request.
 ///
 /// Simply speaking, structures implementing this trait represent arguments of
@@ -21,4 +23,12 @@ pub trait Payload {
     /// It is case insensitive, though must not include underscores. (e.g.
     /// `GetMe`, `GETME`, `getme`, `getMe` are ok, but `get_me` is not ok).
     const NAME: &'static str;
+
+    /// If this payload may take long time to execute (e.g. [`GetUpdates`] with
+    /// big `timeout`), the **minimum** timeout that should be used.
+    ///
+    /// [`GetUpdates`]: crate::payloads::GetUpdates
+    fn timeout_hint(&self) -> Option<Duration> {
+        None
+    }
 }

From fb7710b83801f2c4bfa412cafd44045d6cdbacc4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 14 Feb 2022 19:48:32 +0300
Subject: [PATCH 492/755] Make `GetUpdates` expose its `timeout` via
 `Payload::timeout_hint`

---
 src/local_macros.rs         | 9 +++++++++
 src/payloads/get_updates.rs | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index e4a786a2..ee2f4916 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -99,6 +99,9 @@ macro_rules! impl_payload {
         $(
             @[multipart = $($multipart_attr:ident),*]
         )?
+        $(
+            @[timeout_secs = $timeout_secs:ident]
+        )?
         $(
             #[ $($method_meta:tt)* ]
         )*
@@ -179,6 +182,12 @@ macro_rules! impl_payload {
             type Output = $Ret;
 
             const NAME: &'static str = stringify!($Method);
+
+            $(
+                fn timeout_hint(&self) -> Option<std::time::Duration> {
+                    self.$timeout_secs.map(<_>::into).map(std::time::Duration::from_secs)
+                }
+            )?
         }
 
         calculated_doc! {
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 695b60de..667ffcdd 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -11,6 +11,7 @@ use serde::Serialize;
 use crate::types::{AllowedUpdate, Update};
 
 impl_payload! {
+    @[timeout_secs = timeout]
     /// Use this method to receive incoming updates using long polling ([wiki]). An Array of [`Update`] objects is returned.
     ///
     /// [wiki]: https://en.wikipedia.org/wiki/Push_technology#Long_polling

From 3477f7eded6425f5d7af47b27ed378e37dc28c22 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 17 Feb 2022 14:10:39 +0300
Subject: [PATCH 493/755] Fix sending quiz polls

---
 CHANGELOG.md              | 6 ++++++
 src/payloads/send_poll.rs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad76632a..922aed70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+- Serialization of `SendPoll::type_` (it's now possible to send quiz polls) ([#181][pr181])
+
+[pr181]: https://github.com/teloxide/teloxide-core/pull/181
+
 ### Added
 
 - `Payload::timeout_hint` method to properly handle long running requests like `GetUpdates` ([#180][pr180])
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 52d19938..6b37f9c9 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -29,6 +29,7 @@ impl_payload! {
             /// True, if the poll needs to be anonymous, defaults to True
             pub is_anonymous: bool,
             /// Poll type, “quiz” or “regular”, defaults to “regular”
+            #[serde(rename = "type")]
             pub type_: PollType,
             /// True, if the poll allows multiple answers, ignored for polls in quiz mode, defaults to False
             pub allows_multiple_answers: bool,

From 6bf204221f0217b86df26d566fbde1147247d57b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 17 Feb 2022 14:41:38 +0300
Subject: [PATCH 494/755] Deprecate `Message::chat_id`

---
 CHANGELOG.md         | 6 ++++++
 src/types/message.rs | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 922aed70..bb11fc35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Deprecated
+
+- `Message::chat_id` use `.chat.id` field instead ([#182][pr182])
+
+[pr182]: https://github.com/teloxide/teloxide-core/pull/182
+
 ### Fixed
 
 - Serialization of `SendPoll::type_` (it's now possible to send quiz polls) ([#181][pr181])
diff --git a/src/types/message.rs b/src/types/message.rs
index 454d721f..b7d58e88 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -557,6 +557,7 @@ mod getters {
             }
         }
 
+        #[deprecated(since = "0.4.2", note = "use `.chat.id` field instead")]
         pub fn chat_id(&self) -> i64 {
             self.chat.id
         }

From 1d7825c97a4c7d49742c73af2ad7b0e2348191bb Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 17 Feb 2022 15:03:41 +0300
Subject: [PATCH 495/755] Prepare `0.4.2` release

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb11fc35..00ef47e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.2 - 2022-02-17
+
 ### Deprecated
 
 - `Message::chat_id` use `.chat.id` field instead ([#182][pr182])
diff --git a/Cargo.toml b/Cargo.toml
index 389d2623..f688ca56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2018"
 
 license = "MIT"
diff --git a/src/lib.rs b/src/lib.rs
index 9f50eae5..1f222b6b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronouns and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.3"
+//! teloxide_core = "0.4"
 //! ```
 //! _Compiler support: requires rustc 1.49+_
 //!

From 686ec23b762983250e9579054696053c68a67d4a Mon Sep 17 00:00:00 2001
From: mikhailantoshkin <mike.antoshkin@gmail.com>
Date: Sun, 20 Feb 2022 22:56:29 +0500
Subject: [PATCH 496/755] Add missing enum variants to the chat fucntion

---
 src/types/update.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/types/update.rs b/src/types/update.rs
index 832cd971..02d62a77 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -50,6 +50,9 @@ impl Update {
             UpdateKind::ChannelPost(p) => Some(&p.chat),
             UpdateKind::EditedChannelPost(p) => Some(&p.chat),
             UpdateKind::CallbackQuery(q) => Some(&q.message.as_ref()?.chat),
+            UpdateKind::ChatMember(m) => Some(&m.chat),
+            UpdateKind::MyChatMember(m) => Some(&m.chat),
+            UpdateKind::ChatJoinRequest(c) => Some(&c.chat),
             _ => None,
         }
     }

From 3c09f327239cabc96b223c0373bf1e0b83ac2bef Mon Sep 17 00:00:00 2001
From: mikhailantoshkin <mike.antoshkin@gmail.com>
Date: Sun, 20 Feb 2022 23:12:57 +0500
Subject: [PATCH 497/755] Update changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00ef47e4..2a73d6bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+- `Update::chat()` now returns `Some(&Chat)` for `UpdateKind::ChatMember`, `UpdateKind::MyChatMember`,
+  `UpdateKind::ChatJoinRequest` ([#184][pr184])
+
+[pr184]: https://github.com/teloxide/teloxide-core/pull/184
+
 ## 0.4.2 - 2022-02-17
 
 ### Deprecated

From 812f6ef45e487fbaa9251533efaa40980081c71c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 01:43:25 +0300
Subject: [PATCH 498/755] Revert buggy "better timeouts"

---
 src/net/request.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/net/request.rs b/src/net/request.rs
index 64c71f06..5a671e1e 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -16,7 +16,7 @@ pub async fn request_multipart<T>(
     api_url: reqwest::Url,
     method_name: &str,
     params: reqwest::multipart::Form,
-    timeout_hint: Option<Duration>,
+    _timeout_hint: Option<Duration>,
 ) -> ResponseResult<T>
 where
     T: DeserializeOwned,
@@ -40,9 +40,10 @@ where
         .build()
         .map_err(RequestError::Network)?;
 
-    if let Some(timeout) = timeout_hint {
-        *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
-    }
+    // FIXME: uncomment this, when reqwest starts setting default timeout early
+    // if let Some(timeout) = timeout_hint {
+    //     *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
+    // }
 
     let response = client
         .execute(request)
@@ -58,7 +59,7 @@ pub async fn request_json<T>(
     api_url: reqwest::Url,
     method_name: &str,
     params: Vec<u8>,
-    timeout_hint: Option<Duration>,
+    _timeout_hint: Option<Duration>,
 ) -> ResponseResult<T>
 where
     T: DeserializeOwned,
@@ -83,9 +84,10 @@ where
         .build()
         .map_err(RequestError::Network)?;
 
-    if let Some(timeout) = timeout_hint {
-        *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
-    }
+    // FIXME: uncomment this, when reqwest starts setting default timeout early
+    // if let Some(timeout) = timeout_hint {
+    //     *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
+    // }
 
     let response = client
         .execute(request)

From d5ad882999acf03523465b435fcba17ca0375955 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 01:45:41 +0300
Subject: [PATCH 499/755] fix typos

---
 src/net/request.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/request.rs b/src/net/request.rs
index 5a671e1e..2b046bbd 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -27,7 +27,7 @@ where
     // the used arguments we model this as `...` and `..._inline` pairs of methods.
     //
     // Currently inline versions have wrong Payload::NAME (ie with the "Inline"
-    // sufix). This removes the sufix allowing to call the right telegram method.
+    // suffix). This removes the suffix allowing to call the right telegram method.
     // Note that currently there are no normal telegram methods ending in "Inline",
     // so this is fine.
     //
@@ -70,7 +70,7 @@ where
     // the used arguments we model this as `...` and `..._inline` pairs of methods.
     //
     // Currently inline versions have wrong Payload::NAME (ie with the "Inline"
-    // sufix). This removes the sufix allowing to call the right telegram method.
+    // suffix). This removes the suffix allowing to call the right telegram method.
     // Note that currently there are no normal telegram methods ending in "Inline",
     // so this is fine.
     //

From cfb48a6fa4a16df868008202e8751994b95f011b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 01:48:09 +0300
Subject: [PATCH 500/755] Update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a73d6bb..ede1b596 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `Update::chat()` now returns `Some(&Chat)` for `UpdateKind::ChatMember`, `UpdateKind::MyChatMember`,
   `UpdateKind::ChatJoinRequest` ([#184][pr184])
+- `get_updates` timeouts (partially revert buggy [#180][pr180]) ([#185][pr185])
 
 [pr184]: https://github.com/teloxide/teloxide-core/pull/184
+[pr185]: https://github.com/teloxide/teloxide-core/pull/185
 
-## 0.4.2 - 2022-02-17
+## 0.4.2 - 2022-02-17 [yanked]
 
 ### Deprecated
 

From 9eb51ad34bf6683e2d9e3d36885a9037ccb928d7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 02:21:52 +0300
Subject: [PATCH 501/755] fix clippy

---
 src/net/request.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/net/request.rs b/src/net/request.rs
index 2b046bbd..3730857e 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -34,7 +34,7 @@ where
     // [#460]: https://github.com/teloxide/teloxide/issues/460
     let method_name = method_name.trim_end_matches("Inline");
 
-    let mut request = client
+    let request = client
         .post(crate::net::method_url(api_url, token, method_name))
         .multipart(params)
         .build()
@@ -77,7 +77,7 @@ where
     // [#460]: https://github.com/teloxide/teloxide/issues/460
     let method_name = method_name.trim_end_matches("Inline");
 
-    let mut request = client
+    let request = client
         .post(crate::net::method_url(api_url, token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
         .body(params)

From fbbb5c842bca3e57763825565a9f47238c073baf Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 02:13:27 +0300
Subject: [PATCH 502/755] Add `User::is_telegram`

---
 src/types/user.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/types/user.rs b/src/types/user.rs
index 9498c799..60856fac 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -84,6 +84,26 @@ impl User {
 
         self.id == ANON_CHANNEL_ID
     }
+
+    /// Returns `true` if this is special user used by telegram itself.
+    ///
+    /// It is sometimes also used as a fallback, for example when a channel post
+    /// is automatically forwarded to a group, bots in a group will get a
+    /// message where `from` is the Telegram user.
+    pub fn is_telegram(&self) -> bool {
+        const TELEGRAM_USER_ID: i64 = 777000;
+
+        // Sanity check
+        debug_assert!(
+            (self.id != TELEGRAM_USER_ID)
+                || (!self.is_bot
+                    && self.first_name == "Telegram"
+                    && self.last_name.is_none()
+                    && self.username.is_none())
+        );
+
+        self.id == TELEGRAM_USER_ID
+    }
 }
 
 #[cfg(test)]

From 5fb0a4787f177b9e89ab1d90d8be4212a91d1113 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 02:14:10 +0300
Subject: [PATCH 503/755] fix typos

---
 src/types/user.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/user.rs b/src/types/user.rs
index 60856fac..f748fe96 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -50,7 +50,7 @@ impl User {
     }
 
     /// Returns `true` if this is special user used by telegram bot API to
-    /// denote an annonymous user that sends messages on behalf of a group.
+    /// denote an anonymous user that sends messages on behalf of a group.
     pub fn is_anonymous(&self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
         const ANON_ID: i64 = 1087968824;
@@ -68,7 +68,7 @@ impl User {
     }
 
     /// Returns `true` if this is special user used by telegram bot API to
-    /// denote an annonymous user that sends messages on behalf of a channel.
+    /// denote an anonymous user that sends messages on behalf of a channel.
     pub fn is_channel(&self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
         const ANON_CHANNEL_ID: i64 = 136817688;

From b0607f604add8db9b8c387c79858213ec58bd95a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 3 Mar 2022 02:15:18 +0300
Subject: [PATCH 504/755] update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a73d6bb..13d94346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `User::is_telegram` function ([#186][pr186])
+
+[pr186]: https://github.com/teloxide/teloxide-core/pull/186
+
 ### Fixed
 
 - `Update::chat()` now returns `Some(&Chat)` for `UpdateKind::ChatMember`, `UpdateKind::MyChatMember`,

From 11c79499e32eec85c95c34b0dc96f57415e254db Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Mar 2022 22:43:24 +0400
Subject: [PATCH 505/755] Release 0.4.3

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f766d966..8462f08a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.3 - 2022-03-08
+
 ### Added
 
 - `User::is_telegram` function ([#186][pr186])
diff --git a/Cargo.toml b/Cargo.toml
index f688ca56..8d8a4e38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2018"
 
 license = "MIT"

From 064b19e7355953f6e233d4f36f6e7ff1b068ee14 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 15 Mar 2022 21:00:00 +0400
Subject: [PATCH 506/755] make bot name check case insensitive

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

diff --git a/src/lib.rs b/src/lib.rs
index 19869cbe..c17bbfa6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -360,7 +360,7 @@ fn impl_parse(
               let bot = splited.next();
               let bot_name = bot_name.into();
               match bot {
-                  Some(name) if name == bot_name => {}
+                  Some(name) if name.eq_ignore_ascii_case(&bot_name) => {}
                   None => {}
                   Some(n) => return Err(ParseError::WrongBotName(n.to_string())),
               }

From c7e32fa247dea37942660257b3719946129726d5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 18 Mar 2022 14:13:38 +0400
Subject: [PATCH 507/755] Add `HasPayload::with_payload_mut` function

`HasPayload::with_payload_mut` allows to easily apply multiple changes
to the payload without calling `payload_mut()` multiple times and
creating temporary variable for the request. e.g.:
```rust
// without `with_payload_mut`
{
    let mut req = bot.set_webhook(url.clone());

    req.payload_mut().certificate = certificate.take();
    req.payload_mut().drop_pending_updates = drop_pending_updates;

    req.send().await?;
}

// with `with_payload_mut`
bot
    .set_webhook(url.clone())
    .with_payload_mut(|payload| {
        payload.certificate = certificate.take();
        payload.drop_pending_updates = drop_pending_updates;
    })
    .send()
    .await?
```
---
 CHANGELOG.md                |  6 ++++++
 src/requests/has_payload.rs | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8462f08a..91c9af7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `HasPayload::with_payload_mut` function ([#189][pr189])
+
+[pr189]: https://github.com/teloxide/teloxide-core/pull/189
+
 ## 0.4.3 - 2022-03-08
 
 ### Added
diff --git a/src/requests/has_payload.rs b/src/requests/has_payload.rs
index 870bc50c..d7d12100 100644
--- a/src/requests/has_payload.rs
+++ b/src/requests/has_payload.rs
@@ -28,6 +28,16 @@ pub trait HasPayload {
 
     /// Gain immutable access to the underlying payload.
     fn payload_ref(&self) -> &Self::Payload;
+
+    /// Update payload with a function
+    fn with_payload_mut<F>(mut self, f: F) -> Self
+    where
+        Self: Sized,
+        F: FnOnce(&mut Self::Payload),
+    {
+        f(self.payload_mut());
+        self
+    }
 }
 
 impl<P> HasPayload for P

From d8e3c6ce42a25e9aff9aaa28299a47a7114b243c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 16 Mar 2022 21:09:47 +0400
Subject: [PATCH 508/755] Add `WrongFileIdOrUrl` and `FailedToGetUrlContent`
 errors

---
 CHANGELOG.md  |  6 ++++++
 src/errors.rs | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8462f08a..6e406e10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `WrongFileIdOrUrl` and `FailedToGetUrlContent` errors ([#188][pr188])
+
+[pr188]: https://github.com/teloxide/teloxide-core/pull/188
+
 ## 0.4.3 - 2022-03-08
 
 ### Added
diff --git a/src/errors.rs b/src/errors.rs
index 27d1afb6..e1055844 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -406,6 +406,18 @@ pub enum ApiError {
     #[error("Bad Request: wrong file id")]
     WrongFileId,
 
+    /// Occurs when bot tries to send files with wrong file identifier or HTTP
+    /// url
+    #[serde(rename = "Bad Request: wrong file identifier/HTTP URL specified")]
+    #[error("Bad Request: wrong file identifier/HTTP URL specified")]
+    WrongFileIdOrUrl,
+
+    /// Occurs when When sending files with an url to a site that doesn't
+    /// respond.
+    #[serde(rename = "Bad Request: failed to get HTTP URL content")]
+    #[error("Bad Request: failed to get HTTP URL content")]
+    FailedToGetUrlContent,
+
     /// Occurs when bot tries to do some with group which was deactivated.
     #[serde(rename = "Bad Request: group is deactivated")]
     #[error("Bad Request: group is deactivated")]

From 923be2221d8dad48419079545c2aad1b938c645a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 21 Mar 2022 19:10:12 +0400
Subject: [PATCH 509/755] Add `NotFound` error

---
 CHANGELOG.md  | 2 ++
 src/errors.rs | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e86fd44..aea6658d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `WrongFileIdOrUrl` and `FailedToGetUrlContent` errors ([#188][pr188])
+- `NotFound` error ([#190][pr190])
 - `HasPayload::with_payload_mut` function ([#189][pr189])
 
 [pr188]: https://github.com/teloxide/teloxide-core/pull/188
 [pr189]: https://github.com/teloxide/teloxide-core/pull/189
+[pr190]: https://github.com/teloxide/teloxide-core/pull/190
 
 ## 0.4.3 - 2022-03-08
 
diff --git a/src/errors.rs b/src/errors.rs
index e1055844..a0ac4567 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -66,6 +66,11 @@ pub enum ApiError {
     #[error("Forbidden: bot was blocked by the user")]
     BotBlocked,
 
+    /// Occurs when the bot token is incorrect.
+    #[serde(rename = "Forbidden: bot was blocked by the user")]
+    #[error("Forbidden: bot was blocked by the user")]
+    NotFound,
+
     /// Occurs when bot tries to modify a message without modification content.
     ///
     /// May happen in methods:

From 1a61d02858481669098b850fd50ed7ed55772785 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 21 Mar 2022 19:22:22 +0400
Subject: [PATCH 510/755] Release 0.4.4

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aea6658d..e8c45682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.4 - 2022-04-21
+
 ### Added
 
 - `WrongFileIdOrUrl` and `FailedToGetUrlContent` errors ([#188][pr188])
diff --git a/Cargo.toml b/Cargo.toml
index 8d8a4e38..b9ea7ec8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.3"
+version = "0.4.4"
 edition = "2018"
 
 license = "MIT"

From 7c84eead775dc0150d83f75521899e5a2d12b8f3 Mon Sep 17 00:00:00 2001
From: pan93412 <pan93412@gmail.com>
Date: Tue, 22 Mar 2022 18:05:58 +0800
Subject: [PATCH 511/755] feat: add more rename rules with heck

---
 Cargo.toml          |   1 +
 src/rename_rules.rs | 112 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f45b13b8..7ba649af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ edition = "2018"
 quote = "1.0.7"
 proc-macro2 = "1.0.19"
 syn = { version = "1.0.13",  features = ["full"] }
+heck = "0.4.0"
 
 [lib]
 proc-macro = true
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index ebba4eef..620d3fc2 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -1,6 +1,114 @@
+// Some concepts are from Serde.
+
+use heck::{ToPascalCase, ToLowerCamelCase, ToSnakeCase, ToShoutySnakeCase, ToKebabCase, ToShoutyKebabCase};
+
+/// Apply a renaming rule to an enum variant,
+/// returning the version expected in the source.
+///
+/// The possible `rule` can be: `lowercase`, `UPPERCASE`, `PascalCase`,
+/// `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`,
+/// `SCREAMING-KEBAB-CASE`. See tests for the details how it will work.
 pub fn rename_by_rule(input: &str, rule: &str) -> String {
     match rule {
-        "lowercase" => input.to_string().to_lowercase(),
-        _ => rule.to_string(),
+        "lowercase" => input.to_lowercase(),
+        "UPPERCASE" => input.to_uppercase(),
+        "PascalCase" => input.to_pascal_case(),
+        "camelCase" => input.to_lower_camel_case(),
+        "snake_case" => input.to_snake_case(),
+        "SCREAMING_SNAKE_CASE" => input.to_shouty_snake_case(),
+        "kebab-case" => input.to_kebab_case(),
+        "SCREAMING-KEBAB-CASE" => input.to_shouty_kebab_case(),
+        _ => input.to_string(),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    macro_rules! test_eq {
+        ($lval:expr, $rval:expr) => {
+            assert_eq!(rename_by_rule($lval, TYPE), $rval);
+        };
+    }
+
+    #[test]
+    fn test_lowercase() {
+        const TYPE: &str = "lowercase";
+
+        test_eq!("HelloWorld", "helloworld");
+        test_eq!("Hello_World", "hello_world");
+        test_eq!("Hello-World", "hello-world");
+        test_eq!("helloWorld", "helloworld");
+    }
+
+    #[test]
+    fn test_uppercase() {
+        const TYPE: &str = "UPPERCASE";
+
+        test_eq!("HelloWorld", "HELLOWORLD");
+        test_eq!("Hello_World", "HELLO_WORLD");
+        test_eq!("Hello-World", "HELLO-WORLD");
+        test_eq!("helloWorld", "HELLOWORLD");
+    }
+
+    #[test]
+    fn test_pascalcase() {
+        const TYPE: &str = "PascalCase";
+
+        test_eq!("HelloWorld", "HelloWorld");
+        test_eq!("Hello_World", "HelloWorld");
+        test_eq!("Hello-World", "HelloWorld");
+        test_eq!("helloWorld", "HelloWorld");
+    }
+
+    #[test]
+    fn test_camelcase() {
+        const TYPE: &str = "camelCase";
+
+        test_eq!("HelloWorld", "helloWorld");
+        test_eq!("Hello_World", "helloWorld");
+        test_eq!("Hello-World", "helloWorld");
+        test_eq!("helloWorld", "helloWorld");
+    }
+
+    #[test]
+    fn test_snakecase() {
+        const TYPE: &str = "snake_case";
+
+        test_eq!("HelloWorld", "hello_world");
+        test_eq!("Hello_World", "hello_world");
+        test_eq!("Hello-World", "hello_world");
+        test_eq!("helloWorld", "hello_world");
+    }
+
+    #[test]
+    fn test_screaming_snakecase() {
+        const TYPE: &str = "SCREAMING_SNAKE_CASE";
+
+        test_eq!("HelloWorld", "HELLO_WORLD");
+        test_eq!("Hello_World", "HELLO_WORLD");
+        test_eq!("Hello-World", "HELLO_WORLD");
+        test_eq!("helloWorld", "HELLO_WORLD");
+    }
+
+    #[test]
+    fn test_kebabcase() {
+        const TYPE: &str = "kebab-case";
+
+        test_eq!("HelloWorld", "hello-world");
+        test_eq!("Hello_World", "hello-world");
+        test_eq!("Hello-World", "hello-world");
+        test_eq!("helloWorld", "hello-world");
+    }
+
+    #[test]
+    fn test_screaming_kebabcase() {
+        const TYPE: &str = "SCREAMING-KEBAB-CASE";
+
+        test_eq!("HelloWorld", "HELLO-WORLD");
+        test_eq!("Hello_World", "HELLO-WORLD");
+        test_eq!("Hello-World", "HELLO-WORLD");
+        test_eq!("helloWorld", "HELLO-WORLD");
+    }
+}
\ No newline at end of file

From 3d69d9618249b3c9d38f368c098d4ea1a715b955 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 22 Mar 2022 22:08:47 +0400
Subject: [PATCH 512/755] Fix chat unmark

---
 src/types/chat_id.rs | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index c996c7f3..8a5b88a9 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -23,18 +23,21 @@ impl ChatId {
     pub(crate) fn unmark(&self) -> Option<UnmarkedChatId> {
         use UnmarkedChatId::*;
 
-        const MAX_CHANNEL_ID: i64 = -(10i64.pow(12));
-        const MIN_CHANNEL_ID: i64 = MAX_CHANNEL_ID - (i32::MAX as i64);
-        const MAX_USER_ID: i64 = i32::MAX as _;
-        const MIN_CHAT_ID: i64 = -MAX_USER_ID;
+        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
+        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
+        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
+        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
+        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
+        const MIN_USER_ID: i64 = 0;
+        const MAX_USER_ID: i64 = (1 << 40) - 1;
 
         let res = match self {
-            &Self::Id(id @ MIN_CHAT_ID..=-1) => Chat(-id as _),
-            &Self::Id(id @ MIN_CHANNEL_ID..=MAX_CHANNEL_ID) => Channel((MAX_CHANNEL_ID - id) as _),
-            &Self::Id(id) => {
-                debug_assert!(0 < id && id < MAX_USER_ID, "malformed chat id: {}", id);
-                User(id as _)
+            &Self::Id(id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID) => Chat(-id as _),
+            &Self::Id(id @ MIN_MARKED_CHANNEL_ID..=MAX_MARKED_CHANNEL_ID) => {
+                Channel((MAX_MARKED_CHANNEL_ID - id) as _)
             }
+            &Self::Id(id @ MIN_USER_ID..=MAX_USER_ID) => User(id as _),
+            &Self::Id(id) => panic!("malformed chat id: {}", id),
             Self::ChannelUsername(_) => return None,
         };
 
@@ -43,9 +46,9 @@ impl ChatId {
 }
 
 pub(crate) enum UnmarkedChatId {
-    User(u32),
-    Chat(u32),
-    Channel(u32),
+    User(u64),
+    Chat(u64),
+    Channel(u64),
 }
 
 #[cfg(test)]
@@ -68,4 +71,12 @@ mod tests {
 
         assert_eq!(expected_json, actual_json)
     }
+
+    #[test]
+    fn user_id_unmark() {
+        assert!(matches!(
+            ChatId::Id(5298363099).unmark(),
+            Some(UnmarkedChatId::User(5298363099))
+        ));
+    }
 }

From ffeaa58afc2f045b98a6b41e4f4991b857ca3fd8 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Wed, 23 Mar 2022 07:51:23 +0600
Subject: [PATCH 513/755] Release v0.5.1

---
 CHANGELOG.md | 7 +++++++
 Cargo.toml   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a857c853..66599556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.5.1 - 2022-03-23
+
+### Fixed
+
+ - Make bot name check case-insensitive ([PR #16](https://github.com/teloxide/teloxide-macros/pull/16)).
+ - Add more command rename rules: `UPPERCASE`, `PascalCase`, `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`, and `SCREAMING-KEBAB-CASE` ([PR #18](https://github.com/teloxide/teloxide-macros/pull/18)).
+
 ## 0.5.0 - 2022-02-05
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 7ba649af..43df956d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.5.0"
+version = "0.5.1"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From f9615fc5ab77367fac20f97b25b46e80c937bf0f Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Wed, 23 Mar 2022 07:52:04 +0600
Subject: [PATCH 514/755] Fix fmt

---
 src/rename_rules.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index 620d3fc2..e1ef4a1b 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -1,6 +1,9 @@
 // Some concepts are from Serde.
 
-use heck::{ToPascalCase, ToLowerCamelCase, ToSnakeCase, ToShoutySnakeCase, ToKebabCase, ToShoutyKebabCase};
+use heck::{
+    ToKebabCase, ToLowerCamelCase, ToPascalCase, ToShoutyKebabCase,
+    ToShoutySnakeCase, ToSnakeCase,
+};
 
 /// Apply a renaming rule to an enum variant,
 /// returning the version expected in the source.
@@ -111,4 +114,4 @@ mod tests {
         test_eq!("Hello-World", "HELLO-WORLD");
         test_eq!("helloWorld", "HELLO-WORLD");
     }
-}
\ No newline at end of file
+}

From 37d7dd29bb927c92a61f3d218434959c0500d481 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Wed, 23 Mar 2022 07:55:24 +0600
Subject: [PATCH 515/755] Separate sections in `CHANGELOG.md`

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66599556..e39758e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
  - Make bot name check case-insensitive ([PR #16](https://github.com/teloxide/teloxide-macros/pull/16)).
- - Add more command rename rules: `UPPERCASE`, `PascalCase`, `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`, and `SCREAMING-KEBAB-CASE` ([PR #18](https://github.com/teloxide/teloxide-macros/pull/18)).
+
+### Added
+
+ - More command rename rules: `UPPERCASE`, `PascalCase`, `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`, and `SCREAMING-KEBAB-CASE` ([PR #18](https://github.com/teloxide/teloxide-macros/pull/18)).
 
 ## 0.5.0 - 2022-02-05
 

From 144eb73aaf39145bf8f6b57eec5c76730961c2f1 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 24 Mar 2022 15:04:38 +0600
Subject: [PATCH 516/755] Remove support for the old dispatching

---
 src/dialogue_state.rs |   4 +-
 src/lib.rs            | 172 +-----------------------------------------
 2 files changed, 4 insertions(+), 172 deletions(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index 9aa22c12..5178c754 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -99,9 +99,9 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
         fn assert_clone<T: Clone>() {}
 
         use teloxide::dptree;
-        use teloxide::dispatching2::dialogue::Dialogue;
+        use teloxide::dispatching::dialogue::Dialogue;
 
-        impl #self_params_with_bounds teloxide::dispatching2::HandlerFactory for #enum_ident #self_params #where_clause {
+        impl #self_params_with_bounds teloxide::dispatching::HandlerFactory for #enum_ident #self_params #where_clause {
         type Out = #out;
 
         fn handler() -> dptree::Handler<'static, dptree::di::DependencyMap, Self::Out> {
diff --git a/src/lib.rs b/src/lib.rs
index c17bbfa6..ab3d04f8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,185 +18,17 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{
-    parse_macro_input, DeriveInput, Fields, FnArg, ItemEnum, ItemFn,
-    ReturnType, Type,
-};
-
-use std::fmt::Write;
+use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
 
 #[proc_macro_derive(DialogueState, attributes(handler, handler_out, store))]
 pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     match dialogue_state::expand(input) {
         Ok(s) => s.into(),
-        Err(e) => e.into_compile_error().into(),
+        Err(e) => e.to_compile_error().into(),
     }
 }
 
-/// The docs is below.
-///
-/// The only accepted form at the current moment is `#[teloxide(subtransition)]`
-/// on an asynchronous function. Either this:
-///
-/// ```no_compile
-/// #[teloxide(subtransition)]
-/// async fn my_transition(state: MyState, cx: TransitionIn, ans: T) -> TransitionOut<MyDialogue> {
-///     todo!()
-/// }
-/// ```
-///
-/// Or this:
-///
-/// ```no_compile
-/// #[teloxide(subtransition)]
-/// async fn my_transition(state: MyState, cx: TransitionIn) -> TransitionOut<MyDialogue> {
-///     todo!()
-/// }
-/// ```
-///
-/// Notice the presence/absence of `ans: T`. In the first case, it generates
-/// `impl SubTransition for MyState { type Aux = T; type Dialogue = MyDialogue;
-/// ... }`. In the second case, the `Aux` type defaults to `()`.
-#[proc_macro_attribute]
-pub fn teloxide(attr: TokenStream, item: TokenStream) -> TokenStream {
-    match attr.to_string().as_ref() {
-        "subtransition" => {
-            let item_cloned = item.clone();
-            let input = parse_macro_input!(item as ItemFn);
-            let params = input.sig.inputs.iter().collect::<Vec<&FnArg>>();
-
-            if params.len() != 2 && params.len() != 3 {
-                panic!(
-                    "An transition function must accept two/three parameters: \
-                     a state type, TransitionIn, and an optional data."
-                );
-            }
-
-            // This is actually used inside the quite! { ... } below.
-            #[allow(unused_variables)]
-            let state_type = match params[0] {
-                FnArg::Typed(pat_type) => &pat_type.ty,
-                _ => unreachable!(),
-            };
-            let fn_name = input.sig.ident;
-            let fn_return_type = match input.sig.output {
-                ReturnType::Type(_arrow, _type) => _type,
-                _ => panic!(
-                    "A subtransition must return TransitionOut<your dialogue \
-                     type>"
-                ),
-            };
-            let requester_param_type = match params
-                .get(1)
-                .expect("A requester parameter must be specified")
-            {
-                FnArg::Typed(typed) => typed.ty.clone(),
-                _ => unreachable!(),
-            };
-            let aux_param_type = match params.get(2) {
-                Some(data_param_type) => match *data_param_type {
-                    FnArg::Typed(typed) => typed.ty.clone(),
-                    _ => unreachable!(),
-                },
-                None => {
-                    let unit_type = proc_macro::TokenStream::from(quote! {()});
-                    Box::new(parse_macro_input!(unit_type as Type))
-                }
-            };
-            let call_fn = match params.get(2) {
-                Some(_) => {
-                    quote! {  #fn_name(self, cx, aux) }
-                }
-                None => quote! { #fn_name(self, cx) },
-            };
-
-            let item = proc_macro2::TokenStream::from(item_cloned);
-
-            let impl_transition = quote! {
-                impl teloxide::dispatching::dialogue::Subtransition for #state_type {
-                    type Aux = #aux_param_type;
-                    type Dialogue = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Output;
-                    type Error = <#fn_return_type as teloxide::dispatching::dialogue::SubtransitionOutputType>::Error;
-                    type Requester = <#requester_param_type as teloxide::dispatching::UpdateWithCxRequesterType>::Requester;
-
-                    fn react(self, cx: teloxide::dispatching::dialogue::TransitionIn<Self::Requester>, aux: #aux_param_type)
-                        -> futures::future::BoxFuture<'static, #fn_return_type> {
-                                #item
-                                futures::future::FutureExt::boxed(#call_fn)
-                            }
-                }
-            };
-
-            impl_transition.into()
-        }
-        _ => {
-            panic!("Unrecognised attribute '{}'", attr);
-        }
-    }
-}
-
-/// The docs is below.
-///
-/// All the variants must be of the form `VariantName(MyStateType)`, and
-/// `MyStateType` must implement `Subtransition`. All `MyStateType`s must have
-/// the same `Subtransition::Aux` and `Subtransition::Error`, which will be also
-/// used in the generated implementation.
-#[proc_macro_derive(Transition)]
-pub fn derive_transition(item: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(item as ItemEnum);
-    let mut dispatch_fn = "".to_owned();
-
-    let enum_name = input.ident;
-    let field_type_of_first_variant =
-        match &input.variants.iter().next().unwrap().fields {
-            Fields::Unnamed(fields) => {
-                fields
-                    .unnamed
-                    .iter()
-                    .next()
-                    // .unwrap() because empty enumerations are not yet allowed
-                    // in stable Rust.
-                    .unwrap()
-                    .ty
-                    .to_token_stream()
-                    .to_string()
-            }
-            _ => panic!("Only one unnamed field per variant is allowed"),
-        };
-
-    write!(
-        dispatch_fn,
-        "impl teloxide::dispatching::dialogue::Transition for {1} {{type Aux \
-         = <{0} as teloxide::dispatching::dialogue::Subtransition>::Aux;type \
-         Error = <{0} as \
-         teloxide::dispatching::dialogue::Subtransition>::Error;type \
-         Requester = <{0} as \
-         teloxide::dispatching::dialogue::Subtransition>::Requester;fn \
-         react(self, cx: \
-         teloxide::dispatching::dialogue::TransitionIn<Self::Requester>, aux: \
-         Self::Aux) -> futures::future::BoxFuture<'static, \
-         teloxide::dispatching::dialogue::TransitionOut<Self, Self::Error>> \
-         {{ futures::future::FutureExt::boxed(async move {{ match self {{",
-        field_type_of_first_variant, enum_name
-    )
-    .unwrap();
-
-    for variant in input.variants.iter() {
-        write!(
-            dispatch_fn,
-            "{}::{}(state) => \
-             teloxide::dispatching::dialogue::Subtransition::react(state, cx, \
-             aux).await,",
-            enum_name, variant.ident
-        )
-        .unwrap();
-    }
-
-    write!(dispatch_fn, "}} }}) }} }}").unwrap();
-    dispatch_fn.parse().unwrap()
-}
-
 macro_rules! get_or_return {
     ($($some:tt)*) => {
         match $($some)* {

From eac51495942b6c723a565f7ad6b2750e89b8d126 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 24 Mar 2022 17:40:30 +0600
Subject: [PATCH 517/755] Update the changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e39758e2..d2e70ea6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Removed
+
+ - Support for the old dispatching: `#[teloxide(subtransition)]`.
+
 ## 0.5.1 - 2022-03-23
 
 ### Fixed

From ecf90c8c0535e2a0123bfcce40066613b49977ec Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 17:51:34 +0400
Subject: [PATCH 518/755] Fix a typo in documentation

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

diff --git a/src/types.rs b/src/types.rs
index 751b1842..2d7e80c8 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,4 +1,4 @@
-//! Telergam API types.
+//! Telegram API types.
 
 pub use allowed_update::*;
 pub use animation::*;

From 22cfffc704b93d12053ca402f498155337b18369 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 21:32:01 +0400
Subject: [PATCH 519/755] Fix some more typos

---
 src/adaptors/throttle.rs | 18 +++++++++---------
 src/lib.rs               |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 3e8ef88b..60848b22 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -108,7 +108,7 @@ impl<B> Throttle<B> {
     ///
     /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
     pub fn new_spawn(bot: B, limits: Limits) -> Self {
-        // new/with_settings copypasted here to avoid [rust-lang/#76882]
+        // new/with_settings copy-pasted here to avoid [rust-lang/#76882]
         //
         // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
 
@@ -132,7 +132,7 @@ impl<B> Throttle<B> {
 
     /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
     pub fn spawn_with_settings(bot: B, settings: Settings) -> Self {
-        // with_settings copypasted here to avoid [rust-lang/#76882]
+        // with_settings copy-pasted here to avoid [rust-lang/#76882]
         //
         // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
 
@@ -174,7 +174,7 @@ impl<B> Throttle<B> {
 
     /// Sets new limits.
     ///
-    /// Note: changes may not be applied imidiately.
+    /// Note: changes may not be applied immediately.
     pub async fn set_limits(&self, new: Limits) {
         let (tx, rx) = oneshot::channel();
 
@@ -286,7 +286,7 @@ const SECOND: Duration = Duration::from_secs(1);
 // want to change this.
 const DELAY: Duration = Duration::from_millis(250);
 
-/// Minimal time beetween calls to queue_full function
+/// Minimal time between calls to queue_full function
 const QUEUE_FULL_DELAY: Duration = Duration::from_secs(4);
 
 #[derive(Debug)]
@@ -375,12 +375,12 @@ async fn worker(
     while !rx_is_closed || !queue.is_empty() {
         // FIXME(waffle):
         // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
-        //    execution untill a request is sent. While the execution is 'blocked' no
+        //    execution until a request is sent. While the execution is 'blocked' no
         //    `InfoMessage`s could be answered.
         //
-        // 2. If limits are descreased, ideally we want to shrink queue.
+        // 2. If limits are decreased, ideally we want to shrink queue.
         //
-        // *blocked in asyncronous way
+        // *blocked in asynchronous way
         answer_info(&mut info_rx, &mut limits);
 
         read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
@@ -428,7 +428,7 @@ async fn worker(
         let min_back = now - MINUTE;
         let sec_back = now - SECOND;
 
-        // make history and hchats up-to-date
+        // make history and requests_sent up-to-date
         while let Some((_, time)) = history.front() {
             // history is sorted, we found first up-to-date thing
             if time >= &min_back {
@@ -529,7 +529,7 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
         }
     }
 
-    // Don't grow queue bigger than the capacity to limit DOS posibility
+    // Don't grow queue bigger than the capacity to limit DOS possibility
     while queue.len() < queue.capacity() {
         // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
         match tokio::task::unconstrained(rx.recv()).now_or_never() {
diff --git a/src/lib.rs b/src/lib.rs
index 1f222b6b..4fa831d1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
 //! (Currently, version `5.3` is supported) with ease. The library is fully
-//! asynchronouns and built using [`tokio`].
+//! asynchronous and built using [`tokio`].
 //!
 //!```toml
 //! teloxide_core = "0.4"
@@ -51,8 +51,8 @@
 //! - `erased` — enables [`ErasedRequester`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
 //! - `cache_me` — enables [`CacheMe`] bot adaptor
-//! - `full` — enables all features except `nigthly` and tls-related
-//! - `nightly` — enables nigthly-only features, currently:
+//! - `full` — enables all features except `nightly` and tls-related
+//! - `nightly` — enables nightly-only features, currently:
 //!   - Removes some future boxing using `#![feature(type_alias_impl_trait)]`
 //!   - Used to built docs (`#![feature(doc_cfg, doc_notable_trait)]`)
 //!

From 35e5bac766e80207adc28be6d1243b33b54f49a1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 21:40:00 +0400
Subject: [PATCH 520/755] Pin nightly compiler version in CI

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16523ee9..9cbd2f16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,14 +35,14 @@ jobs:
         rust: 
           - stable
           - beta
-          - nightly
+          - nightly-2022-01-17
     
         include:
           - rust: stable
             features: "--features full"
           - rust: beta
             features: "--features full"
-          - rust: nightly
+          - rust: nightly-2022-01-17
             features: "--all-features"
 
     steps:

From ad56195e52cbea8d14c2973f06affa4b67660b35 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 25 Mar 2022 13:12:26 +0400
Subject: [PATCH 521/755] Fix name of the nightly CI job

---
 .github/workflows/ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cbd2f16..b1569708 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,14 +35,17 @@ jobs:
         rust: 
           - stable
           - beta
-          - nightly-2022-01-17
+          - nightly
     
         include:
           - rust: stable
+            toolchain: stable
             features: "--features full"
           - rust: beta
+            toolchain: beta
             features: "--features full"
-          - rust: nightly-2022-01-17
+          - rust: nightly
+            toolchain: nightly-2022-01-17
             features: "--all-features"
 
     steps:
@@ -51,7 +54,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ matrix.rust }}
+          toolchain: ${{ matrix.toolchain }}
           override: true
       
       - name: build 

From f0fffa7125fe899eff5087c7161784f99b3e1bf1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 13 Mar 2022 17:41:06 +0400
Subject: [PATCH 522/755] Rename `BotCommand` -> `BotCommands`

---
 src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c17bbfa6..7a3c442a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -206,7 +206,7 @@ macro_rules! get_or_return {
     }
 }
 
-#[proc_macro_derive(BotCommand, attributes(command))]
+#[proc_macro_derive(BotCommands, attributes(command))]
 pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     let input = parse_macro_input!(tokens as DeriveInput);
 
@@ -270,7 +270,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     let fn_commands = impl_commands(&variant_infos, &command_enum);
 
     let trait_impl = quote! {
-        impl BotCommand for #ident {
+        impl BotCommands for #ident {
             #fn_descriptions
             #fn_parse
             #fn_commands

From 7e000b917a6af4aa7a0d46e161aed27955959c0a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 14 Mar 2022 18:00:32 +0400
Subject: [PATCH 523/755] `derive(BotCommands)`: support new `descriptions()`

---
 src/command.rs | 18 ++++++++++++++++++
 src/lib.rs     | 44 +++++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 31aa092e..446017e1 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -44,6 +44,24 @@ impl Command {
             String::from(prefix) + &self.name
         }
     }
+
+    pub fn get_matched_value2(
+        &self,
+        global_parameters: &CommandEnum,
+    ) -> (String, String) {
+        let prefix = if let Some(prefix) = &self.prefix {
+            prefix
+        } else if let Some(prefix) = &global_parameters.prefix {
+            prefix
+        } else {
+            "/"
+        };
+        if let Some(rule) = &global_parameters.rename_rule {
+            (String::from(prefix), rename_by_rule(&self.name, rule.as_str()))
+        } else {
+            (String::from(prefix), self.name.clone())
+        }
+    }
 }
 
 pub struct CommandAttrs {
diff --git a/src/lib.rs b/src/lib.rs
index 7a3c442a..3a085cbc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -305,36 +305,26 @@ fn impl_descriptions(
     infos: &[Command],
     global: &CommandEnum,
 ) -> quote::__private::TokenStream {
-    let global_description = if let Some(s) = &global.description {
-        quote! { #s, "\n", }
-    } else {
-        quote! {}
-    };
-    let command = infos.iter().map(|c| c.get_matched_value(global));
-    let description =
-        infos.iter().map(|info| {
-            info.description
-                .as_deref()
-                .map(|e| {
-                    if e != "off" {
-                        format!(" - {}", e)
-                    } else {
-                        e.to_string()
-                    }
-                })
-                .unwrap_or_default()
-        });
-    let result_iter = command.zip(description).map(|(c, d)| {
-        if &d == "off" {
-            quote! {}
-        } else {
-            quote! { #c, #d, '\n', }
-        }
+    let command_descriptions = infos.iter().filter_map(|c| {
+        let (prefix, command) = c.get_matched_value2(global);
+        let description = c.description.clone().unwrap_or_default();
+        (description != "off").then(|| quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } })
     });
 
+    let global_description = match global.description.as_deref() {
+        Some(gd) => quote! { .global_description(#gd) },
+        None => quote! {},
+    };
+
     quote! {
-        fn descriptions() -> String {
-            std::concat!(#global_description #(#result_iter)*).to_string()
+        fn descriptions() -> teloxide::utils::command::CommandDescriptions<'static> {
+            use teloxide::utils::command::{CommandDescriptions, CommandDescription};
+            use std::borrow::Cow;
+
+            CommandDescriptions::new(&[
+                #(#command_descriptions),*
+            ])
+            #global_description
         }
     }
 }

From 0a1d73c223017737c559e1d65e0c911180fca432 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 17:23:11 +0400
Subject: [PATCH 524/755] Rename `ChatId` => `Recipient`

Reason: it isn't _really_ a chat id, it can also be a channel username.
---
 src/adaptors/cache_me.rs                      |   2 +-
 src/adaptors/erased.rs                        | 255 +++++++++---------
 src/adaptors/parse_mode.rs                    |   4 +-
 src/adaptors/throttle.rs                      |  10 +-
 src/bot/api.rs                                | 122 ++++-----
 src/local_macros.rs                           | 118 ++++----
 src/payloads/approve_chat_join_request.rs     |   4 +-
 src/payloads/ban_chat_member.rs               |   4 +-
 src/payloads/ban_chat_sender_chat.rs          |   4 +-
 src/payloads/copy_message.rs                  |   6 +-
 src/payloads/create_chat_invite_link.rs       |   4 +-
 src/payloads/decline_chat_join_request.rs     |   4 +-
 src/payloads/delete_chat_photo.rs             |   4 +-
 src/payloads/delete_chat_sticker_set.rs       |   4 +-
 src/payloads/delete_message.rs                |   4 +-
 src/payloads/edit_chat_invite_link.rs         |   4 +-
 src/payloads/edit_message_caption.rs          |   4 +-
 src/payloads/edit_message_live_location.rs    |   4 +-
 src/payloads/edit_message_media.rs            |   4 +-
 src/payloads/edit_message_reply_markup.rs     |   4 +-
 src/payloads/edit_message_text.rs             |   4 +-
 src/payloads/export_chat_invite_link.rs       |   4 +-
 src/payloads/forward_message.rs               |   6 +-
 src/payloads/get_chat.rs                      |   4 +-
 src/payloads/get_chat_administrators.rs       |   4 +-
 src/payloads/get_chat_member.rs               |   4 +-
 src/payloads/get_chat_member_count.rs         |   4 +-
 src/payloads/get_chat_members_count.rs        |   4 +-
 src/payloads/kick_chat_member.rs              |   4 +-
 src/payloads/leave_chat.rs                    |   4 +-
 src/payloads/pin_chat_message.rs              |   4 +-
 src/payloads/promote_chat_member.rs           |   4 +-
 src/payloads/restrict_chat_member.rs          |   4 +-
 src/payloads/revoke_chat_invite_link.rs       |   4 +-
 src/payloads/send_animation.rs                |   4 +-
 src/payloads/send_audio.rs                    |   4 +-
 src/payloads/send_chat_action.rs              |   4 +-
 src/payloads/send_contact.rs                  |   4 +-
 src/payloads/send_dice.rs                     |   4 +-
 src/payloads/send_document.rs                 |   4 +-
 src/payloads/send_invoice.rs                  |   4 +-
 src/payloads/send_location.rs                 |   4 +-
 src/payloads/send_media_group.rs              |   4 +-
 src/payloads/send_message.rs                  |   4 +-
 src/payloads/send_photo.rs                    |   4 +-
 src/payloads/send_poll.rs                     |   4 +-
 src/payloads/send_sticker.rs                  |   4 +-
 src/payloads/send_venue.rs                    |   4 +-
 src/payloads/send_video.rs                    |   4 +-
 src/payloads/send_video_note.rs               |   4 +-
 src/payloads/send_voice.rs                    |   4 +-
 .../set_chat_administrator_custom_title.rs    |   4 +-
 src/payloads/set_chat_description.rs          |   4 +-
 src/payloads/set_chat_permissions.rs          |   4 +-
 src/payloads/set_chat_photo.rs                |   4 +-
 src/payloads/set_chat_sticker_set.rs          |   4 +-
 src/payloads/set_chat_title.rs                |   4 +-
 src/payloads/stop_message_live_location.rs    |   4 +-
 src/payloads/stop_poll.rs                     |   4 +-
 src/payloads/unban_chat_member.rs             |   4 +-
 src/payloads/unban_chat_sender_chat.rs        |   4 +-
 src/payloads/unpin_all_chat_messages.rs       |   4 +-
 src/payloads/unpin_chat_message.rs            |   4 +-
 src/requests/requester.rs                     | 122 ++++-----
 src/types.rs                                  |   6 +-
 src/types/bot_command_scope.rs                |  12 +-
 src/types/chat_id.rs                          |  81 ------
 src/types/recipient.rs                        |  82 ++++++
 src/types/target_message.rs                   |   4 +-
 69 files changed, 532 insertions(+), 518 deletions(-)
 create mode 100644 src/types/recipient.rs

diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 65fd207e..04a3c902 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -12,7 +12,7 @@ use url::Url;
 use crate::{
     payloads::GetMe,
     requests::{HasPayload, Request, Requester},
-    types::{ChatId, Me, *},
+    types::{Me, Recipient, *},
 };
 
 /// `get_me` cache.
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 65f89f2f..3199c734 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -7,8 +7,8 @@ use crate::{
     payloads::*,
     requests::{HasPayload, Output, Payload, Request, Requester},
     types::{
-        BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, TargetMessage,
+        BotCommand, ChatAction, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage,
     },
 };
 
@@ -207,82 +207,82 @@ trait ErasableRequester<'a> {
 
     fn send_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         text: String,
     ) -> ErasedRequest<'a, SendMessage, Self::Err>;
 
     fn forward_message(
         &self,
-        chat_id: ChatId,
-        from_chat_id: ChatId,
+        chat_id: Recipient,
+        from_chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, ForwardMessage, Self::Err>;
 
     fn copy_message(
         &self,
-        chat_id: ChatId,
-        from_chat_id: ChatId,
+        chat_id: Recipient,
+        from_chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, CopyMessage, Self::Err>;
 
     fn send_photo(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         photo: InputFile,
     ) -> ErasedRequest<'a, SendPhoto, Self::Err>;
 
     fn send_audio(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         audio: InputFile,
     ) -> ErasedRequest<'a, SendAudio, Self::Err>;
 
     fn send_document(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         document: InputFile,
     ) -> ErasedRequest<'a, SendDocument, Self::Err>;
 
     fn send_video(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         video: InputFile,
     ) -> ErasedRequest<'a, SendVideo, Self::Err>;
 
     fn send_animation(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         animation: InputFile,
     ) -> ErasedRequest<'a, SendAnimation, Self::Err>;
 
     fn send_voice(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         voice: InputFile,
     ) -> ErasedRequest<'a, SendVoice, Self::Err>;
 
     fn send_video_note(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         video_note: InputFile,
     ) -> ErasedRequest<'a, SendVideoNote, Self::Err>;
 
     fn send_media_group(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         media: Vec<InputMedia>,
     ) -> ErasedRequest<'a, SendMediaGroup, Self::Err>;
 
     fn send_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, SendLocation, Self::Err>;
 
     fn edit_message_live_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         latitude: f64,
         longitude: f64,
@@ -297,7 +297,7 @@ trait ErasableRequester<'a> {
 
     fn stop_message_live_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         latitude: f64,
         longitude: f64,
@@ -312,7 +312,7 @@ trait ErasableRequester<'a> {
 
     fn send_venue(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         latitude: f64,
         longitude: f64,
         title: String,
@@ -321,23 +321,23 @@ trait ErasableRequester<'a> {
 
     fn send_contact(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         phone_number: String,
         first_name: String,
     ) -> ErasedRequest<'a, SendContact, Self::Err>;
 
     fn send_poll(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         question: String,
         options: Vec<String>,
     ) -> ErasedRequest<'a, SendPoll, Self::Err>;
 
-    fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err>;
+    fn send_dice(&self, chat_id: Recipient) -> ErasedRequest<'a, SendDice, Self::Err>;
 
     fn send_chat_action(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         action: ChatAction,
     ) -> ErasedRequest<'a, SendChatAction, Self::Err>;
 
@@ -350,163 +350,168 @@ trait ErasableRequester<'a> {
 
     fn ban_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, BanChatMember, Self::Err>;
 
     fn kick_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, KickChatMember, Self::Err>;
 
     fn unban_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, UnbanChatMember, Self::Err>;
 
     fn restrict_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, RestrictChatMember, Self::Err>;
 
     fn promote_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, PromoteChatMember, Self::Err>;
 
     fn set_chat_administrator_custom_title(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
         custom_title: String,
     ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err>;
 
     fn ban_chat_sender_chat(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sender_chat_id: i64,
     ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err>;
 
     fn unban_chat_sender_chat(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sender_chat_id: i64,
     ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err>;
 
     fn set_chat_permissions(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, SetChatPermissions, Self::Err>;
 
     fn export_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, ExportChatInviteLink, Self::Err>;
 
     fn create_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, CreateChatInviteLink, Self::Err>;
 
     fn edit_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         invite_link: String,
     ) -> ErasedRequest<'a, EditChatInviteLink, Self::Err>;
 
     fn revoke_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         invite_link: String,
     ) -> ErasedRequest<'a, RevokeChatInviteLink, Self::Err>;
 
     /// For Telegram documentation see [`ApproveChatJoinRequest`].
     fn approve_chat_join_request(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err>;
 
     /// For Telegram documentation see [`DeclineChatJoinRequest`].
     fn decline_chat_join_request(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err>;
 
     fn set_chat_photo(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         photo: InputFile,
     ) -> ErasedRequest<'a, SetChatPhoto, Self::Err>;
 
-    fn delete_chat_photo(&self, chat_id: ChatId) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err>;
+    fn delete_chat_photo(
+        &self,
+        chat_id: Recipient,
+    ) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err>;
 
     fn set_chat_title(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         title: String,
     ) -> ErasedRequest<'a, SetChatTitle, Self::Err>;
 
     fn set_chat_description(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, SetChatDescription, Self::Err>;
 
     fn pin_chat_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, PinChatMessage, Self::Err>;
 
-    fn unpin_chat_message(&self, chat_id: ChatId)
-        -> ErasedRequest<'a, UnpinChatMessage, Self::Err>;
+    fn unpin_chat_message(
+        &self,
+        chat_id: Recipient,
+    ) -> ErasedRequest<'a, UnpinChatMessage, Self::Err>;
 
     fn unpin_all_chat_messages(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, UnpinAllChatMessages, Self::Err>;
 
-    fn leave_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, LeaveChat, Self::Err>;
+    fn leave_chat(&self, chat_id: Recipient) -> ErasedRequest<'a, LeaveChat, Self::Err>;
 
-    fn get_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, GetChat, Self::Err>;
+    fn get_chat(&self, chat_id: Recipient) -> ErasedRequest<'a, GetChat, Self::Err>;
 
     fn get_chat_administrators(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatAdministrators, Self::Err>;
 
     fn get_chat_member_count(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatMemberCount, Self::Err>;
 
     fn get_chat_members_count(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatMembersCount, Self::Err>;
 
     fn get_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, GetChatMember, Self::Err>;
 
     fn set_chat_sticker_set(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sticker_set_name: String,
     ) -> ErasedRequest<'a, SetChatStickerSet, Self::Err>;
 
     fn delete_chat_sticker_set(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, DeleteChatStickerSet, Self::Err>;
 
     fn answer_callback_query(
@@ -531,7 +536,7 @@ trait ErasableRequester<'a> {
 
     fn edit_message_text(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         text: String,
     ) -> ErasedRequest<'a, EditMessageText, Self::Err>;
@@ -544,7 +549,7 @@ trait ErasableRequester<'a> {
 
     fn edit_message_caption(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, EditMessageCaption, Self::Err>;
 
@@ -555,7 +560,7 @@ trait ErasableRequester<'a> {
 
     fn edit_message_media(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         media: InputMedia,
     ) -> ErasedRequest<'a, EditMessageMedia, Self::Err>;
@@ -568,7 +573,7 @@ trait ErasableRequester<'a> {
 
     fn edit_message_reply_markup(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err>;
 
@@ -577,18 +582,21 @@ trait ErasableRequester<'a> {
         inline_message_id: String,
     ) -> ErasedRequest<'a, EditMessageReplyMarkupInline, Self::Err>;
 
-    fn stop_poll(&self, chat_id: ChatId, message_id: i32)
-        -> ErasedRequest<'a, StopPoll, Self::Err>;
+    fn stop_poll(
+        &self,
+        chat_id: Recipient,
+        message_id: i32,
+    ) -> ErasedRequest<'a, StopPoll, Self::Err>;
 
     fn delete_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, DeleteMessage, Self::Err>;
 
     fn send_sticker(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sticker: InputFile,
     ) -> ErasedRequest<'a, SendSticker, Self::Err>;
 
@@ -638,7 +646,7 @@ trait ErasableRequester<'a> {
     #[allow(clippy::too_many_arguments)]
     fn send_invoice(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         title: String,
         description: String,
         payload: String,
@@ -729,7 +737,7 @@ where
 
     fn send_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         text: String,
     ) -> ErasedRequest<'a, SendMessage, Self::Err> {
         Requester::send_message(self, chat_id, text).erase()
@@ -737,8 +745,8 @@ where
 
     fn forward_message(
         &self,
-        chat_id: ChatId,
-        from_chat_id: ChatId,
+        chat_id: Recipient,
+        from_chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, ForwardMessage, Self::Err> {
         Requester::forward_message(self, chat_id, from_chat_id, message_id).erase()
@@ -746,8 +754,8 @@ where
 
     fn copy_message(
         &self,
-        chat_id: ChatId,
-        from_chat_id: ChatId,
+        chat_id: Recipient,
+        from_chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, CopyMessage, Self::Err> {
         Requester::copy_message(self, chat_id, from_chat_id, message_id).erase()
@@ -755,7 +763,7 @@ where
 
     fn send_photo(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         photo: InputFile,
     ) -> ErasedRequest<'a, SendPhoto, Self::Err> {
         Requester::send_photo(self, chat_id, photo).erase()
@@ -763,7 +771,7 @@ where
 
     fn send_audio(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         audio: InputFile,
     ) -> ErasedRequest<'a, SendAudio, Self::Err> {
         Requester::send_audio(self, chat_id, audio).erase()
@@ -771,7 +779,7 @@ where
 
     fn send_document(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         document: InputFile,
     ) -> ErasedRequest<'a, SendDocument, Self::Err> {
         Requester::send_document(self, chat_id, document).erase()
@@ -779,7 +787,7 @@ where
 
     fn send_video(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         video: InputFile,
     ) -> ErasedRequest<'a, SendVideo, Self::Err> {
         Requester::send_video(self, chat_id, video).erase()
@@ -787,7 +795,7 @@ where
 
     fn send_animation(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         animation: InputFile,
     ) -> ErasedRequest<'a, SendAnimation, Self::Err> {
         Requester::send_animation(self, chat_id, animation).erase()
@@ -795,7 +803,7 @@ where
 
     fn send_voice(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         voice: InputFile,
     ) -> ErasedRequest<'a, SendVoice, Self::Err> {
         Requester::send_voice(self, chat_id, voice).erase()
@@ -803,7 +811,7 @@ where
 
     fn send_video_note(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         video_note: InputFile,
     ) -> ErasedRequest<'a, SendVideoNote, Self::Err> {
         Requester::send_video_note(self, chat_id, video_note).erase()
@@ -811,7 +819,7 @@ where
 
     fn send_media_group(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         media: Vec<InputMedia>,
     ) -> ErasedRequest<'a, SendMediaGroup, Self::Err> {
         Requester::send_media_group(self, chat_id, media).erase()
@@ -819,7 +827,7 @@ where
 
     fn send_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, SendLocation, Self::Err> {
@@ -828,7 +836,7 @@ where
 
     fn edit_message_live_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         latitude: f64,
         longitude: f64,
@@ -849,7 +857,7 @@ where
 
     fn stop_message_live_location(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         latitude: f64,
         longitude: f64,
@@ -870,7 +878,7 @@ where
 
     fn send_venue(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         latitude: f64,
         longitude: f64,
         title: String,
@@ -881,7 +889,7 @@ where
 
     fn send_contact(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         phone_number: String,
         first_name: String,
     ) -> ErasedRequest<'a, SendContact, Self::Err> {
@@ -890,20 +898,20 @@ where
 
     fn send_poll(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         question: String,
         options: Vec<String>,
     ) -> ErasedRequest<'a, SendPoll, Self::Err> {
         Requester::send_poll(self, chat_id, question, options).erase()
     }
 
-    fn send_dice(&self, chat_id: ChatId) -> ErasedRequest<'a, SendDice, Self::Err> {
+    fn send_dice(&self, chat_id: Recipient) -> ErasedRequest<'a, SendDice, Self::Err> {
         Requester::send_dice(self, chat_id).erase()
     }
 
     fn send_chat_action(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         action: ChatAction,
     ) -> ErasedRequest<'a, SendChatAction, Self::Err> {
         Requester::send_chat_action(self, chat_id, action).erase()
@@ -922,7 +930,7 @@ where
 
     fn ban_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, BanChatMember, Self::Err> {
         Requester::ban_chat_member(self, chat_id, user_id).erase()
@@ -930,7 +938,7 @@ where
 
     fn kick_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, KickChatMember, Self::Err> {
         Requester::kick_chat_member(self, chat_id, user_id).erase()
@@ -938,7 +946,7 @@ where
 
     fn unban_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, UnbanChatMember, Self::Err> {
         Requester::unban_chat_member(self, chat_id, user_id).erase()
@@ -946,7 +954,7 @@ where
 
     fn restrict_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, RestrictChatMember, Self::Err> {
@@ -955,7 +963,7 @@ where
 
     fn promote_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, PromoteChatMember, Self::Err> {
         Requester::promote_chat_member(self, chat_id, user_id).erase()
@@ -963,7 +971,7 @@ where
 
     fn set_chat_administrator_custom_title(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
         custom_title: String,
     ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err> {
@@ -972,7 +980,7 @@ where
 
     fn ban_chat_sender_chat(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sender_chat_id: i64,
     ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err> {
         Requester::ban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
@@ -980,7 +988,7 @@ where
 
     fn unban_chat_sender_chat(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sender_chat_id: i64,
     ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err> {
         Requester::unban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
@@ -988,7 +996,7 @@ where
 
     fn set_chat_permissions(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, SetChatPermissions, Self::Err> {
         Requester::set_chat_permissions(self, chat_id, permissions).erase()
@@ -996,21 +1004,21 @@ where
 
     fn export_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, ExportChatInviteLink, Self::Err> {
         Requester::export_chat_invite_link(self, chat_id).erase()
     }
 
     fn create_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, CreateChatInviteLink, Self::Err> {
         Requester::create_chat_invite_link(self, chat_id).erase()
     }
 
     fn edit_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         invite_link: String,
     ) -> ErasedRequest<'a, EditChatInviteLink, Self::Err> {
         Requester::edit_chat_invite_link(self, chat_id, invite_link).erase()
@@ -1018,7 +1026,7 @@ where
 
     fn revoke_chat_invite_link(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         invite_link: String,
     ) -> ErasedRequest<'a, RevokeChatInviteLink, Self::Err> {
         Requester::revoke_chat_invite_link(self, chat_id, invite_link).erase()
@@ -1027,7 +1035,7 @@ where
     /// For Telegram documentation see [`ApproveChatJoinRequest`].
     fn approve_chat_join_request(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err> {
         Requester::approve_chat_join_request(self, chat_id, user_id).erase()
@@ -1036,7 +1044,7 @@ where
     /// For Telegram documentation see [`DeclineChatJoinRequest`].
     fn decline_chat_join_request(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err> {
         Requester::decline_chat_join_request(self, chat_id, user_id).erase()
@@ -1044,19 +1052,22 @@ where
 
     fn set_chat_photo(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         photo: InputFile,
     ) -> ErasedRequest<'a, SetChatPhoto, Self::Err> {
         Requester::set_chat_photo(self, chat_id, photo).erase()
     }
 
-    fn delete_chat_photo(&self, chat_id: ChatId) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err> {
+    fn delete_chat_photo(
+        &self,
+        chat_id: Recipient,
+    ) -> ErasedRequest<'a, DeleteChatPhoto, Self::Err> {
         Requester::delete_chat_photo(self, chat_id).erase()
     }
 
     fn set_chat_title(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         title: String,
     ) -> ErasedRequest<'a, SetChatTitle, Self::Err> {
         Requester::set_chat_title(self, chat_id, title).erase()
@@ -1064,14 +1075,14 @@ where
 
     fn set_chat_description(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, SetChatDescription, Self::Err> {
         Requester::set_chat_description(self, chat_id).erase()
     }
 
     fn pin_chat_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, PinChatMessage, Self::Err> {
         Requester::pin_chat_message(self, chat_id, message_id).erase()
@@ -1079,50 +1090,50 @@ where
 
     fn unpin_chat_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, UnpinChatMessage, Self::Err> {
         Requester::unpin_chat_message(self, chat_id).erase()
     }
 
     fn unpin_all_chat_messages(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, UnpinAllChatMessages, Self::Err> {
         Requester::unpin_all_chat_messages(self, chat_id).erase()
     }
 
-    fn leave_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, LeaveChat, Self::Err> {
+    fn leave_chat(&self, chat_id: Recipient) -> ErasedRequest<'a, LeaveChat, Self::Err> {
         Requester::leave_chat(self, chat_id).erase()
     }
 
-    fn get_chat(&self, chat_id: ChatId) -> ErasedRequest<'a, GetChat, Self::Err> {
+    fn get_chat(&self, chat_id: Recipient) -> ErasedRequest<'a, GetChat, Self::Err> {
         Requester::get_chat(self, chat_id).erase()
     }
 
     fn get_chat_administrators(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatAdministrators, Self::Err> {
         Requester::get_chat_administrators(self, chat_id).erase()
     }
 
     fn get_chat_member_count(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatMemberCount, Self::Err> {
         Requester::get_chat_member_count(self, chat_id).erase()
     }
 
     fn get_chat_members_count(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, GetChatMembersCount, Self::Err> {
         Requester::get_chat_members_count(self, chat_id).erase()
     }
 
     fn get_chat_member(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         user_id: i64,
     ) -> ErasedRequest<'a, GetChatMember, Self::Err> {
         Requester::get_chat_member(self, chat_id, user_id).erase()
@@ -1130,7 +1141,7 @@ where
 
     fn set_chat_sticker_set(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sticker_set_name: String,
     ) -> ErasedRequest<'a, SetChatStickerSet, Self::Err> {
         Requester::set_chat_sticker_set(self, chat_id, sticker_set_name).erase()
@@ -1138,7 +1149,7 @@ where
 
     fn delete_chat_sticker_set(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
     ) -> ErasedRequest<'a, DeleteChatStickerSet, Self::Err> {
         Requester::delete_chat_sticker_set(self, chat_id).erase()
     }
@@ -1175,7 +1186,7 @@ where
 
     fn edit_message_text(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         text: String,
     ) -> ErasedRequest<'a, EditMessageText, Self::Err> {
@@ -1192,7 +1203,7 @@ where
 
     fn edit_message_caption(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, EditMessageCaption, Self::Err> {
         Requester::edit_message_caption(self, chat_id, message_id).erase()
@@ -1207,7 +1218,7 @@ where
 
     fn edit_message_media(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
         media: InputMedia,
     ) -> ErasedRequest<'a, EditMessageMedia, Self::Err> {
@@ -1224,7 +1235,7 @@ where
 
     fn edit_message_reply_markup(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err> {
         Requester::edit_message_reply_markup(self, chat_id, message_id).erase()
@@ -1239,7 +1250,7 @@ where
 
     fn stop_poll(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, StopPoll, Self::Err> {
         Requester::stop_poll(self, chat_id, message_id).erase()
@@ -1247,7 +1258,7 @@ where
 
     fn delete_message(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         message_id: i32,
     ) -> ErasedRequest<'a, DeleteMessage, Self::Err> {
         Requester::delete_message(self, chat_id, message_id).erase()
@@ -1255,7 +1266,7 @@ where
 
     fn send_sticker(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         sticker: InputFile,
     ) -> ErasedRequest<'a, SendSticker, Self::Err> {
         Requester::send_sticker(self, chat_id, sticker).erase()
@@ -1319,7 +1330,7 @@ where
 
     fn send_invoice(
         &self,
-        chat_id: ChatId,
+        chat_id: Recipient,
         title: String,
         description: String,
         payload: String,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 2433765e..62649ce5 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -3,7 +3,7 @@ use url::Url;
 use crate::{
     prelude::Requester,
     requests::HasPayload,
-    types::{ChatId, InputFile, ParseMode, *},
+    types::{InputFile, ParseMode, Recipient, *},
 };
 
 /// Default parse mode adaptor, see
@@ -86,7 +86,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
 
     fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         Q: Into<String>,
         O: IntoIterator<Item = String>,
     {
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 3e8ef88b..8c03535f 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -645,17 +645,17 @@ enum ChatIdHash {
 impl ChatIdHash {
     fn is_channel(&self) -> bool {
         match self {
-            &Self::Id(id) => ChatId::Id(id).is_channel(),
+            &Self::Id(id) => Recipient::Id(id).is_channel(),
             Self::ChannelUsernameHash(_) => true,
         }
     }
 }
 
-impl From<&ChatId> for ChatIdHash {
-    fn from(value: &ChatId) -> Self {
+impl From<&Recipient> for ChatIdHash {
+    fn from(value: &Recipient) -> Self {
         match value {
-            ChatId::Id(id) => ChatIdHash::Id(*id),
-            ChatId::ChannelUsername(username) => {
+            Recipient::Id(id) => ChatIdHash::Id(*id),
+            Recipient::ChannelUsername(username) => {
                 let mut hasher = std::collections::hash_map::DefaultHasher::new();
                 username.hash(&mut hasher);
                 let hash = hasher.finish();
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 580fc0db..d9462f01 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -5,8 +5,8 @@ use crate::{
     prelude::Requester,
     requests::{JsonRequest, MultipartRequest},
     types::{
-        BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice,
+        BotCommand, ChatPermissions, InlineQueryResult, InputFile, InputMedia, InputSticker,
+        LabeledPrice, Recipient,
     },
     Bot,
 };
@@ -48,7 +48,7 @@ impl Requester for Bot {
 
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>,
     {
         Self::SendMessage::new(self.clone(), payloads::SendMessage::new(chat_id, text))
@@ -63,8 +63,8 @@ impl Requester for Bot {
         message_id: i32,
     ) -> Self::ForwardMessage
     where
-        C: Into<ChatId>,
-        F: Into<ChatId>,
+        C: Into<Recipient>,
+        F: Into<Recipient>,
     {
         Self::ForwardMessage::new(
             self.clone(),
@@ -76,7 +76,7 @@ impl Requester for Bot {
 
     fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendPhoto::new(self.clone(), payloads::SendPhoto::new(chat_id, photo))
     }
@@ -85,7 +85,7 @@ impl Requester for Bot {
 
     fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendAudio::new(self.clone(), payloads::SendAudio::new(chat_id, audio))
     }
@@ -94,7 +94,7 @@ impl Requester for Bot {
 
     fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendDocument::new(self.clone(), payloads::SendDocument::new(chat_id, document))
     }
@@ -103,7 +103,7 @@ impl Requester for Bot {
 
     fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendVideo::new(self.clone(), payloads::SendVideo::new(chat_id, video))
     }
@@ -112,7 +112,7 @@ impl Requester for Bot {
 
     fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendAnimation::new(
             self.clone(),
@@ -124,7 +124,7 @@ impl Requester for Bot {
 
     fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendVoice::new(self.clone(), payloads::SendVoice::new(chat_id, voice))
     }
@@ -133,7 +133,7 @@ impl Requester for Bot {
 
     fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendVideoNote::new(
             self.clone(),
@@ -145,7 +145,7 @@ impl Requester for Bot {
 
     fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         M: IntoIterator<Item = InputMedia>,
     {
         Self::SendMediaGroup::new(self.clone(), payloads::SendMediaGroup::new(chat_id, media))
@@ -155,7 +155,7 @@ impl Requester for Bot {
 
     fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendLocation::new(
             self.clone(),
@@ -173,7 +173,7 @@ impl Requester for Bot {
         longitude: f64,
     ) -> Self::EditMessageLiveLocation
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::EditMessageLiveLocation::new(
             self.clone(),
@@ -208,7 +208,7 @@ impl Requester for Bot {
         longitude: f64,
     ) -> Self::StopMessageLiveLocation
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::StopMessageLiveLocation::new(
             self.clone(),
@@ -244,7 +244,7 @@ impl Requester for Bot {
         address: A,
     ) -> Self::SendVenue
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>,
         A: Into<String>,
     {
@@ -258,7 +258,7 @@ impl Requester for Bot {
 
     fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> Self::SendContact
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         P: Into<String>,
         F: Into<String>,
     {
@@ -272,7 +272,7 @@ impl Requester for Bot {
 
     fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         Q: Into<String>,
         O: IntoIterator<Item = String>,
     {
@@ -286,7 +286,7 @@ impl Requester for Bot {
 
     fn send_dice<C>(&self, chat_id: C) -> Self::SendDice
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendDice::new(self.clone(), payloads::SendDice::new(chat_id))
     }
@@ -299,7 +299,7 @@ impl Requester for Bot {
         action: crate::types::ChatAction,
     ) -> Self::SendChatAction
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendChatAction::new(self.clone(), payloads::SendChatAction::new(chat_id, action))
     }
@@ -323,7 +323,7 @@ impl Requester for Bot {
 
     fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::KickChatMember::new(
             self.clone(),
@@ -335,7 +335,7 @@ impl Requester for Bot {
 
     fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::BanChatMember::new(self.clone(), payloads::BanChatMember::new(chat_id, user_id))
     }
@@ -344,7 +344,7 @@ impl Requester for Bot {
 
     fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::UnbanChatMember::new(
             self.clone(),
@@ -361,7 +361,7 @@ impl Requester for Bot {
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::RestrictChatMember::new(
             self.clone(),
@@ -373,7 +373,7 @@ impl Requester for Bot {
 
     fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::PromoteChatMember::new(
             self.clone(),
@@ -390,7 +390,7 @@ impl Requester for Bot {
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
-        Ch: Into<ChatId>,
+        Ch: Into<Recipient>,
         Cu: Into<String>,
     {
         Self::SetChatAdministratorCustomTitle::new(
@@ -403,7 +403,7 @@ impl Requester for Bot {
 
     fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::BanChatSenderChat::new(
             self.clone(),
@@ -419,7 +419,7 @@ impl Requester for Bot {
         sender_chat_id: i64,
     ) -> Self::UnbanChatSenderChat
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::UnbanChatSenderChat::new(
             self.clone(),
@@ -435,7 +435,7 @@ impl Requester for Bot {
         permissions: ChatPermissions,
     ) -> Self::SetChatPermissions
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SetChatPermissions::new(
             self.clone(),
@@ -447,7 +447,7 @@ impl Requester for Bot {
 
     fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::ExportChatInviteLink::new(self.clone(), payloads::ExportChatInviteLink::new(chat_id))
     }
@@ -456,7 +456,7 @@ impl Requester for Bot {
 
     fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::CreateChatInviteLink::new(self.clone(), payloads::CreateChatInviteLink::new(chat_id))
     }
@@ -465,7 +465,7 @@ impl Requester for Bot {
 
     fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         I: Into<String>,
     {
         Self::EditChatInviteLink::new(
@@ -482,7 +482,7 @@ impl Requester for Bot {
         invite_link: I,
     ) -> Self::RevokeChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         I: Into<String>,
     {
         Self::RevokeChatInviteLink::new(
@@ -495,7 +495,7 @@ impl Requester for Bot {
 
     fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::ApproveChatJoinRequest::new(
             self.clone(),
@@ -507,7 +507,7 @@ impl Requester for Bot {
 
     fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::DeclineChatJoinRequest::new(
             self.clone(),
@@ -519,7 +519,7 @@ impl Requester for Bot {
 
     fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SetChatPhoto::new(self.clone(), payloads::SetChatPhoto::new(chat_id, photo))
     }
@@ -528,7 +528,7 @@ impl Requester for Bot {
 
     fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::DeleteChatPhoto::new(self.clone(), payloads::DeleteChatPhoto::new(chat_id))
     }
@@ -537,7 +537,7 @@ impl Requester for Bot {
 
     fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>,
     {
         Self::SetChatTitle::new(self.clone(), payloads::SetChatTitle::new(chat_id, title))
@@ -547,7 +547,7 @@ impl Requester for Bot {
 
     fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SetChatDescription::new(self.clone(), payloads::SetChatDescription::new(chat_id))
     }
@@ -556,7 +556,7 @@ impl Requester for Bot {
 
     fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::PinChatMessage::new(
             self.clone(),
@@ -568,7 +568,7 @@ impl Requester for Bot {
 
     fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::UnpinChatMessage::new(self.clone(), payloads::UnpinChatMessage::new(chat_id))
     }
@@ -577,7 +577,7 @@ impl Requester for Bot {
 
     fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::LeaveChat::new(self.clone(), payloads::LeaveChat::new(chat_id))
     }
@@ -586,7 +586,7 @@ impl Requester for Bot {
 
     fn get_chat<C>(&self, chat_id: C) -> Self::GetChat
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::GetChat::new(self.clone(), payloads::GetChat::new(chat_id))
     }
@@ -595,7 +595,7 @@ impl Requester for Bot {
 
     fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::GetChatAdministrators::new(
             self.clone(),
@@ -607,7 +607,7 @@ impl Requester for Bot {
 
     fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::GetChatMembersCount::new(self.clone(), payloads::GetChatMembersCount::new(chat_id))
     }
@@ -616,7 +616,7 @@ impl Requester for Bot {
 
     fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::GetChatMemberCount::new(self.clone(), payloads::GetChatMemberCount::new(chat_id))
     }
@@ -625,7 +625,7 @@ impl Requester for Bot {
 
     fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::GetChatMember::new(self.clone(), payloads::GetChatMember::new(chat_id, user_id))
     }
@@ -634,7 +634,7 @@ impl Requester for Bot {
 
     fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> Self::SetChatStickerSet
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         S: Into<String>,
     {
         Self::SetChatStickerSet::new(
@@ -647,7 +647,7 @@ impl Requester for Bot {
 
     fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::DeleteChatStickerSet::new(self.clone(), payloads::DeleteChatStickerSet::new(chat_id))
     }
@@ -702,7 +702,7 @@ impl Requester for Bot {
 
     fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>,
     {
         Self::EditMessageText::new(
@@ -732,7 +732,7 @@ impl Requester for Bot {
 
     fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::EditMessageCaption::new(
             self.clone(),
@@ -761,7 +761,7 @@ impl Requester for Bot {
         media: InputMedia,
     ) -> Self::EditMessageMedia
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::EditMessageMedia::new(
             self.clone(),
@@ -793,7 +793,7 @@ impl Requester for Bot {
         message_id: i32,
     ) -> Self::EditMessageReplyMarkup
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::EditMessageReplyMarkup::new(
             self.clone(),
@@ -820,7 +820,7 @@ impl Requester for Bot {
 
     fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::StopPoll::new(self.clone(), payloads::StopPoll::new(chat_id, message_id))
     }
@@ -829,7 +829,7 @@ impl Requester for Bot {
 
     fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::DeleteMessage::new(
             self.clone(),
@@ -841,7 +841,7 @@ impl Requester for Bot {
 
     fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::SendSticker::new(self.clone(), payloads::SendSticker::new(chat_id, sticker))
     }
@@ -955,7 +955,7 @@ impl Requester for Bot {
         prices: Pri,
     ) -> Self::SendInvoice
     where
-        Ch: Into<ChatId>,
+        Ch: Into<Recipient>,
         T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
@@ -1089,8 +1089,8 @@ impl Requester for Bot {
 
     fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
     where
-        C: Into<ChatId>,
-        F: Into<ChatId>,
+        C: Into<Recipient>,
+        F: Into<Recipient>,
     {
         Self::CopyMessage::new(
             self.clone(),
@@ -1102,7 +1102,7 @@ impl Requester for Bot {
 
     fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
     {
         Self::UnpinAllChatMessages::new(self.clone(), payloads::UnpinAllChatMessages::new(chat_id))
     }
diff --git a/src/local_macros.rs b/src/local_macros.rs
index ee2f4916..f7289c51 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -481,7 +481,7 @@ macro_rules! requester_forward {
     (@method send_message $body:ident $ty:ident) => {
         type SendMessage = $ty![SendMessage];
 
-        fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage where C: Into<ChatId>,
+        fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage where C: Into<Recipient>,
         T: Into<String> {
             let this = self;
             $body!(send_message this (chat_id: C, text: T))
@@ -490,8 +490,8 @@ macro_rules! requester_forward {
     (@method forward_message $body:ident $ty:ident) => {
         type ForwardMessage = $ty![ForwardMessage];
 
-        fn forward_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::ForwardMessage where C: Into<ChatId>,
-        F: Into<ChatId> {
+        fn forward_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::ForwardMessage where C: Into<Recipient>,
+        F: Into<Recipient> {
             let this = self;
             $body!(forward_message this (chat_id: C, from_chat_id: F, message_id: i32))
         }
@@ -499,8 +499,8 @@ macro_rules! requester_forward {
     (@method copy_message $body:ident $ty:ident) => {
         type CopyMessage = $ty![CopyMessage];
 
-        fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage where C: Into<ChatId>,
-        F: Into<ChatId> {
+        fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage where C: Into<Recipient>,
+        F: Into<Recipient> {
             let this = self;
             $body!(copy_message this (chat_id: C, from_chat_id: F, message_id: i32))
         }
@@ -508,7 +508,7 @@ macro_rules! requester_forward {
     (@method send_photo $body:ident $ty:ident) => {
         type SendPhoto = $ty![SendPhoto];
 
-        fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto where C: Into<ChatId> {
+        fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto where C: Into<Recipient> {
             let this = self;
             $body!(send_photo this (chat_id: C, photo: InputFile))
         }
@@ -516,7 +516,7 @@ macro_rules! requester_forward {
     (@method send_audio $body:ident $ty:ident) => {
         type SendAudio = $ty![SendAudio];
 
-        fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio where C: Into<ChatId> {
+        fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio where C: Into<Recipient> {
             let this = self;
             $body!(send_audio this (chat_id: C, audio: InputFile))
         }
@@ -524,7 +524,7 @@ macro_rules! requester_forward {
     (@method send_document $body:ident $ty:ident) => {
         type SendDocument = $ty![SendDocument];
 
-        fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument where C: Into<ChatId> {
+        fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument where C: Into<Recipient> {
             let this = self;
             $body!(send_document this (chat_id: C, document: InputFile))
         }
@@ -532,7 +532,7 @@ macro_rules! requester_forward {
     (@method send_video $body:ident $ty:ident) => {
         type SendVideo = $ty![SendVideo];
 
-        fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo where C: Into<ChatId> {
+        fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo where C: Into<Recipient> {
             let this = self;
             $body!(send_video this (chat_id: C, video: InputFile))
         }
@@ -540,7 +540,7 @@ macro_rules! requester_forward {
     (@method send_animation $body:ident $ty:ident) => {
         type SendAnimation = $ty![SendAnimation];
 
-        fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation where C: Into<ChatId> {
+        fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation where C: Into<Recipient> {
             let this = self;
             $body!(send_animation this (chat_id: C, animation: InputFile))
         }
@@ -548,7 +548,7 @@ macro_rules! requester_forward {
     (@method send_voice $body:ident $ty:ident) => {
         type SendVoice = $ty![SendVoice];
 
-        fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice where C: Into<ChatId> {
+        fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice where C: Into<Recipient> {
             let this = self;
             $body!(send_voice this (chat_id: C, voice: InputFile))
         }
@@ -556,7 +556,7 @@ macro_rules! requester_forward {
     (@method send_video_note $body:ident $ty:ident) => {
         type SendVideoNote = $ty![SendVideoNote];
 
-        fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote where C: Into<ChatId> {
+        fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote where C: Into<Recipient> {
             let this = self;
             $body!(send_video_note this (chat_id: C, video_note: InputFile))
         }
@@ -564,7 +564,7 @@ macro_rules! requester_forward {
     (@method send_media_group $body:ident $ty:ident) => {
         type SendMediaGroup = $ty![SendMediaGroup];
 
-        fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup where C: Into<ChatId>,
+        fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup where C: Into<Recipient>,
         M: IntoIterator<Item = InputMedia> {
             let this = self;
             $body!(send_media_group this (chat_id: C, media: M))
@@ -573,7 +573,7 @@ macro_rules! requester_forward {
     (@method send_location $body:ident $ty:ident) => {
         type SendLocation = $ty![SendLocation];
 
-        fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation where C: Into<ChatId> {
+        fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation where C: Into<Recipient> {
             let this = self;
             $body!(send_location this (chat_id: C, latitude: f64, longitude: f64))
         }
@@ -581,7 +581,7 @@ macro_rules! requester_forward {
     (@method edit_message_live_location $body:ident $ty:ident) => {
         type EditMessageLiveLocation = $ty![EditMessageLiveLocation];
 
-        fn edit_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocation where C: Into<ChatId> {
+        fn edit_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocation where C: Into<Recipient> {
             let this = self;
             $body!(edit_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
         }
@@ -597,7 +597,7 @@ macro_rules! requester_forward {
     (@method stop_message_live_location $body:ident $ty:ident) => {
         type StopMessageLiveLocation = $ty![StopMessageLiveLocation];
 
-        fn stop_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocation where C: Into<ChatId> {
+        fn stop_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocation where C: Into<Recipient> {
             let this = self;
             $body!(stop_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
         }
@@ -613,7 +613,7 @@ macro_rules! requester_forward {
     (@method send_venue $body:ident $ty:ident) => {
         type SendVenue = $ty![SendVenue];
 
-        fn send_venue<C, T, A>(&self, chat_id: C, latitude: f64, longitude: f64, title: T, address: A) -> Self::SendVenue where C: Into<ChatId>,
+        fn send_venue<C, T, A>(&self, chat_id: C, latitude: f64, longitude: f64, title: T, address: A) -> Self::SendVenue where C: Into<Recipient>,
         T: Into<String>,
         A: Into<String> {
             let this = self;
@@ -623,7 +623,7 @@ macro_rules! requester_forward {
     (@method send_contact $body:ident $ty:ident) => {
         type SendContact = $ty![SendContact];
 
-        fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> Self::SendContact where C: Into<ChatId>,
+        fn send_contact<C, P, F>(&self, chat_id: C, phone_number: P, first_name: F) -> Self::SendContact where C: Into<Recipient>,
         P: Into<String>,
         F: Into<String> {
             let this = self;
@@ -633,7 +633,7 @@ macro_rules! requester_forward {
     (@method send_poll $body:ident $ty:ident) => {
         type SendPoll = $ty![SendPoll];
 
-        fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll where C: Into<ChatId>,
+        fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll where C: Into<Recipient>,
         Q: Into<String>,
         O: IntoIterator<Item = String> {
             let this = self;
@@ -643,7 +643,7 @@ macro_rules! requester_forward {
     (@method send_dice $body:ident $ty:ident) => {
         type SendDice = $ty![SendDice];
 
-        fn send_dice<C>(&self, chat_id: C) -> Self::SendDice where C: Into<ChatId> {
+        fn send_dice<C>(&self, chat_id: C) -> Self::SendDice where C: Into<Recipient> {
             let this = self;
             $body!(send_dice this (chat_id: C))
         }
@@ -651,7 +651,7 @@ macro_rules! requester_forward {
     (@method send_chat_action $body:ident $ty:ident) => {
         type SendChatAction = $ty![SendChatAction];
 
-        fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction where C: Into<ChatId> {
+        fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction where C: Into<Recipient> {
             let this = self;
             $body!(send_chat_action this (chat_id: C, action: ChatAction))
         }
@@ -675,7 +675,7 @@ macro_rules! requester_forward {
     (@method ban_chat_member $body:ident $ty:ident) => {
         type BanChatMember = $ty![BanChatMember];
 
-        fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember where C: Into<ChatId> {
+        fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember where C: Into<Recipient> {
             let this = self;
             $body!(ban_chat_member this (chat_id: C, user_id: i64))
         }
@@ -683,7 +683,7 @@ macro_rules! requester_forward {
     (@method kick_chat_member $body:ident $ty:ident) => {
         type KickChatMember = $ty![KickChatMember];
 
-        fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember where C: Into<ChatId> {
+        fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember where C: Into<Recipient> {
             let this = self;
             $body!(kick_chat_member this (chat_id: C, user_id: i64))
         }
@@ -691,7 +691,7 @@ macro_rules! requester_forward {
     (@method unban_chat_member $body:ident $ty:ident) => {
         type UnbanChatMember = $ty![UnbanChatMember];
 
-        fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember where C: Into<ChatId> {
+        fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember where C: Into<Recipient> {
             let this = self;
             $body!(unban_chat_member this (chat_id: C, user_id: i64))
         }
@@ -699,7 +699,7 @@ macro_rules! requester_forward {
     (@method restrict_chat_member $body:ident $ty:ident) => {
         type RestrictChatMember = $ty![RestrictChatMember];
 
-        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i64, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<ChatId> {
+        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i64, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<Recipient> {
             let this = self;
             $body!(restrict_chat_member this (chat_id: C, user_id: i64, permissions: ChatPermissions))
         }
@@ -707,7 +707,7 @@ macro_rules! requester_forward {
     (@method promote_chat_member $body:ident $ty:ident) => {
         type PromoteChatMember = $ty![PromoteChatMember];
 
-        fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember where C: Into<ChatId> {
+        fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember where C: Into<Recipient> {
             let this = self;
             $body!(promote_chat_member this (chat_id: C, user_id: i64))
         }
@@ -715,7 +715,7 @@ macro_rules! requester_forward {
     (@method set_chat_administrator_custom_title $body:ident $ty:ident) => {
         type SetChatAdministratorCustomTitle = $ty![SetChatAdministratorCustomTitle];
 
-        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i64, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<ChatId>,
+        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i64, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<Recipient>,
         Cu: Into<String> {
             let this = self;
             $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i64, custom_title: Cu))
@@ -724,7 +724,7 @@ macro_rules! requester_forward {
     (@method ban_chat_sender_chat $body:ident $ty:ident) => {
         type BanChatSenderChat = $ty![BanChatSenderChat];
 
-        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat where C: Into<ChatId> {
+        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat where C: Into<Recipient> {
             let this = self;
             $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
         }
@@ -732,7 +732,7 @@ macro_rules! requester_forward {
     (@method unban_chat_sender_chat $body:ident $ty:ident) => {
         type UnbanChatSenderChat = $ty![UnbanChatSenderChat];
 
-        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::UnbanChatSenderChat where C: Into<ChatId> {
+        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::UnbanChatSenderChat where C: Into<Recipient> {
             let this = self;
             $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
         }
@@ -740,7 +740,7 @@ macro_rules! requester_forward {
     (@method set_chat_permissions $body:ident $ty:ident) => {
         type SetChatPermissions = $ty![SetChatPermissions];
 
-        fn set_chat_permissions<C>(&self, chat_id: C, permissions: ChatPermissions) -> Self::SetChatPermissions where C: Into<ChatId> {
+        fn set_chat_permissions<C>(&self, chat_id: C, permissions: ChatPermissions) -> Self::SetChatPermissions where C: Into<Recipient> {
             let this = self;
             $body!(set_chat_permissions this (chat_id: C, permissions: ChatPermissions))
         }
@@ -748,7 +748,7 @@ macro_rules! requester_forward {
     (@method export_chat_invite_link $body:ident $ty:ident) => {
         type ExportChatInviteLink = $ty![ExportChatInviteLink];
 
-        fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink where C: Into<ChatId> {
+        fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink where C: Into<Recipient> {
             let this = self;
             $body!(export_chat_invite_link this (chat_id: C))
         }
@@ -756,7 +756,7 @@ macro_rules! requester_forward {
     (@method create_chat_invite_link $body:ident $ty:ident) => {
         type CreateChatInviteLink = $ty![CreateChatInviteLink];
 
-        fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink where C: Into<ChatId> {
+        fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink where C: Into<Recipient> {
             let this = self;
             $body!(create_chat_invite_link this (chat_id: C))
         }
@@ -764,7 +764,7 @@ macro_rules! requester_forward {
     (@method edit_chat_invite_link $body:ident $ty:ident) => {
         type EditChatInviteLink = $ty![EditChatInviteLink];
 
-        fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink where C: Into<ChatId>,
+        fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink where C: Into<Recipient>,
         I: Into<String> {
             let this = self;
             $body!(edit_chat_invite_link this (chat_id: C, invite_link: I))
@@ -773,7 +773,7 @@ macro_rules! requester_forward {
     (@method revoke_chat_invite_link $body:ident $ty:ident) => {
         type RevokeChatInviteLink = $ty![RevokeChatInviteLink];
 
-        fn revoke_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::RevokeChatInviteLink where C: Into<ChatId>,
+        fn revoke_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::RevokeChatInviteLink where C: Into<Recipient>,
         I: Into<String> {
             let this = self;
             $body!(revoke_chat_invite_link this (chat_id: C, invite_link: I))
@@ -782,7 +782,7 @@ macro_rules! requester_forward {
     (@method approve_chat_join_request $body:ident $ty:ident) => {
         type ApproveChatJoinRequest = $ty![ApproveChatJoinRequest];
 
-        fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest where C: Into<ChatId> {
+        fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest where C: Into<Recipient> {
             let this = self;
             $body!(approve_chat_join_request this (chat_id: C, user_id: i64))
         }
@@ -790,7 +790,7 @@ macro_rules! requester_forward {
     (@method decline_chat_join_request $body:ident $ty:ident) => {
         type DeclineChatJoinRequest = $ty![DeclineChatJoinRequest];
 
-        fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest where C: Into<ChatId> {
+        fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest where C: Into<Recipient> {
             let this = self;
             $body!(decline_chat_join_request this (chat_id: C, user_id: i64))
         }
@@ -798,7 +798,7 @@ macro_rules! requester_forward {
     (@method set_chat_photo $body:ident $ty:ident) => {
         type SetChatPhoto = $ty![SetChatPhoto];
 
-        fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto where C: Into<ChatId> {
+        fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto where C: Into<Recipient> {
             let this = self;
             $body!(set_chat_photo this (chat_id: C, photo: InputFile))
         }
@@ -806,7 +806,7 @@ macro_rules! requester_forward {
     (@method delete_chat_photo $body:ident $ty:ident) => {
         type DeleteChatPhoto = $ty![DeleteChatPhoto];
 
-        fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto where C: Into<ChatId> {
+        fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto where C: Into<Recipient> {
             let this = self;
             $body!(delete_chat_photo this (chat_id: C))
         }
@@ -814,7 +814,7 @@ macro_rules! requester_forward {
     (@method set_chat_title $body:ident $ty:ident) => {
         type SetChatTitle = $ty![SetChatTitle];
 
-        fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle where C: Into<ChatId>,
+        fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle where C: Into<Recipient>,
         T: Into<String> {
             let this = self;
             $body!(set_chat_title this (chat_id: C, title: T))
@@ -823,7 +823,7 @@ macro_rules! requester_forward {
     (@method set_chat_description $body:ident $ty:ident) => {
         type SetChatDescription = $ty![SetChatDescription];
 
-        fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription where C: Into<ChatId> {
+        fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription where C: Into<Recipient> {
             let this = self;
             $body!(set_chat_description this (chat_id: C))
         }
@@ -831,7 +831,7 @@ macro_rules! requester_forward {
     (@method pin_chat_message $body:ident $ty:ident) => {
         type PinChatMessage = $ty![PinChatMessage];
 
-        fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage where C: Into<ChatId> {
+        fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage where C: Into<Recipient> {
             let this = self;
             $body!(pin_chat_message this (chat_id: C, message_id: i32))
         }
@@ -839,7 +839,7 @@ macro_rules! requester_forward {
     (@method unpin_chat_message $body:ident $ty:ident) => {
         type UnpinChatMessage = $ty![UnpinChatMessage];
 
-        fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage where C: Into<ChatId> {
+        fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage where C: Into<Recipient> {
             let this = self;
             $body!(unpin_chat_message this (chat_id: C))
         }
@@ -847,7 +847,7 @@ macro_rules! requester_forward {
     (@method unpin_all_chat_messages $body:ident $ty:ident) => {
         type UnpinAllChatMessages = $ty![UnpinAllChatMessages];
 
-        fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages where C: Into<ChatId> {
+        fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages where C: Into<Recipient> {
             let this = self;
             $body!(unpin_all_chat_messages this (chat_id: C))
         }
@@ -855,7 +855,7 @@ macro_rules! requester_forward {
     (@method leave_chat $body:ident $ty:ident) => {
         type LeaveChat = $ty![LeaveChat];
 
-        fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat where C: Into<ChatId> {
+        fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat where C: Into<Recipient> {
             let this = self;
             $body!(leave_chat this (chat_id: C))
         }
@@ -863,7 +863,7 @@ macro_rules! requester_forward {
     (@method get_chat $body:ident $ty:ident) => {
         type GetChat = $ty![GetChat];
 
-        fn get_chat<C>(&self, chat_id: C) -> Self::GetChat where C: Into<ChatId> {
+        fn get_chat<C>(&self, chat_id: C) -> Self::GetChat where C: Into<Recipient> {
             let this = self;
             $body!(get_chat this (chat_id: C))
         }
@@ -871,7 +871,7 @@ macro_rules! requester_forward {
     (@method get_chat_administrators $body:ident $ty:ident) => {
         type GetChatAdministrators = $ty![GetChatAdministrators];
 
-        fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators where C: Into<ChatId> {
+        fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators where C: Into<Recipient> {
             let this = self;
             $body!(get_chat_administrators this (chat_id: C))
         }
@@ -879,7 +879,7 @@ macro_rules! requester_forward {
     (@method get_chat_member_count $body:ident $ty:ident) => {
         type GetChatMemberCount = $ty![GetChatMemberCount];
 
-        fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount where C: Into<ChatId> {
+        fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount where C: Into<Recipient> {
             let this = self;
             $body!(get_chat_member_count this (chat_id: C))
         }
@@ -887,7 +887,7 @@ macro_rules! requester_forward {
     (@method get_chat_members_count $body:ident $ty:ident) => {
         type GetChatMembersCount = $ty![GetChatMembersCount];
 
-        fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount where C: Into<ChatId> {
+        fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount where C: Into<Recipient> {
             let this = self;
             $body!(get_chat_members_count this (chat_id: C))
         }
@@ -895,7 +895,7 @@ macro_rules! requester_forward {
     (@method get_chat_member $body:ident $ty:ident) => {
         type GetChatMember = $ty![GetChatMember];
 
-        fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember where C: Into<ChatId> {
+        fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember where C: Into<Recipient> {
             let this = self;
             $body!(get_chat_member this (chat_id: C, user_id: i64))
         }
@@ -903,7 +903,7 @@ macro_rules! requester_forward {
     (@method set_chat_sticker_set $body:ident $ty:ident) => {
         type SetChatStickerSet = $ty![SetChatStickerSet];
 
-        fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> Self::SetChatStickerSet where C: Into<ChatId>,
+        fn set_chat_sticker_set<C, S>(&self, chat_id: C, sticker_set_name: S) -> Self::SetChatStickerSet where C: Into<Recipient>,
         S: Into<String> {
             let this = self;
             $body!(set_chat_sticker_set this (chat_id: C, sticker_set_name: S))
@@ -912,7 +912,7 @@ macro_rules! requester_forward {
     (@method delete_chat_sticker_set $body:ident $ty:ident) => {
         type DeleteChatStickerSet = $ty![DeleteChatStickerSet];
 
-        fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet where C: Into<ChatId> {
+        fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet where C: Into<Recipient> {
             let this = self;
             $body!(delete_chat_sticker_set this (chat_id: C))
         }
@@ -961,7 +961,7 @@ macro_rules! requester_forward {
     (@method edit_message_text $body:ident $ty:ident) => {
         type EditMessageText = $ty![EditMessageText];
 
-        fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText where C: Into<ChatId>,
+        fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText where C: Into<Recipient>,
         T: Into<String> {
             let this = self;
             $body!(edit_message_text this (chat_id: C, message_id: i32, text: T))
@@ -979,7 +979,7 @@ macro_rules! requester_forward {
     (@method edit_message_caption $body:ident $ty:ident) => {
         type EditMessageCaption = $ty![EditMessageCaption];
 
-        fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption where C: Into<ChatId> {
+        fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption where C: Into<Recipient> {
             let this = self;
             $body!(edit_message_caption this (chat_id: C, message_id: i32))
         }
@@ -995,7 +995,7 @@ macro_rules! requester_forward {
     (@method edit_message_media $body:ident $ty:ident) => {
         type EditMessageMedia = $ty![EditMessageMedia];
 
-        fn edit_message_media<C>(&self, chat_id: C, message_id: i32, media: InputMedia) -> Self::EditMessageMedia where C: Into<ChatId> {
+        fn edit_message_media<C>(&self, chat_id: C, message_id: i32, media: InputMedia) -> Self::EditMessageMedia where C: Into<Recipient> {
             let this = self;
             $body!(edit_message_media this (chat_id: C, message_id: i32, media: InputMedia))
         }
@@ -1011,7 +1011,7 @@ macro_rules! requester_forward {
     (@method edit_message_reply_markup $body:ident $ty:ident) => {
         type EditMessageReplyMarkup = $ty![EditMessageReplyMarkup];
 
-        fn edit_message_reply_markup<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageReplyMarkup where C: Into<ChatId> {
+        fn edit_message_reply_markup<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageReplyMarkup where C: Into<Recipient> {
             let this = self;
             $body!(edit_message_reply_markup this (chat_id: C, message_id: i32))
         }
@@ -1027,7 +1027,7 @@ macro_rules! requester_forward {
     (@method stop_poll $body:ident $ty:ident) => {
         type StopPoll = $ty![StopPoll];
 
-        fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll where C: Into<ChatId> {
+        fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll where C: Into<Recipient> {
             let this = self;
             $body!(stop_poll this (chat_id: C, message_id: i32))
         }
@@ -1035,7 +1035,7 @@ macro_rules! requester_forward {
     (@method delete_message $body:ident $ty:ident) => {
         type DeleteMessage = $ty![DeleteMessage];
 
-        fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage where C: Into<ChatId> {
+        fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage where C: Into<Recipient> {
             let this = self;
             $body!(delete_message this (chat_id: C, message_id: i32))
         }
@@ -1043,7 +1043,7 @@ macro_rules! requester_forward {
     (@method send_sticker $body:ident $ty:ident) => {
         type SendSticker = $ty![SendSticker];
 
-        fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker where C: Into<ChatId> {
+        fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker where C: Into<Recipient> {
             let this = self;
             $body!(send_sticker this (chat_id: C, sticker: InputFile))
         }
@@ -1110,7 +1110,7 @@ macro_rules! requester_forward {
     (@method send_invoice $body:ident $ty:ident) => {
         type SendInvoice = $ty![SendInvoice];
 
-        fn send_invoice<Ch, T, D, Pa, P, C, Pri>(&self, chat_id: Ch, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri) -> Self::SendInvoice where Ch: Into<ChatId>,
+        fn send_invoice<Ch, T, D, Pa, P, C, Pri>(&self, chat_id: Ch, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri) -> Self::SendInvoice where Ch: Into<Recipient>,
         T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
diff --git a/src/payloads/approve_chat_join_request.rs b/src/payloads/approve_chat_join_request.rs
index fc62df1f..2c1b2781 100644
--- a/src/payloads/approve_chat_join_request.rs
+++ b/src/payloads/approve_chat_join_request.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to approve a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub ApproveChatJoinRequest (ApproveChatJoinRequestSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/ban_chat_member.rs b/src/payloads/ban_chat_member.rs
index b91a5c70..1464935e 100644
--- a/src/payloads/ban_chat_member.rs
+++ b/src/payloads/ban_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to ban a user in a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the chat on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -19,7 +19,7 @@ impl_payload! {
     pub BanChatMember (BanChatMemberSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/ban_chat_sender_chat.rs b/src/payloads/ban_chat_sender_chat.rs
index d46e5def..3aaf7863 100644
--- a/src/payloads/ban_chat_sender_chat.rs
+++ b/src/payloads/ban_chat_sender_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to ban a channel chat in a supergroup or a channel. The owner of the chat will not be able to send messages and join live streams on behalf of the chat, unless it is unbanned first. The bot must be an administrator in the supergroup or channel for this to work and must have the appropriate administrator rights.
@@ -16,7 +16,7 @@ impl_payload! {
     pub BanChatSenderChat (BanChatSenderChatSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
             pub sender_chat_id: i64,
         }
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index 6eec57d5..f0a56fbd 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, MessageEntity, MessageId, ParseMode, ReplyMarkup};
+use crate::types::{MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to copy messages of any kind. The method is analogous to the method forwardMessage, but the copied message doesn't have a link to the original message. Returns the [`MessageId`] of the sent message on success.
@@ -18,9 +18,9 @@ impl_payload! {
     pub CopyMessage (CopyMessageSetters) => MessageId {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
-            pub from_chat_id: ChatId [into],
+            pub from_chat_id: Recipient [into],
             /// Message identifier in the chat specified in _from\_chat\_id_
             pub message_id: i32,
         }
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
index 0e3f1929..ddb054c3 100644
--- a/src/payloads/create_chat_invite_link.rs
+++ b/src/payloads/create_chat_invite_link.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatId, ChatInviteLink};
+use crate::types::{ChatInviteLink, Recipient};
 
 impl_payload! {
     /// Use this method to create an additional invite link for a chat. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. The link can be revoked using the method [`RevokeChatInviteLink`]. Returns the new invite link as [`ChatInviteLink`] object.
@@ -20,7 +20,7 @@ impl_payload! {
     pub CreateChatInviteLink (CreateChatInviteLinkSetters) => ChatInviteLink {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
         optional {
             /// Invite link name; 0-32 characters
diff --git a/src/payloads/decline_chat_join_request.rs b/src/payloads/decline_chat_join_request.rs
index 7d96d17d..e7f5b87e 100644
--- a/src/payloads/decline_chat_join_request.rs
+++ b/src/payloads/decline_chat_join_request.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to decline a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub DeclineChatJoinRequest (DeclineChatJoinRequestSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index 9905ba12..0e5f63af 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to delete a chat photo. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub DeleteChatPhoto (DeleteChatPhotoSetters) => String {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index c9042585..78151eef 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to delete a group sticker set from a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field `can_set_sticker_set` optionally returned in [`GetChat`] requests to check if the bot can use this method. Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
     pub DeleteChatStickerSet (DeleteChatStickerSetSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index a287ead9..35dfbcc1 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to delete a message, including service messages, with the following limitations:
@@ -25,7 +25,7 @@ impl_payload! {
     pub DeleteMessage (DeleteMessageSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to delete
             pub message_id: i32,
         }
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
index cc0cd110..4b1439b0 100644
--- a/src/payloads/edit_chat_invite_link.rs
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to edit a non-primary invite link created by the bot. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the edited invite link as a [`ChatInviteLink`] object.
@@ -19,7 +19,7 @@ impl_payload! {
     pub EditChatInviteLink (EditChatInviteLinkSetters) => String {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// The invite link to edit
             pub invite_link: String [into],
         }
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index df901a8b..50092449 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
+use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
 
 impl_payload! {
     /// Use this method to edit captions of messages. On success, the edited Message is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub EditMessageCaption (EditMessageCaptionSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
         }
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index 26f2be3e..ff8000e9 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ReplyMarkup};
+use crate::types::{Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
@@ -20,7 +20,7 @@ impl_payload! {
     pub EditMessageLiveLocation (EditMessageLiveLocationSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
             /// Latitude of new location
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index e2e99dba..2ab6b094 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, InputMedia, Message};
+use crate::types::{InlineKeyboardMarkup, InputMedia, Message, Recipient};
 
 impl_payload! {
     /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, the edited Message is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub EditMessageMedia (EditMessageMediaSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
             /// A JSON-serialized object for a new media content of the message
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 81ab2496..31717940 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Message};
+use crate::types::{InlineKeyboardMarkup, Message, Recipient};
 
 impl_payload! {
     /// Use this method to edit only the reply markup of messages. On success, the edited Message is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub EditMessageReplyMarkup (EditMessageReplyMarkupSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
         }
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index fb704638..b57670e8 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Message, MessageEntity, ParseMode};
+use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
 
 impl_payload! {
     /// Use this method to edit text and [games] messages. On success, the edited Message is returned.
@@ -20,7 +20,7 @@ impl_payload! {
     pub EditMessageText (EditMessageTextSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
             /// New text of the message, 1-4096 characters after entities parsing
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index adf5e49e..affbb254 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to generate a new invite link for a chat; any previously generated link is revoked. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the new invite link as String on success.
@@ -18,7 +18,7 @@ impl_payload! {
     pub ExportChatInviteLink (ExportChatInviteLinkSetters) => String {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 9c34f0b7..299b5de4 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message};
+use crate::types::{Message, Recipient};
 
 impl_payload! {
     /// Use this method to forward messages of any kind. On success, the sent [`Message`] is returned.
@@ -18,9 +18,9 @@ impl_payload! {
     pub ForwardMessage (ForwardMessageSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
-            pub from_chat_id: ChatId [into],
+            pub from_chat_id: Recipient [into],
             /// Message identifier in the chat specified in _from\_chat\_id_
             pub message_id: i32,
         }
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index 2b40a11d..1174c2c1 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Chat, ChatId};
+use crate::types::{Chat, Recipient};
 
 impl_payload! {
     /// Use this method to get up to date information about the chat (current name of the user for one-on-one conversations, current username of a user, group or channel, etc.). Returns a [`Chat`] object on success.
@@ -18,7 +18,7 @@ impl_payload! {
     pub GetChat (GetChatSetters) => Chat {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index dc14eb20..aabf98d4 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, ChatMember};
+use crate::types::{ChatMember, Recipient};
 
 impl_payload! {
     /// Use this method to get a list of administrators in a chat. On success, returns an Array of [`ChatMember`] objects that contains information about all chat administrators except other bots. If the chat is a group or a supergroup and no administrators were appointed, only the creator will be returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub GetChatAdministrators (GetChatAdministratorsSetters) => Vec<ChatMember> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index 7b76d51c..dcf4f979 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, ChatMember};
+use crate::types::{ChatMember, Recipient};
 
 impl_payload! {
     /// Use this method to get information about a member of a chat. Returns a [`ChatMember`] object on success.
@@ -18,7 +18,7 @@ impl_payload! {
     pub GetChatMember (GetChatMemberSetters) => ChatMember {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/get_chat_member_count.rs b/src/payloads/get_chat_member_count.rs
index aca48ab1..ef135206 100644
--- a/src/payloads/get_chat_member_count.rs
+++ b/src/payloads/get_chat_member_count.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to get the number of members in a chat. Returns _Int_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub GetChatMemberCount (GetChatMemberCountSetters) => u32 {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index b5bb6350..7a86721a 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to get the number of members in a chat. Returns _Int_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub GetChatMembersCount (GetChatMembersCountSetters) => u32 {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 5679d804..75eef991 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to kick a user from a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the group on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -19,7 +19,7 @@ impl_payload! {
     pub KickChatMember (KickChatMemberSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 32d417b6..212cc901 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method for your bot to leave a group, supergroup or channel. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub LeaveChat (LeaveChatSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index b16dd8f3..b6a0552d 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to pin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub PinChatMessage (PinChatMessageSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of a message to pin
             pub message_id: i32,
         }
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 9e69082f..3170756b 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to promote or demote a user in a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Pass _False_ for all boolean parameters to demote a user. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub PromoteChatMember (PromoteChatMemberSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 6e78192c..003632a4 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatId, ChatPermissions, True};
+use crate::types::{ChatPermissions, Recipient, True};
 
 impl_payload! {
     /// Use this method to restrict a user in a supergroup. The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights. Pass _True_ for all permissions to lift restrictions from a user. Returns _True_ on success.
@@ -17,7 +17,7 @@ impl_payload! {
     pub RestrictChatMember (RestrictChatMemberSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
             /// A JSON-serialized object for new user permissions
diff --git a/src/payloads/revoke_chat_invite_link.rs b/src/payloads/revoke_chat_invite_link.rs
index 04a7389f..7321413c 100644
--- a/src/payloads/revoke_chat_invite_link.rs
+++ b/src/payloads/revoke_chat_invite_link.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 impl_payload! {
     /// Use this method to revoke an invite link created by the bot. If the primary link is revoked, a new link is automatically generated. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the revoked invite link as [`ChatInviteLink`] object.
@@ -18,7 +18,7 @@ impl_payload! {
     pub RevokeChatInviteLink (RevokeChatInviteLinkSetters) => String {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// The invite link to revoke
             pub invite_link: String [into],
         }
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 8e718a8e..49e2fa36 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = animation, thumb]
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendAnimation (SendAnimationSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Animation to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index c8123ec9..13906cc4 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = audio, thumb]
@@ -22,7 +22,7 @@ impl_payload! {
     pub SendAudio (SendAudioSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 35e5ea51..45cd89de 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatAction, ChatId, True};
+use crate::types::{ChatAction, Recipient, True};
 
 impl_payload! {
     /// Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns True on success.
@@ -22,7 +22,7 @@ impl_payload! {
     pub SendChatAction (SendChatActionSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], choose_sticker for [stickers], find_location for [location data], record_video_note or upload_video_note for [video notes].
             ///
             /// [text messages]: crate::payloads::SendMessage
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index ab530447..1af036cd 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ReplyMarkup};
+use crate::types::{Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendContact (SendContactSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Contact's phone number
             pub phone_number: String [into],
             /// Contact's first name
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 426154ac..70dd0339 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, DiceEmoji, Message, ReplyMarkup};
+use crate::types::{DiceEmoji, Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send an animated emoji that will display a random value. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendDice (SendDiceSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
         optional {
             /// Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, “🏀”, “⚽”, “🎳”, or “🎰”. Dice can have values 1-6 for “🎲”, “🎯” and “🎳”, values 1-5 for “🏀” and “⚽”, and values 1-64 for “🎰”. Defaults to “🎲”
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 7512f066..6bfc8330 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = document, thumb]
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendDocument (SendDocumentSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// File to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 503ddfb6..7a68601d 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -9,7 +9,7 @@
 use serde::Serialize;
 use url::Url;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, LabeledPrice, Message};
+use crate::types::{InlineKeyboardMarkup, LabeledPrice, Message, Recipient};
 
 impl_payload! {
     /// Use this method to send invoices. On success, the sent [`Message`] is returned.
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendInvoice (SendInvoiceSetters) => Message {
         required {
             /// Unique identifier for the target private chat
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Product name, 1-32 characters
             pub title: String [into],
             /// Product description, 1-255 characters
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index ba482dc2..99037b0d 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ReplyMarkup};
+use crate::types::{Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send point on the map. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendLocation (SendLocationSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Latitude of the location
             pub latitude: f64,
             /// Longitude of the location
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 95fd7886..108004cf 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputMedia, Message};
+use crate::types::{InputMedia, Message, Recipient};
 
 impl_payload! {
     /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Message`]s that were sent is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendMediaGroup (SendMediaGroupSetters) => Vec<Message> {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// A JSON-serialized array describing messages to be sent, must include 2-10 items
             pub media: Vec<InputMedia> [collect],
         }
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index e27ddfc1..7563f7c1 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send text messages. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendMessage (SendMessageSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Text of the message to be sent, 1-4096 characters after entities parsing
             pub text: String [into],
         }
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index e3e28d5b..8ab5d344 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = photo]
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendPhoto (SendPhotoSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Photo to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 6b37f9c9..7409cbc0 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, MessageEntity, ParseMode, PollType, ReplyMarkup};
+use crate::types::{Message, MessageEntity, ParseMode, PollType, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendPoll (SendPollSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Poll question, 1-300 characters
             pub question: String [into],
             /// A JSON-serialized list of answer options, 2-10 strings 1-100 characters each
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index e80d0ee3..65513e8d 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
+use crate::types::{InputFile, Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = sticker]
@@ -19,7 +19,7 @@ impl_payload! {
     pub SendSticker (SendStickerSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Sticker to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 78a901a2..33a99a72 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ReplyMarkup};
+use crate::types::{Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send information about a venue. On success, the sent [`Message`] is returned.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SendVenue (SendVenueSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Latitude of new location
             pub latitude: f64,
             /// Longitude of new location
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 75a7e652..ebf14dff 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = video, thumb]
@@ -20,7 +20,7 @@ impl_payload! {
     pub SendVideo (SendVideoSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Video to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 54c5fd3f..828ca1a3 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, ReplyMarkup};
+use crate::types::{InputFile, Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = video_note, thumb]
@@ -20,7 +20,7 @@ impl_payload! {
     pub SendVideoNote (SendVideoNoteSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Video note to send. Pass a file_id as String to send a video note that exists on the Telegram servers (recommended) or upload a new video using multipart/form-data. [More info on Sending Files »]. Sending video notes by a URL is currently unsupported
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 1d6c8035..bfbbd5fb 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, Message, MessageEntity, ParseMode, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = voice]
@@ -21,7 +21,7 @@ impl_payload! {
     pub SendVoice (SendVoiceSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 3ce02ccf..5f5d772a 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to set a custom title for an administrator in a supergroup promoted by the bot. Returns _True_on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub SetChatAdministratorCustomTitle (SetChatAdministratorCustomTitleSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
             /// New custom title for the administrator; 0-16 characters, emoji are not allowed
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index 1c7cc88b..a9d08495 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to change the description of a group, a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub SetChatDescription (SetChatDescriptionSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
         optional {
             /// New chat description, 0-255 characters
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index 1c619310..da9b5334 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, ChatPermissions, True};
+use crate::types::{ChatPermissions, Recipient, True};
 
 impl_payload! {
     /// Use this method to set default chat permissions for all members. The bot must be an administrator in the group or a supergroup for this to work and must have the _can_restrict_members_ admin rights. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub SetChatPermissions (SetChatPermissionsSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// New default chat permissions
             pub permissions: ChatPermissions,
         }
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index d7f475eb..316f2292 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InputFile, True};
+use crate::types::{InputFile, Recipient, True};
 
 impl_payload! {
     @[multipart = photo]
@@ -17,7 +17,7 @@ impl_payload! {
     pub SetChatPhoto (SetChatPhotoSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// New chat photo, uploaded using multipart/form-data
             pub photo: InputFile,
         }
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index 54410143..f63faa5d 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to set a new group sticker set for a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field _can\_set\_sticker\_set_ optionally returned in getChat requests to check if the bot can use this method. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub SetChatStickerSet (SetChatStickerSetSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Name of the sticker set to be set as the group sticker set
             pub sticker_set_name: String [into],
         }
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 8b26a35c..8cdba296 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to change the title of a chat. Titles can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub SetChatTitle (SetChatTitleSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// New chat title, 1-255 characters
             pub title: String [into],
         }
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index 55c4e0e6..1ee26b5a 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, Message, ReplyMarkup};
+use crate::types::{Message, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
@@ -21,7 +21,7 @@ impl_payload! {
     pub StopMessageLiveLocation (StopMessageLiveLocationSetters) => Message {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
             /// Latitude of new location
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index f5a956cf..c4e0ca24 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, InlineKeyboardMarkup, Poll};
+use crate::types::{InlineKeyboardMarkup, Poll, Recipient};
 
 impl_payload! {
     /// Use this method to stop a poll which was sent by the bot. On success, the stopped Poll with the final results is returned.
@@ -16,7 +16,7 @@ impl_payload! {
     pub StopPoll (StopPollSetters) => Poll {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Identifier of the message to edit
             pub message_id: i32,
         }
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index ca94d87c..56dd522d 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. By default, this method guarantees that after the call the user is not a member of the chat, but will be able to join it. So if the user is a member of the chat they will also be **removed** from the chat. If you don't want this, use the parameter _only\_if\_banned_. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub UnbanChatMember (UnbanChatMemberSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target user
             pub user_id: i64,
         }
diff --git a/src/payloads/unban_chat_sender_chat.rs b/src/payloads/unban_chat_sender_chat.rs
index 17f5d9db..fb884acc 100644
--- a/src/payloads/unban_chat_sender_chat.rs
+++ b/src/payloads/unban_chat_sender_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to unban a previously banned channel chat in a supergroup or channel. The bot must be an administrator for this to work and must have the appropriate administrator rights.
@@ -16,7 +16,7 @@ impl_payload! {
     pub UnbanChatSenderChat (UnbanChatSenderChatSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
             pub sender_chat_id: i64,
         }
diff --git a/src/payloads/unpin_all_chat_messages.rs b/src/payloads/unpin_all_chat_messages.rs
index 6629c6f8..25c8486a 100644
--- a/src/payloads/unpin_all_chat_messages.rs
+++ b/src/payloads/unpin_all_chat_messages.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to clear the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub UnpinAllChatMessages (UnpinAllChatMessagesSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
     }
 }
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index 6ebce38b..0a05a594 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatId, True};
+use crate::types::{Recipient, True};
 
 impl_payload! {
     /// Use this method to remove a message from the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
@@ -16,7 +16,7 @@ impl_payload! {
     pub UnpinChatMessage (UnpinChatMessageSetters) => True {
         required {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
-            pub chat_id: ChatId [into],
+            pub chat_id: Recipient [into],
         }
         optional {
             /// Identifier of a message to unpin. If not specified, the most recent pinned message (by sending date) will be unpinned.
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 899342ed..37ad9c65 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -7,8 +7,8 @@ use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
     types::{
-        BotCommand, ChatAction, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, TargetMessage,
+        BotCommand, ChatAction, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage,
     },
 };
 
@@ -103,7 +103,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SendMessage`].
     fn send_message<C, T>(&self, chat_id: C, text: T) -> Self::SendMessage
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>;
 
     type ForwardMessage: Request<Payload = ForwardMessage, Err = Self::Err>;
@@ -116,72 +116,72 @@ pub trait Requester {
         message_id: i32,
     ) -> Self::ForwardMessage
     where
-        C: Into<ChatId>,
-        F: Into<ChatId>;
+        C: Into<Recipient>,
+        F: Into<Recipient>;
 
     type CopyMessage: Request<Payload = CopyMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`CopyMessage`].
     fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
     where
-        C: Into<ChatId>,
-        F: Into<ChatId>;
+        C: Into<Recipient>,
+        F: Into<Recipient>;
 
     type SendPhoto: Request<Payload = SendPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendPhoto`].
     fn send_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SendPhoto
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendAudio: Request<Payload = SendAudio, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendAudio`].
     fn send_audio<C>(&self, chat_id: C, audio: InputFile) -> Self::SendAudio
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendDocument: Request<Payload = SendDocument, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendDocument`].
     fn send_document<C>(&self, chat_id: C, document: InputFile) -> Self::SendDocument
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendVideo: Request<Payload = SendVideo, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendVideo`].
     fn send_video<C>(&self, chat_id: C, video: InputFile) -> Self::SendVideo
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendAnimation: Request<Payload = SendAnimation, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendAnimation`].
     fn send_animation<C>(&self, chat_id: C, animation: InputFile) -> Self::SendAnimation
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendVoice: Request<Payload = SendVoice, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendVoice`].
     fn send_voice<C>(&self, chat_id: C, voice: InputFile) -> Self::SendVoice
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendVideoNote: Request<Payload = SendVideoNote, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendVideoNote`].
     fn send_video_note<C>(&self, chat_id: C, video_note: InputFile) -> Self::SendVideoNote
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendMediaGroup: Request<Payload = SendMediaGroup, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendMediaGroup`].
     fn send_media_group<C, M>(&self, chat_id: C, media: M) -> Self::SendMediaGroup
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         M: IntoIterator<Item = InputMedia>;
 
     type SendLocation: Request<Payload = SendLocation, Err = Self::Err>;
@@ -189,7 +189,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SendLocation`].
     fn send_location<C>(&self, chat_id: C, latitude: f64, longitude: f64) -> Self::SendLocation
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditMessageLiveLocation: Request<Payload = EditMessageLiveLocation, Err = Self::Err>;
 
@@ -202,7 +202,7 @@ pub trait Requester {
         longitude: f64,
     ) -> Self::EditMessageLiveLocation
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditMessageLiveLocationInline: Request<
         Payload = EditMessageLiveLocationInline,
@@ -230,7 +230,7 @@ pub trait Requester {
         longitude: f64,
     ) -> Self::StopMessageLiveLocation
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type StopMessageLiveLocationInline: Request<
         Payload = StopMessageLiveLocationInline,
@@ -259,7 +259,7 @@ pub trait Requester {
         address: A,
     ) -> Self::SendVenue
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>,
         A: Into<String>;
 
@@ -273,7 +273,7 @@ pub trait Requester {
         first_name: F,
     ) -> Self::SendContact
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         P: Into<String>,
         F: Into<String>;
 
@@ -282,7 +282,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SendPoll`].
     fn send_poll<C, Q, O>(&self, chat_id: C, question: Q, options: O) -> Self::SendPoll
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         Q: Into<String>,
         O: IntoIterator<Item = String>;
 
@@ -291,14 +291,14 @@ pub trait Requester {
     /// For Telegram documentation see [`SendDice`].
     fn send_dice<C>(&self, chat_id: C) -> Self::SendDice
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendChatAction: Request<Payload = SendChatAction, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendChatAction`].
     fn send_chat_action<C>(&self, chat_id: C, action: ChatAction) -> Self::SendChatAction
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
 
@@ -317,21 +317,21 @@ pub trait Requester {
     /// For Telegram documentation see [`BanChatMember`].
     fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`KickChatMember`].
     fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type UnbanChatMember: Request<Payload = UnbanChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnbanChatMember`].
     fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type RestrictChatMember: Request<Payload = RestrictChatMember, Err = Self::Err>;
 
@@ -343,14 +343,14 @@ pub trait Requester {
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type PromoteChatMember: Request<Payload = PromoteChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`PromoteChatMember`].
     fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SetChatAdministratorCustomTitle: Request<
         Payload = SetChatAdministratorCustomTitle,
@@ -365,7 +365,7 @@ pub trait Requester {
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
-        Ch: Into<ChatId>,
+        Ch: Into<Recipient>,
         Cu: Into<String>;
 
     type BanChatSenderChat: Request<Payload = BanChatSenderChat, Err = Self::Err>;
@@ -373,7 +373,7 @@ pub trait Requester {
     /// For Telegram documentation see [`BanChatSenderChat`].
     fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type UnbanChatSenderChat: Request<Payload = UnbanChatSenderChat, Err = Self::Err>;
 
@@ -384,7 +384,7 @@ pub trait Requester {
         sender_chat_id: i64,
     ) -> Self::UnbanChatSenderChat
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SetChatPermissions: Request<Payload = SetChatPermissions, Err = Self::Err>;
 
@@ -395,28 +395,28 @@ pub trait Requester {
         permissions: ChatPermissions,
     ) -> Self::SetChatPermissions
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type ExportChatInviteLink: Request<Payload = ExportChatInviteLink, Err = Self::Err>;
 
     /// For Telegram documentation see [`ExportChatInviteLink`].
     fn export_chat_invite_link<C>(&self, chat_id: C) -> Self::ExportChatInviteLink
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type CreateChatInviteLink: Request<Payload = CreateChatInviteLink, Err = Self::Err>;
 
     /// For Telegram documentation see [`CreateChatInviteLink`].
     fn create_chat_invite_link<C>(&self, chat_id: C) -> Self::CreateChatInviteLink
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditChatInviteLink: Request<Payload = EditChatInviteLink, Err = Self::Err>;
 
     /// For Telegram documentation see [`EditChatInviteLink`].
     fn edit_chat_invite_link<C, I>(&self, chat_id: C, invite_link: I) -> Self::EditChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         I: Into<String>;
 
     type RevokeChatInviteLink: Request<Payload = RevokeChatInviteLink, Err = Self::Err>;
@@ -428,7 +428,7 @@ pub trait Requester {
         invite_link: I,
     ) -> Self::RevokeChatInviteLink
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         I: Into<String>;
 
     type ApproveChatJoinRequest: Request<Payload = ApproveChatJoinRequest, Err = Self::Err>;
@@ -440,7 +440,7 @@ pub trait Requester {
         user_id: i64,
     ) -> Self::ApproveChatJoinRequest
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type DeclineChatJoinRequest: Request<Payload = DeclineChatJoinRequest, Err = Self::Err>;
 
@@ -451,28 +451,28 @@ pub trait Requester {
         user_id: i64,
     ) -> Self::DeclineChatJoinRequest
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SetChatPhoto: Request<Payload = SetChatPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetChatPhoto`].
     fn set_chat_photo<C>(&self, chat_id: C, photo: InputFile) -> Self::SetChatPhoto
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type DeleteChatPhoto: Request<Payload = DeleteChatPhoto, Err = Self::Err>;
 
     /// For Telegram documentation see [`DeleteChatPhoto`].
     fn delete_chat_photo<C>(&self, chat_id: C) -> Self::DeleteChatPhoto
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SetChatTitle: Request<Payload = SetChatTitle, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetChatTitle`].
     fn set_chat_title<C, T>(&self, chat_id: C, title: T) -> Self::SetChatTitle
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>;
 
     type SetChatDescription: Request<Payload = SetChatDescription, Err = Self::Err>;
@@ -480,70 +480,70 @@ pub trait Requester {
     /// For Telegram documentation see [`SetChatDescription`].
     fn set_chat_description<C>(&self, chat_id: C) -> Self::SetChatDescription
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type PinChatMessage: Request<Payload = PinChatMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`PinChatMessage`].
     fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type UnpinChatMessage: Request<Payload = UnpinChatMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnpinChatMessage`].
     fn unpin_chat_message<C>(&self, chat_id: C) -> Self::UnpinChatMessage
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type UnpinAllChatMessages: Request<Payload = UnpinAllChatMessages, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnpinAllChatMessages`].
     fn unpin_all_chat_messages<C>(&self, chat_id: C) -> Self::UnpinAllChatMessages
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type LeaveChat: Request<Payload = LeaveChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`LeaveChat`].
     fn leave_chat<C>(&self, chat_id: C) -> Self::LeaveChat
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetChat: Request<Payload = GetChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChat`].
     fn get_chat<C>(&self, chat_id: C) -> Self::GetChat
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetChatAdministrators: Request<Payload = GetChatAdministrators, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatAdministrators`].
     fn get_chat_administrators<C>(&self, chat_id: C) -> Self::GetChatAdministrators
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetChatMemberCount: Request<Payload = GetChatMemberCount, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMemberCount`].
     fn get_chat_member_count<C>(&self, chat_id: C) -> Self::GetChatMemberCount
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetChatMembersCount: Request<Payload = GetChatMembersCount, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMembersCount`].
     fn get_chat_members_count<C>(&self, chat_id: C) -> Self::GetChatMembersCount
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetChatMember: Request<Payload = GetChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMember`].
     fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SetChatStickerSet: Request<Payload = SetChatStickerSet, Err = Self::Err>;
 
@@ -554,7 +554,7 @@ pub trait Requester {
         sticker_set_name: S,
     ) -> Self::SetChatStickerSet
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         S: Into<String>;
 
     type DeleteChatStickerSet: Request<Payload = DeleteChatStickerSet, Err = Self::Err>;
@@ -562,7 +562,7 @@ pub trait Requester {
     /// For Telegram documentation see [`DeleteChatStickerSet`].
     fn delete_chat_sticker_set<C>(&self, chat_id: C) -> Self::DeleteChatStickerSet
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type AnswerCallbackQuery: Request<Payload = AnswerCallbackQuery, Err = Self::Err>;
 
@@ -606,7 +606,7 @@ pub trait Requester {
         text: T,
     ) -> Self::EditMessageText
     where
-        C: Into<ChatId>,
+        C: Into<Recipient>,
         T: Into<String>;
 
     type EditMessageTextInline: Request<Payload = EditMessageTextInline, Err = Self::Err>;
@@ -626,7 +626,7 @@ pub trait Requester {
     /// For Telegram documentation see [`EditMessageCaption`].
     fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditMessageCaptionInline: Request<Payload = EditMessageCaptionInline, Err = Self::Err>;
 
@@ -648,7 +648,7 @@ pub trait Requester {
         media: InputMedia,
     ) -> Self::EditMessageMedia
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditMessageMediaInline: Request<Payload = EditMessageMediaInline, Err = Self::Err>;
 
@@ -670,7 +670,7 @@ pub trait Requester {
         message_id: i32,
     ) -> Self::EditMessageReplyMarkup
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type EditMessageReplyMarkupInline: Request<
         Payload = EditMessageReplyMarkupInline,
@@ -690,21 +690,21 @@ pub trait Requester {
     /// For Telegram documentation see [`StopPoll`].
     fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type DeleteMessage: Request<Payload = DeleteMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`DeleteMessage`].
     fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type SendSticker: Request<Payload = SendSticker, Err = Self::Err>;
 
     /// For Telegram documentation see [`SendSticker`].
     fn send_sticker<C>(&self, chat_id: C, sticker: InputFile) -> Self::SendSticker
     where
-        C: Into<ChatId>;
+        C: Into<Recipient>;
 
     type GetStickerSet: Request<Payload = GetStickerSet, Err = Self::Err>;
 
@@ -787,7 +787,7 @@ pub trait Requester {
         prices: Pri,
     ) -> Self::SendInvoice
     where
-        Ch: Into<ChatId>,
+        Ch: Into<Recipient>,
         T: Into<String>,
         D: Into<String>,
         Pa: Into<String>,
diff --git a/src/types.rs b/src/types.rs
index 751b1842..c4a55ab3 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -9,7 +9,6 @@ pub use callback_game::*;
 pub use callback_query::*;
 pub use chat::*;
 pub use chat_action::*;
-pub use chat_id::*;
 pub use chat_invite_link::*;
 pub use chat_join_request::*;
 pub use chat_location::*;
@@ -115,7 +114,6 @@ mod callback_game;
 mod callback_query;
 mod chat;
 mod chat_action;
-mod chat_id;
 mod chat_invite_link;
 mod chat_join_request;
 mod chat_location;
@@ -222,6 +220,10 @@ mod non_telegram_types {
     pub(super) mod until_date;
 }
 
+mod recipient;
+
+pub use recipient::*;
+
 pub(crate) mod serde_opt_date_from_unix_timestamp {
     use chrono::{DateTime, NaiveDateTime, Utc};
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
diff --git a/src/types/bot_command_scope.rs b/src/types/bot_command_scope.rs
index d6051941..e3b17517 100644
--- a/src/types/bot_command_scope.rs
+++ b/src/types/bot_command_scope.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 /// This object represents the scope to which bot commands are applied.
 ///
@@ -49,20 +49,20 @@ pub enum BotCommandScope {
     AllPrivateChats,
     AllGroupChats,
     AllChatAdministrators,
-    Chat { chat_id: ChatId },
-    ChatAdministrators { chat_id: ChatId },
-    ChatMember { chat_id: ChatId, user_id: i64 },
+    Chat { chat_id: Recipient },
+    ChatAdministrators { chat_id: Recipient },
+    ChatMember { chat_id: Recipient, user_id: i64 },
 }
 
 #[test]
 fn issue_486() {
     serde_json::to_string(&BotCommandScope::Chat {
-        chat_id: ChatId::Id(0),
+        chat_id: Recipient::Id(0),
     })
     .unwrap();
 
     serde_json::to_string(&BotCommandScope::ChatAdministrators {
-        chat_id: ChatId::Id(0),
+        chat_id: Recipient::Id(0),
     })
     .unwrap();
 }
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 8a5b88a9..8b137891 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -1,82 +1 @@
-use derive_more::{Display, From};
-use serde::{Deserialize, Serialize};
 
-/// A unique identifier for the target chat or username of the target channel
-/// (in the format `@channelusername`).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
-#[serde(untagged)]
-pub enum ChatId {
-    /// A chat identifier.
-    #[display(fmt = "{}", _0)]
-    Id(i64),
-
-    /// A channel username (in the format @channelusername).
-    #[display(fmt = "{}", _0)]
-    ChannelUsername(String),
-}
-
-impl ChatId {
-    pub(crate) fn is_channel(&self) -> bool {
-        matches!(self.unmark(), None | Some(UnmarkedChatId::Channel(_)))
-    }
-
-    pub(crate) fn unmark(&self) -> Option<UnmarkedChatId> {
-        use UnmarkedChatId::*;
-
-        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
-        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
-        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
-        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
-        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
-        const MIN_USER_ID: i64 = 0;
-        const MAX_USER_ID: i64 = (1 << 40) - 1;
-
-        let res = match self {
-            &Self::Id(id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID) => Chat(-id as _),
-            &Self::Id(id @ MIN_MARKED_CHANNEL_ID..=MAX_MARKED_CHANNEL_ID) => {
-                Channel((MAX_MARKED_CHANNEL_ID - id) as _)
-            }
-            &Self::Id(id @ MIN_USER_ID..=MAX_USER_ID) => User(id as _),
-            &Self::Id(id) => panic!("malformed chat id: {}", id),
-            Self::ChannelUsername(_) => return None,
-        };
-
-        Some(res)
-    }
-}
-
-pub(crate) enum UnmarkedChatId {
-    User(u64),
-    Chat(u64),
-    Channel(u64),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn chat_id_id_serialization() {
-        let expected_json = String::from(r#"123456"#);
-        let actual_json = serde_json::to_string(&ChatId::Id(123_456)).unwrap();
-
-        assert_eq!(expected_json, actual_json)
-    }
-
-    #[test]
-    fn chat_id_channel_username_serialization() {
-        let expected_json = String::from(r#""@username""#);
-        let actual_json =
-            serde_json::to_string(&ChatId::ChannelUsername(String::from("@username"))).unwrap();
-
-        assert_eq!(expected_json, actual_json)
-    }
-
-    #[test]
-    fn user_id_unmark() {
-        assert!(matches!(
-            ChatId::Id(5298363099).unmark(),
-            Some(UnmarkedChatId::User(5298363099))
-        ));
-    }
-}
diff --git a/src/types/recipient.rs b/src/types/recipient.rs
new file mode 100644
index 00000000..e1664448
--- /dev/null
+++ b/src/types/recipient.rs
@@ -0,0 +1,82 @@
+use derive_more::{Display, From};
+use serde::{Deserialize, Serialize};
+
+/// A unique identifier for the target chat or username of the target channel
+/// (in the format `@channelusername`).
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
+#[serde(untagged)]
+pub enum Recipient {
+    /// A chat identifier.
+    #[display(fmt = "{}", _0)]
+    Id(i64),
+
+    /// A channel username (in the format @channelusername).
+    #[display(fmt = "{}", _0)]
+    ChannelUsername(String),
+}
+
+impl Recipient {
+    pub(crate) fn is_channel(&self) -> bool {
+        matches!(self.unmark(), None | Some(UnmarkedChatId::Channel(_)))
+    }
+
+    pub(crate) fn unmark(&self) -> Option<UnmarkedChatId> {
+        use UnmarkedChatId::*;
+
+        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
+        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
+        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
+        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
+        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
+        const MIN_USER_ID: i64 = 0;
+        const MAX_USER_ID: i64 = (1 << 40) - 1;
+
+        let res = match self {
+            &Self::Id(id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID) => Chat(-id as _),
+            &Self::Id(id @ MIN_MARKED_CHANNEL_ID..=MAX_MARKED_CHANNEL_ID) => {
+                Channel((MAX_MARKED_CHANNEL_ID - id) as _)
+            }
+            &Self::Id(id @ MIN_USER_ID..=MAX_USER_ID) => User(id as _),
+            &Self::Id(id) => panic!("malformed chat id: {}", id),
+            Self::ChannelUsername(_) => return None,
+        };
+
+        Some(res)
+    }
+}
+
+pub(crate) enum UnmarkedChatId {
+    User(u64),
+    Chat(u64),
+    Channel(u64),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn chat_id_id_serialization() {
+        let expected_json = String::from(r#"123456"#);
+        let actual_json = serde_json::to_string(&Recipient::Id(123_456)).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+
+    #[test]
+    fn chat_id_channel_username_serialization() {
+        let expected_json = String::from(r#""@username""#);
+        let actual_json =
+            serde_json::to_string(&Recipient::ChannelUsername(String::from("@username"))).unwrap();
+
+        assert_eq!(expected_json, actual_json)
+    }
+
+    #[test]
+    fn user_id_unmark() {
+        assert!(matches!(
+            Recipient::Id(5298363099).unmark(),
+            Some(UnmarkedChatId::User(5298363099))
+        ));
+    }
+}
diff --git a/src/types/target_message.rs b/src/types/target_message.rs
index 0c0d8cc1..66f2409e 100644
--- a/src/types/target_message.rs
+++ b/src/types/target_message.rs
@@ -1,4 +1,4 @@
-use crate::types::ChatId;
+use crate::types::Recipient;
 
 use serde::{Deserialize, Serialize};
 
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum TargetMessage {
-    Common { chat_id: ChatId, message_id: i32 },
+    Common { chat_id: Recipient, message_id: i32 },
     Inline { inline_message_id: String },
 }
 

From 41e09159a68e263da35e586bda7d095b5673c7b9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 18:53:13 +0400
Subject: [PATCH 525/755] Make user id typed (add `UserId`)

Reason: when user id is just an integer, it's easy to accidentally
use a "random" integer instead of actual user id, typed APIs make code
less prone to some mistakes.

This commit also fixes an issue when a wrong integer type was used for
`user_id` in `Contact`.

Another option that this addition unlocks is adding methods/implementing
foreign trait for `UserId`.
---
 src/adaptors/erased.rs                        | 77 +++++++++----------
 src/bot/api.rs                                | 51 +++++++-----
 src/local_macros.rs                           | 72 ++++++++---------
 src/payloads/add_sticker_to_set.rs            |  4 +-
 src/payloads/approve_chat_join_request.rs     |  4 +-
 src/payloads/ban_chat_member.rs               |  4 +-
 src/payloads/create_new_sticker_set.rs        |  4 +-
 src/payloads/decline_chat_join_request.rs     |  4 +-
 src/payloads/get_chat_member.rs               |  4 +-
 src/payloads/get_game_high_scores.rs          |  4 +-
 src/payloads/get_user_profile_photos.rs       |  4 +-
 src/payloads/kick_chat_member.rs              |  4 +-
 src/payloads/promote_chat_member.rs           |  4 +-
 src/payloads/restrict_chat_member.rs          |  4 +-
 .../set_chat_administrator_custom_title.rs    |  4 +-
 src/payloads/set_game_score.rs                |  4 +-
 src/payloads/set_game_score_inline.rs         |  4 +-
 src/payloads/set_passport_data_errors.rs      |  4 +-
 src/payloads/set_sticker_set_thumb.rs         |  4 +-
 src/payloads/unban_chat_member.rs             |  4 +-
 src/payloads/upload_sticker_file.rs           |  4 +-
 src/requests/requester.rs                     | 46 ++++++-----
 src/serde_multipart/mod.rs                    |  4 +-
 src/types.rs                                  |  2 +
 src/types/bot_command_scope.rs                |  4 +-
 src/types/callback_query.rs                   |  4 +-
 src/types/chat_member.rs                      |  4 +-
 src/types/contact.rs                          |  4 +-
 src/types/update.rs                           |  4 +-
 src/types/user.rs                             | 12 +--
 src/types/user_id.rs                          | 33 ++++++++
 31 files changed, 224 insertions(+), 165 deletions(-)
 create mode 100644 src/types/user_id.rs

diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 3199c734..a951f037 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -6,10 +6,7 @@ use reqwest::Url;
 use crate::{
     payloads::*,
     requests::{HasPayload, Output, Payload, Request, Requester},
-    types::{
-        BotCommand, ChatAction, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage,
-    },
+    types::*,
 };
 
 /// [`Requester`] with erased type.
@@ -343,7 +340,7 @@ trait ErasableRequester<'a> {
 
     fn get_user_profile_photos(
         &self,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, GetUserProfilePhotos, Self::Err>;
 
     fn get_file(&self, file_id: String) -> ErasedRequest<'a, GetFile, Self::Err>;
@@ -351,38 +348,38 @@ trait ErasableRequester<'a> {
     fn ban_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, BanChatMember, Self::Err>;
 
     fn kick_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, KickChatMember, Self::Err>;
 
     fn unban_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, UnbanChatMember, Self::Err>;
 
     fn restrict_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, RestrictChatMember, Self::Err>;
 
     fn promote_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, PromoteChatMember, Self::Err>;
 
     fn set_chat_administrator_custom_title(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
         custom_title: String,
     ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err>;
 
@@ -430,14 +427,14 @@ trait ErasableRequester<'a> {
     fn approve_chat_join_request(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err>;
 
     /// For Telegram documentation see [`DeclineChatJoinRequest`].
     fn decline_chat_join_request(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err>;
 
     fn set_chat_photo(
@@ -500,7 +497,7 @@ trait ErasableRequester<'a> {
     fn get_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, GetChatMember, Self::Err>;
 
     fn set_chat_sticker_set(
@@ -604,13 +601,13 @@ trait ErasableRequester<'a> {
 
     fn upload_sticker_file(
         &self,
-        user_id: i64,
+        user_id: UserId,
         png_sticker: InputFile,
     ) -> ErasedRequest<'a, UploadStickerFile, Self::Err>;
 
     fn create_new_sticker_set(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: String,
         title: String,
         sticker: InputSticker,
@@ -619,7 +616,7 @@ trait ErasableRequester<'a> {
 
     fn add_sticker_to_set(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: String,
         sticker: InputSticker,
         emojis: String,
@@ -639,7 +636,7 @@ trait ErasableRequester<'a> {
     fn set_sticker_set_thumb(
         &self,
         name: String,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, SetStickerSetThumb, Self::Err>;
 
     // we can't change telegram API
@@ -669,7 +666,7 @@ trait ErasableRequester<'a> {
 
     fn set_passport_data_errors(
         &self,
-        user_id: i64,
+        user_id: UserId,
         errors: Vec<PassportElementError>,
     ) -> ErasedRequest<'a, SetPassportDataErrors, Self::Err>;
 
@@ -681,7 +678,7 @@ trait ErasableRequester<'a> {
 
     fn set_game_score(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -689,14 +686,14 @@ trait ErasableRequester<'a> {
 
     fn set_game_score_inline(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         inline_message_id: String,
     ) -> ErasedRequest<'a, SetGameScoreInline, Self::Err>;
 
     fn get_game_high_scores(
         &self,
-        user_id: i64,
+        user_id: UserId,
         target: TargetMessage,
     ) -> ErasedRequest<'a, GetGameHighScores, Self::Err>;
 }
@@ -919,7 +916,7 @@ where
 
     fn get_user_profile_photos(
         &self,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, GetUserProfilePhotos, Self::Err> {
         Requester::get_user_profile_photos(self, user_id).erase()
     }
@@ -931,7 +928,7 @@ where
     fn ban_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, BanChatMember, Self::Err> {
         Requester::ban_chat_member(self, chat_id, user_id).erase()
     }
@@ -939,7 +936,7 @@ where
     fn kick_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, KickChatMember, Self::Err> {
         Requester::kick_chat_member(self, chat_id, user_id).erase()
     }
@@ -947,7 +944,7 @@ where
     fn unban_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, UnbanChatMember, Self::Err> {
         Requester::unban_chat_member(self, chat_id, user_id).erase()
     }
@@ -955,7 +952,7 @@ where
     fn restrict_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
         permissions: ChatPermissions,
     ) -> ErasedRequest<'a, RestrictChatMember, Self::Err> {
         Requester::restrict_chat_member(self, chat_id, user_id, permissions).erase()
@@ -964,7 +961,7 @@ where
     fn promote_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, PromoteChatMember, Self::Err> {
         Requester::promote_chat_member(self, chat_id, user_id).erase()
     }
@@ -972,7 +969,7 @@ where
     fn set_chat_administrator_custom_title(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
         custom_title: String,
     ) -> ErasedRequest<'a, SetChatAdministratorCustomTitle, Self::Err> {
         Requester::set_chat_administrator_custom_title(self, chat_id, user_id, custom_title).erase()
@@ -1036,7 +1033,7 @@ where
     fn approve_chat_join_request(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, ApproveChatJoinRequest, Self::Err> {
         Requester::approve_chat_join_request(self, chat_id, user_id).erase()
     }
@@ -1045,7 +1042,7 @@ where
     fn decline_chat_join_request(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, DeclineChatJoinRequest, Self::Err> {
         Requester::decline_chat_join_request(self, chat_id, user_id).erase()
     }
@@ -1134,7 +1131,7 @@ where
     fn get_chat_member(
         &self,
         chat_id: Recipient,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, GetChatMember, Self::Err> {
         Requester::get_chat_member(self, chat_id, user_id).erase()
     }
@@ -1278,7 +1275,7 @@ where
 
     fn upload_sticker_file(
         &self,
-        user_id: i64,
+        user_id: UserId,
         png_sticker: InputFile,
     ) -> ErasedRequest<'a, UploadStickerFile, Self::Err> {
         Requester::upload_sticker_file(self, user_id, png_sticker).erase()
@@ -1286,7 +1283,7 @@ where
 
     fn create_new_sticker_set(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: String,
         title: String,
         sticker: InputSticker,
@@ -1297,7 +1294,7 @@ where
 
     fn add_sticker_to_set(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: String,
         sticker: InputSticker,
         emojis: String,
@@ -1323,7 +1320,7 @@ where
     fn set_sticker_set_thumb(
         &self,
         name: String,
-        user_id: i64,
+        user_id: UserId,
     ) -> ErasedRequest<'a, SetStickerSetThumb, Self::Err> {
         Requester::set_sticker_set_thumb(self, name, user_id).erase()
     }
@@ -1369,7 +1366,7 @@ where
 
     fn set_passport_data_errors(
         &self,
-        user_id: i64,
+        user_id: UserId,
         errors: Vec<PassportElementError>,
     ) -> ErasedRequest<'a, SetPassportDataErrors, Self::Err> {
         Requester::set_passport_data_errors(self, user_id, errors).erase()
@@ -1385,7 +1382,7 @@ where
 
     fn set_game_score(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -1395,7 +1392,7 @@ where
 
     fn set_game_score_inline(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         inline_message_id: String,
     ) -> ErasedRequest<'a, SetGameScoreInline, Self::Err> {
@@ -1404,7 +1401,7 @@ where
 
     fn get_game_high_scores(
         &self,
-        user_id: i64,
+        user_id: UserId,
         target: TargetMessage,
     ) -> ErasedRequest<'a, GetGameHighScores, Self::Err> {
         Requester::get_game_high_scores(self, user_id, target).erase()
diff --git a/src/bot/api.rs b/src/bot/api.rs
index d9462f01..4383e536 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -6,7 +6,7 @@ use crate::{
     requests::{JsonRequest, MultipartRequest},
     types::{
         BotCommand, ChatPermissions, InlineQueryResult, InputFile, InputMedia, InputSticker,
-        LabeledPrice, Recipient,
+        LabeledPrice, Recipient, UserId,
     },
     Bot,
 };
@@ -306,7 +306,7 @@ impl Requester for Bot {
 
     type GetUserProfilePhotos = JsonRequest<payloads::GetUserProfilePhotos>;
 
-    fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos {
+    fn get_user_profile_photos(&self, user_id: UserId) -> Self::GetUserProfilePhotos {
         Self::GetUserProfilePhotos::new(self.clone(), payloads::GetUserProfilePhotos::new(user_id))
     }
 
@@ -321,7 +321,7 @@ impl Requester for Bot {
 
     type KickChatMember = JsonRequest<payloads::KickChatMember>;
 
-    fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::KickChatMember
     where
         C: Into<Recipient>,
     {
@@ -333,7 +333,7 @@ impl Requester for Bot {
 
     type BanChatMember = JsonRequest<payloads::BanChatMember>;
 
-    fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
+    fn ban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::BanChatMember
     where
         C: Into<Recipient>,
     {
@@ -342,7 +342,7 @@ impl Requester for Bot {
 
     type UnbanChatMember = JsonRequest<payloads::UnbanChatMember>;
 
-    fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::UnbanChatMember
     where
         C: Into<Recipient>,
     {
@@ -357,7 +357,7 @@ impl Requester for Bot {
     fn restrict_chat_member<C>(
         &self,
         chat_id: C,
-        user_id: i64,
+        user_id: UserId,
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
@@ -371,7 +371,7 @@ impl Requester for Bot {
 
     type PromoteChatMember = JsonRequest<payloads::PromoteChatMember>;
 
-    fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::PromoteChatMember
     where
         C: Into<Recipient>,
     {
@@ -386,7 +386,7 @@ impl Requester for Bot {
     fn set_chat_administrator_custom_title<Ch, Cu>(
         &self,
         chat_id: Ch,
-        user_id: i64,
+        user_id: UserId,
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
@@ -493,7 +493,11 @@ impl Requester for Bot {
 
     type ApproveChatJoinRequest = JsonRequest<payloads::ApproveChatJoinRequest>;
 
-    fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest
+    fn approve_chat_join_request<C>(
+        &self,
+        chat_id: C,
+        user_id: UserId,
+    ) -> Self::ApproveChatJoinRequest
     where
         C: Into<Recipient>,
     {
@@ -505,7 +509,11 @@ impl Requester for Bot {
 
     type DeclineChatJoinRequest = JsonRequest<payloads::DeclineChatJoinRequest>;
 
-    fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest
+    fn decline_chat_join_request<C>(
+        &self,
+        chat_id: C,
+        user_id: UserId,
+    ) -> Self::DeclineChatJoinRequest
     where
         C: Into<Recipient>,
     {
@@ -623,7 +631,7 @@ impl Requester for Bot {
 
     type GetChatMember = JsonRequest<payloads::GetChatMember>;
 
-    fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
+    fn get_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::GetChatMember
     where
         C: Into<Recipient>,
     {
@@ -857,8 +865,11 @@ impl Requester for Bot {
 
     type UploadStickerFile = MultipartRequest<payloads::UploadStickerFile>;
 
-    fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile where
-    {
+    fn upload_sticker_file(
+        &self,
+        user_id: UserId,
+        png_sticker: InputFile,
+    ) -> Self::UploadStickerFile where {
         Self::UploadStickerFile::new(
             self.clone(),
             payloads::UploadStickerFile::new(user_id, png_sticker),
@@ -869,7 +880,7 @@ impl Requester for Bot {
 
     fn create_new_sticker_set<N, T, E>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: N,
         title: T,
         sticker: InputSticker,
@@ -890,7 +901,7 @@ impl Requester for Bot {
 
     fn add_sticker_to_set<N, E>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: N,
         sticker: InputSticker,
         emojis: E,
@@ -932,7 +943,7 @@ impl Requester for Bot {
 
     type SetStickerSetThumb = MultipartRequest<payloads::SetStickerSetThumb>;
 
-    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: UserId) -> Self::SetStickerSetThumb
     where
         N: Into<String>,
     {
@@ -1007,7 +1018,7 @@ impl Requester for Bot {
 
     type SetPassportDataErrors = JsonRequest<payloads::SetPassportDataErrors>;
 
-    fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors
+    fn set_passport_data_errors<E>(&self, user_id: UserId, errors: E) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = crate::types::PassportElementError>,
     {
@@ -1033,7 +1044,7 @@ impl Requester for Bot {
 
     fn set_game_score(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -1048,7 +1059,7 @@ impl Requester for Bot {
 
     fn set_game_score_inline<I>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         inline_message_id: I,
     ) -> Self::SetGameScoreInline
@@ -1063,7 +1074,7 @@ impl Requester for Bot {
 
     type GetGameHighScores = JsonRequest<payloads::GetGameHighScores>;
 
-    fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores
+    fn get_game_high_scores<T>(&self, user_id: UserId, target: T) -> Self::GetGameHighScores
     where
         T: Into<crate::types::TargetMessage>,
     {
diff --git a/src/local_macros.rs b/src/local_macros.rs
index f7289c51..e31876b8 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -659,9 +659,9 @@ macro_rules! requester_forward {
     (@method get_user_profile_photos $body:ident $ty:ident) => {
         type GetUserProfilePhotos = $ty![GetUserProfilePhotos];
 
-        fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos {
+        fn get_user_profile_photos(&self, user_id: UserId) -> Self::GetUserProfilePhotos {
             let this = self;
-            $body!(get_user_profile_photos this (user_id: i64))
+            $body!(get_user_profile_photos this (user_id: UserId))
         }
     };
     (@method get_file $body:ident $ty:ident) => {
@@ -675,50 +675,50 @@ macro_rules! requester_forward {
     (@method ban_chat_member $body:ident $ty:ident) => {
         type BanChatMember = $ty![BanChatMember];
 
-        fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember where C: Into<Recipient> {
+        fn ban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::BanChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(ban_chat_member this (chat_id: C, user_id: i64))
+            $body!(ban_chat_member this (chat_id: C, user_id: UserId))
         }
     };
     (@method kick_chat_member $body:ident $ty:ident) => {
         type KickChatMember = $ty![KickChatMember];
 
-        fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember where C: Into<Recipient> {
+        fn kick_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::KickChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(kick_chat_member this (chat_id: C, user_id: i64))
+            $body!(kick_chat_member this (chat_id: C, user_id: UserId))
         }
     };
     (@method unban_chat_member $body:ident $ty:ident) => {
         type UnbanChatMember = $ty![UnbanChatMember];
 
-        fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember where C: Into<Recipient> {
+        fn unban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::UnbanChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(unban_chat_member this (chat_id: C, user_id: i64))
+            $body!(unban_chat_member this (chat_id: C, user_id: UserId))
         }
     };
     (@method restrict_chat_member $body:ident $ty:ident) => {
         type RestrictChatMember = $ty![RestrictChatMember];
 
-        fn restrict_chat_member<C>(&self, chat_id: C, user_id: i64, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<Recipient> {
+        fn restrict_chat_member<C>(&self, chat_id: C, user_id: UserId, permissions: ChatPermissions) -> Self::RestrictChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(restrict_chat_member this (chat_id: C, user_id: i64, permissions: ChatPermissions))
+            $body!(restrict_chat_member this (chat_id: C, user_id: UserId, permissions: ChatPermissions))
         }
     };
     (@method promote_chat_member $body:ident $ty:ident) => {
         type PromoteChatMember = $ty![PromoteChatMember];
 
-        fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember where C: Into<Recipient> {
+        fn promote_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::PromoteChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(promote_chat_member this (chat_id: C, user_id: i64))
+            $body!(promote_chat_member this (chat_id: C, user_id: UserId))
         }
     };
     (@method set_chat_administrator_custom_title $body:ident $ty:ident) => {
         type SetChatAdministratorCustomTitle = $ty![SetChatAdministratorCustomTitle];
 
-        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: i64, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<Recipient>,
+        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: UserId, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<Recipient>,
         Cu: Into<String> {
             let this = self;
-            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: i64, custom_title: Cu))
+            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: UserId, custom_title: Cu))
         }
     };
     (@method ban_chat_sender_chat $body:ident $ty:ident) => {
@@ -782,17 +782,17 @@ macro_rules! requester_forward {
     (@method approve_chat_join_request $body:ident $ty:ident) => {
         type ApproveChatJoinRequest = $ty![ApproveChatJoinRequest];
 
-        fn approve_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::ApproveChatJoinRequest where C: Into<Recipient> {
+        fn approve_chat_join_request<C>(&self, chat_id: C, user_id: UserId) -> Self::ApproveChatJoinRequest where C: Into<Recipient> {
             let this = self;
-            $body!(approve_chat_join_request this (chat_id: C, user_id: i64))
+            $body!(approve_chat_join_request this (chat_id: C, user_id: UserId))
         }
     };
     (@method decline_chat_join_request $body:ident $ty:ident) => {
         type DeclineChatJoinRequest = $ty![DeclineChatJoinRequest];
 
-        fn decline_chat_join_request<C>(&self, chat_id: C, user_id: i64) -> Self::DeclineChatJoinRequest where C: Into<Recipient> {
+        fn decline_chat_join_request<C>(&self, chat_id: C, user_id: UserId) -> Self::DeclineChatJoinRequest where C: Into<Recipient> {
             let this = self;
-            $body!(decline_chat_join_request this (chat_id: C, user_id: i64))
+            $body!(decline_chat_join_request this (chat_id: C, user_id: UserId))
         }
     };
     (@method set_chat_photo $body:ident $ty:ident) => {
@@ -895,9 +895,9 @@ macro_rules! requester_forward {
     (@method get_chat_member $body:ident $ty:ident) => {
         type GetChatMember = $ty![GetChatMember];
 
-        fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember where C: Into<Recipient> {
+        fn get_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::GetChatMember where C: Into<Recipient> {
             let this = self;
-            $body!(get_chat_member this (chat_id: C, user_id: i64))
+            $body!(get_chat_member this (chat_id: C, user_id: UserId))
         }
     };
     (@method set_chat_sticker_set $body:ident $ty:ident) => {
@@ -1059,28 +1059,28 @@ macro_rules! requester_forward {
     (@method upload_sticker_file $body:ident $ty:ident) => {
         type UploadStickerFile = $ty![UploadStickerFile];
 
-        fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile {
+        fn upload_sticker_file(&self, user_id: UserId, png_sticker: InputFile) -> Self::UploadStickerFile {
             let this = self;
-            $body!(upload_sticker_file this (user_id: i64, png_sticker: InputFile))
+            $body!(upload_sticker_file this (user_id: UserId, png_sticker: InputFile))
         }
     };
     (@method create_new_sticker_set $body:ident $ty:ident) => {
         type CreateNewStickerSet = $ty![CreateNewStickerSet];
 
-        fn create_new_sticker_set<N, T, E>(&self, user_id: i64, name: N, title: T, sticker: InputSticker, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
+        fn create_new_sticker_set<N, T, E>(&self, user_id: UserId, name: N, title: T, sticker: InputSticker, emojis: E) -> Self::CreateNewStickerSet where N: Into<String>,
         T: Into<String>,
         E: Into<String> {
             let this = self;
-            $body!(create_new_sticker_set this (user_id: i64, name: N, title: T, sticker: InputSticker, emojis: E))
+            $body!(create_new_sticker_set this (user_id: UserId, name: N, title: T, sticker: InputSticker, emojis: E))
         }
     };
     (@method add_sticker_to_set $body:ident $ty:ident) => {
         type AddStickerToSet = $ty![AddStickerToSet];
 
-        fn add_sticker_to_set<N, E>(&self, user_id: i64, name: N, sticker: InputSticker, emojis: E) -> Self::AddStickerToSet where N: Into<String>,
+        fn add_sticker_to_set<N, E>(&self, user_id: UserId, name: N, sticker: InputSticker, emojis: E) -> Self::AddStickerToSet where N: Into<String>,
         E: Into<String> {
             let this = self;
-            $body!(add_sticker_to_set this (user_id: i64, name: N, sticker: InputSticker, emojis: E))
+            $body!(add_sticker_to_set this (user_id: UserId, name: N, sticker: InputSticker, emojis: E))
         }
     };
     (@method set_sticker_position_in_set $body:ident $ty:ident) => {
@@ -1102,9 +1102,9 @@ macro_rules! requester_forward {
     (@method set_sticker_set_thumb $body:ident $ty:ident) => {
         type SetStickerSetThumb = $ty![SetStickerSetThumb];
 
-        fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb where N: Into<String> {
+        fn set_sticker_set_thumb<N>(&self, name: N, user_id: UserId) -> Self::SetStickerSetThumb where N: Into<String> {
             let this = self;
-            $body!(set_sticker_set_thumb this (name: N, user_id: i64))
+            $body!(set_sticker_set_thumb this (name: N, user_id: UserId))
         }
     };
     (@method send_invoice $body:ident $ty:ident) => {
@@ -1140,9 +1140,9 @@ macro_rules! requester_forward {
     (@method set_passport_data_errors $body:ident $ty:ident) => {
         type SetPassportDataErrors = $ty![SetPassportDataErrors];
 
-        fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors where E: IntoIterator<Item = PassportElementError> {
+        fn set_passport_data_errors<E>(&self, user_id: UserId, errors: E) -> Self::SetPassportDataErrors where E: IntoIterator<Item = PassportElementError> {
             let this = self;
-            $body!(set_passport_data_errors this (user_id: i64, errors: E))
+            $body!(set_passport_data_errors this (user_id: UserId, errors: E))
         }
     };
     (@method send_game $body:ident $ty:ident) => {
@@ -1156,25 +1156,25 @@ macro_rules! requester_forward {
     (@method set_game_score $body:ident $ty:ident) => {
         type SetGameScore = $ty![SetGameScore];
 
-        fn set_game_score(&self, user_id: i64, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
+        fn set_game_score(&self, user_id: UserId, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
             let this = self;
-            $body!(set_game_score this (user_id: i64, score: u64, chat_id: u32, message_id: i64))
+            $body!(set_game_score this (user_id: UserId, score: u64, chat_id: u32, message_id: i64))
         }
     };
     (@method set_game_score_inline $body:ident $ty:ident) => {
         type SetGameScoreInline = $ty![SetGameScoreInline];
 
-        fn set_game_score_inline<I>(&self, user_id: i64, score: u64, inline_message_id: I) -> Self::SetGameScoreInline where I: Into<String> {
+        fn set_game_score_inline<I>(&self, user_id: UserId, score: u64, inline_message_id: I) -> Self::SetGameScoreInline where I: Into<String> {
             let this = self;
-            $body!(set_game_score_inline this (user_id: i64, score: u64, inline_message_id: I))
+            $body!(set_game_score_inline this (user_id: UserId, score: u64, inline_message_id: I))
         }
     };
     (@method get_game_high_scores $body:ident $ty:ident) => {
         type GetGameHighScores = $ty![GetGameHighScores];
 
-        fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores where T: Into<TargetMessage> {
+        fn get_game_high_scores<T>(&self, user_id: UserId, target: T) -> Self::GetGameHighScores where T: Into<TargetMessage> {
             let this = self;
-            $body!(get_game_high_scores this (user_id: i64, target: T))
+            $body!(get_game_high_scores this (user_id: UserId, target: T))
         }
     };
 }
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index 0ea3907e..a231d9e3 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{InputSticker, MaskPosition, True};
+use crate::types::{InputSticker, MaskPosition, True, UserId};
 
 impl_payload! {
     @[multipart = sticker]
@@ -17,7 +17,7 @@ impl_payload! {
     pub AddStickerToSet (AddStickerToSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i64,
+            pub user_id: UserId,
             /// Sticker set name
             pub name: String [into],
             /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
diff --git a/src/payloads/approve_chat_join_request.rs b/src/payloads/approve_chat_join_request.rs
index 2c1b2781..eac96cf3 100644
--- a/src/payloads/approve_chat_join_request.rs
+++ b/src/payloads/approve_chat_join_request.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to approve a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
     }
 }
diff --git a/src/payloads/ban_chat_member.rs b/src/payloads/ban_chat_member.rs
index 1464935e..c9262bfd 100644
--- a/src/payloads/ban_chat_member.rs
+++ b/src/payloads/ban_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to ban a user in a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the chat on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -21,7 +21,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index c3fa4abe..1ba21044 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{InputSticker, MaskPosition, True};
+use crate::types::{InputSticker, MaskPosition, True, UserId};
 
 impl_payload! {
     @[multipart = sticker]
@@ -17,7 +17,7 @@ impl_payload! {
     pub CreateNewStickerSet (CreateNewStickerSetSetters) => True {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i64,
+            pub user_id: UserId,
             /// Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g., _animals_). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in _“\_by\_<bot username>”. <bot\_username>_ is case insensitive. 1-64 characters.
             pub name: String [into],
             /// Sticker set title, 1-64 characters
diff --git a/src/payloads/decline_chat_join_request.rs b/src/payloads/decline_chat_join_request.rs
index e7f5b87e..6524b027 100644
--- a/src/payloads/decline_chat_join_request.rs
+++ b/src/payloads/decline_chat_join_request.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to decline a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
     }
 }
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index dcf4f979..eee95f01 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{ChatMember, Recipient};
+use crate::types::{ChatMember, Recipient, UserId};
 
 impl_payload! {
     /// Use this method to get information about a member of a chat. Returns a [`ChatMember`] object on success.
@@ -20,7 +20,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
     }
 }
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index 854cd5e4..d38a3468 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{TargetMessage, True};
+use crate::types::{TargetMessage, True, UserId};
 
 impl_payload! {
     /// Use this method to get data for high score tables. Will return the score of the specified user and several of their neighbors in a game. On success, returns an Array of [`GameHighScore`] objects.
@@ -20,7 +20,7 @@ impl_payload! {
     pub GetGameHighScores (GetGameHighScoresSetters) => True {
         required {
             /// User identifier
-            pub user_id: i64,
+            pub user_id: UserId,
             /// Target message
             #[serde(flatten)]
             pub target: TargetMessage [into],
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 56a97492..193e8438 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::UserProfilePhotos;
+use crate::types::{UserId, UserProfilePhotos};
 
 impl_payload! {
     /// Use this method to get a list of profile pictures for a user. Returns a [`UserProfilePhotos`] object.
@@ -18,7 +18,7 @@ impl_payload! {
     pub GetUserProfilePhotos (GetUserProfilePhotosSetters) => UserProfilePhotos {
         required {
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// Sequential number of the first photo to be returned. By default, all photos are returned.
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 75eef991..9b45538d 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to kick a user from a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the group on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.
@@ -21,7 +21,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 3170756b..8af4b0b9 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to promote or demote a user in a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Pass _False_ for all boolean parameters to demote a user. Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// Pass True, if the administrator's presence in the chat is hidden
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index 003632a4..a390cbef 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -9,7 +9,7 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{ChatPermissions, Recipient, True};
+use crate::types::{ChatPermissions, Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to restrict a user in a supergroup. The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights. Pass _True_ for all permissions to lift restrictions from a user. Returns _True_ on success.
@@ -19,7 +19,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
             /// A JSON-serialized object for new user permissions
             pub permissions: ChatPermissions,
         }
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index 5f5d772a..fe82a6c7 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to set a custom title for an administrator in a supergroup promoted by the bot. Returns _True_on success.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
             /// New custom title for the administrator; 0-16 characters, emoji are not allowed
             pub custom_title: String [into],
         }
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 5d1bdb4c..540a7323 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::Message;
+use crate::types::{Message, UserId};
 
 impl_payload! {
     /// Use this method to set the score of the specified user in a game. On success, returns the edited [`Message`]. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.
@@ -20,7 +20,7 @@ impl_payload! {
     pub SetGameScore (SetGameScoreSetters) => Message {
         required {
             /// User identifier
-            pub user_id: i64,
+            pub user_id: UserId,
             /// New score
             pub score: u64,
             /// Unique identifier for the target chat
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 1b62c50a..90f6269b 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::Message;
+use crate::types::{Message, UserId};
 
 impl_payload! {
     /// Use this method to set the score of the specified user in a game. On success, returns _True_. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SetGameScoreInline (SetGameScoreInlineSetters) => Message {
         required {
             /// User identifier
-            pub user_id: i64,
+            pub user_id: UserId,
             /// New score
             pub score: u64,
             /// Identifier of the inline message
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index fdb52796..d906071f 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{PassportElementError, True};
+use crate::types::{PassportElementError, True, UserId};
 
 impl_payload! {
     /// Informs a user that some of the Telegram Passport elements they provided contains errors. The user will not be able to re-submit their Passport to you until the errors are fixed (the contents of the field for which you returned the error must change). Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
     pub SetPassportDataErrors (SetPassportDataErrorsSetters) => True {
         required {
             /// User identifier
-            pub user_id: i64,
+            pub user_id: UserId,
             /// A JSON-serialized array describing the errors
             pub errors: Vec<PassportElementError> [collect],
         }
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index 022ab8e3..1aaecab3 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{InputFile, True};
+use crate::types::{InputFile, True, UserId};
 
 impl_payload! {
     @[multipart = thumb]
@@ -19,7 +19,7 @@ impl_payload! {
             /// Name of the sticker set
             pub name: String [into],
             /// User identifier of sticker file owner
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// A **PNG** image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a **TGS** animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]. Animated sticker set thumbnail can't be uploaded via HTTP URL.
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index 56dd522d..d58f35c8 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{Recipient, True, UserId};
 
 impl_payload! {
     /// Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. By default, this method guarantees that after the call the user is not a member of the chat, but will be able to join it. So if the user is a member of the chat they will also be **removed** from the chat. If you don't want this, use the parameter _only\_if\_banned_. Returns _True_ on success.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target user
-            pub user_id: i64,
+            pub user_id: UserId,
         }
         optional {
             /// Do nothing if the user is not banned
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index f1d190eb..77c5468b 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{File, InputFile};
+use crate::types::{File, InputFile, UserId};
 
 impl_payload! {
     @[multipart = png_sticker]
@@ -17,7 +17,7 @@ impl_payload! {
     pub UploadStickerFile (UploadStickerFileSetters) => File {
         required {
             /// User identifier of sticker file owner
-            pub user_id: i64,
+            pub user_id: UserId,
             /// PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 37ad9c65..7df85bee 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -8,7 +8,7 @@ use crate::{
     requests::Request,
     types::{
         BotCommand, ChatAction, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage,
+        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage, UserId,
     },
 };
 
@@ -303,7 +303,7 @@ pub trait Requester {
     type GetUserProfilePhotos: Request<Payload = GetUserProfilePhotos, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetUserProfilePhotos`].
-    fn get_user_profile_photos(&self, user_id: i64) -> Self::GetUserProfilePhotos;
+    fn get_user_profile_photos(&self, user_id: UserId) -> Self::GetUserProfilePhotos;
 
     type GetFile: Request<Payload = GetFile, Err = Self::Err>;
 
@@ -315,21 +315,21 @@ pub trait Requester {
     type BanChatMember: Request<Payload = BanChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`BanChatMember`].
-    fn ban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::BanChatMember
+    fn ban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::BanChatMember
     where
         C: Into<Recipient>;
 
     type KickChatMember: Request<Payload = KickChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`KickChatMember`].
-    fn kick_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::KickChatMember
+    fn kick_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::KickChatMember
     where
         C: Into<Recipient>;
 
     type UnbanChatMember: Request<Payload = UnbanChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnbanChatMember`].
-    fn unban_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::UnbanChatMember
+    fn unban_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::UnbanChatMember
     where
         C: Into<Recipient>;
 
@@ -339,7 +339,7 @@ pub trait Requester {
     fn restrict_chat_member<C>(
         &self,
         chat_id: C,
-        user_id: i64,
+        user_id: UserId,
         permissions: ChatPermissions,
     ) -> Self::RestrictChatMember
     where
@@ -348,7 +348,7 @@ pub trait Requester {
     type PromoteChatMember: Request<Payload = PromoteChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`PromoteChatMember`].
-    fn promote_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::PromoteChatMember
+    fn promote_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::PromoteChatMember
     where
         C: Into<Recipient>;
 
@@ -361,7 +361,7 @@ pub trait Requester {
     fn set_chat_administrator_custom_title<Ch, Cu>(
         &self,
         chat_id: Ch,
-        user_id: i64,
+        user_id: UserId,
         custom_title: Cu,
     ) -> Self::SetChatAdministratorCustomTitle
     where
@@ -437,7 +437,7 @@ pub trait Requester {
     fn approve_chat_join_request<C>(
         &self,
         chat_id: C,
-        user_id: i64,
+        user_id: UserId,
     ) -> Self::ApproveChatJoinRequest
     where
         C: Into<Recipient>;
@@ -448,7 +448,7 @@ pub trait Requester {
     fn decline_chat_join_request<C>(
         &self,
         chat_id: C,
-        user_id: i64,
+        user_id: UserId,
     ) -> Self::DeclineChatJoinRequest
     where
         C: Into<Recipient>;
@@ -541,7 +541,7 @@ pub trait Requester {
     type GetChatMember: Request<Payload = GetChatMember, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetChatMember`].
-    fn get_chat_member<C>(&self, chat_id: C, user_id: i64) -> Self::GetChatMember
+    fn get_chat_member<C>(&self, chat_id: C, user_id: UserId) -> Self::GetChatMember
     where
         C: Into<Recipient>;
 
@@ -716,14 +716,18 @@ pub trait Requester {
     type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
 
     /// For Telegram documentation see [`UploadStickerFile`].
-    fn upload_sticker_file(&self, user_id: i64, png_sticker: InputFile) -> Self::UploadStickerFile;
+    fn upload_sticker_file(
+        &self,
+        user_id: UserId,
+        png_sticker: InputFile,
+    ) -> Self::UploadStickerFile;
 
     type CreateNewStickerSet: Request<Payload = CreateNewStickerSet, Err = Self::Err>;
 
     /// For Telegram documentation see [`CreateNewStickerSet`].
     fn create_new_sticker_set<N, T, E>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: N,
         title: T,
         sticker: InputSticker,
@@ -739,7 +743,7 @@ pub trait Requester {
     /// For Telegram documentation see [`AddStickerToSet`].
     fn add_sticker_to_set<N, E>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         name: N,
         sticker: InputSticker,
         emojis: E,
@@ -769,7 +773,7 @@ pub trait Requester {
     type SetStickerSetThumb: Request<Payload = SetStickerSetThumb, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetStickerSetThumb`].
-    fn set_sticker_set_thumb<N>(&self, name: N, user_id: i64) -> Self::SetStickerSetThumb
+    fn set_sticker_set_thumb<N>(&self, name: N, user_id: UserId) -> Self::SetStickerSetThumb
     where
         N: Into<String>;
 
@@ -816,7 +820,11 @@ pub trait Requester {
     type SetPassportDataErrors: Request<Payload = SetPassportDataErrors, Err = Self::Err>;
 
     /// For Telegram documentation see [`SetPassportDataErrors`].
-    fn set_passport_data_errors<E>(&self, user_id: i64, errors: E) -> Self::SetPassportDataErrors
+    fn set_passport_data_errors<E>(
+        &self,
+        user_id: UserId,
+        errors: E,
+    ) -> Self::SetPassportDataErrors
     where
         E: IntoIterator<Item = PassportElementError>;
 
@@ -832,7 +840,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SetGameScore`].
     fn set_game_score(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         chat_id: u32,
         message_id: i64,
@@ -843,7 +851,7 @@ pub trait Requester {
     /// For Telegram documentation see [`SetGameScoreInline`].
     fn set_game_score_inline<I>(
         &self,
-        user_id: i64,
+        user_id: UserId,
         score: u64,
         inline_message_id: I,
     ) -> Self::SetGameScoreInline
@@ -853,7 +861,7 @@ pub trait Requester {
     type GetGameHighScores: Request<Payload = GetGameHighScores, Err = Self::Err>;
 
     /// For Telegram documentation see [`GetGameHighScores`].
-    fn get_game_high_scores<T>(&self, user_id: i64, target: T) -> Self::GetGameHighScores
+    fn get_game_high_scores<T>(&self, user_id: UserId, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;
 }
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index 5e992595..bb279722 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -90,7 +90,7 @@ mod tests {
         types::{
             InputFile, InputMedia, InputMediaAnimation, InputMediaAudio, InputMediaDocument,
             InputMediaPhoto, InputMediaVideo, InputSticker, MessageEntity, MessageEntityKind,
-            ParseMode,
+            ParseMode, UserId,
         },
     };
 
@@ -151,7 +151,7 @@ mod tests {
     #[tokio::test]
     async fn test_add_sticker_to_set() {
         to_form_ref(&payloads::AddStickerToSet::new(
-            0,
+            UserId(0),
             "name",
             InputSticker::Png(InputFile::file("./media/logo.png")),
             "✈️⚙️",
diff --git a/src/types.rs b/src/types.rs
index c4a55ab3..230fdcaf 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -221,8 +221,10 @@ mod non_telegram_types {
 }
 
 mod recipient;
+mod user_id;
 
 pub use recipient::*;
+pub use user_id::*;
 
 pub(crate) mod serde_opt_date_from_unix_timestamp {
     use chrono::{DateTime, NaiveDateTime, Utc};
diff --git a/src/types/bot_command_scope.rs b/src/types/bot_command_scope.rs
index e3b17517..8a7042c9 100644
--- a/src/types/bot_command_scope.rs
+++ b/src/types/bot_command_scope.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::Recipient;
+use crate::types::{Recipient, UserId};
 
 /// This object represents the scope to which bot commands are applied.
 ///
@@ -51,7 +51,7 @@ pub enum BotCommandScope {
     AllChatAdministrators,
     Chat { chat_id: Recipient },
     ChatAdministrators { chat_id: Recipient },
-    ChatMember { chat_id: Recipient, user_id: i64 },
+    ChatMember { chat_id: Recipient, user_id: UserId },
 }
 
 #[test]
diff --git a/src/types/callback_query.rs b/src/types/callback_query.rs
index 47cedb96..92d2f920 100644
--- a/src/types/callback_query.rs
+++ b/src/types/callback_query.rs
@@ -51,6 +51,8 @@ pub struct CallbackQuery {
 
 #[cfg(test)]
 mod tests {
+    use crate::types::UserId;
+
     use super::*;
 
     #[test]
@@ -70,7 +72,7 @@ mod tests {
         let expected = CallbackQuery {
             id: "id".to_string(),
             from: User {
-                id: 12345,
+                id: UserId(12345),
                 is_bot: false,
                 first_name: "firstName".to_string(),
                 last_name: None,
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index ed577bac..0bfd5607 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -591,6 +591,8 @@ pub enum ChatMemberStatus {
 
 #[cfg(test)]
 mod tests {
+    use crate::types::UserId;
+
     use super::*;
 
     #[test]
@@ -618,7 +620,7 @@ mod tests {
         }"#;
         let expected = ChatMember {
             user: User {
-                id: 1029940401,
+                id: UserId(1029940401),
                 is_bot: false,
                 first_name: "First".to_string(),
                 last_name: Some("Last".to_string()),
diff --git a/src/types/contact.rs b/src/types/contact.rs
index 147d31dd..f2fef9be 100644
--- a/src/types/contact.rs
+++ b/src/types/contact.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+use crate::types::UserId;
+
 /// This object represents a phone contact.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#contact).
@@ -16,7 +18,7 @@ pub struct Contact {
     pub last_name: Option<String>,
 
     /// A contact's user identifier in Telegram.
-    pub user_id: Option<i32>,
+    pub user_id: Option<UserId>,
 
     /// Additional data about the contact in the form of a [vCard].
     ///
diff --git a/src/types/update.rs b/src/types/update.rs
index 02d62a77..1b97031b 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -295,7 +295,7 @@ impl Serialize for UpdateKind {
 mod test {
     use crate::types::{
         Chat, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon, MessageKind,
-        Update, UpdateKind, User,
+        Update, UpdateKind, User, UserId,
     };
 
     use chrono::{DateTime, NaiveDateTime, Utc};
@@ -350,7 +350,7 @@ mod test {
                 },
                 kind: MessageKind::Common(MessageCommon {
                     from: Some(User {
-                        id: 218_485_655,
+                        id: UserId(218_485_655),
                         is_bot: false,
                         first_name: String::from("Waffle"),
                         last_name: None,
diff --git a/src/types/user.rs b/src/types/user.rs
index f748fe96..978ddfa0 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+use crate::types::UserId;
+
 /// This object represents a Telegram user or bot.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#user).
@@ -7,7 +9,7 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct User {
     /// Unique identifier for this user or bot.
-    pub id: i64,
+    pub id: UserId,
 
     /// `true`, if this user is a bot.
     pub is_bot: bool,
@@ -53,7 +55,7 @@ impl User {
     /// denote an anonymous user that sends messages on behalf of a group.
     pub fn is_anonymous(&self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
-        const ANON_ID: i64 = 1087968824;
+        const ANON_ID: UserId = UserId(1087968824);
 
         // Sanity check
         debug_assert!(
@@ -71,7 +73,7 @@ impl User {
     /// denote an anonymous user that sends messages on behalf of a channel.
     pub fn is_channel(&self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
-        const ANON_CHANNEL_ID: i64 = 136817688;
+        const ANON_CHANNEL_ID: UserId = UserId(136817688);
 
         // Sanity check
         debug_assert!(
@@ -91,7 +93,7 @@ impl User {
     /// is automatically forwarded to a group, bots in a group will get a
     /// message where `from` is the Telegram user.
     pub fn is_telegram(&self) -> bool {
-        const TELEGRAM_USER_ID: i64 = 777000;
+        const TELEGRAM_USER_ID: UserId = UserId(777000);
 
         // Sanity check
         debug_assert!(
@@ -121,7 +123,7 @@ mod tests {
             "language_code":"ru"
         }"#;
         let expected = User {
-            id: 12345,
+            id: UserId(12345),
             is_bot: false,
             first_name: "firstName".to_string(),
             last_name: Some("lastName".to_string()),
diff --git a/src/types/user_id.rs b/src/types/user_id.rs
new file mode 100644
index 00000000..70211323
--- /dev/null
+++ b/src/types/user_id.rs
@@ -0,0 +1,33 @@
+use derive_more::Display;
+use serde::{Deserialize, Serialize};
+
+/// Identifier of a user.
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Display, Serialize, Deserialize,
+)]
+#[serde(transparent)]
+pub struct UserId(pub u64);
+
+#[cfg(test)]
+mod tests {
+    use serde::{Deserialize, Serialize};
+
+    use crate::types::UserId;
+
+    /// Test that `UserId` is serialized as the underlying integer
+    #[test]
+    fn deser() {
+        let user_id = S {
+            user_id: UserId(17),
+        };
+        let json = r#"{"user_id":17}"#;
+
+        #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+        struct S {
+            user_id: UserId,
+        }
+
+        assert_eq!(serde_json::to_string(&user_id).unwrap(), json);
+        assert_eq!(user_id, serde_json::from_str(json).unwrap());
+    }
+}

From f2378935b74edf9a4570b60a2af05d351132f17a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 20:33:08 +0400
Subject: [PATCH 526/755] Make chat id typed (add `ChatId`)

Note that this is different from the previous `ChatId` (that was renamed
to `Recipient`), since it can't hold @channelusername.

Reason: same as w/ `UserId`
---
 src/adaptors/erased.rs                 |  8 +--
 src/adaptors/throttle.rs               |  4 +-
 src/bot/api.rs                         |  8 +--
 src/lib.rs                             |  2 +-
 src/local_macros.rs                    |  8 +--
 src/payloads/ban_chat_sender_chat.rs   |  4 +-
 src/payloads/unban_chat_sender_chat.rs |  4 +-
 src/requests/request.rs                |  6 +-
 src/requests/requester.rs              | 31 +++++++----
 src/serde_multipart/mod.rs             | 12 ++--
 src/types.rs                           |  2 +
 src/types/bot_command_scope.rs         |  6 +-
 src/types/chat.rs                      | 18 +++---
 src/types/chat_id.rs                   | 77 ++++++++++++++++++++++++++
 src/types/message.rs                   | 40 ++++++-------
 src/types/recipient.rs                 | 50 +++--------------
 src/types/update.rs                    |  6 +-
 17 files changed, 171 insertions(+), 115 deletions(-)

diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index a951f037..6dd77a1b 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -386,13 +386,13 @@ trait ErasableRequester<'a> {
     fn ban_chat_sender_chat(
         &self,
         chat_id: Recipient,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err>;
 
     fn unban_chat_sender_chat(
         &self,
         chat_id: Recipient,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err>;
 
     fn set_chat_permissions(
@@ -978,7 +978,7 @@ where
     fn ban_chat_sender_chat(
         &self,
         chat_id: Recipient,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> ErasedRequest<'a, BanChatSenderChat, Self::Err> {
         Requester::ban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
     }
@@ -986,7 +986,7 @@ where
     fn unban_chat_sender_chat(
         &self,
         chat_id: Recipient,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> ErasedRequest<'a, UnbanChatSenderChat, Self::Err> {
         Requester::unban_chat_sender_chat(self, chat_id, sender_chat_id).erase()
     }
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 8c03535f..908697a0 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -638,14 +638,14 @@ download_forward! {
 /// usernames. (It is just a hashed username.)
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq)]
 enum ChatIdHash {
-    Id(i64),
+    Id(ChatId),
     ChannelUsernameHash(u64),
 }
 
 impl ChatIdHash {
     fn is_channel(&self) -> bool {
         match self {
-            &Self::Id(id) => Recipient::Id(id).is_channel(),
+            &Self::Id(id) => id.is_channel(),
             Self::ChannelUsernameHash(_) => true,
         }
     }
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 4383e536..0fdb8a51 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -5,8 +5,8 @@ use crate::{
     prelude::Requester,
     requests::{JsonRequest, MultipartRequest},
     types::{
-        BotCommand, ChatPermissions, InlineQueryResult, InputFile, InputMedia, InputSticker,
-        LabeledPrice, Recipient, UserId,
+        BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
+        InputSticker, LabeledPrice, Recipient, UserId,
     },
     Bot,
 };
@@ -401,7 +401,7 @@ impl Requester for Bot {
 
     type BanChatSenderChat = JsonRequest<payloads::BanChatSenderChat>;
 
-    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
+    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::BanChatSenderChat
     where
         C: Into<Recipient>,
     {
@@ -416,7 +416,7 @@ impl Requester for Bot {
     fn unban_chat_sender_chat<C>(
         &self,
         chat_id: C,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> Self::UnbanChatSenderChat
     where
         C: Into<Recipient>,
diff --git a/src/lib.rs b/src/lib.rs
index 1f222b6b..71e89323 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@
 //! ```
 //! # #[cfg(feature = "auto_send")]
 //! # async {
-//! # let chat_id = 0;
+//! # let chat_id = teloxide_core::types::ChatId(-1);
 //! use teloxide_core::{
 //!     prelude::*,
 //!     types::{DiceEmoji, ParseMode},
diff --git a/src/local_macros.rs b/src/local_macros.rs
index e31876b8..43f26711 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -724,17 +724,17 @@ macro_rules! requester_forward {
     (@method ban_chat_sender_chat $body:ident $ty:ident) => {
         type BanChatSenderChat = $ty![BanChatSenderChat];
 
-        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat where C: Into<Recipient> {
+        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::BanChatSenderChat where C: Into<Recipient> {
             let this = self;
-            $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
+            $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: ChatId))
         }
     };
     (@method unban_chat_sender_chat $body:ident $ty:ident) => {
         type UnbanChatSenderChat = $ty![UnbanChatSenderChat];
 
-        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::UnbanChatSenderChat where C: Into<Recipient> {
+        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::UnbanChatSenderChat where C: Into<Recipient> {
             let this = self;
-            $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: i64))
+            $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: ChatId))
         }
     };
     (@method set_chat_permissions $body:ident $ty:ident) => {
diff --git a/src/payloads/ban_chat_sender_chat.rs b/src/payloads/ban_chat_sender_chat.rs
index 3aaf7863..dd1d43ef 100644
--- a/src/payloads/ban_chat_sender_chat.rs
+++ b/src/payloads/ban_chat_sender_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{ChatId, Recipient, True};
 
 impl_payload! {
     /// Use this method to ban a channel chat in a supergroup or a channel. The owner of the chat will not be able to send messages and join live streams on behalf of the chat, unless it is unbanned first. The bot must be an administrator in the supergroup or channel for this to work and must have the appropriate administrator rights.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
-            pub sender_chat_id: i64,
+            pub sender_chat_id: ChatId,
         }
     }
 }
diff --git a/src/payloads/unban_chat_sender_chat.rs b/src/payloads/unban_chat_sender_chat.rs
index fb884acc..b4ec78f2 100644
--- a/src/payloads/unban_chat_sender_chat.rs
+++ b/src/payloads/unban_chat_sender_chat.rs
@@ -8,7 +8,7 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{ChatId, Recipient, True};
 
 impl_payload! {
     /// Use this method to unban a previously banned channel chat in a supergroup or channel. The bot must be an administrator for this to work and must have the appropriate administrator rights.
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
-            pub sender_chat_id: i64,
+            pub sender_chat_id: ChatId,
         }
     }
 }
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 0dd99e86..ee91232b 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -75,12 +75,12 @@ pub trait Request: HasPayload {
     /// ## Examples
     /// ```
     /// # async {
-    /// use teloxide_core::{prelude::*, requests::Request, Bot};
+    /// use teloxide_core::{prelude::*, requests::Request, types::ChatId, Bot};
     ///
     /// let bot = Bot::new("TOKEN");
-    /// # let chat_ids = vec![1i64, 2, 3, 4].into_iter().map(Into::into);
+    /// # let chat_ids = vec![1i64, 2, 3, 4].into_iter().map(ChatId).map(Into::into).collect::<Vec<_>>();
     ///
-    /// let mut req = bot.send_message(0, "Hi there!");
+    /// let mut req = bot.send_message(ChatId(0xAAAAAAAA), "Hi there!");
     /// for chat_id in chat_ids {
     ///     req.chat_id = chat_id;
     ///     req.send_ref().await.unwrap();
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 7df85bee..1cde022e 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -6,10 +6,7 @@ use url::Url;
 use crate::{
     payloads::{GetMe, SendMessage, *},
     requests::Request,
-    types::{
-        BotCommand, ChatAction, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, PassportElementError, Recipient, TargetMessage, UserId,
-    },
+    types::*,
 };
 
 /// Methods for building requests.
@@ -22,27 +19,35 @@ use crate::{
 ///
 /// ```
 /// # async {
-/// use teloxide_core::{prelude::*, types::ParseMode};
+/// # let chat_id = ChatId(-1);
+/// use teloxide_core::{
+///     prelude::*,
+///     types::{ChatId, ParseMode},
+/// };
 ///
 /// // Bot implements `Requester`
 /// let bot = Bot::new("TOKEN");
 ///
 /// // Required parameters are supplied to the `Requester` methods:
-/// bot.send_message(0, "<b>Text</b>")
+/// bot.send_message(chat_id, "<b>Text</b>")
 ///     // Optional parameters can be supplied by calling setters
 ///     .parse_mode(ParseMode::Html)
 ///     // To send request to telegram you need to call `.send()` and await the resulting future
 ///     .send()
 ///     .await?;
-/// # Ok::<_, teloxide_core::RequestError>(()) };
+/// # Ok::<_, teloxide_core::RequestError>(())
+/// # };
 /// ```
 ///
 /// Using `Requester` in a generic context:
 ///
 /// ```
-/// use teloxide_core::{prelude::*, types::Message};
+/// use teloxide_core::{
+///     prelude::*,
+///     types::{ChatId, Message},
+/// };
 ///
-/// async fn send_hi<R>(bot: R, chat: i64) -> Message
+/// async fn send_hi<R>(bot: R, chat: ChatId) -> Message
 /// where
 ///     R: Requester,
 /// {
@@ -371,7 +376,11 @@ pub trait Requester {
     type BanChatSenderChat: Request<Payload = BanChatSenderChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`BanChatSenderChat`].
-    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: i64) -> Self::BanChatSenderChat
+    fn ban_chat_sender_chat<C>(
+        &self,
+        chat_id: C,
+        sender_chat_id: ChatId,
+    ) -> Self::BanChatSenderChat
     where
         C: Into<Recipient>;
 
@@ -381,7 +390,7 @@ pub trait Requester {
     fn unban_chat_sender_chat<C>(
         &self,
         chat_id: C,
-        sender_chat_id: i64,
+        sender_chat_id: ChatId,
     ) -> Self::UnbanChatSenderChat
     where
         C: Into<Recipient>;
diff --git a/src/serde_multipart/mod.rs b/src/serde_multipart/mod.rs
index bb279722..5d04902a 100644
--- a/src/serde_multipart/mod.rs
+++ b/src/serde_multipart/mod.rs
@@ -88,9 +88,9 @@ mod tests {
     use crate::{
         payloads::{self, setters::*},
         types::{
-            InputFile, InputMedia, InputMediaAnimation, InputMediaAudio, InputMediaDocument,
-            InputMediaPhoto, InputMediaVideo, InputSticker, MessageEntity, MessageEntityKind,
-            ParseMode, UserId,
+            ChatId, InputFile, InputMedia, InputMediaAnimation, InputMediaAudio,
+            InputMediaDocument, InputMediaPhoto, InputMediaVideo, InputSticker, MessageEntity,
+            MessageEntityKind, ParseMode, UserId,
         },
     };
 
@@ -98,7 +98,7 @@ mod tests {
     #[tokio::test]
     async fn issue_473() {
         to_form_ref(
-            &payloads::SendPhoto::new(0, InputFile::file_id("0")).caption_entities([
+            &payloads::SendPhoto::new(ChatId(0), InputFile::file_id("0")).caption_entities([
                 MessageEntity {
                     kind: MessageEntityKind::Url,
                     offset: 0,
@@ -115,7 +115,7 @@ mod tests {
         const CAPTION: &str = "caption";
 
         to_form_ref(&payloads::SendMediaGroup::new(
-            0,
+            ChatId(0),
             [
                 InputMedia::Photo(
                     InputMediaPhoto::new(InputFile::file("./media/logo.png"))
@@ -163,7 +163,7 @@ mod tests {
     #[tokio::test]
     async fn test_send_animation() {
         to_form_ref(
-            &payloads::SendAnimation::new(0, InputFile::file("./media/logo.png"))
+            &payloads::SendAnimation::new(ChatId(0), InputFile::file("./media/logo.png"))
                 .caption_entities(entities())
                 .thumb(InputFile::read(
                     File::open("./media/logo.png").await.unwrap(),
diff --git a/src/types.rs b/src/types.rs
index 230fdcaf..100b1279 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -220,9 +220,11 @@ mod non_telegram_types {
     pub(super) mod until_date;
 }
 
+mod chat_id;
 mod recipient;
 mod user_id;
 
+pub use chat_id::*;
 pub use recipient::*;
 pub use user_id::*;
 
diff --git a/src/types/bot_command_scope.rs b/src/types/bot_command_scope.rs
index 8a7042c9..e005aabb 100644
--- a/src/types/bot_command_scope.rs
+++ b/src/types/bot_command_scope.rs
@@ -56,13 +56,15 @@ pub enum BotCommandScope {
 
 #[test]
 fn issue_486() {
+    use crate::types::ChatId;
+
     serde_json::to_string(&BotCommandScope::Chat {
-        chat_id: Recipient::Id(0),
+        chat_id: Recipient::Id(ChatId(0)),
     })
     .unwrap();
 
     serde_json::to_string(&BotCommandScope::ChatAdministrators {
-        chat_id: Recipient::Id(0),
+        chat_id: Recipient::Id(ChatId(0)),
     })
     .unwrap();
 }
diff --git a/src/types/chat.rs b/src/types/chat.rs
index a3e6f3fa..626b4d95 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{ChatLocation, ChatPermissions, ChatPhoto, Message, True};
+use crate::types::{ChatId, ChatLocation, ChatPermissions, ChatPhoto, Message, True};
 
 /// This object represents a chat.
 ///
@@ -8,12 +8,8 @@ use crate::types::{ChatLocation, ChatPermissions, ChatPhoto, Message, True};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Chat {
-    /// A unique identifier for this chat. This number may be greater than 32
-    /// bits and some programming languages may have difficulty/silent defects
-    /// in interpreting it. But it is smaller than 52 bits, so a signed 64 bit
-    /// integer or double-precision float type are safe for storing this
-    /// identifier.
-    pub id: i64,
+    /// A unique identifier for this chat.
+    pub id: ChatId,
 
     #[serde(flatten)]
     pub kind: ChatKind,
@@ -454,11 +450,11 @@ mod tests {
     #[test]
     fn channel_de() {
         let expected = Chat {
-            id: -1,
+            id: ChatId(-1),
             kind: ChatKind::Public(ChatPublic {
                 title: None,
                 kind: PublicChatKind::Channel(PublicChatChannel {
-                    username: Some("channelname".into()),
+                    username: Some("channel_name".into()),
                     linked_chat_id: None,
                 }),
                 description: None,
@@ -469,7 +465,7 @@ mod tests {
             pinned_message: None,
             message_auto_delete_time: None,
         };
-        let actual = from_str(r#"{"id":-1,"type":"channel","username":"channelname"}"#).unwrap();
+        let actual = from_str(r#"{"id":-1,"type":"channel","username":"channel_name"}"#).unwrap();
         assert_eq!(expected, actual);
     }
 
@@ -477,7 +473,7 @@ mod tests {
     fn private_chat_de() {
         assert_eq!(
             Chat {
-                id: 0,
+                id: ChatId(0),
                 kind: ChatKind::Private(ChatPrivate {
                     type_: (),
                     username: Some("username".into()),
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 8b137891..d66c84f3 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -1 +1,78 @@
+use derive_more::Display;
+use serde::{Deserialize, Serialize};
 
+use crate::types::UserId;
+
+/// Identifier of a chat.
+///
+/// Note that "a chat" here means any of group, supergroup, channel or user PM.
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Display, Serialize, Deserialize,
+)]
+#[serde(transparent)]
+pub struct ChatId(pub i64);
+
+impl ChatId {
+    pub(crate) fn is_channel(self) -> bool {
+        matches!(self.unmark(), UnmarkedChatId::Channel(_))
+    }
+
+    pub(crate) fn unmark(self) -> UnmarkedChatId {
+        use UnmarkedChatId::*;
+
+        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
+        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
+        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
+        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
+        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
+        const MIN_USER_ID: i64 = 0;
+        const MAX_USER_ID: i64 = (1 << 40) - 1;
+
+        match self.0 {
+            id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID => Group(-id as _),
+            id @ MIN_MARKED_CHANNEL_ID..=MAX_MARKED_CHANNEL_ID => {
+                Channel((MAX_MARKED_CHANNEL_ID - id) as _)
+            }
+            id @ MIN_USER_ID..=MAX_USER_ID => User(UserId(id as _)),
+            id => panic!("malformed chat id: {}", id),
+        }
+    }
+}
+
+pub(crate) enum UnmarkedChatId {
+    User(UserId),
+    Group(u64),
+    Channel(u64),
+}
+
+#[cfg(test)]
+mod tests {
+    use serde::{Deserialize, Serialize};
+
+    use crate::types::{ChatId, UnmarkedChatId, UserId};
+
+    /// Test that `ChatId` is serialized as the underlying integer
+    #[test]
+    fn deser() {
+        let chat_id = S {
+            chat_id: ChatId(0xAA),
+        };
+        let json = r#"{"chat_id":170}"#;
+
+        #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+        struct S {
+            chat_id: ChatId,
+        }
+
+        assert_eq!(serde_json::to_string(&chat_id).unwrap(), json);
+        assert_eq!(chat_id, serde_json::from_str(json).unwrap());
+    }
+
+    #[test]
+    fn user_id_unmark() {
+        assert!(matches!(
+            ChatId(5298363099).unmark(),
+            UnmarkedChatId::User(UserId(5298363099))
+        ));
+    }
+}
diff --git a/src/types/message.rs b/src/types/message.rs
index b7d58e88..bc680e5f 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -4,8 +4,8 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    Animation, Audio, Chat, Contact, Dice, Document, Game, InlineKeyboardMarkup, Invoice, Location,
-    MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
+    Animation, Audio, Chat, ChatId, Contact, Dice, Document, Game, InlineKeyboardMarkup, Invoice,
+    Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
     ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote,
     Voice, VoiceChatEnded, VoiceChatParticipantsInvited, VoiceChatScheduled, VoiceChatStarted,
 };
@@ -187,14 +187,14 @@ pub enum ChatMigration {
     /// identifier `chat_id`.
     To {
         #[serde(rename = "migrate_to_chat_id")]
-        chat_id: i64,
+        chat_id: ChatId,
     },
 
     /// The supergroup has been migrated from a group with the specified
     /// identifier `chat_id`.
     From {
         #[serde(rename = "migrate_from_chat_id")]
-        chat_id: i64,
+        chat_id: ChatId,
     },
 }
 
@@ -519,14 +519,15 @@ mod getters {
     use std::ops::Deref;
 
     use crate::types::{
-        self, message::MessageKind::*, Chat, ChatMigration, Forward, ForwardedFrom, MediaAnimation,
-        MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind, MediaLocation, MediaPhoto,
-        MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo, MediaVideoNote, MediaVoice,
-        Message, MessageChannelChatCreated, MessageCommon, MessageConnectedWebsite,
-        MessageDeleteChatPhoto, MessageDice, MessageEntity, MessageGroupChatCreated,
-        MessageInvoice, MessageLeftChatMember, MessageNewChatMembers, MessageNewChatPhoto,
-        MessageNewChatTitle, MessagePassportData, MessagePinned, MessageProximityAlertTriggered,
-        MessageSuccessfulPayment, MessageSupergroupChatCreated, PhotoSize, True, User,
+        self, message::MessageKind::*, Chat, ChatId, ChatMigration, Forward, ForwardedFrom,
+        MediaAnimation, MediaAudio, MediaContact, MediaDocument, MediaGame, MediaKind,
+        MediaLocation, MediaPhoto, MediaPoll, MediaSticker, MediaText, MediaVenue, MediaVideo,
+        MediaVideoNote, MediaVoice, Message, MessageChannelChatCreated, MessageCommon,
+        MessageConnectedWebsite, MessageDeleteChatPhoto, MessageDice, MessageEntity,
+        MessageGroupChatCreated, MessageInvoice, MessageLeftChatMember, MessageNewChatMembers,
+        MessageNewChatPhoto, MessageNewChatTitle, MessagePassportData, MessagePinned,
+        MessageProximityAlertTriggered, MessageSuccessfulPayment, MessageSupergroupChatCreated,
+        PhotoSize, True, User,
     };
 
     /// Getters for [Message] fields from [telegram docs].
@@ -558,7 +559,7 @@ mod getters {
         }
 
         #[deprecated(since = "0.4.2", note = "use `.chat.id` field instead")]
-        pub fn chat_id(&self) -> i64 {
+        pub fn chat_id(&self) -> ChatId {
             self.chat.id
         }
 
@@ -931,7 +932,7 @@ mod getters {
             }
         }
 
-        pub fn migrate_to_chat_id(&self) -> Option<i64> {
+        pub fn migrate_to_chat_id(&self) -> Option<ChatId> {
             match &self.kind {
                 Common(MessageCommon {
                     media_kind: MediaKind::Migration(ChatMigration::To { chat_id }),
@@ -941,7 +942,7 @@ mod getters {
             }
         }
 
-        pub fn migrate_from_chat_id(&self) -> Option<i64> {
+        pub fn migrate_from_chat_id(&self) -> Option<ChatId> {
             match &self.kind {
                 Common(MessageCommon {
                     media_kind: MediaKind::Migration(ChatMigration::From { chat_id }),
@@ -1069,7 +1070,8 @@ impl Message {
             // accessible to the group members.
             None => format!(
                 "https://t.me/c/{0}/{1}/",
-                (-self.chat.id) - 1000000000000,
+                // FIXME: this may be wrong for private channels
+                (-self.chat.id.0) - 1000000000000,
                 self.id
             ),
         };
@@ -1326,7 +1328,7 @@ mod tests {
         let message: Message = serde_json::from_str(json).unwrap();
 
         let group = Chat {
-            id: -1001160242915,
+            id: ChatId(-1001160242915),
             kind: ChatKind::Public(ChatPublic {
                 title: Some("a".to_owned()),
                 kind: PublicChatKind::Supergroup(PublicChatSupergroup {
@@ -1360,8 +1362,8 @@ mod tests {
     /// Regression test for <https://github.com/teloxide/teloxide/issues/427>
     #[test]
     fn issue_427() {
-        let old = -599075523;
-        let new = -1001555296434;
+        let old = ChatId(-599075523);
+        let new = ChatId(-1001555296434);
 
         // Migration to a supergroup
         let json = r#"{"chat":{"all_members_are_administrators":false,"id":-599075523,"title":"test","type":"group"},"date":1629404938,"from":{"first_name":"nullptr","id":729497414,"is_bot":false,"language_code":"en","username":"hex0x0000"},"message_id":16,"migrate_to_chat_id":-1001555296434}"#;
diff --git a/src/types/recipient.rs b/src/types/recipient.rs
index e1664448..dc719f62 100644
--- a/src/types/recipient.rs
+++ b/src/types/recipient.rs
@@ -1,6 +1,8 @@
 use derive_more::{Display, From};
 use serde::{Deserialize, Serialize};
 
+use crate::types::ChatId;
+
 /// A unique identifier for the target chat or username of the target channel
 /// (in the format `@channelusername`).
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
@@ -8,7 +10,7 @@ use serde::{Deserialize, Serialize};
 pub enum Recipient {
     /// A chat identifier.
     #[display(fmt = "{}", _0)]
-    Id(i64),
+    Id(ChatId),
 
     /// A channel username (in the format @channelusername).
     #[display(fmt = "{}", _0)]
@@ -16,39 +18,13 @@ pub enum Recipient {
 }
 
 impl Recipient {
+    #[allow(unused)]
     pub(crate) fn is_channel(&self) -> bool {
-        matches!(self.unmark(), None | Some(UnmarkedChatId::Channel(_)))
+        match self {
+            Recipient::Id(id) => id.is_channel(),
+            Recipient::ChannelUsername(_) => true,
+        }
     }
-
-    pub(crate) fn unmark(&self) -> Option<UnmarkedChatId> {
-        use UnmarkedChatId::*;
-
-        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
-        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
-        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
-        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
-        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
-        const MIN_USER_ID: i64 = 0;
-        const MAX_USER_ID: i64 = (1 << 40) - 1;
-
-        let res = match self {
-            &Self::Id(id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID) => Chat(-id as _),
-            &Self::Id(id @ MIN_MARKED_CHANNEL_ID..=MAX_MARKED_CHANNEL_ID) => {
-                Channel((MAX_MARKED_CHANNEL_ID - id) as _)
-            }
-            &Self::Id(id @ MIN_USER_ID..=MAX_USER_ID) => User(id as _),
-            &Self::Id(id) => panic!("malformed chat id: {}", id),
-            Self::ChannelUsername(_) => return None,
-        };
-
-        Some(res)
-    }
-}
-
-pub(crate) enum UnmarkedChatId {
-    User(u64),
-    Chat(u64),
-    Channel(u64),
 }
 
 #[cfg(test)]
@@ -58,7 +34,7 @@ mod tests {
     #[test]
     fn chat_id_id_serialization() {
         let expected_json = String::from(r#"123456"#);
-        let actual_json = serde_json::to_string(&Recipient::Id(123_456)).unwrap();
+        let actual_json = serde_json::to_string(&Recipient::Id(ChatId(123_456))).unwrap();
 
         assert_eq!(expected_json, actual_json)
     }
@@ -71,12 +47,4 @@ mod tests {
 
         assert_eq!(expected_json, actual_json)
     }
-
-    #[test]
-    fn user_id_unmark() {
-        assert!(matches!(
-            Recipient::Id(5298363099).unmark(),
-            Some(UnmarkedChatId::User(5298363099))
-        ));
-    }
 }
diff --git a/src/types/update.rs b/src/types/update.rs
index 1b97031b..05a316e7 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -294,8 +294,8 @@ impl Serialize for UpdateKind {
 #[cfg(test)]
 mod test {
     use crate::types::{
-        Chat, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon, MessageKind,
-        Update, UpdateKind, User, UserId,
+        Chat, ChatId, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon,
+        MessageKind, Update, UpdateKind, User, UserId,
     };
 
     use chrono::{DateTime, NaiveDateTime, Utc};
@@ -335,7 +335,7 @@ mod test {
                 id: 6557,
                 date,
                 chat: Chat {
-                    id: 218_485_655,
+                    id: ChatId(218_485_655),
                     kind: ChatKind::Private(ChatPrivate {
                         type_: (),
                         username: Some(String::from("WaffleLapkin")),

From 036c46caaa153abd3135e8868d30ddac37eca5ea Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 20:43:46 +0400
Subject: [PATCH 527/755] reformat code a bit

---
 rustfmt.toml           | 1 +
 src/types/chat_id.rs   | 8 ++++----
 src/types/recipient.rs | 4 +++-
 src/types/user_id.rs   | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 9b0523d1..16746573 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -3,3 +3,4 @@ wrap_comments = true
 format_strings = true
 imports_granularity = "Crate"
 use_field_init_shorthand = true
+merge_derives = false
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index d66c84f3..4d35840a 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -1,4 +1,3 @@
-use derive_more::Display;
 use serde::{Deserialize, Serialize};
 
 use crate::types::UserId;
@@ -6,9 +5,10 @@ use crate::types::UserId;
 /// Identifier of a chat.
 ///
 /// Note that "a chat" here means any of group, supergroup, channel or user PM.
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Display, Serialize, Deserialize,
-)]
+#[derive(Clone, Copy)]
+#[derive(Debug, derive_more::Display)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Serialize, Deserialize)]
 #[serde(transparent)]
 pub struct ChatId(pub i64);
 
diff --git a/src/types/recipient.rs b/src/types/recipient.rs
index dc719f62..36679686 100644
--- a/src/types/recipient.rs
+++ b/src/types/recipient.rs
@@ -5,7 +5,9 @@ use crate::types::ChatId;
 
 /// A unique identifier for the target chat or username of the target channel
 /// (in the format `@channelusername`).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Display, From)]
+#[derive(Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Display, From)]
+#[derive(Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum Recipient {
     /// A chat identifier.
diff --git a/src/types/user_id.rs b/src/types/user_id.rs
index 70211323..bfee58bf 100644
--- a/src/types/user_id.rs
+++ b/src/types/user_id.rs
@@ -1,10 +1,10 @@
-use derive_more::Display;
 use serde::{Deserialize, Serialize};
 
 /// Identifier of a user.
-#[derive(
-    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Display, Serialize, Deserialize,
-)]
+#[derive(Clone, Copy)]
+#[derive(Debug, derive_more::Display)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Serialize, Deserialize)]
 #[serde(transparent)]
 pub struct UserId(pub u64);
 

From 4fbec56674e5d93da4147c942bf170bf30754ec3 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 20:47:30 +0400
Subject: [PATCH 528/755] Impl `From<UserId>` for `ChatId` and `Recipient`

---
 src/types/chat_id.rs   | 6 ++++++
 src/types/recipient.rs | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 4d35840a..2e8a69c1 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -12,6 +12,12 @@ use crate::types::UserId;
 #[serde(transparent)]
 pub struct ChatId(pub i64);
 
+impl From<UserId> for ChatId {
+    fn from(UserId(id): UserId) -> Self {
+        Self(id as _)
+    }
+}
+
 impl ChatId {
     pub(crate) fn is_channel(self) -> bool {
         matches!(self.unmark(), UnmarkedChatId::Channel(_))
diff --git a/src/types/recipient.rs b/src/types/recipient.rs
index 36679686..e7a29672 100644
--- a/src/types/recipient.rs
+++ b/src/types/recipient.rs
@@ -1,7 +1,7 @@
 use derive_more::{Display, From};
 use serde::{Deserialize, Serialize};
 
-use crate::types::ChatId;
+use crate::types::{ChatId, UserId};
 
 /// A unique identifier for the target chat or username of the target channel
 /// (in the format `@channelusername`).
@@ -29,6 +29,12 @@ impl Recipient {
     }
 }
 
+impl From<UserId> for Recipient {
+    fn from(id: UserId) -> Self {
+        Self::Id(id.into())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 71dee3b5635752e01ae300ddd7d33327952d562c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 24 Mar 2022 21:08:30 +0400
Subject: [PATCH 529/755] Use `Into<ChatId>` in methods

---
 src/bot/api.rs                         |  8 +++++---
 src/local_macros.rs                    | 10 ++++++----
 src/payloads/ban_chat_sender_chat.rs   |  2 +-
 src/payloads/unban_chat_sender_chat.rs |  2 +-
 src/requests/requester.rs              | 16 +++++++---------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index 0fdb8a51..396c935d 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -401,9 +401,10 @@ impl Requester for Bot {
 
     type BanChatSenderChat = JsonRequest<payloads::BanChatSenderChat>;
 
-    fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::BanChatSenderChat
+    fn ban_chat_sender_chat<C, S>(&self, chat_id: C, sender_chat_id: S) -> Self::BanChatSenderChat
     where
         C: Into<Recipient>,
+        S: Into<ChatId>,
     {
         Self::BanChatSenderChat::new(
             self.clone(),
@@ -413,13 +414,14 @@ impl Requester for Bot {
 
     type UnbanChatSenderChat = JsonRequest<payloads::UnbanChatSenderChat>;
 
-    fn unban_chat_sender_chat<C>(
+    fn unban_chat_sender_chat<C, S>(
         &self,
         chat_id: C,
-        sender_chat_id: ChatId,
+        sender_chat_id: S,
     ) -> Self::UnbanChatSenderChat
     where
         C: Into<Recipient>,
+        S: Into<ChatId>,
     {
         Self::UnbanChatSenderChat::new(
             self.clone(),
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 43f26711..9971da25 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -724,17 +724,19 @@ macro_rules! requester_forward {
     (@method ban_chat_sender_chat $body:ident $ty:ident) => {
         type BanChatSenderChat = $ty![BanChatSenderChat];
 
-        fn ban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::BanChatSenderChat where C: Into<Recipient> {
+        fn ban_chat_sender_chat<C, S>(&self, chat_id: C, sender_chat_id: S) -> Self::BanChatSenderChat where C: Into<Recipient>,
+        S: Into<ChatId> {
             let this = self;
-            $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: ChatId))
+            $body!(ban_chat_sender_chat this (chat_id: C, sender_chat_id: S))
         }
     };
     (@method unban_chat_sender_chat $body:ident $ty:ident) => {
         type UnbanChatSenderChat = $ty![UnbanChatSenderChat];
 
-        fn unban_chat_sender_chat<C>(&self, chat_id: C, sender_chat_id: ChatId) -> Self::UnbanChatSenderChat where C: Into<Recipient> {
+        fn unban_chat_sender_chat<C, S>(&self, chat_id: C, sender_chat_id: S) -> Self::UnbanChatSenderChat where C: Into<Recipient>,
+        S: Into<ChatId> {
             let this = self;
-            $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: ChatId))
+            $body!(unban_chat_sender_chat this (chat_id: C, sender_chat_id: S))
         }
     };
     (@method set_chat_permissions $body:ident $ty:ident) => {
diff --git a/src/payloads/ban_chat_sender_chat.rs b/src/payloads/ban_chat_sender_chat.rs
index dd1d43ef..2416fbd6 100644
--- a/src/payloads/ban_chat_sender_chat.rs
+++ b/src/payloads/ban_chat_sender_chat.rs
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
-            pub sender_chat_id: ChatId,
+            pub sender_chat_id: ChatId [into],
         }
     }
 }
diff --git a/src/payloads/unban_chat_sender_chat.rs b/src/payloads/unban_chat_sender_chat.rs
index b4ec78f2..54d4d4ea 100644
--- a/src/payloads/unban_chat_sender_chat.rs
+++ b/src/payloads/unban_chat_sender_chat.rs
@@ -18,7 +18,7 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Unique identifier of the target sender chat
-            pub sender_chat_id: ChatId,
+            pub sender_chat_id: ChatId [into],
         }
     }
 }
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 1cde022e..282e5ba4 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -376,24 +376,22 @@ pub trait Requester {
     type BanChatSenderChat: Request<Payload = BanChatSenderChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`BanChatSenderChat`].
-    fn ban_chat_sender_chat<C>(
-        &self,
-        chat_id: C,
-        sender_chat_id: ChatId,
-    ) -> Self::BanChatSenderChat
+    fn ban_chat_sender_chat<C, S>(&self, chat_id: C, sender_chat_id: S) -> Self::BanChatSenderChat
     where
-        C: Into<Recipient>;
+        C: Into<Recipient>,
+        S: Into<ChatId>;
 
     type UnbanChatSenderChat: Request<Payload = UnbanChatSenderChat, Err = Self::Err>;
 
     /// For Telegram documentation see [`UnbanChatSenderChat`].
-    fn unban_chat_sender_chat<C>(
+    fn unban_chat_sender_chat<C, S>(
         &self,
         chat_id: C,
-        sender_chat_id: ChatId,
+        sender_chat_id: S,
     ) -> Self::UnbanChatSenderChat
     where
-        C: Into<Recipient>;
+        C: Into<Recipient>,
+        S: Into<ChatId>;
 
     type SetChatPermissions: Request<Payload = SetChatPermissions, Err = Self::Err>;
 

From c2d2a15ef17657c50cdc1b870abf9ef6e1037555 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 18:13:32 +0400
Subject: [PATCH 530/755] Split derives because rustfmt hates me

---
 src/types/reply_keyboard_remove.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
index 5acb6ccc..7e8490c7 100644
--- a/src/types/reply_keyboard_remove.rs
+++ b/src/types/reply_keyboard_remove.rs
@@ -13,7 +13,8 @@ use crate::types::True;
 ///
 /// [`KeyboardMarkup`]: crate::types::KeyboardMarkup
 #[serde_with_macros::skip_serializing_none]
-#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize)]
+#[derive(Eq, Hash, PartialEq)]
 pub struct KeyboardRemove {
     /// Requests clients to remove the custom keyboard (user will not be able
     /// to summon this keyboard; if you want to hide the keyboard from sight

From 380ebde98bb76514a1087891216f321e05759417 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 18:26:18 +0400
Subject: [PATCH 531/755] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c45682..a6408f44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Changed
+
+- `user.id` now uses `UserId` type, `ChatId` now represents only _chat id_, not channel username, all `chat_id` function parameters now accept `Recipient` [**BC**]
+
 ## 0.4.4 - 2022-04-21
 
 ### Added

From ea7226795984cf035b02b0da73ff45f2ac63e34f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 18:28:38 +0400
Subject: [PATCH 532/755] restart CI


From 9b3c0d88d23ecc9444341b130e06d8b57cc85bd1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 18:30:47 +0400
Subject: [PATCH 533/755] restart CI


From 705083c2d92a2e94b96f2e052d76fae2f35d2993 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 20:59:41 +0400
Subject: [PATCH 534/755] Add `UserId::{url, is_anonymous, is_channel,
 is_telegram}` functions

---
 CHANGELOG.md         |  6 ++++++
 src/types/user.rs    | 30 +++++++++++-------------------
 src/types/user_id.rs | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6408f44..7d6b229c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
+
+[pr197]: https://github.com/teloxide/teloxide-core/pull/197
+
 ### Changed
 
 - `user.id` now uses `UserId` type, `ChatId` now represents only _chat id_, not channel username, all `chat_id` function parameters now accept `Recipient` [**BC**]
diff --git a/src/types/user.rs b/src/types/user.rs
index 978ddfa0..f43b06c6 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -46,65 +46,57 @@ impl User {
     }
 
     /// Returns an URL that links to this user in the form of
-    /// `tg://user/?id=<...>`
+    /// `tg://user/?id=<...>`.
     pub fn url(&self) -> reqwest::Url {
-        reqwest::Url::parse(&format!("tg://user/?id={}", self.id)).unwrap()
+        self.id.url()
     }
 
-    /// Returns `true` if this is special user used by telegram bot API to
+    /// Returns `true` if this is the special user used by telegram bot API to
     /// denote an anonymous user that sends messages on behalf of a group.
     pub fn is_anonymous(&self) -> bool {
-        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
-        const ANON_ID: UserId = UserId(1087968824);
-
         // Sanity check
         debug_assert!(
-            (self.id != ANON_ID)
+            !self.id.is_anonymous()
                 || (self.is_bot
                     && self.first_name == "Group"
                     && self.last_name.is_none()
                     && self.username.as_deref() == Some("GroupAnonymousBot"))
         );
 
-        self.id == ANON_ID
+        self.id.is_anonymous()
     }
 
-    /// Returns `true` if this is special user used by telegram bot API to
+    /// Returns `true` if this is the special user used by telegram bot API to
     /// denote an anonymous user that sends messages on behalf of a channel.
     pub fn is_channel(&self) -> bool {
-        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
-        const ANON_CHANNEL_ID: UserId = UserId(136817688);
-
         // Sanity check
         debug_assert!(
-            (self.id != ANON_CHANNEL_ID)
+            !self.id.is_channel()
                 || (self.is_bot
                     && self.first_name == "Group"
                     && self.last_name.is_none()
                     && self.username.as_deref() == Some("GroupAnonymousBot"))
         );
 
-        self.id == ANON_CHANNEL_ID
+        self.id.is_channel()
     }
 
-    /// Returns `true` if this is special user used by telegram itself.
+    /// Returns `true` if this is the special user used by telegram itself.
     ///
     /// It is sometimes also used as a fallback, for example when a channel post
     /// is automatically forwarded to a group, bots in a group will get a
     /// message where `from` is the Telegram user.
     pub fn is_telegram(&self) -> bool {
-        const TELEGRAM_USER_ID: UserId = UserId(777000);
-
         // Sanity check
         debug_assert!(
-            (self.id != TELEGRAM_USER_ID)
+            !self.id.is_telegram()
                 || (!self.is_bot
                     && self.first_name == "Telegram"
                     && self.last_name.is_none()
                     && self.username.is_none())
         );
 
-        self.id == TELEGRAM_USER_ID
+        self.id.is_telegram()
     }
 }
 
diff --git a/src/types/user_id.rs b/src/types/user_id.rs
index bfee58bf..20198f76 100644
--- a/src/types/user_id.rs
+++ b/src/types/user_id.rs
@@ -8,6 +8,46 @@ use serde::{Deserialize, Serialize};
 #[serde(transparent)]
 pub struct UserId(pub u64);
 
+impl UserId {
+    /// Returns an URL that links to the user with this id in the form of
+    /// `tg://user/?id=<...>`.
+    pub fn url(self) -> reqwest::Url {
+        reqwest::Url::parse(&format!("tg://user/?id={}", self)).unwrap()
+    }
+
+    /// Returns `true` if this is the id of the special user used by telegram
+    /// bot API to denote an anonymous user that sends messages on behalf of
+    /// a group.
+    pub fn is_anonymous(self) -> bool {
+        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
+        const ANON_ID: UserId = UserId(1087968824);
+
+        self == ANON_ID
+    }
+
+    /// Returns `true` if this is the id of the special user used by telegram
+    /// bot API to denote an anonymous user that sends messages on behalf of
+    /// a channel.
+    pub fn is_channel(self) -> bool {
+        // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
+        const ANON_CHANNEL_ID: UserId = UserId(136817688);
+
+        self == ANON_CHANNEL_ID
+    }
+
+    /// Returns `true` if this is the id of the special user used by telegram
+    /// itself.
+    ///
+    /// It is sometimes also used as a fallback, for example when a channel post
+    /// is automatically forwarded to a group, bots in a group will get a
+    /// message where `from` is the Telegram user.
+    pub fn is_telegram(self) -> bool {
+        const TELEGRAM_USER_ID: UserId = UserId(777000);
+
+        self == TELEGRAM_USER_ID
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use serde::{Deserialize, Serialize};

From 55f753a2010299360360f17a05a63c23f857b5d3 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 21:09:34 +0400
Subject: [PATCH 535/755] Add `User::{tme_url, preferably_tme_url}` functions

---
 CHANGELOG.md      |  1 +
 src/types/user.rs | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d6b229c..18b7db4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
+- `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197]) 
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
 
diff --git a/src/types/user.rs b/src/types/user.rs
index f43b06c6..d4904d45 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -51,6 +51,22 @@ impl User {
         self.id.url()
     }
 
+    /// Returns an URL that links to this user in the form of `t.me/<...>`.
+    /// Returns `None` if `self.username.is_none()`.
+    pub fn tme_url(&self) -> Option<reqwest::Url> {
+        Some(
+            format!("https://t.me/{}", self.username.as_ref()?)
+                .parse()
+                .unwrap(),
+        )
+    }
+
+    /// Returns an URL that links to this user in the form of `t.me/<...>` or
+    /// `tg://user/?id=<...>`, preferring `t.me` one when possible.
+    pub fn preferably_tme_url(&self) -> reqwest::Url {
+        self.tme_url().unwrap_or_else(|| self.url())
+    }
+
     /// Returns `true` if this is the special user used by telegram bot API to
     /// denote an anonymous user that sends messages on behalf of a group.
     pub fn is_anonymous(&self) -> bool {

From df9ffe8918bfcd6d897dd8594e9329ab2d6ae7ae Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 22:43:55 +0400
Subject: [PATCH 536/755] Add `Me::username` and `Deref<Target = User>` impl
 for `Me`

---
 CHANGELOG.md    |  3 ++-
 src/types/me.rs | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18b7db4a..f9f518f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
-- `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197]) 
+- `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197])
+- `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
 
diff --git a/src/types/me.rs b/src/types/me.rs
index ddb699dc..d404690a 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -1,6 +1,9 @@
-use crate::types::User;
+use std::ops::Deref;
+
 use serde::{Deserialize, Serialize};
 
+use crate::types::User;
+
 /// Returned only in [`GetMe`].
 ///
 /// [`GetMe`]: crate::payloads::GetMe
@@ -20,3 +23,21 @@ pub struct Me {
     /// `true`, if the bot supports inline queries.
     pub supports_inline_queries: bool,
 }
+
+impl Me {
+    /// Returns the username of the bot.
+    pub fn username(&self) -> &str {
+        self.user
+            .username
+            .as_deref()
+            .expect("Bots must have usernames")
+    }
+}
+
+impl Deref for Me {
+    type Target = User;
+
+    fn deref(&self) -> &Self::Target {
+        &self.user
+    }
+}

From b3c0d00b7d4a61550e214612bd5d4f1c76bc7149 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 2 Apr 2022 22:56:32 +0400
Subject: [PATCH 537/755] "override" `mention` and `tme_url` on `Me`

That's not **really** an override, but by adding an inherent methods
we "hide" methods from `Deref<Target = User>`, that allows us to return
non-option types from `me.mention()` and `me.tme_url()` -- bots must
always have usernames.
---
 CHANGELOG.md    |  1 +
 src/types/me.rs | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9f518f6..efe3a738 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
 - `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197])
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
+- `Me::{mention, tme_url}` ([#197][pr197])
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
 
diff --git a/src/types/me.rs b/src/types/me.rs
index d404690a..5bc6a7cd 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -32,6 +32,16 @@ impl Me {
             .as_deref()
             .expect("Bots must have usernames")
     }
+
+    /// Returns a username mention of this bot.
+    pub fn mention(&self) -> String {
+        format!("@{}", self.username())
+    }
+
+    /// Returns an URL that links to this bot in the form of `t.me/<...>`.
+    pub fn tme_url(&self) -> reqwest::Url {
+        format!("https://t.me/{}", self.username()).parse().unwrap()
+    }
 }
 
 impl Deref for Me {

From daec5ee13e63e83663986ea853f99a29c0782a1c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 13:06:30 +0400
Subject: [PATCH 538/755] Hide bot token in errors

This fixes a potential[^1] security vulnerability -- if bot shows errors
from teloxide to the user & for some reason network error happened[^2]
the url of the request would be included in the error. Since TBA
includes bot token in the error this may lead to token leakage.

This commit fixes that issue by removing the token from the urls of
`reqwest::Error`, we try to only replace the token, but if we fail we
remove the whole url.

This can be tested by using a very low timeout value for the http
reqwest client:
```rust
let client = reqwest::Client::builder()
    .timeout(std::time::Duration::from_millis(1))
    .build()
    .unwrap();

let bot = Bot::from_env_with_client(client).auto_send();

// see if the token is redacted when network error (timeout) happens
// while sending common requests
let _ = dbg!(bot.get_me().await);

// see if the token is redacted when network error (timeout) happens
// while downloading files ("path" is unimportant as the timeout is so
// low the request probably won't even be sent)
let _ = dbg!(bot.download_file_stream("path").next().await);
```

For me this gives the following result:
```text
[t.rs:26] bot.get_me().await = Err(
    Network(
        reqwest::Error {
            kind: Request,
            url: Url {
                scheme: "https",
                cannot_be_a_base: false,
                username: "",
                password: None,
                host: Some(
                    Domain(
                        "api.telegram.org",
                    ),
                ),
                port: None,
                path: "/token:redacted/GetMe",
                query: None,
                fragment: None,
            },
            source: TimedOut,
        },
    ),
)
[t.rs:31] bot.download_file_stream("path").next().await = Some(
    Err(
        reqwest::Error {
            kind: Request,
            url: Url {
                scheme: "https",
                cannot_be_a_base: false,
                username: "",
                password: None,
                host: Some(
                    Domain(
                        "api.telegram.org",
                    ),
                ),
                port: None,
                path: "/file/token:redacted/path",
                query: None,
                fragment: None,
            },
            source: TimedOut,
        },
    ),
)
```

Note that this commits parent is `d0be260` and not the current master
the master branch currently contains breaking changes (we'll need to
make a release from this brach directly).

[^1]: Note that there are recorded cases where the token got exposed.
[^2]: Note that this can be theoretically be controlled by the user when
      sending/downloading bigger files.
---
 CHANGELOG.md        |  8 +++++++
 Cargo.toml          |  2 +-
 src/bot/download.rs |  1 +
 src/errors.rs       | 58 ++++++++++++++++++++++++++++++++++++++++++---
 src/net/request.rs  | 18 ++++----------
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c45682..caddfe38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.4.5 - 2022-04-03
+
+### Fixed
+
+- Hide bot token in errors ([#200][200])
+
+[200]: https://github.com/teloxide/teloxide-core/pull/200
+
 ## 0.4.4 - 2022-04-21
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index b9ea7ec8..c672ab93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.4"
+version = "0.4.5"
 edition = "2018"
 
 license = "MIT"
diff --git a/src/bot/download.rs b/src/bot/download.rs
index 5a98e488..4b07460b 100644
--- a/src/bot/download.rs
+++ b/src/bot/download.rs
@@ -41,6 +41,7 @@ impl<'w> Download<'w> for Bot {
             &self.token,
             path,
         )
+        .map(|res| res.map_err(crate::errors::hide_token))
         .boxed()
     }
 }
diff --git a/src/errors.rs b/src/errors.rs
index a0ac4567..ad3348dd 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,19 +1,19 @@
 use std::io;
 
-use derive_more::From;
 use serde::Deserialize;
 use thiserror::Error;
 
 /// An error caused by downloading a file.
-#[derive(Debug, Error, From)]
+#[derive(Debug, Error)]
 pub enum DownloadError {
     /// A network error while downloading a file from Telegram.
     #[error("A network error: {0}")]
+    // NOTE: this variant must not be created by anything except the From impl
     Network(#[source] reqwest::Error),
 
     /// An I/O error while writing a file to destination.
     #[error("An I/O error: {0}")]
-    Io(#[source] std::io::Error),
+    Io(#[from] std::io::Error),
 }
 
 /// An error caused by sending a request to Telegram.
@@ -35,6 +35,7 @@ pub enum RequestError {
 
     /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
+    // NOTE: this variant must not be created by anything except the From impl
     Network(#[source] reqwest::Error),
 
     /// Error while parsing a response from Telegram.
@@ -727,3 +728,54 @@ pub enum ApiError {
     #[error("Unknown error: {0:?}")]
     Unknown(String),
 }
+
+impl From<reqwest::Error> for DownloadError {
+    fn from(error: reqwest::Error) -> Self {
+        DownloadError::Network(hide_token(error))
+    }
+}
+
+impl From<reqwest::Error> for RequestError {
+    fn from(error: reqwest::Error) -> Self {
+        RequestError::Network(hide_token(error))
+    }
+}
+
+/// Replaces token in the url in the error with `token:redacted` string.
+pub(crate) fn hide_token(mut error: reqwest::Error) -> reqwest::Error {
+    let url = match error.url_mut() {
+        Some(url) => url,
+        None => return error,
+    };
+
+    if let Some(mut segments) = url.path_segments() {
+        // Usually the url looks like "bot<token>/..." or "file/bot<token>/...".
+        let (beginning, segment) = match segments.next() {
+            Some("file") => ("file/", segments.next()),
+            segment => ("", segment),
+        };
+
+        if let Some(token) = segment.and_then(|s| s.strip_prefix("bot")) {
+            // make sure that what we are about to delete looks like a bot token
+            if let Some((id, secret)) = token.split_once(':') {
+                if secret.len() >= 35
+                    && secret
+                        .chars()
+                        .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
+                    && id.chars().all(|c| c.is_ascii_digit())
+                {
+                    // found token, hide only the token
+                    let without_token =
+                        &url.path()[(beginning.len() + "/bot".len() + token.len())..];
+                    let redacted = format!("{beginning}token:redacted{without_token}");
+
+                    url.set_path(&redacted);
+                    return error;
+                }
+            }
+        }
+    }
+
+    // couldn't find token in the url, hide the whole url
+    error.without_url()
+}
diff --git a/src/net/request.rs b/src/net/request.rs
index 3730857e..1b2273cd 100644
--- a/src/net/request.rs
+++ b/src/net/request.rs
@@ -37,18 +37,14 @@ where
     let request = client
         .post(crate::net::method_url(api_url, token, method_name))
         .multipart(params)
-        .build()
-        .map_err(RequestError::Network)?;
+        .build()?;
 
     // FIXME: uncomment this, when reqwest starts setting default timeout early
     // if let Some(timeout) = timeout_hint {
     //     *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
     // }
 
-    let response = client
-        .execute(request)
-        .await
-        .map_err(RequestError::Network)?;
+    let response = client.execute(request).await?;
 
     process_response(response).await
 }
@@ -81,18 +77,14 @@ where
         .post(crate::net::method_url(api_url, token, method_name))
         .header(CONTENT_TYPE, HeaderValue::from_static("application/json"))
         .body(params)
-        .build()
-        .map_err(RequestError::Network)?;
+        .build()?;
 
     // FIXME: uncomment this, when reqwest starts setting default timeout early
     // if let Some(timeout) = timeout_hint {
     //     *request.timeout_mut().get_or_insert(Duration::ZERO) += timeout;
     // }
 
-    let response = client
-        .execute(request)
-        .await
-        .map_err(RequestError::Network)?;
+    let response = client.execute(request).await?;
 
     process_response(response).await
 }
@@ -105,7 +97,7 @@ where
         tokio::time::sleep(DELAY_ON_SERVER_ERROR).await;
     }
 
-    let text = response.text().await.map_err(RequestError::Network)?;
+    let text = response.text().await?;
 
     serde_json::from_str::<TelegramResponse<T>>(&text)
         .map_err(|source| RequestError::InvalidJson {

From 05603560e6729fe577386031e3b2efe8765db10d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 14:47:10 +0400
Subject: [PATCH 539/755] Give a name to a magic number and document it

---
 src/errors.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index ad3348dd..be1adc40 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -758,11 +758,22 @@ pub(crate) fn hide_token(mut error: reqwest::Error) -> reqwest::Error {
         if let Some(token) = segment.and_then(|s| s.strip_prefix("bot")) {
             // make sure that what we are about to delete looks like a bot token
             if let Some((id, secret)) = token.split_once(':') {
-                if secret.len() >= 35
-                    && secret
-                        .chars()
-                        .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
-                    && id.chars().all(|c| c.is_ascii_digit())
+                // The part before the : in the token is the id of the bot.
+                let id_character = |c: char| c.is_ascii_digit();
+
+                // The part after the : in the token is the secret.
+                //
+                // In all bot tokens we could find the secret is 35 characters long and is
+                // 0-9a-zA-Z_- only.
+                //
+                // It would be nice to research if TBA always has 35 character secrets or if it
+                // is just a coincidence.
+                const SECRET_LENGTH: usize = 35;
+                let secret_character = |c: char| c.is_ascii_alphanumeric() || c == '-' || c == '_';
+
+                if secret.len() >= SECRET_LENGTH
+                    && id.chars().all(id_character)
+                    && secret.chars().all(secret_character)
                 {
                     // found token, hide only the token
                     let without_token =

From d91863e1c38c7d3d0d5b8dc157278d97bf0f0bb4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 4 Apr 2022 03:00:53 +0400
Subject: [PATCH 540/755] Add some tests

---
 src/types/me.rs      | 29 +++++++++++++++++++++++++++++
 src/types/user.rs    | 42 ++++++++++++++++++++++++++++++++++++++++++
 src/types/user_id.rs |  7 +++++++
 3 files changed, 78 insertions(+)

diff --git a/src/types/me.rs b/src/types/me.rs
index 5bc6a7cd..9ecfb574 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -51,3 +51,32 @@ impl Deref for Me {
         &self.user
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::types::{Me, User, UserId};
+
+    #[test]
+    fn convenience_methods_work() {
+        let me = Me {
+            user: User {
+                id: UserId(42),
+                is_bot: true,
+                first_name: "First".to_owned(),
+                last_name: None,
+                username: Some("SomethingSomethingBot".to_owned()),
+                language_code: None,
+            },
+            can_join_groups: false,
+            can_read_all_group_messages: false,
+            supports_inline_queries: false,
+        };
+
+        assert_eq!(me.username(), "SomethingSomethingBot");
+        assert_eq!(me.mention(), "@SomethingSomethingBot");
+        assert_eq!(
+            me.tme_url(),
+            "https://t.me/SomethingSomethingBot".parse().unwrap()
+        );
+    }
+}
diff --git a/src/types/user.rs b/src/types/user.rs
index d4904d45..dbf953ef 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -141,4 +141,46 @@ mod tests {
         let actual = serde_json::from_str::<User>(json).unwrap();
         assert_eq!(actual, expected)
     }
+
+    #[test]
+    fn convenience_methods_work() {
+        let user_a = User {
+            id: UserId(43),
+            is_bot: false,
+            first_name: "First".to_owned(),
+            last_name: Some("Last".to_owned()),
+            username: Some("aaaaaaaaaaaaaaaa".to_owned()),
+            language_code: None,
+        };
+
+        let user_b = User {
+            id: UserId(44),
+            is_bot: false,
+            first_name: ".".to_owned(),
+            last_name: None,
+            username: None,
+            language_code: None,
+        };
+
+        assert_eq!(user_a.full_name(), "First Last");
+        assert_eq!(user_b.full_name(), ".");
+
+        assert_eq!(user_a.mention(), Some("@aaaaaaaaaaaaaaaa".to_owned()));
+        assert_eq!(user_b.mention(), None);
+
+        assert_eq!(
+            user_a.tme_url(),
+            Some("https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap())
+        );
+        assert_eq!(user_b.tme_url(), None);
+
+        assert_eq!(
+            user_a.preferably_tme_url(),
+            "https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap()
+        );
+        assert_eq!(
+            user_b.preferably_tme_url(),
+            "tg://user/?id=44".parse().unwrap()
+        );
+    }
 }
diff --git a/src/types/user_id.rs b/src/types/user_id.rs
index 20198f76..fe31e573 100644
--- a/src/types/user_id.rs
+++ b/src/types/user_id.rs
@@ -70,4 +70,11 @@ mod tests {
         assert_eq!(serde_json::to_string(&user_id).unwrap(), json);
         assert_eq!(user_id, serde_json::from_str(json).unwrap());
     }
+
+    #[test]
+    fn url_works() {
+        let id = UserId(17);
+
+        assert_eq!(id.url(), "tg://user/?id=17".parse().unwrap());
+    }
 }

From 74d44868a638dac330dc8b2b8348e60398dc37b1 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Fri, 8 Apr 2022 00:08:05 +0600
Subject: [PATCH 541/755] Deprecate `#[derive(DialogueState)]`

---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 06b3249f..8baeaa34 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -21,6 +21,7 @@ use quote::{quote, ToTokens};
 use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
 
 #[proc_macro_derive(DialogueState, attributes(handler, handler_out, store))]
+#[deprecated(note = "Use teloxide::handler! instead")]
 pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
     let input = parse_macro_input!(item as ItemEnum);
     match dialogue_state::expand(input) {

From 09ff2655906a332fa96413b56a6bc55aac594d37 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Fri, 8 Apr 2022 00:09:57 +0600
Subject: [PATCH 542/755] Update `CHANGELOG.md`

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2e70ea6..946da168 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
  - Support for the old dispatching: `#[teloxide(subtransition)]`.
 
+### Deprecated
+
+ - `#[derive(DialogueState)]` in favour of `teloxide::handler!`.
+
 ## 0.5.1 - 2022-03-23
 
 ### Fixed

From 213db7b64c037e612152fc4e3f05760cd2cf25f4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 8 Apr 2022 15:57:16 +0400
Subject: [PATCH 543/755] Add `AllowedUpdate::ChatJoinRequest`

---
 CHANGELOG.md                | 2 ++
 src/types/allowed_update.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce0aed6..f65ead34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197])
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
 - `Me::{mention, tme_url}` ([#197][pr197])
+- `AllowedUpdate::ChatJoinRequest` ([#201][pr201])
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
+[pr201]: https://github.com/teloxide/teloxide-core/pull/201
 
 ### Changed
 
diff --git a/src/types/allowed_update.rs b/src/types/allowed_update.rs
index 0683683f..7820ad8f 100644
--- a/src/types/allowed_update.rs
+++ b/src/types/allowed_update.rs
@@ -16,4 +16,5 @@ pub enum AllowedUpdate {
     PollAnswer,
     MyChatMember,
     ChatMember,
+    ChatJoinRequest,
 }

From 9d7bd2aeedaf983162736c9e2d87eb8a35bd8010 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sat, 9 Apr 2022 02:27:26 +0600
Subject: [PATCH 544/755] Release v0.6.0

---
 CHANGELOG.md | 4 +++-
 Cargo.toml   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 946da168..11aec587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.0 - 2022-04-09
+
 ### Removed
 
- - Support for the old dispatching: `#[teloxide(subtransition)]`.
+ - Support for the old dispatching: `#[teloxide(subtransition)]` [**BC**].
 
 ### Deprecated
 
diff --git a/Cargo.toml b/Cargo.toml
index 43df956d..8225ca26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.5.1"
+version = "0.6.0"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 51d6800a3239ca9f397e78279bfae4588166fd08 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 24 Oct 2021 14:50:06 +0300
Subject: [PATCH 545/755] Make RequestError::RetryAfter::0 u32, instead of i32

(you can't really wait a negative amount of time, can you?)
---
 CHANGELOG.md                     | 4 ++++
 src/errors.rs                    | 2 +-
 src/types/response_parameters.rs | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ce0aed6..3ee3c75b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Changed
+
+- `RequestError::RetryAfter` now has a `u32` field instead of `i32`
+
 ### Added
 
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
diff --git a/src/errors.rs b/src/errors.rs
index be1adc40..15fd2843 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -31,7 +31,7 @@ pub enum RequestError {
     /// In case of exceeding flood control, the number of seconds left to wait
     /// before the request can be repeated.
     #[error("Retry after {0} seconds")]
-    RetryAfter(i32),
+    RetryAfter(u32),
 
     /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
diff --git a/src/types/response_parameters.rs b/src/types/response_parameters.rs
index c69ce9e0..88f3a355 100644
--- a/src/types/response_parameters.rs
+++ b/src/types/response_parameters.rs
@@ -16,7 +16,7 @@ pub enum ResponseParameters {
 
     /// In case of exceeding flood control, the number of seconds left to wait
     /// before the request can be repeated.
-    RetryAfter(i32),
+    RetryAfter(u32),
 }
 
 #[cfg(test)]

From 6a91c448361b12fe69146de9afd1d50aa1dadaab Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 24 Oct 2021 15:45:33 +0300
Subject: [PATCH 546/755] make `errors` module pub and add
 `errors::AsResponseParameters` trait

---
 CHANGELOG.md  | 11 +++++++++++
 src/errors.rs | 54 +++++++++++++++++++++++++++++++++++++++------------
 src/lib.rs    |  2 +-
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ee3c75b..3f4a2512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `errors` module and `errors::AsResponseParameters` trait
+- `EditedMessageIsTooLong` error [#109][pr109]
+- `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
+- `Limits::messages_per_min_channel` ([#121][pr121])
+
+[pr109]: https://github.com/teloxide/teloxide-core/pull/109
+[pr116]: https://github.com/teloxide/teloxide-core/pull/116
+[pr121]: https://github.com/teloxide/teloxide-core/pull/121
+
 ### Changed
 
 - `RequestError::RetryAfter` now has a `u32` field instead of `i32`
diff --git a/src/errors.rs b/src/errors.rs
index 15fd2843..2ed570db 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -3,18 +3,7 @@ use std::io;
 use serde::Deserialize;
 use thiserror::Error;
 
-/// An error caused by downloading a file.
-#[derive(Debug, Error)]
-pub enum DownloadError {
-    /// A network error while downloading a file from Telegram.
-    #[error("A network error: {0}")]
-    // NOTE: this variant must not be created by anything except the From impl
-    Network(#[source] reqwest::Error),
-
-    /// An I/O error while writing a file to destination.
-    #[error("An I/O error: {0}")]
-    Io(#[from] std::io::Error),
-}
+use crate::types::ResponseParameters;
 
 /// An error caused by sending a request to Telegram.
 #[derive(Debug, Error)]
@@ -57,6 +46,47 @@ pub enum RequestError {
     Io(#[source] io::Error),
 }
 
+/// An error caused by downloading a file.
+#[derive(Debug, Error)]
+pub enum DownloadError {
+    /// A network error while downloading a file from Telegram.
+    #[error("A network error: {0}")]
+    // NOTE: this variant must not be created by anything except the From impl
+    Network(#[source] reqwest::Error),
+
+    /// An I/O error while writing a file to destination.
+    #[error("An I/O error: {0}")]
+    Io(#[from] std::io::Error),
+}
+
+pub trait AsResponseParameters {
+    fn response_parameters(&self) -> Option<ResponseParameters>;
+
+    fn retry_after(&self) -> Option<u32> {
+        self.response_parameters().and_then(|rp| match rp {
+            ResponseParameters::RetryAfter(n) => Some(n),
+            _ => None,
+        })
+    }
+
+    fn migrate_to_chat_id(&self) -> Option<i64> {
+        self.response_parameters().and_then(|rp| match rp {
+            ResponseParameters::MigrateToChatId(id) => Some(id),
+            _ => None,
+        })
+    }
+}
+
+impl AsResponseParameters for crate::RequestError {
+    fn response_parameters(&self) -> Option<ResponseParameters> {
+        match self {
+            &Self::RetryAfter(n) => Some(ResponseParameters::RetryAfter(n)),
+            &Self::MigrateToChatId(id) => Some(ResponseParameters::MigrateToChatId(id)),
+            _ => None,
+        }
+    }
+}
+
 /// A kind of an API error.
 #[derive(Debug, Error, Deserialize, PartialEq, Hash, Eq, Clone)]
 #[serde(field_identifier)]
diff --git a/src/lib.rs b/src/lib.rs
index 5e85148d..fd4ad1dc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -101,6 +101,7 @@ pub use self::{
 };
 
 pub mod adaptors;
+pub mod errors;
 pub mod net;
 pub mod payloads;
 pub mod prelude;
@@ -109,7 +110,6 @@ pub mod types;
 
 // reexported
 mod bot;
-mod errors;
 
 // implementation details
 mod serde_multipart;

From 43802a5c41de5b1d34480aae5ddd0fd51e983089 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 24 Oct 2021 15:46:50 +0300
Subject: [PATCH 547/755] Improve `Throttling` adoptor

- Freeze when getting `RetryAfter(_)` error
- Retry requests that previously returned `RetryAfter(_)` error
---
 CHANGELOG.md                  |   3 +
 src/adaptors/throttle.rs      | 606 +++++++++++++++++++++++-----------
 src/requests/requester_ext.rs |   8 +-
 3 files changed, 424 insertions(+), 193 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f4a2512..8d819d83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improve `Throttling` adoptor
+  - Freeze when getting `RetryAfter(_)` error
+  - Retry requests that previously returned `RetryAfter(_)` error
 - `RequestError::RetryAfter` now has a `u32` field instead of `i32`
 
 ### Added
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 7d75ec7f..d49c6df5 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -11,7 +11,6 @@ use futures::{
     task::{Context, Poll},
     FutureExt,
 };
-use never::Never;
 use tokio::sync::{
     mpsc,
     oneshot::{self, Receiver, Sender},
@@ -21,6 +20,7 @@ use vecrem::VecExt;
 
 use crate::{
     adaptors::throttle::chan_send::{ChanSend, MpscSend},
+    errors::AsResponseParameters,
     requests::{HasPayload, Output, Request, Requester},
     types::*,
 };
@@ -76,7 +76,11 @@ impl<B> Throttle<B> {
     ///
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
-    pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>) {
+    pub fn new(bot: B, limits: Limits) -> (Self, impl Future<Output = ()>)
+    where
+        B: Requester + Clone,
+        B::Err: AsResponseParameters,
+    {
         let settings = Settings {
             limits,
             ..<_>::default()
@@ -88,11 +92,15 @@ impl<B> Throttle<B> {
     ///
     /// Note: [`Throttle`] will only send requests if returned worker is
     /// polled/spawned/awaited.
-    pub fn with_settings(bot: B, settings: Settings) -> (Self, impl Future<Output = ()>) {
+    pub fn with_settings(bot: B, settings: Settings) -> (Self, impl Future<Output = ()>)
+    where
+        B: Requester + Clone,
+        B::Err: AsResponseParameters,
+    {
         let (tx, rx) = mpsc::channel(settings.limits.messages_per_sec_overall as usize);
         let (info_tx, info_rx) = mpsc::channel(2);
 
-        let worker = worker(settings, rx, info_rx);
+        let worker = worker(settings, rx, info_rx, bot.clone());
         let this = Self {
             bot,
             queue: tx,
@@ -107,44 +115,27 @@ impl<B> Throttle<B> {
     /// Note: it's recommended to use [`RequesterExt::throttle`] instead.
     ///
     /// [`RequesterExt::throttle`]: crate::requests::RequesterExt::throttle
-    pub fn new_spawn(bot: B, limits: Limits) -> Self {
-        // new/with_settings copy-pasted here to avoid [rust-lang/#76882]
-        //
-        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
-
-        let (tx, rx) = mpsc::channel(limits.messages_per_sec_overall as usize);
-        let (info_tx, info_rx) = mpsc::channel(2);
-
-        let settings = Settings {
-            limits,
-            ..<_>::default()
-        };
-        let worker = worker(settings, rx, info_rx);
-        let this = Self {
-            bot,
-            queue: tx,
-            info_tx,
-        };
+    pub fn new_spawn(bot: B, limits: Limits) -> Self
+    where
+        B: Requester + Clone + Send + Sync + 'static,
+        B::Err: AsResponseParameters,
+        B::GetChat: Send,
+    {
+        let (this, worker) = Self::new(bot, limits);
 
         tokio::spawn(worker);
+
         this
     }
 
     /// Creates new [`Throttle`] spawning the worker with `tokio::spawn`
-    pub fn spawn_with_settings(bot: B, settings: Settings) -> Self {
-        // with_settings copy-pasted here to avoid [rust-lang/#76882]
-        //
-        // [rust-lang/#76882]: https://github.com/rust-lang/rust/issues/76882
-
-        let (tx, rx) = mpsc::channel(settings.limits.messages_per_sec_overall as usize);
-        let (info_tx, info_rx) = mpsc::channel(2);
-
-        let worker = worker(settings, rx, info_rx);
-        let this = Self {
-            bot,
-            queue: tx,
-            info_tx,
-        };
+    pub fn spawn_with_settings(bot: B, settings: Settings) -> Self
+    where
+        B: Requester + Clone + Send + Sync + 'static,
+        B::Err: AsResponseParameters,
+        B::GetChat: Send,
+    {
+        let (this, worker) = Self::with_settings(bot, settings);
 
         tokio::spawn(worker);
         this
@@ -241,6 +232,8 @@ impl Default for Limits {
 pub struct Settings {
     pub limits: Limits,
     pub on_queue_full: BoxedFnMut<usize, BoxedFuture>,
+    pub retry: bool,
+    pub check_slow_mode: bool,
 }
 
 impl Settings {
@@ -257,6 +250,16 @@ impl Settings {
         self.on_queue_full = Box::new(move |pending| Box::pin(val(pending)));
         self
     }
+
+    pub fn no_retry(mut self) -> Self {
+        self.retry = false;
+        self
+    }
+
+    pub fn check_slow_mode(mut self) -> Self {
+        self.check_slow_mode = true;
+        self
+    }
 }
 
 impl Default for Settings {
@@ -267,6 +270,8 @@ impl Default for Settings {
                 log::warn!("Throttle queue is full ({} pending requests)", pending);
                 Box::pin(ready(()))
             }),
+            retry: true,
+            check_slow_mode: false,
         }
     }
 }
@@ -306,6 +311,13 @@ struct RequestsSentToChats {
     per_sec: HashMap<ChatIdHash, RequestsSent>,
 }
 
+struct FreezeUntil {
+    until: Instant,
+    after: Duration,
+    chat: ChatIdHash,
+    retry: Option<RequestLock>,
+}
+
 // Throttling is quite complicated. This comment describes the algorithm of the
 // current implementation.
 //
@@ -349,14 +361,20 @@ struct RequestsSentToChats {
 // the request that it can be now executed, increase counts, add record to the
 // history.
 
-async fn worker(
+async fn worker<B>(
     Settings {
         mut limits,
         mut on_queue_full,
+        retry,
+        check_slow_mode,
     }: Settings,
     mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
     mut info_rx: mpsc::Receiver<InfoMessage>,
-) {
+    bot: B,
+) where
+    B: Requester,
+    B::Err: AsResponseParameters,
+{
     // FIXME(waffle): Make an research about data structures for this queue.
     //                Currently this is O(n) removing (n = number of elements
     //                stayed), amortized O(1) push (vec+vecrem).
@@ -366,12 +384,17 @@ async fn worker(
     let mut history: VecDeque<(ChatIdHash, Instant)> = VecDeque::new();
     let mut requests_sent = RequestsSentToChats::default();
 
+    let mut slow_mode: Option<HashMap<ChatIdHash, (Duration, Instant)>> =
+        check_slow_mode.then(HashMap::new);
+
     let mut rx_is_closed = false;
 
     let mut last_queue_full = Instant::now()
         .checked_sub(QUEUE_FULL_DELAY)
         .unwrap_or_else(Instant::now);
 
+    let (freeze_tx, mut freeze_rx) = mpsc::channel::<FreezeUntil>(1);
+
     while !rx_is_closed || !queue.is_empty() {
         // FIXME(waffle):
         // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
@@ -383,7 +406,32 @@ async fn worker(
         // *blocked in asynchronous way
         answer_info(&mut info_rx, &mut limits);
 
-        read_from_rx(&mut rx, &mut queue, &mut rx_is_closed).await;
+        freeze(
+            &mut freeze_rx,
+            &freeze_tx,
+            slow_mode.as_mut(),
+            &mut queue,
+            &bot,
+            None,
+        )
+        .await;
+
+        loop {
+            tokio::select! {
+                () = read_from_rx(&mut rx, &mut queue, &mut rx_is_closed) => break,
+                freeze_until = freeze_rx.recv() => {
+                    freeze(
+                        &mut freeze_rx,
+                        &freeze_tx,
+                        slow_mode.as_mut(),
+                        &mut queue,
+                        &bot,
+                        freeze_until
+                    )
+                    .await;
+                },
+            }
+        }
         //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
 
         if queue.len() == queue.capacity() && last_queue_full.elapsed() > QUEUE_FULL_DELAY {
@@ -470,6 +518,15 @@ async fn worker(
 
         while let Some(entry) = queue_removing.next() {
             let chat = &entry.value().0;
+
+            let slow_mode = slow_mode.as_mut().and_then(|sm| sm.get_mut(chat));
+
+            if let Some(&mut (delay, last)) = slow_mode {
+                if last + delay > Instant::now() {
+                    continue;
+                }
+            }
+
             let requests_sent_per_sec_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
             let requests_sent_per_min_count = requests_sent.per_min.get(chat).copied().unwrap_or(0);
 
@@ -483,18 +540,26 @@ async fn worker(
                 && requests_sent_per_min_count < messages_per_min_limit;
 
             if limits_not_exceeded {
-                *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
-                *requests_sent.per_min.entry(*chat).or_insert(0) += 1;
-                history.push_back((*chat, Instant::now()));
+                // Unlock the associated request.
 
-                // Close the channel and unlock the associated request.
+                let chat = *chat;
                 let (_, lock) = entry.remove();
-                lock.unlock();
 
-                // We have "sent" one request, so now we can send one less.
-                allowed -= 1;
-                if allowed == 0 {
-                    break;
+                // Only count request as sent if the request wasn't dropped before unlocked
+                if lock.unlock(retry, freeze_tx.clone()).is_ok() {
+                    *requests_sent.per_sec.entry(chat).or_insert(0) += 1;
+                    *requests_sent.per_min.entry(chat).or_insert(0) += 1;
+                    history.push_back((chat, Instant::now()));
+
+                    if let Some((_, last)) = slow_mode {
+                        *last = Instant::now();
+                    }
+
+                    // We have "sent" one request, so now we can send one less.
+                    allowed -= 1;
+                    if allowed == 0 {
+                        break;
+                    }
                 }
             }
         }
@@ -521,8 +586,78 @@ fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
     }
 }
 
+async fn freeze(
+    rx: &mut mpsc::Receiver<FreezeUntil>,
+    tx: &mpsc::Sender<FreezeUntil>,
+    mut slow_mode: Option<&mut HashMap<ChatIdHash, (Duration, Instant)>>,
+    queue: &mut Vec<(ChatIdHash, RequestLock)>,
+    bot: &impl Requester,
+    mut imm: Option<FreezeUntil>,
+) {
+    // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
+    while let Some(FreezeUntil {
+        until,
+        after,
+        chat,
+        mut retry,
+    }) = imm.take().or_else(|| {
+        tokio::task::unconstrained(rx.recv())
+            .now_or_never()
+            .flatten()
+    }) {
+        if let Some(slow_mode) = slow_mode.as_deref_mut() {
+            // TODO: do something with channels?...
+            if let hash @ ChatIdHash::Id(id) = chat {
+                // TODO: maybe not call `get_chat` every time?
+
+                // At this point there isn't much we can do with the error besides ignoring
+                if let Ok(chat) = bot.get_chat(id).send().await {
+                    match chat.slow_mode_delay() {
+                        Some(delay) => {
+                            let now = Instant::now();
+                            let new_delay = Duration::from_secs(delay.into());
+                            slow_mode.insert(hash, (new_delay, now));
+                        }
+                        None => {
+                            slow_mode.remove(&hash);
+                        }
+                    };
+                }
+            }
+        }
+
+        // slow mode is enabled and it is <= to the delay asked by telegram
+        let slow_mode_enabled_and_likely_the_cause = slow_mode
+            .as_ref()
+            .and_then(|m| m.get(&chat).map(|(delay, _)| delay <= &after))
+            .unwrap_or(false);
+
+        // Do not sleep if slow mode is enabled since the freeze is most likely caused
+        // by the said slow mode and not by the global limits.
+        if slow_mode_enabled_and_likely_the_cause {
+            queue.extend(Some(chat).zip(retry.take()));
+        } else {
+            log::warn!(
+                "freezing the bot for approximately {:?} due to `RetryAfter` error from telegram",
+                after
+            );
+
+            tokio::time::sleep_until(until.into()).await;
+
+            log::warn!("unfreezing the bot");
+
+            if let Some(lock) = retry {
+                // Since we are already retrying the request, retries are obviously turned on.
+                let retry = true;
+                let _ = lock.unlock(retry, tx.clone());
+            }
+        }
+    }
+}
+
 async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
     if queue.is_empty() {
+        log::warn!("A-blocking on queue");
         match rx.recv().await {
             Some(req) => queue.push(req),
             None => *rx_is_closed = true,
@@ -544,7 +679,7 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
 macro_rules! f {
     ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
         ThrottlingRequest {
-            request: $this.inner().$m($($arg),*),
+            request: Arc::new($this.inner().$m($($arg),*)),
             chat_id: |p| (&p.payload_ref().chat_id).into(),
             worker: $this.queue.clone(),
         }
@@ -571,24 +706,26 @@ macro_rules! ftyid {
 
 impl<B: Requester> Requester for Throttle<B>
 where
-    B::SendMessage: Send,
-    B::ForwardMessage: Send,
-    B::CopyMessage: Send,
-    B::SendPhoto: Send,
-    B::SendAudio: Send,
-    B::SendDocument: Send,
-    B::SendVideo: Send,
-    B::SendAnimation: Send,
-    B::SendVoice: Send,
-    B::SendVideoNote: Send,
-    B::SendMediaGroup: Send,
-    B::SendLocation: Send,
-    B::SendVenue: Send,
-    B::SendContact: Send,
-    B::SendPoll: Send,
-    B::SendDice: Send,
-    B::SendSticker: Send,
-    B::SendInvoice: Send,
+    B::Err: AsResponseParameters,
+
+    B::SendMessage: Clone + Send + Sync,
+    B::ForwardMessage: Clone + Send + Sync,
+    B::CopyMessage: Clone + Send + Sync,
+    B::SendPhoto: Clone + Send + Sync,
+    B::SendAudio: Clone + Send + Sync,
+    B::SendDocument: Clone + Send + Sync,
+    B::SendVideo: Clone + Send + Sync,
+    B::SendAnimation: Clone + Send + Sync,
+    B::SendVoice: Clone + Send + Sync,
+    B::SendVideoNote: Clone + Send + Sync,
+    B::SendMediaGroup: Clone + Send + Sync,
+    B::SendLocation: Clone + Send + Sync,
+    B::SendVenue: Clone + Send + Sync,
+    B::SendContact: Clone + Send + Sync,
+    B::SendPoll: Clone + Send + Sync,
+    B::SendDice: Clone + Send + Sync,
+    B::SendSticker: Clone + Send + Sync,
+    B::SendInvoice: Clone + Send + Sync,
 {
     type Err = B::Err;
 
@@ -667,16 +804,16 @@ impl From<&Recipient> for ChatIdHash {
 
 #[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct ThrottlingRequest<R: HasPayload> {
-    request: R,
+    request: Arc<R>,
     chat_id: fn(&R::Payload) -> ChatIdHash,
     worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
 }
 
-impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
+impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
 
     fn payload_mut(&mut self) -> &mut Self::Payload {
-        self.request.payload_mut()
+        Arc::make_mut(&mut self.request).payload_mut()
     }
 
     fn payload_ref(&self) -> &Self::Payload {
@@ -686,11 +823,13 @@ impl<R: HasPayload> HasPayload for ThrottlingRequest<R> {
 
 impl<R> Request for ThrottlingRequest<R>
 where
-    R: Request + Send,
+    R: Request + Clone + Send + Sync,
+    R::Err: AsResponseParameters,
+    Output<R>: Send,
 {
     type Err = R::Err;
     type Send = ThrottlingSend<R>;
-    type SendRef = ThrottlingSendRef<R>;
+    type SendRef = ThrottlingSend<R>;
 
     fn send(self) -> Self::Send {
         let (tx, rx) = channel();
@@ -699,7 +838,8 @@ where
         let send = self.worker.send1((chat_id, tx));
 
         let inner = ThrottlingSendInner::Registering {
-            request: self.request,
+            request: Arc::try_unwrap(self.request).into(),
+            chat: chat_id,
             send,
             wait: rx,
         };
@@ -718,69 +858,114 @@ where
         //
         // However `Request` documentation explicitly notes that `send{,_ref}`
         // should **not** do any kind of work, so it's ok.
-        let request = self.request.send_ref();
+        let request = Either::Left(Arc::clone(&self.request));
 
-        let inner = ThrottlingSendRefInner::Registering {
+        let inner = ThrottlingSendInner::Registering {
+            chat: chat_id,
             request,
             send,
             wait: rx,
         };
-        ThrottlingSendRef(inner)
+        ThrottlingSend(inner)
     }
 }
 
+use either::Either;
+use std::sync::Arc;
+
 #[pin_project::pin_project]
 pub struct ThrottlingSend<R: Request>(#[pin] ThrottlingSendInner<R>);
 
 #[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
 enum ThrottlingSendInner<R: Request> {
     Registering {
-        request: R,
+        request: Either<Arc<R>, R>,
+        chat: ChatIdHash,
         #[pin]
         send: ChanSend<(ChatIdHash, RequestLock)>,
         wait: RequestWaiter,
     },
+    Freezing {
+        #[pin]
+        freeze_fut: ChanSend<FreezeUntil>,
+        res: Result<Output<R>, R::Err>,
+    },
+    FreezingRetry {
+        #[pin]
+        freeze_fut: ChanSend<FreezeUntil>,
+        request: Either<Arc<R>, R>,
+        chat: ChatIdHash,
+        wait: RequestWaiter,
+    },
     Pending {
-        request: R,
+        request: Either<Arc<R>, R>,
+        chat: ChatIdHash,
         #[pin]
         wait: RequestWaiter,
     },
     Sent {
+        freeze: mpsc::Sender<FreezeUntil>,
+        chat: ChatIdHash,
         #[pin]
         fut: R::Send,
     },
+    SentRef {
+        freeze: mpsc::Sender<FreezeUntil>,
+        chat: ChatIdHash,
+        #[pin]
+        fut: R::SendRef,
+    },
+    SentRetryable {
+        request: Either<Arc<R>, R>,
+        chat: ChatIdHash,
+        freeze: mpsc::Sender<FreezeUntil>,
+        #[pin]
+        fut: R::SendRef,
+    },
+
     Done,
 }
 
-impl<R: Request> Future for ThrottlingSend<R> {
+impl<R: Request> Future for ThrottlingSend<R>
+where
+    R::Err: AsResponseParameters,
+{
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let mut this = self.as_mut().project().0;
 
         match this.as_mut().project() {
-            SendProj::Registering {
-                request: _,
-                send,
-                wait: _,
-            } => match send.poll(cx) {
+            SendProj::Registering { send, .. } => match send.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 Poll::Ready(res) => {
                     if let SendRepl::Registering {
                         request,
                         send: _,
                         wait,
+                        chat,
                     } = this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
                         match res {
-                            Ok(()) => this
-                                .as_mut()
-                                .project_replace(ThrottlingSendInner::Pending { request, wait }),
+                            Ok(()) => this.as_mut().set(ThrottlingSendInner::Pending {
+                                request,
+                                wait,
+                                chat,
+                            }),
                             // The worker is unlikely to drop queue before sending all requests,
                             // but just in case it has dropped the queue, we want to just send the
                             // request.
-                            Err(_) => this.as_mut().project_replace(ThrottlingSendInner::Sent {
-                                fut: request.send(),
+                            Err(_) => this.as_mut().set(match request {
+                                Either::Left(shared) => ThrottlingSendInner::SentRef {
+                                    freeze: mpsc::channel(1).0,
+                                    fut: shared.send_ref(),
+                                    chat,
+                                },
+                                Either::Right(owned) => ThrottlingSendInner::Sent {
+                                    freeze: mpsc::channel(1).0,
+                                    fut: owned.send(),
+                                    chat,
+                                },
                             }),
                         };
                     }
@@ -788,116 +973,154 @@ impl<R: Request> Future for ThrottlingSend<R> {
                     self.poll(cx)
                 }
             },
-            SendProj::Pending { request: _, wait } => match wait.poll(cx) {
+            SendProj::Pending { wait, .. } => match wait.poll(cx) {
                 Poll::Pending => Poll::Pending,
                 // Worker pass "message" to unlock us by closing the channel,
                 // and thus we can safely ignore this result as we know it will
                 // always be `Err(_)` (because `Ok(Never)` is uninhibited)
                 // and that's what we want.
-                Poll::Ready(_) => {
-                    if let SendRepl::Pending { request, wait: _ } =
+                Poll::Ready((retry, freeze)) => {
+                    if let SendRepl::Pending { request, chat, .. } =
                         this.as_mut().project_replace(ThrottlingSendInner::Done)
                     {
-                        this.as_mut().project_replace(ThrottlingSendInner::Sent {
-                            fut: request.send(),
-                        });
-                    }
-
-                    self.poll(cx)
-                }
-            },
-            SendProj::Sent { fut } => {
-                let res = futures::ready!(fut.poll(cx));
-                this.set(ThrottlingSendInner::Done);
-                Poll::Ready(res)
-            }
-            SendProj::Done => Poll::Pending,
-        }
-    }
-}
-
-#[pin_project::pin_project]
-pub struct ThrottlingSendRef<R: Request>(#[pin] ThrottlingSendRefInner<R>);
-
-#[pin_project::pin_project(project = SendRefProj, project_replace = SendRefRepl)]
-enum ThrottlingSendRefInner<R: Request> {
-    Registering {
-        request: R::SendRef,
-        #[pin]
-        send: ChanSend<(ChatIdHash, RequestLock)>,
-        wait: RequestWaiter,
-    },
-    Pending {
-        request: R::SendRef,
-        #[pin]
-        wait: RequestWaiter,
-    },
-    Sent {
-        #[pin]
-        fut: R::SendRef,
-    },
-    Done,
-}
-
-impl<R: Request> Future for ThrottlingSendRef<R> {
-    type Output = Result<Output<R>, R::Err>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.as_mut().project().0;
-
-        match this.as_mut().project() {
-            SendRefProj::Registering {
-                request: _,
-                send,
-                wait: _,
-            } => match send.poll(cx) {
-                Poll::Pending => Poll::Pending,
-                Poll::Ready(res) => {
-                    if let SendRefRepl::Registering {
-                        request,
-                        send: _,
-                        wait,
-                    } = this.as_mut().project_replace(ThrottlingSendRefInner::Done)
-                    {
-                        match res {
-                            Ok(()) => this
-                                .as_mut()
-                                .project_replace(ThrottlingSendRefInner::Pending { request, wait }),
-                            // The worker is unlikely to drop queue before sending all requests,
-                            // but just in case it has dropped the queue, we want to just send the
-                            // request.
-                            Err(_) => this
-                                .as_mut()
-                                .project_replace(ThrottlingSendRefInner::Sent { fut: request }),
+                        let repl = match (retry, request) {
+                            (true, request) => ThrottlingSendInner::SentRetryable {
+                                fut: request.as_ref().either(|r| &**r, |r| r).send_ref(),
+                                chat,
+                                request,
+                                freeze,
+                            },
+                            (false, Either::Left(shared)) => ThrottlingSendInner::SentRef {
+                                fut: shared.send_ref(),
+                                chat,
+                                freeze,
+                            },
+                            (false, Either::Right(owned)) => ThrottlingSendInner::Sent {
+                                fut: owned.send(),
+                                chat,
+                                freeze,
+                            },
                         };
+
+                        this.as_mut().project_replace(repl);
                     }
 
                     self.poll(cx)
                 }
             },
-            SendRefProj::Pending { request: _, wait } => match wait.poll(cx) {
-                Poll::Pending => Poll::Pending,
-                // Worker pass "message" to unlock us by closing the channel,
-                // and thus we can safely ignore this result as we know it will
-                // always be `Err(_)` (because `Ok(Never)` is uninhibited)
-                // and that's what we want.
-                Poll::Ready(_) => {
-                    if let SendRefRepl::Pending { request, wait: _ } =
-                        this.as_mut().project_replace(ThrottlingSendRefInner::Done)
-                    {
-                        this.as_mut()
-                            .project_replace(ThrottlingSendRefInner::Sent { fut: request });
-                    }
-
-                    self.poll(cx)
+            SendProj::Freezing { freeze_fut, .. } => {
+                // Error here means that the worker died, so we can't really do anything about
+                // it
+                let _ = futures::ready!(freeze_fut.poll(cx));
+                if let SendRepl::Freezing { res, .. } =
+                    this.as_mut().project_replace(ThrottlingSendInner::Done)
+                {
+                    Poll::Ready(res)
+                } else {
+                    // The match above guarantees that this is unreachable
+                    unreachable!()
                 }
-            },
-            SendRefProj::Sent { fut } => {
-                let res = futures::ready!(fut.poll(cx));
-                this.set(ThrottlingSendRefInner::Done);
-                Poll::Ready(res)
             }
-            SendRefProj::Done => Poll::Pending,
+            SendProj::FreezingRetry { freeze_fut, .. } => {
+                // Error here means that the worker died, so we can't really do anything about
+                // it
+                let _ = futures::ready!(freeze_fut.poll(cx));
+
+                if let SendRepl::FreezingRetry {
+                    request,
+                    chat,
+                    wait,
+                    ..
+                } = this.as_mut().project_replace(ThrottlingSendInner::Done)
+                {
+                    this.as_mut().set(ThrottlingSendInner::Pending {
+                        request,
+                        chat,
+                        wait,
+                    });
+
+                    self.poll(cx)
+                } else {
+                    unreachable!()
+                }
+            }
+            SendProj::Sent { fut, freeze, chat } => {
+                let res = futures::ready!(fut.poll(cx));
+
+                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
+                    let after = Duration::from_secs(retry_after.into());
+                    let freeze_fut = freeze.clone().send1(FreezeUntil {
+                        until: Instant::now() + after,
+                        after,
+                        chat: *chat,
+                        retry: None,
+                    });
+
+                    this.set(ThrottlingSendInner::Freezing { freeze_fut, res });
+                    self.poll(cx)
+                } else {
+                    this.set(ThrottlingSendInner::Done);
+                    Poll::Ready(res)
+                }
+            }
+            SendProj::SentRef { freeze, fut, chat } => {
+                let res = futures::ready!(fut.poll(cx));
+
+                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
+                    let after = Duration::from_secs(retry_after.into());
+                    let freeze_fut = freeze.clone().send1(FreezeUntil {
+                        until: Instant::now() + after,
+                        after,
+                        chat: *chat,
+                        retry: None,
+                    });
+
+                    this.set(ThrottlingSendInner::Freezing { freeze_fut, res });
+                    self.poll(cx)
+                } else {
+                    this.set(ThrottlingSendInner::Done);
+                    Poll::Ready(res)
+                }
+            }
+            SendProj::SentRetryable { fut, .. } => {
+                let res = futures::ready!(fut.poll(cx));
+                let (lock, wait) = channel();
+
+                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
+                    let after = Duration::from_secs(retry_after.into());
+
+                    if let SendRepl::SentRetryable {
+                        request,
+                        freeze,
+                        chat,
+                        ..
+                    } = this.as_mut().project_replace(ThrottlingSendInner::Done)
+                    {
+                        log::warn!("Freezing, before retrying: {}", retry_after);
+                        let freeze_fut = freeze.send1(FreezeUntil {
+                            until: Instant::now(),
+                            after,
+                            chat,
+                            retry: Some(lock),
+                        });
+                        this.as_mut().set(ThrottlingSendInner::FreezingRetry {
+                            freeze_fut,
+                            request,
+                            chat,
+                            wait,
+                        })
+                    }
+
+                    self.poll(cx)
+                } else {
+                    this.set(ThrottlingSendInner::Done);
+                    Poll::Ready(res)
+                }
+            }
+            SendProj::Done => {
+                log::error!("Polling done");
+                Poll::Pending
+            }
         }
     }
 }
@@ -910,25 +1133,26 @@ fn channel() -> (RequestLock, RequestWaiter) {
 }
 
 #[must_use]
-struct RequestLock(Sender<Never>);
+struct RequestLock(Sender<(bool, mpsc::Sender<FreezeUntil>)>);
 
 impl RequestLock {
-    fn unlock(self) {
-        // Unlock request by closing oneshot channel
+    fn unlock(self, retry: bool, freeze: mpsc::Sender<FreezeUntil>) -> Result<(), ()> {
+        self.0.send((retry, freeze)).map_err(drop)
     }
 }
 
 #[must_use]
 #[pin_project::pin_project]
-struct RequestWaiter(#[pin] Receiver<Never>);
+struct RequestWaiter(#[pin] Receiver<(bool, mpsc::Sender<FreezeUntil>)>);
 
 impl Future for RequestWaiter {
-    type Output = ();
+    type Output = (bool, mpsc::Sender<FreezeUntil>);
 
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
         match this.0.poll(cx) {
-            Poll::Ready(_) => Poll::Ready(()),
+            Poll::Ready(Ok(ret)) => Poll::Ready(ret),
+            Poll::Ready(Err(_)) => panic!("`RequestLock` is dropped by the throttle worker"),
             Poll::Pending => Poll::Pending,
         }
     }
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 919296fc..455c7c61 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,4 +1,6 @@
-use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
+use crate::{
+    adaptors::DefaultParseMode, errors::AsResponseParameters, requests::Requester, types::ParseMode,
+};
 
 #[cfg(feature = "cache_me")]
 use crate::adaptors::CacheMe;
@@ -60,7 +62,9 @@ pub trait RequesterExt: Requester {
     #[cfg(feature = "throttle")]
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
-        Self: Sized,
+        Self: Sized + Clone + Send + Sync + 'static,
+        Self::Err: AsResponseParameters,
+        Self::GetChat: Send,
     {
         Throttle::new_spawn(self, limits)
     }

From 0a034316536c9fc273c3e7876b024bc43f16fe56 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 24 Oct 2021 22:16:37 +0300
Subject: [PATCH 548/755] Make `{Json,Multipart}Request` clonable

This is required for the new `Throttle` design
---
 src/requests/json.rs      | 1 +
 src/requests/multipart.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/requests/json.rs b/src/requests/json.rs
index 18517bd2..fc9e068b 100644
--- a/src/requests/json.rs
+++ b/src/requests/json.rs
@@ -10,6 +10,7 @@ use crate::{
 ///
 /// [JSON]: https://core.telegram.org/bots/api#making-requests
 #[must_use = "Requests are lazy and do nothing unless sent"]
+#[derive(Clone)]
 pub struct JsonRequest<P> {
     bot: Bot,
     payload: P,
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 8ab398f7..6aa36dda 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -11,6 +11,7 @@ use crate::{
 ///
 /// [multipart/form-data]: https://core.telegram.org/bots/api#making-requests
 #[must_use = "Requests are lazy and do nothing unless sent"]
+#[derive(Clone)]
 pub struct MultipartRequest<P> {
     bot: Bot,
     payload: P,

From 435181fa0b4b78d0481c6f4805b457af86a7f07a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 24 Oct 2021 22:18:33 +0300
Subject: [PATCH 549/755] Improve sanity

Refactor `Throttle` send-future. Previously it was a hand-written future, but
this quickly escalated to an unreadable mess. This commit uses `box`ing and
`async fn` to mitigate this problem.

Hopefully I'm not going insane now
---
 src/adaptors/throttle.rs | 432 +++++++++------------------------------
 1 file changed, 101 insertions(+), 331 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index d49c6df5..f2878263 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -3,11 +3,13 @@ use std::{
     future::Future,
     hash::{Hash, Hasher},
     pin::Pin,
+    sync::Arc,
     time::{Duration, Instant},
 };
 
+use either::Either;
 use futures::{
-    future::ready,
+    future::{ready, BoxFuture},
     task::{Context, Poll},
     FutureExt,
 };
@@ -19,7 +21,6 @@ use url::Url;
 use vecrem::VecExt;
 
 use crate::{
-    adaptors::throttle::chan_send::{ChanSend, MpscSend},
     errors::AsResponseParameters,
     requests::{HasPayload, Output, Request, Requester},
     types::*,
@@ -708,24 +709,24 @@ impl<B: Requester> Requester for Throttle<B>
 where
     B::Err: AsResponseParameters,
 
-    B::SendMessage: Clone + Send + Sync,
-    B::ForwardMessage: Clone + Send + Sync,
-    B::CopyMessage: Clone + Send + Sync,
-    B::SendPhoto: Clone + Send + Sync,
-    B::SendAudio: Clone + Send + Sync,
-    B::SendDocument: Clone + Send + Sync,
-    B::SendVideo: Clone + Send + Sync,
-    B::SendAnimation: Clone + Send + Sync,
-    B::SendVoice: Clone + Send + Sync,
-    B::SendVideoNote: Clone + Send + Sync,
-    B::SendMediaGroup: Clone + Send + Sync,
-    B::SendLocation: Clone + Send + Sync,
-    B::SendVenue: Clone + Send + Sync,
-    B::SendContact: Clone + Send + Sync,
-    B::SendPoll: Clone + Send + Sync,
-    B::SendDice: Clone + Send + Sync,
-    B::SendSticker: Clone + Send + Sync,
-    B::SendInvoice: Clone + Send + Sync,
+    B::SendMessage: Clone + Send + Sync + 'static,
+    B::ForwardMessage: Clone + Send + Sync + 'static,
+    B::CopyMessage: Clone + Send + Sync + 'static,
+    B::SendPhoto: Clone + Send + Sync + 'static,
+    B::SendAudio: Clone + Send + Sync + 'static,
+    B::SendDocument: Clone + Send + Sync + 'static,
+    B::SendVideo: Clone + Send + Sync + 'static,
+    B::SendAnimation: Clone + Send + Sync + 'static,
+    B::SendVoice: Clone + Send + Sync + 'static,
+    B::SendVideoNote: Clone + Send + Sync + 'static,
+    B::SendMediaGroup: Clone + Send + Sync + 'static,
+    B::SendLocation: Clone + Send + Sync + 'static,
+    B::SendVenue: Clone + Send + Sync + 'static,
+    B::SendContact: Clone + Send + Sync + 'static,
+    B::SendPoll: Clone + Send + Sync + 'static,
+    B::SendDice: Clone + Send + Sync + 'static,
+    B::SendSticker: Clone + Send + Sync + 'static,
+    B::SendInvoice: Clone + Send + Sync + 'static,
 {
     type Err = B::Err;
 
@@ -812,6 +813,8 @@ pub struct ThrottlingRequest<R: HasPayload> {
 impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
 
+    /// Note that if this request was already executed via `send_ref` and it
+    /// didn't yet completed, this method will clone the underlying request
     fn payload_mut(&mut self) -> &mut Self::Payload {
         Arc::make_mut(&mut self.request).payload_mut()
     }
@@ -823,8 +826,8 @@ impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
 
 impl<R> Request for ThrottlingRequest<R>
 where
-    R: Request + Clone + Send + Sync,
-    R::Err: AsResponseParameters,
+    R: Request + Clone + Send + Sync + 'static, // TODO: rem static
+    R::Err: AsResponseParameters + Send,
     Output<R>: Send,
 {
     type Err = R::Err;
@@ -832,99 +835,22 @@ where
     type SendRef = ThrottlingSend<R>;
 
     fn send(self) -> Self::Send {
-        let (tx, rx) = channel();
+        let chat = (self.chat_id)(self.payload_ref());
+        let request = Either::from(Arc::try_unwrap(self.request));
 
-        let chat_id = (self.chat_id)(self.payload_ref());
-        let send = self.worker.send1((chat_id, tx));
-
-        let inner = ThrottlingSendInner::Registering {
-            request: Arc::try_unwrap(self.request).into(),
-            chat: chat_id,
-            send,
-            wait: rx,
-        };
-        ThrottlingSend(inner)
+        ThrottlingSend(Box::pin(send(request, chat, self.worker)))
     }
 
     fn send_ref(&self) -> Self::SendRef {
-        let (tx, rx) = channel();
-
-        let chat_id = (self.chat_id)(self.payload_ref());
-        let send = self.worker.clone().send1((chat_id, tx));
-
-        // As we can't move self.0 (request) out, as we do in `send` we are
-        // forced to call `send_ref()`. This may have overhead and/or lead to
-        // wrong results because `R::send_ref` does the send.
-        //
-        // However `Request` documentation explicitly notes that `send{,_ref}`
-        // should **not** do any kind of work, so it's ok.
+        let chat = (self.chat_id)(self.payload_ref());
         let request = Either::Left(Arc::clone(&self.request));
 
-        let inner = ThrottlingSendInner::Registering {
-            chat: chat_id,
-            request,
-            send,
-            wait: rx,
-        };
-        ThrottlingSend(inner)
+        ThrottlingSend(Box::pin(send(request, chat, self.worker.clone())))
     }
 }
 
-use either::Either;
-use std::sync::Arc;
-
 #[pin_project::pin_project]
-pub struct ThrottlingSend<R: Request>(#[pin] ThrottlingSendInner<R>);
-
-#[pin_project::pin_project(project = SendProj, project_replace = SendRepl)]
-enum ThrottlingSendInner<R: Request> {
-    Registering {
-        request: Either<Arc<R>, R>,
-        chat: ChatIdHash,
-        #[pin]
-        send: ChanSend<(ChatIdHash, RequestLock)>,
-        wait: RequestWaiter,
-    },
-    Freezing {
-        #[pin]
-        freeze_fut: ChanSend<FreezeUntil>,
-        res: Result<Output<R>, R::Err>,
-    },
-    FreezingRetry {
-        #[pin]
-        freeze_fut: ChanSend<FreezeUntil>,
-        request: Either<Arc<R>, R>,
-        chat: ChatIdHash,
-        wait: RequestWaiter,
-    },
-    Pending {
-        request: Either<Arc<R>, R>,
-        chat: ChatIdHash,
-        #[pin]
-        wait: RequestWaiter,
-    },
-    Sent {
-        freeze: mpsc::Sender<FreezeUntil>,
-        chat: ChatIdHash,
-        #[pin]
-        fut: R::Send,
-    },
-    SentRef {
-        freeze: mpsc::Sender<FreezeUntil>,
-        chat: ChatIdHash,
-        #[pin]
-        fut: R::SendRef,
-    },
-    SentRetryable {
-        request: Either<Arc<R>, R>,
-        chat: ChatIdHash,
-        freeze: mpsc::Sender<FreezeUntil>,
-        #[pin]
-        fut: R::SendRef,
-    },
-
-    Done,
-}
+pub struct ThrottlingSend<R: Request>(#[pin] BoxFuture<'static, Result<Output<R>, R::Err>>);
 
 impl<R: Request> Future for ThrottlingSend<R>
 where
@@ -933,195 +859,85 @@ where
     type Output = Result<Output<R>, R::Err>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this = self.as_mut().project().0;
+        self.as_mut().project().0.poll(cx)
+    }
+}
 
-        match this.as_mut().project() {
-            SendProj::Registering { send, .. } => match send.poll(cx) {
-                Poll::Pending => Poll::Pending,
-                Poll::Ready(res) => {
-                    if let SendRepl::Registering {
-                        request,
-                        send: _,
-                        wait,
-                        chat,
-                    } = this.as_mut().project_replace(ThrottlingSendInner::Done)
-                    {
-                        match res {
-                            Ok(()) => this.as_mut().set(ThrottlingSendInner::Pending {
-                                request,
-                                wait,
-                                chat,
-                            }),
-                            // The worker is unlikely to drop queue before sending all requests,
-                            // but just in case it has dropped the queue, we want to just send the
-                            // request.
-                            Err(_) => this.as_mut().set(match request {
-                                Either::Left(shared) => ThrottlingSendInner::SentRef {
-                                    freeze: mpsc::channel(1).0,
-                                    fut: shared.send_ref(),
-                                    chat,
-                                },
-                                Either::Right(owned) => ThrottlingSendInner::Sent {
-                                    freeze: mpsc::channel(1).0,
-                                    fut: owned.send(),
-                                    chat,
-                                },
-                            }),
-                        };
-                    }
+/// Actual implementation of the `ThrottlingSend` future
+async fn send<R>(
+    request: Either<Arc<R>, R>,
+    chat: ChatIdHash,
+    worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
+) -> Result<Output<R>, R::Err>
+where
+    R: Request + Send + Sync + 'static,
+    R::Err: AsResponseParameters + Send,
+    Output<R>: Send,
+{
+    // We use option to `take` when sending by value.
+    //
+    // All unwraps down below will succed because we always return immediately after
+    // taking.
+    let mut request: Either<Arc<R>, Option<R>> = request.map_right(Some);
 
-                    self.poll(cx)
-                }
-            },
-            SendProj::Pending { wait, .. } => match wait.poll(cx) {
-                Poll::Pending => Poll::Pending,
-                // Worker pass "message" to unlock us by closing the channel,
-                // and thus we can safely ignore this result as we know it will
-                // always be `Err(_)` (because `Ok(Never)` is uninhibited)
-                // and that's what we want.
-                Poll::Ready((retry, freeze)) => {
-                    if let SendRepl::Pending { request, chat, .. } =
-                        this.as_mut().project_replace(ThrottlingSendInner::Done)
-                    {
-                        let repl = match (retry, request) {
-                            (true, request) => ThrottlingSendInner::SentRetryable {
-                                fut: request.as_ref().either(|r| &**r, |r| r).send_ref(),
-                                chat,
-                                request,
-                                freeze,
-                            },
-                            (false, Either::Left(shared)) => ThrottlingSendInner::SentRef {
-                                fut: shared.send_ref(),
-                                chat,
-                                freeze,
-                            },
-                            (false, Either::Right(owned)) => ThrottlingSendInner::Sent {
-                                fut: owned.send(),
-                                chat,
-                                freeze,
-                            },
-                        };
+    loop {
+        let (lock, wait) = channel();
 
-                        this.as_mut().project_replace(repl);
-                    }
+        // The worker is unlikely to drop queue before sending all requests,
+        // but just in case it has dropped the queue, we want to just send the
+        // request.
+        if let Err(_) = worker.send((chat, lock)).await {
+            return match &mut request {
+                Either::Left(shared) => shared.send_ref().await,
+                Either::Right(owned) => owned.take().unwrap().send().await,
+            };
+        };
 
-                    self.poll(cx)
-                }
-            },
-            SendProj::Freezing { freeze_fut, .. } => {
-                // Error here means that the worker died, so we can't really do anything about
-                // it
-                let _ = futures::ready!(freeze_fut.poll(cx));
-                if let SendRepl::Freezing { res, .. } =
-                    this.as_mut().project_replace(ThrottlingSendInner::Done)
-                {
-                    Poll::Ready(res)
-                } else {
-                    // The match above guarantees that this is unreachable
-                    unreachable!()
-                }
+        let (retry, freeze) = wait.await;
+
+        let res = match (retry, &mut request) {
+            (true, request) => {
+                request
+                    .as_ref()
+                    .either(|r| &**r, |r| r.as_ref().unwrap())
+                    .send_ref()
+                    .await
             }
-            SendProj::FreezingRetry { freeze_fut, .. } => {
-                // Error here means that the worker died, so we can't really do anything about
-                // it
-                let _ = futures::ready!(freeze_fut.poll(cx));
+            (false, Either::Left(shared)) => shared.send_ref().await,
+            (false, Either::Right(owned)) => owned.take().unwrap().send().await,
+        };
 
-                if let SendRepl::FreezingRetry {
-                    request,
+        let retry_after = res.as_ref().err().and_then(<_>::retry_after);
+        if let Some(retry_after) = retry_after {
+            let after = Duration::from_secs(retry_after.into());
+
+            if retry {
+                log::warn!("Freezing, before retrying: {}", retry_after);
+            }
+
+            let (lock, wait) = channel();
+
+            // Error here means that the worker died, so we can't really do anything about
+            // it
+            let _ = freeze
+                .send(FreezeUntil {
+                    until: Instant::now(), // TODO: this is obviously wrong
+                    after,
                     chat,
-                    wait,
-                    ..
-                } = this.as_mut().project_replace(ThrottlingSendInner::Done)
-                {
-                    this.as_mut().set(ThrottlingSendInner::Pending {
-                        request,
-                        chat,
-                        wait,
-                    });
+                    retry: Some(lock),
+                })
+                .await;
 
-                    self.poll(cx)
-                } else {
-                    unreachable!()
-                }
-            }
-            SendProj::Sent { fut, freeze, chat } => {
-                let res = futures::ready!(fut.poll(cx));
-
-                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
-                    let after = Duration::from_secs(retry_after.into());
-                    let freeze_fut = freeze.clone().send1(FreezeUntil {
-                        until: Instant::now() + after,
-                        after,
-                        chat: *chat,
-                        retry: None,
-                    });
-
-                    this.set(ThrottlingSendInner::Freezing { freeze_fut, res });
-                    self.poll(cx)
-                } else {
-                    this.set(ThrottlingSendInner::Done);
-                    Poll::Ready(res)
-                }
-            }
-            SendProj::SentRef { freeze, fut, chat } => {
-                let res = futures::ready!(fut.poll(cx));
-
-                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
-                    let after = Duration::from_secs(retry_after.into());
-                    let freeze_fut = freeze.clone().send1(FreezeUntil {
-                        until: Instant::now() + after,
-                        after,
-                        chat: *chat,
-                        retry: None,
-                    });
-
-                    this.set(ThrottlingSendInner::Freezing { freeze_fut, res });
-                    self.poll(cx)
-                } else {
-                    this.set(ThrottlingSendInner::Done);
-                    Poll::Ready(res)
-                }
-            }
-            SendProj::SentRetryable { fut, .. } => {
-                let res = futures::ready!(fut.poll(cx));
-                let (lock, wait) = channel();
-
-                if let Err(Some(retry_after)) = res.as_ref().map_err(<_>::retry_after) {
-                    let after = Duration::from_secs(retry_after.into());
-
-                    if let SendRepl::SentRetryable {
-                        request,
-                        freeze,
-                        chat,
-                        ..
-                    } = this.as_mut().project_replace(ThrottlingSendInner::Done)
-                    {
-                        log::warn!("Freezing, before retrying: {}", retry_after);
-                        let freeze_fut = freeze.send1(FreezeUntil {
-                            until: Instant::now(),
-                            after,
-                            chat,
-                            retry: Some(lock),
-                        });
-                        this.as_mut().set(ThrottlingSendInner::FreezingRetry {
-                            freeze_fut,
-                            request,
-                            chat,
-                            wait,
-                        })
-                    }
-
-                    self.poll(cx)
-                } else {
-                    this.set(ThrottlingSendInner::Done);
-                    Poll::Ready(res)
-                }
-            }
-            SendProj::Done => {
-                log::error!("Polling done");
-                Poll::Pending
-            }
+            wait.await;
         }
+
+        match res {
+            res @ Ok(_) => break res,
+            res @ Err(_) if !retry => break res,
+            Err(_) => {
+                // Next iteration will retry
+            }
+        };
     }
 }
 
@@ -1157,49 +973,3 @@ impl Future for RequestWaiter {
         }
     }
 }
-
-mod chan_send {
-    use std::{future::Future, pin::Pin};
-
-    use futures::task::{Context, Poll};
-    use tokio::sync::{mpsc, mpsc::error::SendError};
-
-    pub(super) trait MpscSend<T> {
-        fn send1(self, val: T) -> ChanSend<T>;
-    }
-
-    #[pin_project::pin_project]
-    pub(super) struct ChanSend<T>(#[pin] Inner<T>);
-
-    #[cfg(not(feature = "nightly"))]
-    type Inner<T> = Pin<Box<dyn Future<Output = Result<(), SendError<T>>> + Send>>;
-    #[cfg(feature = "nightly")]
-    type Inner<T> = impl Future<Output = Result<(), SendError<T>>>;
-
-    impl<T: Send + 'static> MpscSend<T> for mpsc::Sender<T> {
-        // `return`s trick IDEA not to show errors
-        #[allow(clippy::needless_return)]
-        fn send1(self, val: T) -> ChanSend<T> {
-            #[cfg(feature = "nightly")]
-            {
-                fn def<T>(sender: mpsc::Sender<T>, val: T) -> Inner<T> {
-                    async move { sender.send(val).await }
-                }
-                return ChanSend(def(self, val));
-            }
-            #[cfg(not(feature = "nightly"))]
-            {
-                let this = self;
-                return ChanSend(Box::pin(async move { this.send(val).await }));
-            }
-        }
-    }
-
-    impl<T> Future for ChanSend<T> {
-        type Output = Result<(), SendError<T>>;
-
-        fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-            self.project().0.poll(cx)
-        }
-    }
-}

From 439a345dee6d27afbf6fab7f97e0416b6e0659fb Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 17 Jan 2022 15:59:39 +0300
Subject: [PATCH 550/755] Use tokio's `try_recv` instead of hacks

---
 Cargo.toml               |  4 ++--
 src/adaptors/throttle.rs | 33 ++++++++++++++-------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c672ab93..149591d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ exclude = [
 
 [dependencies]
 futures = "0.3.5"
-tokio = { version = "1.8.0", features = ["fs"] }
+tokio = { version = "1.12.0", features = ["fs"] }
 tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
@@ -66,7 +66,7 @@ native-tls = ["reqwest/native-tls"]
 nightly = []
 
 # Throttling bot adaptor
-throttle = ["vecrem"]
+throttle = ["vecrem", "tokio/macros"]
 
 # Trace bot adaptor
 trace_adaptor = []
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index f2878263..38a2c60d 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -11,10 +11,10 @@ use either::Either;
 use futures::{
     future::{ready, BoxFuture},
     task::{Context, Poll},
-    FutureExt,
 };
 use tokio::sync::{
     mpsc,
+    mpsc::error::TryRecvError,
     oneshot::{self, Receiver, Sender},
 };
 use url::Url;
@@ -573,8 +573,7 @@ async fn worker<B>(
 }
 
 fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
-    // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-    while let Some(Some(req)) = tokio::task::unconstrained(rx.recv()).now_or_never() {
+    while let Ok(req) = rx.try_recv() {
         // Errors are ignored with .ok(). Error means that the response channel
         // is closed and the response isn't needed.
         match req {
@@ -595,17 +594,14 @@ async fn freeze(
     bot: &impl Requester,
     mut imm: Option<FreezeUntil>,
 ) {
-    // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-    while let Some(FreezeUntil {
-        until,
-        after,
-        chat,
-        mut retry,
-    }) = imm.take().or_else(|| {
-        tokio::task::unconstrained(rx.recv())
-            .now_or_never()
-            .flatten()
-    }) {
+    while let Some(freeze_until) = imm.take().or_else(|| rx.try_recv().ok()) {
+        let FreezeUntil {
+            until,
+            after,
+            chat,
+            mut retry,
+        } = freeze_until;
+
         if let Some(slow_mode) = slow_mode.as_deref_mut() {
             // TODO: do something with channels?...
             if let hash @ ChatIdHash::Id(id) = chat {
@@ -667,12 +663,11 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
 
     // Don't grow queue bigger than the capacity to limit DOS possibility
     while queue.len() < queue.capacity() {
-        // FIXME(waffle): https://github.com/tokio-rs/tokio/issues/3350
-        match tokio::task::unconstrained(rx.recv()).now_or_never() {
-            Some(Some(req)) => queue.push(req),
-            Some(None) => *rx_is_closed = true,
+        match rx.try_recv() {
+            Ok(req) => queue.push(req),
+            Err(TryRecvError::Disconnected) => *rx_is_closed = true,
             // There are no items in queue.
-            None => break,
+            Err(TryRecvError::Empty) => break,
         }
     }
 }

From 081b74edb03e4545abd01411fba743b7bc28ad66 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Feb 2022 18:13:14 +0300
Subject: [PATCH 551/755] Split `Throttle` implementation into modules

---
 src/adaptors/throttle.rs                | 799 +-----------------------
 src/adaptors/throttle/request.rs        | 157 +++++
 src/adaptors/throttle/request_lock.rs   |  45 ++
 src/adaptors/throttle/requester_impl.rs | 103 +++
 src/adaptors/throttle/settings.rs       | 105 ++++
 src/adaptors/throttle/worker.rs         | 401 ++++++++++++
 6 files changed, 835 insertions(+), 775 deletions(-)
 create mode 100644 src/adaptors/throttle/request.rs
 create mode 100644 src/adaptors/throttle/request_lock.rs
 create mode 100644 src/adaptors/throttle/requester_impl.rs
 create mode 100644 src/adaptors/throttle/settings.rs
 create mode 100644 src/adaptors/throttle/worker.rs

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 38a2c60d..caaef945 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -1,31 +1,34 @@
+/// `ThrottlingRequest` and `ThrottlingSend` structures
+mod request;
+/// Lock that allows requests to wait until they are allowed to be sent
+mod request_lock;
+/// `impl Requester for Throttle<_>`
+mod requester_impl;
+/// `Settings` and `Limits` structures
+mod settings;
+/// "Worker" that checks the limits
+mod worker;
+
 use std::{
-    collections::{hash_map::Entry, HashMap, VecDeque},
     future::Future,
     hash::{Hash, Hasher},
-    pin::Pin,
-    sync::Arc,
-    time::{Duration, Instant},
 };
 
-use either::Either;
-use futures::{
-    future::{ready, BoxFuture},
-    task::{Context, Poll},
-};
 use tokio::sync::{
     mpsc,
-    mpsc::error::TryRecvError,
-    oneshot::{self, Receiver, Sender},
+    oneshot::{self},
 };
-use url::Url;
-use vecrem::VecExt;
 
-use crate::{
-    errors::AsResponseParameters,
-    requests::{HasPayload, Output, Request, Requester},
-    types::*,
+use crate::{errors::AsResponseParameters, requests::Requester, types::*};
+
+use self::{
+    request_lock::{channel, RequestLock},
+    worker::{worker, FreezeUntil, InfoMessage},
 };
 
+pub use request::{ThrottlingRequest, ThrottlingSend};
+pub use settings::{Limits, Settings};
+
 /// Automatic request limits respecting mechanism.
 ///
 /// Telegram has strict [limits], which, if exceeded will sooner or later cause
@@ -47,7 +50,8 @@ use crate::{
 /// ```no_run (throttle fails to spawn task without tokio runtime)
 /// use teloxide_core::{adaptors::throttle::Limits, requests::RequesterExt, Bot};
 ///
-/// let bot = Bot::new("TOKEN").throttle(Limits::default());
+/// let bot = Bot::new("TOKEN")
+///     .throttle(Limits::default());
 ///
 /// /* send many requests here */
 /// ```
@@ -154,6 +158,8 @@ impl<B> Throttle<B> {
 
     /// Returns currently used [`Limits`].
     pub async fn limits(&self) -> Limits {
+        const WORKER_DIED: &str = "worker died before last `Throttle` instance";
+
         let (tx, rx) = oneshot::channel();
 
         self.info_tx
@@ -179,592 +185,6 @@ impl<B> Throttle<B> {
     }
 }
 
-/// Telegram request limits.
-///
-/// This struct is used in [`Throttle`].
-///
-/// Note that you may ask telegram [@BotSupport] to increase limits for your
-/// particular bot if it has a lot of users (but they may or may not do that).
-///
-/// [@BotSupport]: https://t.me/botsupport
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
-pub struct Limits {
-    /// Allowed messages in one chat per second.
-    pub messages_per_sec_chat: u32,
-
-    /// Allowed messages in one chat per minute.
-    pub messages_per_min_chat: u32,
-
-    /// Allowed messages in one channel per minute.
-    pub messages_per_min_channel: u32,
-
-    /// Allowed messages per second.
-    pub messages_per_sec_overall: u32,
-}
-
-/// Defaults are taken from [telegram documentation][tgdoc] (except for
-/// `messages_per_min_channel`).
-///
-/// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
-impl Default for Limits {
-    fn default() -> Self {
-        Self {
-            messages_per_sec_chat: 1,
-            messages_per_sec_overall: 30,
-            messages_per_min_chat: 20,
-            messages_per_min_channel: 10,
-        }
-    }
-}
-
-/// Settings used by [`Throttle`] adaptor.
-///
-/// ## Examples
-///
-/// ```
-/// use teloxide_core::adaptors::throttle;
-///
-/// let settings = throttle::Settings::default()
-///     .on_queue_full(|pending| async move { /* do something when internal queue is full */ });
-/// // use settings in `Throttle::with_settings` or other constructors
-/// # let _ = settings;
-/// ```
-#[non_exhaustive]
-pub struct Settings {
-    pub limits: Limits,
-    pub on_queue_full: BoxedFnMut<usize, BoxedFuture>,
-    pub retry: bool,
-    pub check_slow_mode: bool,
-}
-
-impl Settings {
-    pub fn limits(mut self, val: Limits) -> Self {
-        self.limits = val;
-        self
-    }
-
-    pub fn on_queue_full<F, Fut>(mut self, mut val: F) -> Self
-    where
-        F: FnMut(usize) -> Fut + Send + 'static,
-        Fut: Future<Output = ()> + Send + 'static,
-    {
-        self.on_queue_full = Box::new(move |pending| Box::pin(val(pending)));
-        self
-    }
-
-    pub fn no_retry(mut self) -> Self {
-        self.retry = false;
-        self
-    }
-
-    pub fn check_slow_mode(mut self) -> Self {
-        self.check_slow_mode = true;
-        self
-    }
-}
-
-impl Default for Settings {
-    fn default() -> Self {
-        Self {
-            limits: <_>::default(),
-            on_queue_full: Box::new(|pending| {
-                log::warn!("Throttle queue is full ({} pending requests)", pending);
-                Box::pin(ready(()))
-            }),
-            retry: true,
-            check_slow_mode: false,
-        }
-    }
-}
-
-// Required to not trigger `clippy::type-complexity` lint
-type BoxedFnMut<I, O> = Box<dyn FnMut(I) -> O + Send>;
-type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
-
-const WORKER_DIED: &str = "worker died before last `Throttle` instance";
-
-const MINUTE: Duration = Duration::from_secs(60);
-const SECOND: Duration = Duration::from_secs(1);
-
-// Delay between worker iterations.
-//
-// For now it's `second/4`, but that number is chosen pretty randomly, we may
-// want to change this.
-const DELAY: Duration = Duration::from_millis(250);
-
-/// Minimal time between calls to queue_full function
-const QUEUE_FULL_DELAY: Duration = Duration::from_secs(4);
-
-#[derive(Debug)]
-enum InfoMessage {
-    GetLimits { response: Sender<Limits> },
-    SetLimits { new: Limits, response: Sender<()> },
-}
-
-type RequestsSent = u32;
-
-// I wish there was special data structure for history which removed the
-// need in 2 hashmaps
-// (waffle)
-#[derive(Default)]
-struct RequestsSentToChats {
-    per_min: HashMap<ChatIdHash, RequestsSent>,
-    per_sec: HashMap<ChatIdHash, RequestsSent>,
-}
-
-struct FreezeUntil {
-    until: Instant,
-    after: Duration,
-    chat: ChatIdHash,
-    retry: Option<RequestLock>,
-}
-
-// Throttling is quite complicated. This comment describes the algorithm of the
-// current implementation.
-//
-// ### Request
-//
-// When a throttling request is sent, it sends a tuple of `ChatId` and
-// `Sender<()>` to the worker. Then the request waits for a notification from
-// the worker. When notification is received, it sends the underlying request.
-//
-// ### Worker
-//
-// The worker does the most important job -- it ensures that the limits are
-// never exceeded.
-//
-// The worker stores a history of requests sent in the last minute (and to which
-// chats they were sent) and a queue of pending updates.
-//
-// The worker does the following algorithm loop:
-//
-// 1. If the queue is empty, wait for the first message in incoming channel (and
-// add it to the queue).
-//
-// 2. Read all present messages from an incoming channel and transfer them to
-// the queue.
-//
-// 3. Record the current time.
-//
-// 4. Clear the history from records whose time < (current time - minute).
-//
-// 5. Count all requests which were sent last second, `allowed =
-// limit.messages_per_sec_overall - count`.
-//
-// 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
-//
-// 7. Count how many requests were sent to which chats (i.e.: create
-// `Map<ChatId, Count>`). (Note: the same map, but for last minute also exists,
-// but it's updated, instead of recreation.)
-//
-// 8. While `allowed >= 0` search for requests which chat haven't exceed the
-// limits (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
-// the request that it can be now executed, increase counts, add record to the
-// history.
-
-async fn worker<B>(
-    Settings {
-        mut limits,
-        mut on_queue_full,
-        retry,
-        check_slow_mode,
-    }: Settings,
-    mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
-    mut info_rx: mpsc::Receiver<InfoMessage>,
-    bot: B,
-) where
-    B: Requester,
-    B::Err: AsResponseParameters,
-{
-    // FIXME(waffle): Make an research about data structures for this queue.
-    //                Currently this is O(n) removing (n = number of elements
-    //                stayed), amortized O(1) push (vec+vecrem).
-    let mut queue: Vec<(ChatIdHash, RequestLock)> =
-        Vec::with_capacity(limits.messages_per_sec_overall as usize);
-
-    let mut history: VecDeque<(ChatIdHash, Instant)> = VecDeque::new();
-    let mut requests_sent = RequestsSentToChats::default();
-
-    let mut slow_mode: Option<HashMap<ChatIdHash, (Duration, Instant)>> =
-        check_slow_mode.then(HashMap::new);
-
-    let mut rx_is_closed = false;
-
-    let mut last_queue_full = Instant::now()
-        .checked_sub(QUEUE_FULL_DELAY)
-        .unwrap_or_else(Instant::now);
-
-    let (freeze_tx, mut freeze_rx) = mpsc::channel::<FreezeUntil>(1);
-
-    while !rx_is_closed || !queue.is_empty() {
-        // FIXME(waffle):
-        // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
-        //    execution until a request is sent. While the execution is 'blocked' no
-        //    `InfoMessage`s could be answered.
-        //
-        // 2. If limits are decreased, ideally we want to shrink queue.
-        //
-        // *blocked in asynchronous way
-        answer_info(&mut info_rx, &mut limits);
-
-        freeze(
-            &mut freeze_rx,
-            &freeze_tx,
-            slow_mode.as_mut(),
-            &mut queue,
-            &bot,
-            None,
-        )
-        .await;
-
-        loop {
-            tokio::select! {
-                () = read_from_rx(&mut rx, &mut queue, &mut rx_is_closed) => break,
-                freeze_until = freeze_rx.recv() => {
-                    freeze(
-                        &mut freeze_rx,
-                        &freeze_tx,
-                        slow_mode.as_mut(),
-                        &mut queue,
-                        &bot,
-                        freeze_until
-                    )
-                    .await;
-                },
-            }
-        }
-        //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
-
-        if queue.len() == queue.capacity() && last_queue_full.elapsed() > QUEUE_FULL_DELAY {
-            last_queue_full = Instant::now();
-            tokio::spawn(on_queue_full(queue.len()));
-        }
-
-        // _Maybe_ we need to use `spawn_blocking` here, because there is
-        // decent amount of blocking work. However _for now_ I've decided not
-        // to use it here.
-        //
-        // Reasons (not to use `spawn_blocking`):
-        //
-        // 1. The work seems not very CPU-bound, it's not heavy computations,
-        //    it's more like light computations.
-        //
-        // 2. `spawn_blocking` is not zero-cost — it spawns a new system thread
-        //    + do so other work. This may actually be *worse* then current
-        //    "just do everything in this async fn" approach.
-        //
-        // 3. With `rt-threaded` feature, tokio uses [`num_cpus()`] threads
-        //    which should be enough to work fine with one a-bit-blocking task.
-        //    Crucially current behaviour will be problem mostly with
-        //    single-threaded runtimes (and in case you're using one, you
-        //    probably don't want to spawn unnecessary threads anyway).
-        //
-        // I think if we'll ever change this behaviour, we need to make it
-        // _configurable_.
-        //
-        // See also [discussion (ru)].
-        //
-        // NOTE: If you are reading this because you have any problems because
-        // of this worker, open an [issue on github]
-        //
-        // [`num_cpus()`]: https://vee.gg/JGwq2
-        // [discussion (ru)]: https://t.me/rust_async/27891
-        // [issue on github]: https://github.com/teloxide/teloxide/issues/new
-        //
-        // (waffle)
-
-        let now = Instant::now();
-        let min_back = now - MINUTE;
-        let sec_back = now - SECOND;
-
-        // make history and requests_sent up-to-date
-        while let Some((_, time)) = history.front() {
-            // history is sorted, we found first up-to-date thing
-            if time >= &min_back {
-                break;
-            }
-
-            if let Some((chat, _)) = history.pop_front() {
-                let entry = requests_sent.per_min.entry(chat).and_modify(|count| {
-                    *count -= 1;
-                });
-
-                if let Entry::Occupied(entry) = entry {
-                    if *entry.get() == 0 {
-                        entry.remove_entry();
-                    }
-                }
-            }
-        }
-
-        // as truncates which is ok since in case of truncation it would always be >=
-        // limits.overall_s
-        let used = history
-            .iter()
-            .take_while(|(_, time)| time > &sec_back)
-            .count() as u32;
-        let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
-
-        if allowed == 0 {
-            requests_sent.per_sec.clear();
-            tokio::time::sleep(DELAY).await;
-            continue;
-        }
-
-        for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
-            *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
-        }
-
-        let mut queue_removing = queue.removing();
-
-        while let Some(entry) = queue_removing.next() {
-            let chat = &entry.value().0;
-
-            let slow_mode = slow_mode.as_mut().and_then(|sm| sm.get_mut(chat));
-
-            if let Some(&mut (delay, last)) = slow_mode {
-                if last + delay > Instant::now() {
-                    continue;
-                }
-            }
-
-            let requests_sent_per_sec_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
-            let requests_sent_per_min_count = requests_sent.per_min.get(chat).copied().unwrap_or(0);
-
-            let messages_per_min_limit = if chat.is_channel() {
-                limits.messages_per_min_channel
-            } else {
-                limits.messages_per_min_chat
-            };
-
-            let limits_not_exceeded = requests_sent_per_sec_count < limits.messages_per_sec_chat
-                && requests_sent_per_min_count < messages_per_min_limit;
-
-            if limits_not_exceeded {
-                // Unlock the associated request.
-
-                let chat = *chat;
-                let (_, lock) = entry.remove();
-
-                // Only count request as sent if the request wasn't dropped before unlocked
-                if lock.unlock(retry, freeze_tx.clone()).is_ok() {
-                    *requests_sent.per_sec.entry(chat).or_insert(0) += 1;
-                    *requests_sent.per_min.entry(chat).or_insert(0) += 1;
-                    history.push_back((chat, Instant::now()));
-
-                    if let Some((_, last)) = slow_mode {
-                        *last = Instant::now();
-                    }
-
-                    // We have "sent" one request, so now we can send one less.
-                    allowed -= 1;
-                    if allowed == 0 {
-                        break;
-                    }
-                }
-            }
-        }
-
-        // It's easier to just recompute last second stats, instead of keeping
-        // track of it alongside with minute stats, so we just throw this away.
-        requests_sent.per_sec.clear();
-        tokio::time::sleep(DELAY).await;
-    }
-}
-
-fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
-    while let Ok(req) = rx.try_recv() {
-        // Errors are ignored with .ok(). Error means that the response channel
-        // is closed and the response isn't needed.
-        match req {
-            InfoMessage::GetLimits { response } => response.send(*limits).ok(),
-            InfoMessage::SetLimits { new, response } => {
-                *limits = new;
-                response.send(()).ok()
-            }
-        };
-    }
-}
-
-async fn freeze(
-    rx: &mut mpsc::Receiver<FreezeUntil>,
-    tx: &mpsc::Sender<FreezeUntil>,
-    mut slow_mode: Option<&mut HashMap<ChatIdHash, (Duration, Instant)>>,
-    queue: &mut Vec<(ChatIdHash, RequestLock)>,
-    bot: &impl Requester,
-    mut imm: Option<FreezeUntil>,
-) {
-    while let Some(freeze_until) = imm.take().or_else(|| rx.try_recv().ok()) {
-        let FreezeUntil {
-            until,
-            after,
-            chat,
-            mut retry,
-        } = freeze_until;
-
-        if let Some(slow_mode) = slow_mode.as_deref_mut() {
-            // TODO: do something with channels?...
-            if let hash @ ChatIdHash::Id(id) = chat {
-                // TODO: maybe not call `get_chat` every time?
-
-                // At this point there isn't much we can do with the error besides ignoring
-                if let Ok(chat) = bot.get_chat(id).send().await {
-                    match chat.slow_mode_delay() {
-                        Some(delay) => {
-                            let now = Instant::now();
-                            let new_delay = Duration::from_secs(delay.into());
-                            slow_mode.insert(hash, (new_delay, now));
-                        }
-                        None => {
-                            slow_mode.remove(&hash);
-                        }
-                    };
-                }
-            }
-        }
-
-        // slow mode is enabled and it is <= to the delay asked by telegram
-        let slow_mode_enabled_and_likely_the_cause = slow_mode
-            .as_ref()
-            .and_then(|m| m.get(&chat).map(|(delay, _)| delay <= &after))
-            .unwrap_or(false);
-
-        // Do not sleep if slow mode is enabled since the freeze is most likely caused
-        // by the said slow mode and not by the global limits.
-        if slow_mode_enabled_and_likely_the_cause {
-            queue.extend(Some(chat).zip(retry.take()));
-        } else {
-            log::warn!(
-                "freezing the bot for approximately {:?} due to `RetryAfter` error from telegram",
-                after
-            );
-
-            tokio::time::sleep_until(until.into()).await;
-
-            log::warn!("unfreezing the bot");
-
-            if let Some(lock) = retry {
-                // Since we are already retrying the request, retries are obviously turned on.
-                let retry = true;
-                let _ = lock.unlock(retry, tx.clone());
-            }
-        }
-    }
-}
-
-async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
-    if queue.is_empty() {
-        log::warn!("A-blocking on queue");
-        match rx.recv().await {
-            Some(req) => queue.push(req),
-            None => *rx_is_closed = true,
-        }
-    }
-
-    // Don't grow queue bigger than the capacity to limit DOS possibility
-    while queue.len() < queue.capacity() {
-        match rx.try_recv() {
-            Ok(req) => queue.push(req),
-            Err(TryRecvError::Disconnected) => *rx_is_closed = true,
-            // There are no items in queue.
-            Err(TryRecvError::Empty) => break,
-        }
-    }
-}
-
-macro_rules! f {
-    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
-        ThrottlingRequest {
-            request: Arc::new($this.inner().$m($($arg),*)),
-            chat_id: |p| (&p.payload_ref().chat_id).into(),
-            worker: $this.queue.clone(),
-        }
-    };
-}
-
-macro_rules! fty {
-    ($T:ident) => {
-        ThrottlingRequest<B::$T>
-    };
-}
-
-macro_rules! fid {
-    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
-        $this.inner().$m($($arg),*)
-    };
-}
-
-macro_rules! ftyid {
-    ($T:ident) => {
-        B::$T
-    };
-}
-
-impl<B: Requester> Requester for Throttle<B>
-where
-    B::Err: AsResponseParameters,
-
-    B::SendMessage: Clone + Send + Sync + 'static,
-    B::ForwardMessage: Clone + Send + Sync + 'static,
-    B::CopyMessage: Clone + Send + Sync + 'static,
-    B::SendPhoto: Clone + Send + Sync + 'static,
-    B::SendAudio: Clone + Send + Sync + 'static,
-    B::SendDocument: Clone + Send + Sync + 'static,
-    B::SendVideo: Clone + Send + Sync + 'static,
-    B::SendAnimation: Clone + Send + Sync + 'static,
-    B::SendVoice: Clone + Send + Sync + 'static,
-    B::SendVideoNote: Clone + Send + Sync + 'static,
-    B::SendMediaGroup: Clone + Send + Sync + 'static,
-    B::SendLocation: Clone + Send + Sync + 'static,
-    B::SendVenue: Clone + Send + Sync + 'static,
-    B::SendContact: Clone + Send + Sync + 'static,
-    B::SendPoll: Clone + Send + Sync + 'static,
-    B::SendDice: Clone + Send + Sync + 'static,
-    B::SendSticker: Clone + Send + Sync + 'static,
-    B::SendInvoice: Clone + Send + Sync + 'static,
-{
-    type Err = B::Err;
-
-    requester_forward! {
-        send_message, forward_message, copy_message, send_photo, send_audio,
-        send_document, send_video, send_animation, send_voice, send_video_note,
-        send_media_group, send_location, send_venue, send_contact, send_poll,
-        send_dice, send_sticker, send_invoice => f, fty
-    }
-
-    requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, ban_chat_member,
-        unban_chat_member, restrict_chat_member, promote_chat_member,
-        set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
-        answer_callback_query, set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
-        edit_message_text, edit_message_text_inline, edit_message_caption,
-        edit_message_caption_inline, edit_message_media, edit_message_media_inline,
-        edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
-        delete_message, get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
-        set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
-        approve_chat_join_request, decline_chat_join_request,
-        get_game_high_scores => fid, ftyid
-    }
-}
-
-download_forward! {
-    'w
-    B
-    Throttle<B>
-    { this => this.inner() }
-}
-
 /// An ID used in the worker.
 ///
 /// It is used instead of `ChatId` to make copying cheap even in case of
@@ -797,174 +217,3 @@ impl From<&Recipient> for ChatIdHash {
         }
     }
 }
-
-#[must_use = "Requests are lazy and do nothing unless sent"]
-pub struct ThrottlingRequest<R: HasPayload> {
-    request: Arc<R>,
-    chat_id: fn(&R::Payload) -> ChatIdHash,
-    worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
-}
-
-impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
-    type Payload = R::Payload;
-
-    /// Note that if this request was already executed via `send_ref` and it
-    /// didn't yet completed, this method will clone the underlying request
-    fn payload_mut(&mut self) -> &mut Self::Payload {
-        Arc::make_mut(&mut self.request).payload_mut()
-    }
-
-    fn payload_ref(&self) -> &Self::Payload {
-        self.request.payload_ref()
-    }
-}
-
-impl<R> Request for ThrottlingRequest<R>
-where
-    R: Request + Clone + Send + Sync + 'static, // TODO: rem static
-    R::Err: AsResponseParameters + Send,
-    Output<R>: Send,
-{
-    type Err = R::Err;
-    type Send = ThrottlingSend<R>;
-    type SendRef = ThrottlingSend<R>;
-
-    fn send(self) -> Self::Send {
-        let chat = (self.chat_id)(self.payload_ref());
-        let request = Either::from(Arc::try_unwrap(self.request));
-
-        ThrottlingSend(Box::pin(send(request, chat, self.worker)))
-    }
-
-    fn send_ref(&self) -> Self::SendRef {
-        let chat = (self.chat_id)(self.payload_ref());
-        let request = Either::Left(Arc::clone(&self.request));
-
-        ThrottlingSend(Box::pin(send(request, chat, self.worker.clone())))
-    }
-}
-
-#[pin_project::pin_project]
-pub struct ThrottlingSend<R: Request>(#[pin] BoxFuture<'static, Result<Output<R>, R::Err>>);
-
-impl<R: Request> Future for ThrottlingSend<R>
-where
-    R::Err: AsResponseParameters,
-{
-    type Output = Result<Output<R>, R::Err>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.as_mut().project().0.poll(cx)
-    }
-}
-
-/// Actual implementation of the `ThrottlingSend` future
-async fn send<R>(
-    request: Either<Arc<R>, R>,
-    chat: ChatIdHash,
-    worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
-) -> Result<Output<R>, R::Err>
-where
-    R: Request + Send + Sync + 'static,
-    R::Err: AsResponseParameters + Send,
-    Output<R>: Send,
-{
-    // We use option to `take` when sending by value.
-    //
-    // All unwraps down below will succed because we always return immediately after
-    // taking.
-    let mut request: Either<Arc<R>, Option<R>> = request.map_right(Some);
-
-    loop {
-        let (lock, wait) = channel();
-
-        // The worker is unlikely to drop queue before sending all requests,
-        // but just in case it has dropped the queue, we want to just send the
-        // request.
-        if let Err(_) = worker.send((chat, lock)).await {
-            return match &mut request {
-                Either::Left(shared) => shared.send_ref().await,
-                Either::Right(owned) => owned.take().unwrap().send().await,
-            };
-        };
-
-        let (retry, freeze) = wait.await;
-
-        let res = match (retry, &mut request) {
-            (true, request) => {
-                request
-                    .as_ref()
-                    .either(|r| &**r, |r| r.as_ref().unwrap())
-                    .send_ref()
-                    .await
-            }
-            (false, Either::Left(shared)) => shared.send_ref().await,
-            (false, Either::Right(owned)) => owned.take().unwrap().send().await,
-        };
-
-        let retry_after = res.as_ref().err().and_then(<_>::retry_after);
-        if let Some(retry_after) = retry_after {
-            let after = Duration::from_secs(retry_after.into());
-
-            if retry {
-                log::warn!("Freezing, before retrying: {}", retry_after);
-            }
-
-            let (lock, wait) = channel();
-
-            // Error here means that the worker died, so we can't really do anything about
-            // it
-            let _ = freeze
-                .send(FreezeUntil {
-                    until: Instant::now(), // TODO: this is obviously wrong
-                    after,
-                    chat,
-                    retry: Some(lock),
-                })
-                .await;
-
-            wait.await;
-        }
-
-        match res {
-            res @ Ok(_) => break res,
-            res @ Err(_) if !retry => break res,
-            Err(_) => {
-                // Next iteration will retry
-            }
-        };
-    }
-}
-
-fn channel() -> (RequestLock, RequestWaiter) {
-    let (tx, rx) = oneshot::channel();
-    let tx = RequestLock(tx);
-    let rx = RequestWaiter(rx);
-    (tx, rx)
-}
-
-#[must_use]
-struct RequestLock(Sender<(bool, mpsc::Sender<FreezeUntil>)>);
-
-impl RequestLock {
-    fn unlock(self, retry: bool, freeze: mpsc::Sender<FreezeUntil>) -> Result<(), ()> {
-        self.0.send((retry, freeze)).map_err(drop)
-    }
-}
-
-#[must_use]
-#[pin_project::pin_project]
-struct RequestWaiter(#[pin] Receiver<(bool, mpsc::Sender<FreezeUntil>)>);
-
-impl Future for RequestWaiter {
-    type Output = (bool, mpsc::Sender<FreezeUntil>);
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.project();
-        match this.0.poll(cx) {
-            Poll::Ready(Ok(ret)) => Poll::Ready(ret),
-            Poll::Ready(Err(_)) => panic!("`RequestLock` is dropped by the throttle worker"),
-            Poll::Pending => Poll::Pending,
-        }
-    }
-}
diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
new file mode 100644
index 00000000..424a6950
--- /dev/null
+++ b/src/adaptors/throttle/request.rs
@@ -0,0 +1,157 @@
+use std::{
+    future::Future,
+    pin::Pin,
+    sync::Arc,
+    time::{Duration, Instant},
+};
+
+use either::Either;
+use futures::{
+    future::BoxFuture,
+    task::{Context, Poll},
+};
+use tokio::sync::mpsc;
+
+use crate::{
+    adaptors::throttle::{channel, ChatIdHash, FreezeUntil, RequestLock},
+    errors::AsResponseParameters,
+    requests::{HasPayload, Output, Request},
+};
+
+#[must_use = "Requests are lazy and do nothing unless sent"]
+pub struct ThrottlingRequest<R: HasPayload> {
+    pub(super) request: Arc<R>,
+    pub(super) chat_id: fn(&R::Payload) -> ChatIdHash,
+    pub(super) worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
+}
+
+#[pin_project::pin_project]
+pub struct ThrottlingSend<R: Request>(#[pin] BoxFuture<'static, Result<Output<R>, R::Err>>);
+
+impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
+    type Payload = R::Payload;
+
+    /// Note that if this request was already executed via `send_ref` and it
+    /// didn't yet completed, this method will clone the underlying request
+    fn payload_mut(&mut self) -> &mut Self::Payload {
+        Arc::make_mut(&mut self.request).payload_mut()
+    }
+
+    fn payload_ref(&self) -> &Self::Payload {
+        self.request.payload_ref()
+    }
+}
+
+impl<R> Request for ThrottlingRequest<R>
+where
+    R: Request + Clone + Send + Sync + 'static, // TODO: rem static
+    R::Err: AsResponseParameters + Send,
+    Output<R>: Send,
+{
+    type Err = R::Err;
+    type Send = ThrottlingSend<R>;
+    type SendRef = ThrottlingSend<R>;
+
+    fn send(self) -> Self::Send {
+        let chat = (self.chat_id)(self.payload_ref());
+        let request = Either::from(Arc::try_unwrap(self.request));
+
+        ThrottlingSend(Box::pin(send(request, chat, self.worker)))
+    }
+
+    fn send_ref(&self) -> Self::SendRef {
+        let chat = (self.chat_id)(self.payload_ref());
+        let request = Either::Left(Arc::clone(&self.request));
+
+        ThrottlingSend(Box::pin(send(request, chat, self.worker.clone())))
+    }
+}
+
+impl<R: Request> Future for ThrottlingSend<R>
+where
+    R::Err: AsResponseParameters,
+{
+    type Output = Result<Output<R>, R::Err>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        self.as_mut().project().0.poll(cx)
+    }
+}
+
+/// Actual implementation of the `ThrottlingSend` future
+async fn send<R>(
+    request: Either<Arc<R>, R>,
+    chat: ChatIdHash,
+    worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
+) -> Result<Output<R>, R::Err>
+where
+    R: Request + Send + Sync + 'static,
+    R::Err: AsResponseParameters + Send,
+    Output<R>: Send,
+{
+    // We use option to `take` when sending by value.
+    //
+    // All unwraps down below will succed because we always return immediately after
+    // taking.
+    let mut request: Either<Arc<R>, Option<R>> = request.map_right(Some);
+
+    loop {
+        let (lock, wait) = channel();
+
+        // The worker is unlikely to drop queue before sending all requests,
+        // but just in case it has dropped the queue, we want to just send the
+        // request.
+        if let Err(_) = worker.send((chat, lock)).await {
+            return match &mut request {
+                Either::Left(shared) => shared.send_ref().await,
+                Either::Right(owned) => owned.take().unwrap().send().await,
+            };
+        };
+
+        let (retry, freeze) = wait.await;
+
+        let res = match (retry, &mut request) {
+            (true, request) => {
+                request
+                    .as_ref()
+                    .either(|r| &**r, |r| r.as_ref().unwrap())
+                    .send_ref()
+                    .await
+            }
+            (false, Either::Left(shared)) => shared.send_ref().await,
+            (false, Either::Right(owned)) => owned.take().unwrap().send().await,
+        };
+
+        let retry_after = res.as_ref().err().and_then(<_>::retry_after);
+        if let Some(retry_after) = retry_after {
+            let after = Duration::from_secs(retry_after.into());
+
+            if retry {
+                log::warn!("Freezing, before retrying: {}", retry_after);
+            }
+
+            let (lock, wait) = channel();
+
+            // Error here means that the worker died, so we can't really do anything about
+            // it
+            let _ = freeze
+                .send(FreezeUntil {
+                    until: Instant::now(), // TODO: this is obviously wrong
+                    after,
+                    chat,
+                    retry: Some(lock),
+                })
+                .await;
+
+            wait.await;
+        }
+
+        match res {
+            res @ Ok(_) => break res,
+            res @ Err(_) if !retry => break res,
+            Err(_) => {
+                // Next iteration will retry
+            }
+        };
+    }
+}
diff --git a/src/adaptors/throttle/request_lock.rs b/src/adaptors/throttle/request_lock.rs
new file mode 100644
index 00000000..e21093c2
--- /dev/null
+++ b/src/adaptors/throttle/request_lock.rs
@@ -0,0 +1,45 @@
+use std::pin::Pin;
+
+use futures::{
+    task::{Context, Poll},
+    Future,
+};
+use tokio::sync::{
+    mpsc,
+    oneshot::{self, Receiver, Sender},
+};
+
+use crate::adaptors::throttle::FreezeUntil;
+
+pub(super) fn channel() -> (RequestLock, RequestWaiter) {
+    let (tx, rx) = oneshot::channel();
+    let tx = RequestLock(tx);
+    let rx = RequestWaiter(rx);
+    (tx, rx)
+}
+
+#[must_use]
+pub(super) struct RequestLock(Sender<(bool, mpsc::Sender<FreezeUntil>)>);
+
+#[must_use]
+#[pin_project::pin_project]
+pub(super) struct RequestWaiter(#[pin] Receiver<(bool, mpsc::Sender<FreezeUntil>)>);
+
+impl RequestLock {
+    pub(super) fn unlock(self, retry: bool, freeze: mpsc::Sender<FreezeUntil>) -> Result<(), ()> {
+        self.0.send((retry, freeze)).map_err(drop)
+    }
+}
+
+impl Future for RequestWaiter {
+    type Output = (bool, mpsc::Sender<FreezeUntil>);
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        match this.0.poll(cx) {
+            Poll::Ready(Ok(ret)) => Poll::Ready(ret),
+            Poll::Ready(Err(_)) => panic!("`RequestLock` is dropped by the throttle worker"),
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
diff --git a/src/adaptors/throttle/requester_impl.rs b/src/adaptors/throttle/requester_impl.rs
new file mode 100644
index 00000000..a3c45e42
--- /dev/null
+++ b/src/adaptors/throttle/requester_impl.rs
@@ -0,0 +1,103 @@
+use std::sync::Arc;
+
+use url::Url;
+
+use crate::{
+    adaptors::{throttle::ThrottlingRequest, Throttle},
+    errors::AsResponseParameters,
+    requests::{HasPayload, Requester},
+    types::*,
+};
+
+macro_rules! f {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        ThrottlingRequest {
+            request: Arc::new($this.inner().$m($($arg),*)),
+            chat_id: |p| (&p.payload_ref().chat_id).into(),
+            worker: $this.queue.clone(),
+        }
+    };
+}
+
+macro_rules! fty {
+    ($T:ident) => {
+        ThrottlingRequest<B::$T>
+    };
+}
+
+macro_rules! fid {
+    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+        $this.inner().$m($($arg),*)
+    };
+}
+
+macro_rules! ftyid {
+    ($T:ident) => {
+        B::$T
+    };
+}
+
+impl<B: Requester> Requester for Throttle<B>
+where
+    B::Err: AsResponseParameters,
+
+    B::SendMessage: Clone + Send + Sync + 'static,
+    B::ForwardMessage: Clone + Send + Sync + 'static,
+    B::CopyMessage: Clone + Send + Sync + 'static,
+    B::SendPhoto: Clone + Send + Sync + 'static,
+    B::SendAudio: Clone + Send + Sync + 'static,
+    B::SendDocument: Clone + Send + Sync + 'static,
+    B::SendVideo: Clone + Send + Sync + 'static,
+    B::SendAnimation: Clone + Send + Sync + 'static,
+    B::SendVoice: Clone + Send + Sync + 'static,
+    B::SendVideoNote: Clone + Send + Sync + 'static,
+    B::SendMediaGroup: Clone + Send + Sync + 'static,
+    B::SendLocation: Clone + Send + Sync + 'static,
+    B::SendVenue: Clone + Send + Sync + 'static,
+    B::SendContact: Clone + Send + Sync + 'static,
+    B::SendPoll: Clone + Send + Sync + 'static,
+    B::SendDice: Clone + Send + Sync + 'static,
+    B::SendSticker: Clone + Send + Sync + 'static,
+    B::SendInvoice: Clone + Send + Sync + 'static,
+{
+    type Err = B::Err;
+
+    requester_forward! {
+        send_message, forward_message, copy_message, send_photo, send_audio,
+        send_document, send_video, send_animation, send_voice, send_video_note,
+        send_media_group, send_location, send_venue, send_contact, send_poll,
+        send_dice, send_sticker, send_invoice => f, fty
+    }
+
+    requester_forward! {
+        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
+        edit_message_live_location, edit_message_live_location_inline,
+        stop_message_live_location, stop_message_live_location_inline,
+        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, ban_chat_member,
+        unban_chat_member, restrict_chat_member, promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
+        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
+        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
+        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
+        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count,
+        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
+        answer_callback_query, set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
+        edit_message_text, edit_message_text_inline, edit_message_caption,
+        edit_message_caption_inline, edit_message_media, edit_message_media_inline,
+        edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
+        delete_message, get_sticker_set, upload_sticker_file, create_new_sticker_set,
+        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
+        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
+        set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
+        approve_chat_join_request, decline_chat_join_request,
+        get_game_high_scores => fid, ftyid
+    }
+}
+
+download_forward! {
+    'w
+    B
+    Throttle<B>
+    { this => this.inner() }
+}
diff --git a/src/adaptors/throttle/settings.rs b/src/adaptors/throttle/settings.rs
new file mode 100644
index 00000000..82ef7e4a
--- /dev/null
+++ b/src/adaptors/throttle/settings.rs
@@ -0,0 +1,105 @@
+use std::pin::Pin;
+
+use futures::{future::ready, Future};
+
+// Required to not trigger `clippy::type-complexity` lint
+type BoxedFnMut<I, O> = Box<dyn FnMut(I) -> O + Send>;
+type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
+
+/// Settings used by [`Throttle`] adaptor.
+///
+/// ## Examples
+///
+/// ```
+/// use teloxide_core::adaptors::throttle;
+///
+/// let settings = throttle::Settings::default()
+///     .on_queue_full(|pending| async move { /* do something when internal queue is full */ });
+/// // use settings in `Throttle::with_settings` or other constructors
+/// # let _ = settings;
+/// ```
+#[non_exhaustive]
+pub struct Settings {
+    pub limits: Limits,
+    pub on_queue_full: BoxedFnMut<usize, BoxedFuture>,
+    pub retry: bool,
+    pub check_slow_mode: bool,
+}
+
+/// Telegram request limits.
+///
+/// This struct is used in [`Throttle`].
+///
+/// Note that you may ask telegram [@BotSupport] to increase limits for your
+/// particular bot if it has a lot of users (but they may or may not do that).
+///
+/// [@BotSupport]: https://t.me/botsupport
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+pub struct Limits {
+    /// Allowed messages in one chat per second.
+    pub messages_per_sec_chat: u32,
+
+    /// Allowed messages in one chat per minute.
+    pub messages_per_min_chat: u32,
+
+    /// Allowed messages in one channel per minute.
+    pub messages_per_min_channel: u32,
+
+    /// Allowed messages per second.
+    pub messages_per_sec_overall: u32,
+}
+
+impl Settings {
+    pub fn limits(mut self, val: Limits) -> Self {
+        self.limits = val;
+        self
+    }
+
+    pub fn on_queue_full<F, Fut>(mut self, mut val: F) -> Self
+    where
+        F: FnMut(usize) -> Fut + Send + 'static,
+        Fut: Future<Output = ()> + Send + 'static,
+    {
+        self.on_queue_full = Box::new(move |pending| Box::pin(val(pending)));
+        self
+    }
+
+    pub fn no_retry(mut self) -> Self {
+        self.retry = false;
+        self
+    }
+
+    pub fn check_slow_mode(mut self) -> Self {
+        self.check_slow_mode = true;
+        self
+    }
+}
+
+impl Default for Settings {
+    fn default() -> Self {
+        Self {
+            limits: <_>::default(),
+            on_queue_full: Box::new(|pending| {
+                log::warn!("Throttle queue is full ({} pending requests)", pending);
+                Box::pin(ready(()))
+            }),
+            retry: true,
+            check_slow_mode: false,
+        }
+    }
+}
+
+/// Defaults are taken from [telegram documentation][tgdoc] (except for
+/// `messages_per_min_channel`).
+///
+/// [tgdoc]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
+impl Default for Limits {
+    fn default() -> Self {
+        Self {
+            messages_per_sec_chat: 1,
+            messages_per_sec_overall: 30,
+            messages_per_min_chat: 20,
+            messages_per_min_channel: 10,
+        }
+    }
+}
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
new file mode 100644
index 00000000..eae5961f
--- /dev/null
+++ b/src/adaptors/throttle/worker.rs
@@ -0,0 +1,401 @@
+use std::{
+    collections::{hash_map::Entry, HashMap, VecDeque},
+    time::{Duration, Instant},
+};
+
+use tokio::sync::{mpsc, mpsc::error::TryRecvError, oneshot::Sender};
+use vecrem::VecExt;
+
+use crate::{
+    adaptors::throttle::{request_lock::RequestLock, ChatIdHash, Limits, Settings},
+    errors::AsResponseParameters,
+    requests::{Request, Requester},
+};
+
+const MINUTE: Duration = Duration::from_secs(60);
+const SECOND: Duration = Duration::from_secs(1);
+
+// Delay between worker iterations.
+//
+// For now it's `second/4`, but that number is chosen pretty randomly, we may
+// want to change this.
+const DELAY: Duration = Duration::from_millis(250);
+
+/// Minimal time beetween calls to queue_full function
+const QUEUE_FULL_DELAY: Duration = Duration::from_secs(4);
+
+#[derive(Debug)]
+pub(super) enum InfoMessage {
+    GetLimits { response: Sender<Limits> },
+    SetLimits { new: Limits, response: Sender<()> },
+}
+
+type RequestsSent = u32;
+
+// I wish there was special data structure for history which removed the
+// need in 2 hashmaps
+// (waffle)
+#[derive(Default)]
+struct RequestsSentToChats {
+    per_min: HashMap<ChatIdHash, RequestsSent>,
+    per_sec: HashMap<ChatIdHash, RequestsSent>,
+}
+
+pub(super) struct FreezeUntil {
+    pub(super) until: Instant,
+    pub(super) after: Duration,
+    pub(super) chat: ChatIdHash,
+    pub(super) retry: Option<RequestLock>,
+}
+
+// Throttling is quite complicated. This comment describes the algorithm of the
+// current implementation.
+//
+// ### Request
+//
+// When a throttling request is sent, it sends a tuple of `ChatId` and
+// `Sender<()>` to the worker. Then the request waits for a notification from
+// the worker. When notification is received, it sends the underlying request.
+//
+// ### Worker
+//
+// The worker does the most important job -- it ensures that the limits are
+// never exceeded.
+//
+// The worker stores a history of requests sent in the last minute (and to which
+// chats they were sent) and a queue of pending updates.
+//
+// The worker does the following algorithm loop:
+//
+// 1. If the queue is empty, wait for the first message in incoming channel (and
+// add it to the queue).
+//
+// 2. Read all present messages from an incoming channel and transfer them to
+// the queue.
+//
+// 3. Record the current time.
+//
+// 4. Clear the history from records whose time < (current time - minute).
+//
+// 5. Count all requests which were sent last second, `allowed =
+// limit.messages_per_sec_overall - count`.
+//
+// 6. If `allowed == 0` wait a bit and `continue` to the next iteration.
+//
+// 7. Count how many requests were sent to which chats (i.e.: create
+// `Map<ChatId, Count>`). (Note: the same map, but for last minute also exists,
+// but it's updated, instead of recreation.)
+//
+// 8. While `allowed >= 0` search for requests which chat haven't exceed the
+// limits (i.e.: map[chat] < limit), if one is found, decrease `allowed`, notify
+// the request that it can be now executed, increase counts, add record to the
+// history.
+pub(super) async fn worker<B>(
+    Settings {
+        mut limits,
+        mut on_queue_full,
+        retry,
+        check_slow_mode,
+    }: Settings,
+    mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
+    mut info_rx: mpsc::Receiver<InfoMessage>,
+    bot: B,
+) where
+    B: Requester,
+    B::Err: AsResponseParameters,
+{
+    // FIXME(waffle): Make an research about data structures for this queue.
+    //                Currently this is O(n) removing (n = number of elements
+    //                stayed), amortized O(1) push (vec+vecrem).
+    let mut queue: Vec<(ChatIdHash, RequestLock)> =
+        Vec::with_capacity(limits.messages_per_sec_overall as usize);
+
+    let mut history: VecDeque<(ChatIdHash, Instant)> = VecDeque::new();
+    let mut requests_sent = RequestsSentToChats::default();
+
+    let mut slow_mode: Option<HashMap<ChatIdHash, (Duration, Instant)>> =
+        check_slow_mode.then(HashMap::new);
+
+    let mut rx_is_closed = false;
+
+    let mut last_queue_full = Instant::now()
+        .checked_sub(QUEUE_FULL_DELAY)
+        .unwrap_or_else(Instant::now);
+
+    let (freeze_tx, mut freeze_rx) = mpsc::channel::<FreezeUntil>(1);
+
+    while !rx_is_closed || !queue.is_empty() {
+        // FIXME(waffle):
+        // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
+        //    execution untill a request is sent. While the execution is 'blocked' no
+        //    `InfoMessage`s could be answered.
+        //
+        // 2. If limits are descreased, ideally we want to shrink queue.
+        //
+        // *blocked in asyncronous way
+        answer_info(&mut info_rx, &mut limits);
+
+        freeze(
+            &mut freeze_rx,
+            &freeze_tx,
+            slow_mode.as_mut(),
+            &mut queue,
+            &bot,
+            None,
+        )
+        .await;
+
+        loop {
+            tokio::select! {
+                () = read_from_rx(&mut rx, &mut queue, &mut rx_is_closed) => break,
+                freeze_until = freeze_rx.recv() => {
+                    freeze(
+                        &mut freeze_rx,
+                        &freeze_tx,
+                        slow_mode.as_mut(),
+                        &mut queue,
+                        &bot,
+                        freeze_until
+                    )
+                    .await;
+                },
+            }
+        }
+        //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
+
+        if queue.len() == queue.capacity() && last_queue_full.elapsed() > QUEUE_FULL_DELAY {
+            last_queue_full = Instant::now();
+            tokio::spawn(on_queue_full(queue.len()));
+        }
+
+        // _Maybe_ we need to use `spawn_blocking` here, because there is
+        // decent amount of blocking work. However _for now_ I've decided not
+        // to use it here.
+        //
+        // Reasons (not to use `spawn_blocking`):
+        //
+        // 1. The work seems not very CPU-bound, it's not heavy computations,
+        //    it's more like light computations.
+        //
+        // 2. `spawn_blocking` is not zero-cost — it spawns a new system thread
+        //    + do so other work. This may actually be *worse* then current
+        //    "just do everything in this async fn" approach.
+        //
+        // 3. With `rt-threaded` feature, tokio uses [`num_cpus()`] threads
+        //    which should be enough to work fine with one a-bit-blocking task.
+        //    Crucially current behaviour will be problem mostly with
+        //    single-threaded runtimes (and in case you're using one, you
+        //    probably don't want to spawn unnecessary threads anyway).
+        //
+        // I think if we'll ever change this behaviour, we need to make it
+        // _configurable_.
+        //
+        // See also [discussion (ru)].
+        //
+        // NOTE: If you are reading this because you have any problems because
+        // of this worker, open an [issue on github]
+        //
+        // [`num_cpus()`]: https://vee.gg/JGwq2
+        // [discussion (ru)]: https://t.me/rust_async/27891
+        // [issue on github]: https://github.com/teloxide/teloxide/issues/new
+        //
+        // (waffle)
+
+        let now = Instant::now();
+        let min_back = now - MINUTE;
+        let sec_back = now - SECOND;
+
+        // make history and hchats up-to-date
+        while let Some((_, time)) = history.front() {
+            // history is sorted, we found first up-to-date thing
+            if time >= &min_back {
+                break;
+            }
+
+            if let Some((chat, _)) = history.pop_front() {
+                let entry = requests_sent.per_min.entry(chat).and_modify(|count| {
+                    *count -= 1;
+                });
+
+                if let Entry::Occupied(entry) = entry {
+                    if *entry.get() == 0 {
+                        entry.remove_entry();
+                    }
+                }
+            }
+        }
+
+        // as truncates which is ok since in case of truncation it would always be >=
+        // limits.overall_s
+        let used = history
+            .iter()
+            .take_while(|(_, time)| time > &sec_back)
+            .count() as u32;
+        let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
+
+        if allowed == 0 {
+            requests_sent.per_sec.clear();
+            tokio::time::sleep(DELAY).await;
+            continue;
+        }
+
+        for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
+            *requests_sent.per_sec.entry(*chat).or_insert(0) += 1;
+        }
+
+        let mut queue_removing = queue.removing();
+
+        while let Some(entry) = queue_removing.next() {
+            let chat = &entry.value().0;
+
+            let slow_mode = slow_mode.as_mut().and_then(|sm| sm.get_mut(chat));
+
+            if let Some(&mut (delay, last)) = slow_mode {
+                if last + delay > Instant::now() {
+                    continue;
+                }
+            }
+
+            let requests_sent_per_sec_count = requests_sent.per_sec.get(chat).copied().unwrap_or(0);
+            let requests_sent_per_min_count = requests_sent.per_min.get(chat).copied().unwrap_or(0);
+
+            let messages_per_min_limit = if chat.is_channel() {
+                limits.messages_per_min_channel
+            } else {
+                limits.messages_per_min_chat
+            };
+
+            let limits_not_exceeded = requests_sent_per_sec_count < limits.messages_per_sec_chat
+                && requests_sent_per_min_count < messages_per_min_limit;
+
+            if limits_not_exceeded {
+                // Unlock the associated request.
+
+                let chat = *chat;
+                let (_, lock) = entry.remove();
+
+                // Only count request as sent if the request wasn't dropped before unlocked
+                if lock.unlock(retry, freeze_tx.clone()).is_ok() {
+                    *requests_sent.per_sec.entry(chat).or_insert(0) += 1;
+                    *requests_sent.per_min.entry(chat).or_insert(0) += 1;
+                    history.push_back((chat, Instant::now()));
+
+                    if let Some((_, last)) = slow_mode {
+                        *last = Instant::now();
+                    }
+
+                    // We have "sent" one request, so now we can send one less.
+                    allowed -= 1;
+                    if allowed == 0 {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // It's easier to just recompute last second stats, instead of keeping
+        // track of it alongside with minute stats, so we just throw this away.
+        requests_sent.per_sec.clear();
+        tokio::time::sleep(DELAY).await;
+    }
+}
+
+fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
+    while let Ok(req) = rx.try_recv() {
+        // Errors are ignored with .ok(). Error means that the response channel
+        // is closed and the response isn't needed.
+        match req {
+            InfoMessage::GetLimits { response } => response.send(*limits).ok(),
+            InfoMessage::SetLimits { new, response } => {
+                *limits = new;
+                response.send(()).ok()
+            }
+        };
+    }
+}
+
+async fn freeze(
+    rx: &mut mpsc::Receiver<FreezeUntil>,
+    tx: &mpsc::Sender<FreezeUntil>,
+    mut slow_mode: Option<&mut HashMap<ChatIdHash, (Duration, Instant)>>,
+    queue: &mut Vec<(ChatIdHash, RequestLock)>,
+    bot: &impl Requester,
+    mut imm: Option<FreezeUntil>,
+) {
+    while let Some(freeze_until) = imm.take().or_else(|| rx.try_recv().ok()) {
+        let FreezeUntil {
+            until,
+            after,
+            chat,
+            mut retry,
+        } = freeze_until;
+
+        if let Some(slow_mode) = slow_mode.as_deref_mut() {
+            // TODO: do something with channels?...
+            if let hash @ ChatIdHash::Id(id) = chat {
+                // TODO: maybe not call `get_chat` every time?
+
+                // At this point there isn't much we can do with the error besides ignoring
+                if let Ok(chat) = bot.get_chat(id).send().await {
+                    match chat.slow_mode_delay() {
+                        Some(delay) => {
+                            let now = Instant::now();
+                            let new_delay = Duration::from_secs(delay.into());
+                            slow_mode.insert(hash, (new_delay, now));
+                        }
+                        None => {
+                            slow_mode.remove(&hash);
+                        }
+                    };
+                }
+            }
+        }
+
+        // slow mode is enabled and it is <= to the delay asked by telegram
+        let slow_mode_enabled_and_likely_the_cause = slow_mode
+            .as_ref()
+            .and_then(|m| m.get(&chat).map(|(delay, _)| delay <= &after))
+            .unwrap_or(false);
+
+        // Do not sleep if slow mode is enabled since the freeze is most likely caused
+        // by the said slow mode and not by the global limits.
+        if slow_mode_enabled_and_likely_the_cause {
+            queue.extend(Some(chat).zip(retry.take()));
+        } else {
+            log::warn!(
+                "freezing the bot for approximately {:?} due to `RetryAfter` error from telegram",
+                after
+            );
+
+            tokio::time::sleep_until(until.into()).await;
+
+            log::warn!("unfreezing the bot");
+
+            if let Some(lock) = retry {
+                // Since we are already retrying the request, retries are obviously turned on.
+                let retry = true;
+                let _ = lock.unlock(retry, tx.clone());
+            }
+        }
+    }
+}
+
+async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
+    if queue.is_empty() {
+        log::warn!("A-blocking on queue");
+        match rx.recv().await {
+            Some(req) => queue.push(req),
+            None => *rx_is_closed = true,
+        }
+    }
+
+    // Don't grow queue bigger than the capacity to limit DOS posibility
+    while queue.len() < queue.capacity() {
+        match rx.try_recv() {
+            Ok(req) => queue.push(req),
+            Err(TryRecvError::Disconnected) => *rx_is_closed = true,
+            // There are no items in queue.
+            Err(TryRecvError::Empty) => break,
+        }
+    }
+}

From dcbef82e43120c23120e7eff9e0451d78d87d7bc Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Feb 2022 18:51:04 +0300
Subject: [PATCH 552/755] Cleanup `throttling::request`

---
 src/adaptors/throttle/request.rs | 82 +++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index 424a6950..49ba02c3 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -5,7 +5,6 @@ use std::{
     time::{Duration, Instant},
 };
 
-use either::Either;
 use futures::{
     future::BoxFuture,
     task::{Context, Poll},
@@ -18,6 +17,7 @@ use crate::{
     requests::{HasPayload, Output, Request},
 };
 
+/// Request returned by [`Throttling`](crate::adaptors::Throttle) methods.
 #[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct ThrottlingRequest<R: HasPayload> {
     pub(super) request: Arc<R>,
@@ -25,14 +25,21 @@ pub struct ThrottlingRequest<R: HasPayload> {
     pub(super) worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
 }
 
+/// Future returned by [`ThrottlingRequest`]s.
 #[pin_project::pin_project]
 pub struct ThrottlingSend<R: Request>(#[pin] BoxFuture<'static, Result<Output<R>, R::Err>>);
 
+enum ShareableRequest<R> {
+    Shared(Arc<R>),
+    // Option is used to `take` ownership
+    Owned(Option<R>),
+}
+
 impl<R: HasPayload + Clone> HasPayload for ThrottlingRequest<R> {
     type Payload = R::Payload;
 
     /// Note that if this request was already executed via `send_ref` and it
-    /// didn't yet completed, this method will clone the underlying request
+    /// didn't yet completed, this method will clone the underlying request.
     fn payload_mut(&mut self) -> &mut Self::Payload {
         Arc::make_mut(&mut self.request).payload_mut()
     }
@@ -54,16 +61,21 @@ where
 
     fn send(self) -> Self::Send {
         let chat = (self.chat_id)(self.payload_ref());
-        let request = Either::from(Arc::try_unwrap(self.request));
+        let request = match Arc::try_unwrap(self.request) {
+            Ok(owned) => ShareableRequest::Owned(Some(owned)),
+            Err(shared) => ShareableRequest::Shared(shared),
+        };
+        let fut = send(request, chat, self.worker);
 
-        ThrottlingSend(Box::pin(send(request, chat, self.worker)))
+        ThrottlingSend(Box::pin(fut))
     }
 
     fn send_ref(&self) -> Self::SendRef {
         let chat = (self.chat_id)(self.payload_ref());
-        let request = Either::Left(Arc::clone(&self.request));
+        let request = ShareableRequest::Shared(Arc::clone(&self.request));
+        let fut = send(request, chat, self.worker.clone());
 
-        ThrottlingSend(Box::pin(send(request, chat, self.worker.clone())))
+        ThrottlingSend(Box::pin(fut))
     }
 }
 
@@ -80,7 +92,7 @@ where
 
 /// Actual implementation of the `ThrottlingSend` future
 async fn send<R>(
-    request: Either<Arc<R>, R>,
+    mut request: ShareableRequest<R>,
     chat: ChatIdHash,
     worker: mpsc::Sender<(ChatIdHash, RequestLock)>,
 ) -> Result<Output<R>, R::Err>
@@ -89,11 +101,10 @@ where
     R::Err: AsResponseParameters + Send,
     Output<R>: Send,
 {
-    // We use option to `take` when sending by value.
+    // We use option in `ShareableRequest` to `take` when sending by value.
     //
     // All unwraps down below will succed because we always return immediately after
     // taking.
-    let mut request: Either<Arc<R>, Option<R>> = request.map_right(Some);
 
     loop {
         let (lock, wait) = channel();
@@ -102,29 +113,36 @@ where
         // but just in case it has dropped the queue, we want to just send the
         // request.
         if let Err(_) = worker.send((chat, lock)).await {
-            return match &mut request {
-                Either::Left(shared) => shared.send_ref().await,
-                Either::Right(owned) => owned.take().unwrap().send().await,
+            log::error!("Worker dropped the queue before sending all requests");
+
+            let res = match &mut request {
+                ShareableRequest::Shared(shared) => shared.send_ref().await,
+                ShareableRequest::Owned(owned) => owned.take().unwrap().send().await,
             };
+
+            return res;
         };
 
         let (retry, freeze) = wait.await;
 
         let res = match (retry, &mut request) {
+            // Retries are turned on, use `send_ref` even if we have owned access
             (true, request) => {
-                request
-                    .as_ref()
-                    .either(|r| &**r, |r| r.as_ref().unwrap())
-                    .send_ref()
-                    .await
+                let request = match request {
+                    ShareableRequest::Shared(shared) => &**shared,
+                    ShareableRequest::Owned(owned) => owned.as_ref().unwrap(),
+                };
+
+                request.send_ref().await
             }
-            (false, Either::Left(shared)) => shared.send_ref().await,
-            (false, Either::Right(owned)) => owned.take().unwrap().send().await,
+            (false, ShareableRequest::Shared(shared)) => shared.send_ref().await,
+            (false, ShareableRequest::Owned(owned)) => owned.take().unwrap().send().await,
         };
 
         let retry_after = res.as_ref().err().and_then(<_>::retry_after);
         if let Some(retry_after) = retry_after {
             let after = Duration::from_secs(retry_after.into());
+            let until = Instant::now() + after;
 
             if retry {
                 log::warn!("Freezing, before retrying: {}", retry_after);
@@ -132,26 +150,34 @@ where
 
             let (lock, wait) = channel();
 
-            // Error here means that the worker died, so we can't really do anything about
-            // it
-            let _ = freeze
+            let r = freeze
                 .send(FreezeUntil {
-                    until: Instant::now(), // TODO: this is obviously wrong
+                    until,
                     after,
                     chat,
                     retry: Some(lock),
                 })
                 .await;
 
-            wait.await;
+            if retry {
+                match r {
+                    Ok(()) => {
+                        // TODO: do we need `_retry` or `_freeze_tx`?
+                        let (_retry, _freeze_tx) = wait.await;
+                    }
+                    // The worker has died, sleep until we may retry
+                    Err(_) => {
+                        log::error!("Worker has died while request w");
+                        tokio::time::sleep_until(until.into()).await;
+                    }
+                }
+            }
         }
 
         match res {
             res @ Ok(_) => break res,
-            res @ Err(_) if !retry => break res,
-            Err(_) => {
-                // Next iteration will retry
-            }
+            Err(_) if retry && retry_after.is_some() => continue,
+            res @ Err(_) => break res,
         };
     }
 }

From ed48de2f751c4a321d41e30e376fde1a4418a693 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Feb 2022 22:11:47 +0300
Subject: [PATCH 553/755] Simplify freezing

---
 src/adaptors/throttle/request.rs  | 33 ++++++------------------------
 src/adaptors/throttle/settings.rs |  1 +
 src/adaptors/throttle/worker.rs   | 34 +++----------------------------
 3 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index 49ba02c3..c400f282 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -144,40 +144,19 @@ where
             let after = Duration::from_secs(retry_after.into());
             let until = Instant::now() + after;
 
+            // If we'll retry, we check that worker hasn't died at the start of the loop
+            // otherwise we don't care if the worker is alive or not
+            let _ = freeze.send(FreezeUntil { until, after, chat }).await;
+
             if retry {
                 log::warn!("Freezing, before retrying: {}", retry_after);
-            }
-
-            let (lock, wait) = channel();
-
-            let r = freeze
-                .send(FreezeUntil {
-                    until,
-                    after,
-                    chat,
-                    retry: Some(lock),
-                })
-                .await;
-
-            if retry {
-                match r {
-                    Ok(()) => {
-                        // TODO: do we need `_retry` or `_freeze_tx`?
-                        let (_retry, _freeze_tx) = wait.await;
-                    }
-                    // The worker has died, sleep until we may retry
-                    Err(_) => {
-                        log::error!("Worker has died while request w");
-                        tokio::time::sleep_until(until.into()).await;
-                    }
-                }
+                tokio::time::sleep_until(until.into()).await;
             }
         }
 
         match res {
-            res @ Ok(_) => break res,
             Err(_) if retry && retry_after.is_some() => continue,
-            res @ Err(_) => break res,
+            res => break res,
         };
     }
 }
diff --git a/src/adaptors/throttle/settings.rs b/src/adaptors/throttle/settings.rs
index 82ef7e4a..a1829cc1 100644
--- a/src/adaptors/throttle/settings.rs
+++ b/src/adaptors/throttle/settings.rs
@@ -15,6 +15,7 @@ type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
 ///
 /// let settings = throttle::Settings::default()
 ///     .on_queue_full(|pending| async move { /* do something when internal queue is full */ });
+///
 /// // use settings in `Throttle::with_settings` or other constructors
 /// # let _ = settings;
 /// ```
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index eae5961f..85bca5bd 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -45,7 +45,6 @@ pub(super) struct FreezeUntil {
     pub(super) until: Instant,
     pub(super) after: Duration,
     pub(super) chat: ChatIdHash,
-    pub(super) retry: Option<RequestLock>,
 }
 
 // Throttling is quite complicated. This comment describes the algorithm of the
@@ -135,30 +134,18 @@ pub(super) async fn worker<B>(
         // *blocked in asyncronous way
         answer_info(&mut info_rx, &mut limits);
 
-        freeze(
-            &mut freeze_rx,
-            &freeze_tx,
-            slow_mode.as_mut(),
-            &mut queue,
-            &bot,
-            None,
-        )
-        .await;
-
         loop {
             tokio::select! {
-                () = read_from_rx(&mut rx, &mut queue, &mut rx_is_closed) => break,
                 freeze_until = freeze_rx.recv() => {
                     freeze(
                         &mut freeze_rx,
-                        &freeze_tx,
                         slow_mode.as_mut(),
-                        &mut queue,
                         &bot,
                         freeze_until
                     )
                     .await;
                 },
+                () = read_from_rx(&mut rx, &mut queue, &mut rx_is_closed) => break,
             }
         }
         //debug_assert_eq!(queue.capacity(), limits.messages_per_sec_overall as usize);
@@ -316,19 +303,12 @@ fn answer_info(rx: &mut mpsc::Receiver<InfoMessage>, limits: &mut Limits) {
 
 async fn freeze(
     rx: &mut mpsc::Receiver<FreezeUntil>,
-    tx: &mpsc::Sender<FreezeUntil>,
     mut slow_mode: Option<&mut HashMap<ChatIdHash, (Duration, Instant)>>,
-    queue: &mut Vec<(ChatIdHash, RequestLock)>,
     bot: &impl Requester,
     mut imm: Option<FreezeUntil>,
 ) {
     while let Some(freeze_until) = imm.take().or_else(|| rx.try_recv().ok()) {
-        let FreezeUntil {
-            until,
-            after,
-            chat,
-            mut retry,
-        } = freeze_until;
+        let FreezeUntil { until, after, chat } = freeze_until;
 
         if let Some(slow_mode) = slow_mode.as_deref_mut() {
             // TODO: do something with channels?...
@@ -359,9 +339,7 @@ async fn freeze(
 
         // Do not sleep if slow mode is enabled since the freeze is most likely caused
         // by the said slow mode and not by the global limits.
-        if slow_mode_enabled_and_likely_the_cause {
-            queue.extend(Some(chat).zip(retry.take()));
-        } else {
+        if !slow_mode_enabled_and_likely_the_cause {
             log::warn!(
                 "freezing the bot for approximately {:?} due to `RetryAfter` error from telegram",
                 after
@@ -370,12 +348,6 @@ async fn freeze(
             tokio::time::sleep_until(until.into()).await;
 
             log::warn!("unfreezing the bot");
-
-            if let Some(lock) = retry {
-                // Since we are already retrying the request, retries are obviously turned on.
-                let retry = true;
-                let _ = lock.unlock(retry, tx.clone());
-            }
         }
     }
 }

From d259f8aa23dd6b99f6850a6a37e0a90a47407176 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Feb 2022 22:27:25 +0300
Subject: [PATCH 554/755] Add diargam explaining how `ThrottlingRequest` works

https://asciiflow.com/#/share/eJzFV71u2zAQfhWCkx0EDdqhRbUEGbpmCLoE0BBCpiPBEplSFBwhCFoEHTt0MNw%2BRKeMRZ9GT9KjrB8ykhj9pRUIWTR1d9%2Fdfcej7jAjEcUOS8LwGIckpQI7%2BM7Fty523r9%2Be%2BziFJ7evFNPkt5KmLj45AT1vrLdH9dlXRIffcGlDAN2fUE%2FJTSWBwm4b7nYULFYWoSHm4PVoaMENELUMgqM41Xsf8NdFDELYhRTJk20MaVFENGKe0kELxAZcHZ4a%2BL1uXZg9jATtkIejxTgGK25QBEX1Eit3QVztdQaMFAV5RFAMHy%2BRYEconXfppV4MiFhmOaRjo3157T2CQl6YfKNVIwKgkGiQu5tdKymbp%2FEFQcDujpV4j%2B%2BVnokL1ZbCe78Q196Z0Lng5Hhp3nuyvvkfBpWL1sodW53w0CRT44ich14R%2B3M7fKjq87m8cusNsNqsw712XA%2B1IEbRx0Tm2k%2FL5GAMeB%2FbWlLYONR%2B1pRGZqmOYKX1X2hBpjlxQY7FWx7ChQ0XCVY1qJTPaErVdGvEqZ%2BFsurSTGVPnSmBpjZPG0SYFIi7Zp7Ua5JUAtxTblubKNDZfUvp4lMBCttaFytUmaTjZNQlrJ5y%2Fapt4GeqjJerf1%2FPyHuj9qPkb4medo5oE8%2FCLG4oFKkZ2sJ51O2XD4vScOYTrHZTiGr7EwBtlnRcRA4oQGdREBjOF2dDpB8EURd3bhVss84r4zX12W7RuulJzfbfct2X0aN74Ns7nWbD%2Fl%2FT1r%2BQ7e%2B6fWobrtuX35ZPf15QDbCLOMyWKdlk5U%2B0b%2BPtOA8VhYUgdNy81OqtKNqXfKICgHNW4M06Kg6whN1ivbJzQ1ldKXTKOv%2B1p2etRHf3fge3%2F8FrCjqXw%3D%3D)
---
 src/adaptors/throttle/request.rs | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index c400f282..a1a78afd 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -90,6 +90,53 @@ where
     }
 }
 
+// This diagram explains how `ThrottlingRequest` works/what `send` does
+//
+//                                          │
+//                      ThrottlingRequest   │   worker()
+//                                          │
+//                      ┌───────────────┐   │  ┌────────────────────────┐
+//  ┌──────────────────►│request is sent│   │  │see worker documentation│
+//  │                   └───────┬───────┘   │  │and comments for more   │
+//  │                           │           │  │information on how it   │
+//  │                           ▼           │  │actually works          │
+//  │                      ┌─────────┐      │  └────────────────────────┘
+//  │ ┌────────────────┐   │send lock│      │
+//  │ │has worker died?│◄──┤to worker├─────►:───────────┐
+//  │ └─┬─────────────┬┘   └─────────┘      │           ▼
+//  │   │             │                     │  ┌──────────────────┐
+//  │   Y             └─N───────┐           │  │     *magic*      │
+//  │   │                       │           │  └────────┬─────────┘
+//  │   ▼                       ▼           │           │
+//  │ ┌───────────┐    ┌────────────────┐   │           ▼
+//  │ │send inner │    │wait for worker │   │  ┌─────────────────┐
+//  │ │request    │    │to allow sending│◄──:◄─┤ `lock.unlock()` │
+//  │ └───┬───────┘    │this request    │   │  └─────────────────┘
+//  │     │            └────────┬───────┘   │
+//  │     │                     │           │
+//  │     ▼                     ▼           │
+//  │    ┌──────┐  ┌────────────────────┐   │
+//  │    │return│  │send inner request  │   │
+//  │    │result│  │and check its result│   │
+//  │    └──────┘  └─┬─────────┬────────┘   │
+//  │     ▲    ▲     │         │            │
+//  │     │    │     │ Err(RetryAfter(n))   │
+//  │     │    │   else        │            │
+//  │     │    │     │         ▼            │
+//  │     │    └─────┘  ┌───────────────┐   │
+//  │     │             │are retries on?│   │
+//  │     │             └┬─────────────┬┘   │
+//  │     │              │             │    │
+//  │     └────────────N─┘             Y    │
+//  │                                  │    │  ┌──────────────────┐
+//  │                                  ▼    │  │     *magic*      │
+//  │                ┌──────────────────┐   │  └──────────────────┘
+// ┌┴────────────┐   │notify worker that│   │           ▲
+// │retry request│◄──┤RetryAfter error  ├──►:───────────┘
+// └─────────────┘   │has happened      │   │
+//                   └──────────────────┘   │
+//                                          │
+
 /// Actual implementation of the `ThrottlingSend` future
 async fn send<R>(
     mut request: ShareableRequest<R>,

From af0dd99ef48f9035418a8ed6ca94759595337736 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Apr 2022 18:46:52 +0400
Subject: [PATCH 555/755] Use `Duration` instead of `u32` as the `RetryAfter`
 field

---
 CHANGELOG.md                     |  2 +-
 src/adaptors/throttle/request.rs | 11 ++-----
 src/errors.rs                    |  8 ++---
 src/types.rs                     | 50 ++++++++++++++++++++++++++++++++
 src/types/response_parameters.rs |  6 ++--
 5 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d819d83..5afb3b4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve `Throttling` adoptor
   - Freeze when getting `RetryAfter(_)` error
   - Retry requests that previously returned `RetryAfter(_)` error
-- `RequestError::RetryAfter` now has a `u32` field instead of `i32`
+- `RequestError::RetryAfter` now has a `Duration` field instead of `i32`
 
 ### Added
 
diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index a1a78afd..c109b178 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -1,9 +1,4 @@
-use std::{
-    future::Future,
-    pin::Pin,
-    sync::Arc,
-    time::{Duration, Instant},
-};
+use std::{future::Future, pin::Pin, sync::Arc, time::Instant};
 
 use futures::{
     future::BoxFuture,
@@ -188,7 +183,7 @@ where
 
         let retry_after = res.as_ref().err().and_then(<_>::retry_after);
         if let Some(retry_after) = retry_after {
-            let after = Duration::from_secs(retry_after.into());
+            let after = retry_after;
             let until = Instant::now() + after;
 
             // If we'll retry, we check that worker hasn't died at the start of the loop
@@ -196,7 +191,7 @@ where
             let _ = freeze.send(FreezeUntil { until, after, chat }).await;
 
             if retry {
-                log::warn!("Freezing, before retrying: {}", retry_after);
+                log::warn!("Freezing, before retrying: {:?}", retry_after);
                 tokio::time::sleep_until(until.into()).await;
             }
         }
diff --git a/src/errors.rs b/src/errors.rs
index 2ed570db..5d8c4c1b 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,4 +1,4 @@
-use std::io;
+use std::{io, time::Duration};
 
 use serde::Deserialize;
 use thiserror::Error;
@@ -19,8 +19,8 @@ pub enum RequestError {
 
     /// In case of exceeding flood control, the number of seconds left to wait
     /// before the request can be repeated.
-    #[error("Retry after {0} seconds")]
-    RetryAfter(u32),
+    #[error("Retry after {0:?}")]
+    RetryAfter(Duration),
 
     /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
@@ -62,7 +62,7 @@ pub enum DownloadError {
 pub trait AsResponseParameters {
     fn response_parameters(&self) -> Option<ResponseParameters>;
 
-    fn retry_after(&self) -> Option<u32> {
+    fn retry_after(&self) -> Option<Duration> {
         self.response_parameters().and_then(|rp| match rp {
             ResponseParameters::RetryAfter(n) => Some(n),
             _ => None,
diff --git a/src/types.rs b/src/types.rs
index ea1f33c0..e544656c 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -345,3 +345,53 @@ pub(crate) mod option_url_from_string {
         }
     }
 }
+
+pub(crate) mod duration_secs {
+    use std::time::Duration;
+
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    pub(crate) fn serialize<S>(this: &Duration, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        // match this {
+        //     Some(url) => url.serialize(serializer),
+        //     None => "".serialize(serializer),
+        // }
+        this.as_secs().serialize(serializer)
+    }
+
+    pub(crate) fn deserialize<'de, D>(deserializer: D) -> Result<Duration, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        u64::deserialize(deserializer).map(Duration::from_secs)
+    }
+
+    #[test]
+    fn test() {
+        #[derive(Serialize, Deserialize)]
+        struct Struct {
+            #[serde(with = "crate::types::duration_secs")]
+            duration: Duration,
+        }
+
+        {
+            let json = r#"{"duration":0}"#;
+            let duration: Struct = serde_json::from_str(json).unwrap();
+            assert_eq!(duration.duration, Duration::from_secs(0));
+            assert_eq!(serde_json::to_string(&duration).unwrap(), json.to_owned());
+
+            let json = r#"{"duration":12}"#;
+            let duration: Struct = serde_json::from_str(json).unwrap();
+            assert_eq!(duration.duration, Duration::from_secs(12));
+            assert_eq!(serde_json::to_string(&duration).unwrap(), json.to_owned());
+
+            let json = r#"{"duration":1234}"#;
+            let duration: Struct = serde_json::from_str(json).unwrap();
+            assert_eq!(duration.duration, Duration::from_secs(1234));
+            assert_eq!(serde_json::to_string(&duration).unwrap(), json.to_owned());
+        }
+    }
+}
diff --git a/src/types/response_parameters.rs b/src/types/response_parameters.rs
index 88f3a355..b792a626 100644
--- a/src/types/response_parameters.rs
+++ b/src/types/response_parameters.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use serde::{Deserialize, Serialize};
 
 /// Contains information about why a request was unsuccessful.
@@ -16,7 +18,7 @@ pub enum ResponseParameters {
 
     /// In case of exceeding flood control, the number of seconds left to wait
     /// before the request can be repeated.
-    RetryAfter(u32),
+    RetryAfter(#[serde(with = "crate::types::duration_secs")] Duration),
 }
 
 #[cfg(test)]
@@ -34,7 +36,7 @@ mod tests {
 
     #[test]
     fn retry_after_deserialization() {
-        let expected = ResponseParameters::RetryAfter(123_456);
+        let expected = ResponseParameters::RetryAfter(Duration::from_secs(123_456));
         let actual: ResponseParameters = serde_json::from_str(r#"{"retry_after":123456}"#).unwrap();
 
         assert_eq!(expected, actual);

From 2477a0f945a367731928d84d02b580367d48f106 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Apr 2022 19:04:30 +0400
Subject: [PATCH 556/755] Fix infinite loop in `read_from_rx`

---
 CHANGELOG.md                    |  6 ++++++
 src/adaptors/throttle/worker.rs | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5afb3b4e..daf670f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Retry requests that previously returned `RetryAfter(_)` error
 - `RequestError::RetryAfter` now has a `Duration` field instead of `i32`
 
+### Fixed
+
+- Fix never ending loop that caused programs that used `Throttling` to never stop, see issue [#535][issue535]
+
+[issue535]: https://github.com/teloxide/teloxide/issues/535
+
 ### Added
 
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index 85bca5bd..4aa57099 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -365,9 +365,26 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
     while queue.len() < queue.capacity() {
         match rx.try_recv() {
             Ok(req) => queue.push(req),
-            Err(TryRecvError::Disconnected) => *rx_is_closed = true,
+            Err(TryRecvError::Disconnected) => {
+                *rx_is_closed = true;
+                break;
+            }
             // There are no items in queue.
             Err(TryRecvError::Empty) => break,
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[tokio::test]
+    async fn issue_535() {
+        let (tx, mut rx) = tokio::sync::mpsc::channel(1);
+
+        // Close channel
+        drop(tx);
+
+        // Previously this caused an infinite loop
+        super::read_from_rx::<()>(&mut rx, &mut Vec::new(), &mut false).await;
+    }
+}

From c24f7f4fc0b6cf7a6328d14aa74724100d25f06c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Apr 2022 19:16:41 +0400
Subject: [PATCH 557/755] Fix typos & stuff

---
 src/adaptors/throttle.rs         | 10 +++++++---
 src/adaptors/throttle/request.rs |  4 ++--
 src/adaptors/throttle/worker.rs  | 12 ++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index caaef945..ecff0e7a 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -33,15 +33,17 @@ pub use settings::{Limits, Settings};
 ///
 /// Telegram has strict [limits], which, if exceeded will sooner or later cause
 /// `RequestError::RetryAfter(_)` errors. These errors can cause users of your
-/// bot to never receive responds from the bot or receive them in wrong order.
+/// bot to never receive responses from the bot or receive them in a wrong
+/// order.
 ///
 /// This bot wrapper automatically checks for limits, suspending requests until
 /// they could be sent without exceeding limits (request order in chats is not
 /// changed).
 ///
 /// It's recommended to use this wrapper before other wrappers (i.e.:
-/// `SomeWrapper<Throttle<Bot>>`) because if done otherwise inner wrappers may
-/// cause `Throttle` to miscalculate limits usage.
+/// `SomeWrapper<Throttle<Bot>>` not `Throttle<SomeWrapper<Bot>>`) because if
+/// done otherwise inner wrappers may cause `Throttle` to miscalculate limits
+/// usage.
 ///
 /// [limits]: https://core.telegram.org/bots/faq#my-bot-is-hitting-limits-how-do-i-avoid-this
 ///
@@ -209,6 +211,8 @@ impl From<&Recipient> for ChatIdHash {
         match value {
             Recipient::Id(id) => ChatIdHash::Id(*id),
             Recipient::ChannelUsername(username) => {
+                // FIXME: this could probably use a faster hasher, `DefaultHasher` is known to
+                //        be slow (it's not like we _need_ this to be fast, but still)
                 let mut hasher = std::collections::hash_map::DefaultHasher::new();
                 username.hash(&mut hasher);
                 let hash = hasher.finish();
diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index c109b178..d2188748 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -145,8 +145,8 @@ where
 {
     // We use option in `ShareableRequest` to `take` when sending by value.
     //
-    // All unwraps down below will succed because we always return immediately after
-    // taking.
+    // All unwraps down below will succeed because we always return immediately
+    // after taking.
 
     loop {
         let (lock, wait) = channel();
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index 4aa57099..bbf58a97 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -21,7 +21,7 @@ const SECOND: Duration = Duration::from_secs(1);
 // want to change this.
 const DELAY: Duration = Duration::from_millis(250);
 
-/// Minimal time beetween calls to queue_full function
+/// Minimal time between calls to queue_full function
 const QUEUE_FULL_DELAY: Duration = Duration::from_secs(4);
 
 #[derive(Debug)]
@@ -126,12 +126,12 @@ pub(super) async fn worker<B>(
     while !rx_is_closed || !queue.is_empty() {
         // FIXME(waffle):
         // 1. If the `queue` is empty, `read_from_rx` call down below will 'block'
-        //    execution untill a request is sent. While the execution is 'blocked' no
+        //    execution until a request is sent. While the execution is 'blocked' no
         //    `InfoMessage`s could be answered.
         //
-        // 2. If limits are descreased, ideally we want to shrink queue.
+        // 2. If limits are decreased, ideally we want to shrink queue.
         //
-        // *blocked in asyncronous way
+        // *blocked in asynchronous way
         answer_info(&mut info_rx, &mut limits);
 
         loop {
@@ -192,7 +192,7 @@ pub(super) async fn worker<B>(
         let min_back = now - MINUTE;
         let sec_back = now - SECOND;
 
-        // make history and hchats up-to-date
+        // make history and requests_sent up-to-date
         while let Some((_, time)) = history.front() {
             // history is sorted, we found first up-to-date thing
             if time >= &min_back {
@@ -361,7 +361,7 @@ async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_c
         }
     }
 
-    // Don't grow queue bigger than the capacity to limit DOS posibility
+    // Don't grow queue bigger than the capacity to limit DOS possibility
     while queue.len() < queue.capacity() {
         match rx.try_recv() {
             Ok(req) => queue.push(req),

From bf8e11f3a57da5333a930035292001817a133dc2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Apr 2022 19:24:18 +0400
Subject: [PATCH 558/755] satisfy clippy

---
 src/adaptors/throttle/request.rs | 2 +-
 src/adaptors/throttle/worker.rs  | 5 +++++
 src/errors.rs                    | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index d2188748..bf431ebb 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -154,7 +154,7 @@ where
         // The worker is unlikely to drop queue before sending all requests,
         // but just in case it has dropped the queue, we want to just send the
         // request.
-        if let Err(_) = worker.send((chat, lock)).await {
+        if worker.send((chat, lock)).await.is_err() {
             log::error!("Worker dropped the queue before sending all requests");
 
             let res = match &mut request {
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index bbf58a97..92731da6 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -310,6 +310,11 @@ async fn freeze(
     while let Some(freeze_until) = imm.take().or_else(|| rx.try_recv().ok()) {
         let FreezeUntil { until, after, chat } = freeze_until;
 
+        // Clippy thinks that this `.as_deref_mut()` doesn't change the type (&mut
+        // HashMap -> &mut HashMap), but it's actually a reborrow (the lifetimes
+        // differ), since we are in a loop, simply using `slow_mode` would produce a
+        // moved-out error.
+        #[allow(clippy::needless_option_as_deref)]
         if let Some(slow_mode) = slow_mode.as_deref_mut() {
             // TODO: do something with channels?...
             if let hash @ ChatIdHash::Id(id) = chat {
diff --git a/src/errors.rs b/src/errors.rs
index 5d8c4c1b..35c01787 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -79,9 +79,9 @@ pub trait AsResponseParameters {
 
 impl AsResponseParameters for crate::RequestError {
     fn response_parameters(&self) -> Option<ResponseParameters> {
-        match self {
-            &Self::RetryAfter(n) => Some(ResponseParameters::RetryAfter(n)),
-            &Self::MigrateToChatId(id) => Some(ResponseParameters::MigrateToChatId(id)),
+        match *self {
+            Self::RetryAfter(n) => Some(ResponseParameters::RetryAfter(n)),
+            Self::MigrateToChatId(id) => Some(ResponseParameters::MigrateToChatId(id)),
             _ => None,
         }
     }

From edb84691a2522a8c5a5754f121855518a202c6ba Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 10 Apr 2022 19:28:15 +0400
Subject: [PATCH 559/755] Fix changelog formatting

---
 CHANGELOG.md | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index daf670f4..dfa44f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,32 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
-### Added
-
-- `errors` module and `errors::AsResponseParameters` trait
-- `EditedMessageIsTooLong` error [#109][pr109]
-- `UntilDate` enum and use it for `{Restricted, Banned}::until_date` ([#116][pr116])
-- `Limits::messages_per_min_channel` ([#121][pr121])
-
-[pr109]: https://github.com/teloxide/teloxide-core/pull/109
-[pr116]: https://github.com/teloxide/teloxide-core/pull/116
-[pr121]: https://github.com/teloxide/teloxide-core/pull/121
-
-### Changed
-
-- Improve `Throttling` adoptor
-  - Freeze when getting `RetryAfter(_)` error
-  - Retry requests that previously returned `RetryAfter(_)` error
-- `RequestError::RetryAfter` now has a `Duration` field instead of `i32`
-
 ### Fixed
 
-- Fix never ending loop that caused programs that used `Throttling` to never stop, see issue [#535][issue535]
+- Fix never ending loop that caused programs that used `Throttling` to never stop, see issue [#535][issue535] ([#130][pr130])
 
 [issue535]: https://github.com/teloxide/teloxide/issues/535
+[pr130]: https://github.com/teloxide/teloxide-core/pull/130
 
 ### Added
 
+- `errors` module and `errors::AsResponseParameters` trait ([#130][pr130])
 - `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
 - `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197])
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
@@ -43,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `user.id` now uses `UserId` type, `ChatId` now represents only _chat id_, not channel username, all `chat_id` function parameters now accept `Recipient` [**BC**]
+- Improve `Throttling` adoptor ([#130][pr130])
+  - Freeze when getting `RetryAfter(_)` error
+  - Retry requests that previously returned `RetryAfter(_)` error
+- `RequestError::RetryAfter` now has a `Duration` field instead of `i32`
 
 ## 0.4.5 - 2022-04-03
 

From 6ebdeb7f0105a4dcb72402b8ec853fdbb82b5b13 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 00:21:18 +0400
Subject: [PATCH 560/755] Expose bare chat id

---
 CHANGELOG.md         |   3 ++
 src/types/chat_id.rs | 116 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f65ead34..85b65f2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
 - `Me::{mention, tme_url}` ([#197][pr197])
 - `AllowedUpdate::ChatJoinRequest` ([#201][pr201])
+- `ChatId::{is_user, is_group, is_channel, to_bare}` functions and `BareChatId` type [#198][pr198]
+
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
+[pr198]: https://github.com/teloxide/teloxide-core/pull/198
 [pr201]: https://github.com/teloxide/teloxide-core/pull/201
 
 ### Changed
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 2e8a69c1..75583425 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -12,27 +12,43 @@ use crate::types::UserId;
 #[serde(transparent)]
 pub struct ChatId(pub i64);
 
-impl From<UserId> for ChatId {
-    fn from(UserId(id): UserId) -> Self {
-        Self(id as _)
-    }
+/// Bare chat id as represented in MTProto API.
+///
+/// In MTProto API peer ids can have different types, for example `User(1)` and
+/// `Group(1)` are different chats. For bot API these peer ids are encoded in
+/// such a way that they can be stored in a simple integer (ie bot API chat ids
+/// have the type encoded in them). This type exposes the "bare" "peer id" of a
+/// chat.
+///
+/// `BareChatId` can be created by [`ChatId::to_bare`].
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum BareChatId {
+    User(UserId),
+    Group(u64),
+    Channel(u64),
 }
 
 impl ChatId {
-    pub(crate) fn is_channel(self) -> bool {
-        matches!(self.unmark(), UnmarkedChatId::Channel(_))
+    /// Returns `true` if this is an id of a user.
+    pub fn is_user(self) -> bool {
+        matches!(self.to_bare(), BareChatId::User(_))
     }
 
-    pub(crate) fn unmark(self) -> UnmarkedChatId {
-        use UnmarkedChatId::*;
+    /// Returns `true` if this is an id of a group or supergroup.
+    pub fn is_group(self) -> bool {
+        matches!(self.to_bare(), BareChatId::Group(_))
+    }
 
-        // https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
-        const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
-        const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
-        const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
-        const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
-        const MIN_USER_ID: i64 = 0;
-        const MAX_USER_ID: i64 = (1 << 40) - 1;
+    /// Returns `true` if this is an id of a channel.
+    pub fn is_channel(self) -> bool {
+        matches!(self.to_bare(), BareChatId::Channel(_))
+    }
+
+    /// Converts this id to "bare" MTProto peer id.
+    ///
+    /// See [`BareChatId`] for more.
+    pub fn to_bare(self) -> BareChatId {
+        use BareChatId::*;
 
         match self.0 {
             id @ MIN_MARKED_CHAT_ID..=MAX_MARKED_CHAT_ID => Group(-id as _),
@@ -45,17 +61,38 @@ impl ChatId {
     }
 }
 
-pub(crate) enum UnmarkedChatId {
-    User(UserId),
-    Group(u64),
-    Channel(u64),
+impl From<UserId> for ChatId {
+    fn from(UserId(id): UserId) -> Self {
+        Self(id as _)
+    }
 }
 
+impl BareChatId {
+    /// Converts bare chat id back to normal bot API [`ChatId`].
+    pub fn to_bot_api(self) -> ChatId {
+        use BareChatId::*;
+
+        match self {
+            User(UserId(id)) => ChatId(id as _),
+            Group(id) => ChatId(-(id as i64)),
+            Channel(id) => ChatId(MAX_MARKED_CHANNEL_ID - (id as i64)),
+        }
+    }
+}
+
+// https://github.com/mtcute/mtcute/blob/6933ecc3f82dd2e9100f52b0afec128af564713b/packages/core/src/utils/peer-utils.ts#L4
+const MIN_MARKED_CHANNEL_ID: i64 = -1997852516352;
+const MAX_MARKED_CHANNEL_ID: i64 = -1000000000000;
+const MIN_MARKED_CHAT_ID: i64 = MAX_MARKED_CHANNEL_ID + 1;
+const MAX_MARKED_CHAT_ID: i64 = MIN_USER_ID - 1;
+const MIN_USER_ID: i64 = 0;
+const MAX_USER_ID: i64 = (1 << 40) - 1;
+
 #[cfg(test)]
 mod tests {
     use serde::{Deserialize, Serialize};
 
-    use crate::types::{ChatId, UnmarkedChatId, UserId};
+    use crate::types::{BareChatId, ChatId, UserId};
 
     /// Test that `ChatId` is serialized as the underlying integer
     #[test]
@@ -75,10 +112,43 @@ mod tests {
     }
 
     #[test]
-    fn user_id_unmark() {
+    fn chonky_user_id_to_bare() {
         assert!(matches!(
-            ChatId(5298363099).unmark(),
-            UnmarkedChatId::User(UserId(5298363099))
+            ChatId(5298363099).to_bare(),
+            BareChatId::User(UserId(5298363099))
         ));
     }
+
+    #[test]
+    fn to_bare_to_bot_api_identity() {
+        fn assert_identity(x: u64) {
+            use BareChatId::*;
+
+            assert_eq!(User(UserId(x)), User(UserId(x)).to_bot_api().to_bare());
+            assert_eq!(Group(x), Group(x).to_bot_api().to_bare());
+            assert_eq!(Channel(x), Channel(x).to_bot_api().to_bare());
+        }
+
+        // Somewhat random numbers
+        let ids = [
+            1,
+            4,
+            17,
+            34,
+            51,
+            777000,
+            1000000,
+            1 << 20,
+            (1 << 35) | 123456,
+            1 << 40 - 1,
+        ];
+
+        // rust 2021 when :(
+        ids.iter().copied().for_each(assert_identity);
+    }
+
+    #[test]
+    fn display() {
+        assert_eq!(ChatId(1).to_string(), "1");
+    }
 }

From 7bf3894a319f5e76a5f8f327b713408fb63ee4fd Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 01:22:38 +0400
Subject: [PATCH 561/755] Correct documentation

From the standpoint of telegram supergroup is a channel...
---
 src/types/chat_id.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 75583425..71df51b5 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -34,12 +34,16 @@ impl ChatId {
         matches!(self.to_bare(), BareChatId::User(_))
     }
 
-    /// Returns `true` if this is an id of a group or supergroup.
+    /// Returns `true` if this is an id of a group.
+    ///
+    /// Note: supergroup is **not** considered a group.
     pub fn is_group(self) -> bool {
         matches!(self.to_bare(), BareChatId::Group(_))
     }
 
     /// Returns `true` if this is an id of a channel.
+    ///
+    /// Note: supergroup is considered a channel.
     pub fn is_channel(self) -> bool {
         matches!(self.to_bare(), BareChatId::Channel(_))
     }
@@ -138,6 +142,8 @@ mod tests {
             51,
             777000,
             1000000,
+            617136926,
+            1666111087,
             1 << 20,
             (1 << 35) | 123456,
             1 << 40 - 1,

From 57a3731e6b73354cc12a3c32852efbb858e34d8c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 01:40:50 +0400
Subject: [PATCH 562/755] Fix `Message::url`

---
 CHANGELOG.md         |  4 ++++
 src/types/message.rs | 38 ++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85b65f2b..cd4ef396 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `user.id` now uses `UserId` type, `ChatId` now represents only _chat id_, not channel username, all `chat_id` function parameters now accept `Recipient` [**BC**]
 
+### Fixed
+
+- A bug in `Message::url` implementation ([#198][pr198])
+
 ## 0.4.5 - 2022-04-03
 
 ### Fixed
diff --git a/src/types/message.rs b/src/types/message.rs
index bc680e5f..ac8d4c72 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -4,10 +4,11 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    Animation, Audio, Chat, ChatId, Contact, Dice, Document, Game, InlineKeyboardMarkup, Invoice,
-    Location, MessageAutoDeleteTimerChanged, MessageEntity, PassportData, PhotoSize, Poll,
-    ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User, Venue, Video, VideoNote,
-    Voice, VoiceChatEnded, VoiceChatParticipantsInvited, VoiceChatScheduled, VoiceChatStarted,
+    Animation, Audio, BareChatId, Chat, ChatId, Contact, Dice, Document, Game,
+    InlineKeyboardMarkup, Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity,
+    PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User,
+    Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
+    VoiceChatScheduled, VoiceChatStarted,
 };
 
 /// This object represents a message.
@@ -1050,30 +1051,35 @@ impl Message {
     /// Note that for private groups the link will only be accessible for group
     /// members.
     ///
-    /// Returns `None` for private chats (i.e.: DMs).
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
     pub fn url(&self) -> Option<reqwest::Url> {
-        if self.chat.is_private() {
+        use BareChatId::*;
+
+        // Note: `t.me` links use bare chat ids
+        let chat_id = match self.chat.id.to_bare() {
             // For private chats (i.e.: DMs) we can't produce "normal" t.me link.
             //
             // There are "tg://openmessage?user_id={0}&message_id={1}" links, which are
             // supposed to open any chat, including private messages, but they
             // are only supported by some telegram clients (e.g. Plus Messenger,
             // Telegram for Android 4.9+).
-            return None;
-        }
+            User(_) => return None,
+            // Similarly to user chats, there is no way to create a link to a message in a normal,
+            // private group.
+            //
+            // (public groups are always supergroup which are in turn channels).
+            Group(_) => return None,
+            Channel(id) => id,
+        };
 
         let url = match self.chat.username() {
             // If it's public group (i.e. not DM, not private group), we can produce
             // "normal" t.me link (accessible to everyone).
             Some(username) => format!("https://t.me/{0}/{1}/", username, self.id),
-            // For private groups we produce "private" t.me/c links. These are only
-            // accessible to the group members.
-            None => format!(
-                "https://t.me/c/{0}/{1}/",
-                // FIXME: this may be wrong for private channels
-                (-self.chat.id.0) - 1000000000000,
-                self.id
-            ),
+            // For private supergroups and channels we produce "private" t.me/c links. These are
+            // only accessible to the group members.
+            None => format!("https://t.me/c/{0}/{1}/", chat_id, self.id),
         };
 
         // UNWRAP:

From fa189af463fd558faac599d379965c687da358c2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 3 Apr 2022 23:46:53 +0400
Subject: [PATCH 563/755] ix clippyF

---
 src/types/chat_id.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index 71df51b5..e4951727 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -146,7 +146,7 @@ mod tests {
             1666111087,
             1 << 20,
             (1 << 35) | 123456,
-            1 << 40 - 1,
+            (1 << 40) - 1,
         ];
 
         // rust 2021 when :(

From 6318a7e730b82fdbf03f31e0bd61d94c7ee7c7f9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Apr 2022 13:51:00 +0400
Subject: [PATCH 564/755] Apply changes from the review

Make `BareChatId` internal.
---
 CHANGELOG.md             |  3 +--
 src/adaptors/throttle.rs |  2 +-
 src/types/chat_id.rs     | 13 ++++++-------
 src/types/recipient.rs   | 10 ----------
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd4ef396..57c44cbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
 - `Me::{mention, tme_url}` ([#197][pr197])
 - `AllowedUpdate::ChatJoinRequest` ([#201][pr201])
-- `ChatId::{is_user, is_group, is_channel, to_bare}` functions and `BareChatId` type [#198][pr198]
-
+- `ChatId::{is_user, is_group, is_channel_or_supergroup}` functions [#198][pr198]
 
 [pr197]: https://github.com/teloxide/teloxide-core/pull/197
 [pr198]: https://github.com/teloxide/teloxide-core/pull/198
diff --git a/src/adaptors/throttle.rs b/src/adaptors/throttle.rs
index 7d75ec7f..4e10be25 100644
--- a/src/adaptors/throttle.rs
+++ b/src/adaptors/throttle.rs
@@ -645,7 +645,7 @@ enum ChatIdHash {
 impl ChatIdHash {
     fn is_channel(&self) -> bool {
         match self {
-            &Self::Id(id) => id.is_channel(),
+            &Self::Id(id) => id.is_channel_or_supergroup(),
             Self::ChannelUsernameHash(_) => true,
         }
     }
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index e4951727..cca06e41 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -22,9 +22,10 @@ pub struct ChatId(pub i64);
 ///
 /// `BareChatId` can be created by [`ChatId::to_bare`].
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum BareChatId {
+pub(crate) enum BareChatId {
     User(UserId),
     Group(u64),
+    /// Note: supergroups are considered channels.
     Channel(u64),
 }
 
@@ -42,16 +43,14 @@ impl ChatId {
     }
 
     /// Returns `true` if this is an id of a channel.
-    ///
-    /// Note: supergroup is considered a channel.
-    pub fn is_channel(self) -> bool {
+    pub fn is_channel_or_supergroup(self) -> bool {
         matches!(self.to_bare(), BareChatId::Channel(_))
     }
 
     /// Converts this id to "bare" MTProto peer id.
     ///
     /// See [`BareChatId`] for more.
-    pub fn to_bare(self) -> BareChatId {
+    pub(crate) fn to_bare(self) -> BareChatId {
         use BareChatId::*;
 
         match self.0 {
@@ -73,7 +72,8 @@ impl From<UserId> for ChatId {
 
 impl BareChatId {
     /// Converts bare chat id back to normal bot API [`ChatId`].
-    pub fn to_bot_api(self) -> ChatId {
+    #[allow(unused)]
+    pub(crate) fn to_bot_api(self) -> ChatId {
         use BareChatId::*;
 
         match self {
@@ -146,7 +146,6 @@ mod tests {
             1666111087,
             1 << 20,
             (1 << 35) | 123456,
-            (1 << 40) - 1,
         ];
 
         // rust 2021 when :(
diff --git a/src/types/recipient.rs b/src/types/recipient.rs
index e7a29672..469aac97 100644
--- a/src/types/recipient.rs
+++ b/src/types/recipient.rs
@@ -19,16 +19,6 @@ pub enum Recipient {
     ChannelUsername(String),
 }
 
-impl Recipient {
-    #[allow(unused)]
-    pub(crate) fn is_channel(&self) -> bool {
-        match self {
-            Recipient::Id(id) => id.is_channel(),
-            Recipient::ChannelUsername(_) => true,
-        }
-    }
-}
-
 impl From<UserId> for Recipient {
     fn from(id: UserId) -> Self {
         Self::Id(id.into())

From 22c6330ba874079eeaf515b2f689a46779b880f1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 13 Apr 2022 14:58:38 +0400
Subject: [PATCH 565/755] Prepare 0.5.0 release

---
 CHANGELOG.md | 11 +++++------
 Cargo.toml   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44aeedee..8ec90f20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
-### Fixed
-
-- Fix never ending loop that caused programs that used `Throttling` to never stop, see issue [#535][issue535] ([#130][pr130])
-
-[issue535]: https://github.com/teloxide/teloxide/issues/535
-[pr130]: https://github.com/teloxide/teloxide-core/pull/130
+## 0.5.0 - 2022-04-13
 
 ### Added
 
@@ -39,6 +34,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - A bug in `Message::url` implementation ([#198][pr198])
+- Fix never ending loop that caused programs that used `Throttling` to never stop, see issue [#535][issue535] ([#130][pr130])
+
+[issue535]: https://github.com/teloxide/teloxide/issues/535
+[pr130]: https://github.com/teloxide/teloxide-core/pull/130
 
 ## 0.4.5 - 2022-04-03
 
diff --git a/Cargo.toml b/Cargo.toml
index 149591d9..ee049f3a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.4.5"
+version = "0.5.0"
 edition = "2018"
 
 license = "MIT"

From 5e8263704d26f0d054c823aa51fcfb447ff6234a Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Mon, 18 Apr 2022 15:51:17 +0600
Subject: [PATCH 566/755] Document the `errors` module

---
 src/errors.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/errors.rs b/src/errors.rs
index 35c01787..0c56c3e7 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,3 +1,5 @@
+//! Possible error types.
+
 use std::{io, time::Duration};
 
 use serde::Deserialize;

From 9ee3b90988841e967ab38985f3aa49cfb681f963 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Mon, 18 Apr 2022 15:52:22 +0600
Subject: [PATCH 567/755] Update the changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec90f20..e30854b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+ - Document the `errors` module.
+
 ## 0.5.0 - 2022-04-13
 
 ### Added

From 86d351b35abe2daed1e29b58af9b7247a4f96280 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Apr 2022 14:02:06 +0400
Subject: [PATCH 568/755] Remove master docs

---
 README.md    | 3 ---
 netlify.toml | 7 -------
 2 files changed, 10 deletions(-)
 delete mode 100644 netlify.toml

diff --git a/README.md b/README.md
index ec037397..56a659a4 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,6 @@
   <a href="https://docs.rs/teloxide_core/">
     <img src="https://docs.rs/teloxide-core/badge.svg">
   </a>
-  <a href="https://teloxide-core.netlify.com">
-    <img src="https://img.shields.io/badge/docs-master-blue">
-  </a>
   <a href="LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
diff --git a/netlify.toml b/netlify.toml
deleted file mode 100644
index 6493423a..00000000
--- a/netlify.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[build] 
-command = "rustup install nightly --profile minimal && cargo +nightly docs --no-deps && cp -r target/doc _netlify_out"
-publish = "_netlify_out" 
-
-[[redirects]]
-from = "/" 
-to = "/teloxide_core"

From f98472d798c0baf4c96806ab8ee643866edbf3e9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Apr 2022 14:03:50 +0400
Subject: [PATCH 569/755] Release v0.5.1

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e30854b0..2fb5bebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.5.1 - 2022-04-18
+
 ### Fixed
 
  - Document the `errors` module.
diff --git a/Cargo.toml b/Cargo.toml
index ee049f3a..e631f00c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2018"
 
 license = "MIT"
diff --git a/README.md b/README.md
index 56a659a4..5cf1660b 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 </div>
 
 ```toml
-teloxide-core = "0.4"
+teloxide-core = "0.5"
 ```
 _Compiler support: requires rustc 1.49+_.
 
diff --git a/src/lib.rs b/src/lib.rs
index fd4ad1dc..44015b0e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.4"
+//! teloxide_core = "0.5"
 //! ```
 //! _Compiler support: requires rustc 1.49+_
 //!

From cf2004dcc20455a9fca7caa4f7449ccdceed6870 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Apr 2022 22:13:36 +0400
Subject: [PATCH 570/755] Correct MSRV

---
 README.md  | 2 +-
 src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5cf1660b..1b65c62e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
 ```toml
 teloxide-core = "0.5"
 ```
-_Compiler support: requires rustc 1.49+_.
+_Compiler support: requires rustc 1.58+_.
 
 [`teloxide`]: https://docs.rs/teloxide
 [Telegram Bot API]: https://core.telegram.org/bots/api
diff --git a/src/lib.rs b/src/lib.rs
index 44015b0e..b4d27cff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@
 //!```toml
 //! teloxide_core = "0.5"
 //! ```
-//! _Compiler support: requires rustc 1.49+_
+//! _Compiler support: requires rustc 1.58+_.
 //!
 //! ```
 //! # #[cfg(feature = "auto_send")]

From 7c55ad535e861e408cb341af3358eb6de0c7135f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Apr 2022 22:15:13 +0400
Subject: [PATCH 571/755] Add MSRV check to CI

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1569708..9d75c311 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
           - stable
           - beta
           - nightly
+          - msrv
     
         include:
           - rust: stable
@@ -47,6 +48,9 @@ jobs:
           - rust: nightly
             toolchain: nightly-2022-01-17
             features: "--all-features"
+          - rust: msrv
+            features: "--features full"
+            toolchain: "1.58.0"
 
     steps:
       - uses: actions/checkout@v1

From c1a763eeb0062a6aa834bc17e6014615adb3267e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 16:08:29 +0400
Subject: [PATCH 572/755] Add TBA 6.0 types and fields

---
 src/types.rs                           | 10 +++
 src/types/chat_administrator_rights.rs | 48 +++++++++++++
 src/types/inline_keyboard_button.rs    | 11 ++-
 src/types/keyboard_button.rs           | 95 +++++++++++++++++---------
 src/types/menu_button.rs               | 35 ++++++++++
 src/types/message.rs                   |  9 ++-
 src/types/sent_web_app_message.rs      | 13 ++++
 src/types/web_app_data.rs              | 13 ++++
 src/types/web_app_info.rs              | 14 ++++
 src/types/webhook_info.rs              |  6 ++
 10 files changed, 221 insertions(+), 33 deletions(-)
 create mode 100644 src/types/chat_administrator_rights.rs
 create mode 100644 src/types/menu_button.rs
 create mode 100644 src/types/sent_web_app_message.rs
 create mode 100644 src/types/web_app_data.rs
 create mode 100644 src/types/web_app_info.rs

diff --git a/src/types.rs b/src/types.rs
index e544656c..1551e36f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -9,6 +9,7 @@ pub use callback_game::*;
 pub use callback_query::*;
 pub use chat::*;
 pub use chat_action::*;
+pub use chat_administrator_rights::*;
 pub use chat_invite_link::*;
 pub use chat_join_request::*;
 pub use chat_location::*;
@@ -64,6 +65,7 @@ pub use location::*;
 pub use login_url::*;
 pub use mask_position::*;
 pub use me::*;
+pub use menu_button::*;
 pub use message::*;
 pub use message_auto_delete_timer_changed::*;
 pub use message_entity::*;
@@ -83,6 +85,7 @@ pub use reply_keyboard_markup::*;
 pub use reply_keyboard_remove::*;
 pub use reply_markup::*;
 pub use response_parameters::*;
+pub use sent_web_app_message::*;
 pub use shipping_address::*;
 pub use shipping_option::*;
 pub use shipping_query::*;
@@ -103,6 +106,8 @@ pub use voice_chat_ended::*;
 pub use voice_chat_participants_invited::*;
 pub use voice_chat_scheduled::*;
 pub use voice_chat_started::*;
+pub use web_app_data::*;
+pub use web_app_info::*;
 pub use webhook_info::*;
 
 mod allowed_update;
@@ -114,6 +119,7 @@ mod callback_game;
 mod callback_query;
 mod chat;
 mod chat_action;
+mod chat_administrator_rights;
 mod chat_invite_link;
 mod chat_join_request;
 mod chat_location;
@@ -145,6 +151,7 @@ mod location;
 mod login_url;
 mod mask_position;
 mod me;
+mod menu_button;
 mod message;
 mod message_auto_delete_timer_changed;
 mod message_entity;
@@ -161,6 +168,7 @@ mod reply_keyboard_markup;
 mod reply_keyboard_remove;
 mod reply_markup;
 mod response_parameters;
+mod sent_web_app_message;
 mod shipping_address;
 mod shipping_option;
 mod shipping_query;
@@ -181,6 +189,8 @@ mod voice_chat_ended;
 mod voice_chat_participants_invited;
 mod voice_chat_scheduled;
 mod voice_chat_started;
+mod web_app_data;
+mod web_app_info;
 mod webhook_info;
 
 mod inline_query;
diff --git a/src/types/chat_administrator_rights.rs b/src/types/chat_administrator_rights.rs
new file mode 100644
index 00000000..047f70f5
--- /dev/null
+++ b/src/types/chat_administrator_rights.rs
@@ -0,0 +1,48 @@
+use serde::{Deserialize, Serialize};
+
+/// Represents the rights of an administrator in a chat.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct ChatAdministratorRights {
+    /// `true`, if the user's presence in the chat is hidden
+    pub is_anonymous: bool,
+
+    /// `true`, if the administrator can access the chat event log, chat
+    /// statistics, message statistics in channels, see channel members, see
+    /// anonymous administrators in supergroups and ignore slow mode. Implied by
+    /// any other administrator privilege
+    pub can_manage_chat: bool,
+
+    /// `true`, if the administrator can delete messages of other users
+    pub can_delete_messages: bool,
+
+    /// `true`, if the administrator can manage video chats
+    pub can_manage_video_chats: bool,
+
+    /// `true`, if the administrator can restrict, ban or unban chat members
+    pub can_restrict_members: bool,
+
+    /// `true`, if the administrator can add new administrators with a subset of
+    /// their own privileges or demote administrators that he has promoted,
+    /// directly or indirectly (promoted by administrators that were appointed
+    /// by the user)
+    pub can_promote_members: bool,
+
+    /// `true`, if the user is allowed to change the chat title, photo and other
+    /// settings
+    pub can_change_info: bool,
+
+    /// `true`, if the user is allowed to invite new users to the chat
+    pub can_invite_users: bool,
+
+    /// `true`, if the administrator can post in the channel; channels
+    /// only
+    pub can_post_messages: Option<bool>,
+
+    /// `true`, if the administrator can edit messages of other users
+    /// and can pin messages; channels only
+    pub can_edit_messages: Option<bool>,
+
+    /// `true`, if the user is allowed to pin messages; groups and
+    /// supergroups only
+    pub can_pin_messages: Option<bool>,
+}
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 06a70850..35acc26d 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -1,4 +1,4 @@
-use crate::types::{CallbackGame, LoginUrl};
+use crate::types::{CallbackGame, LoginUrl, WebAppInfo};
 use serde::{Deserialize, Serialize};
 
 /// This object represents one button of an inline keyboard.
@@ -62,6 +62,15 @@ pub enum InlineKeyboardButtonKind {
     /// [`CallbackQuery`]: crate::types::CallbackQuery
     CallbackData(String),
 
+    /// Description of the [Web App] that will be launched when the user presses
+    /// the button. The Web App will be able to send an arbitrary message on
+    /// behalf of the user using the method [`AnswerWebAppQuery`]. Available
+    /// only in private chats between a user and the bot.
+    ///
+    /// [Web App]: https://core.telegram.org/bots/webapps
+    /// [`AnswerWebAppQuery`]: crate::payloads::AnswerWebAppQuery
+    WebApp(WebAppInfo),
+
     /// If set, pressing the button will prompt the user to select one of their
     /// chats, open that chat and insert the bot‘s username and the specified
     /// inline query in the input field. Can be empty, in which case just the
diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index aef83a28..d4e041c0 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -1,6 +1,6 @@
 use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 
-use crate::types::{KeyboardButtonPollType, True};
+use crate::types::{KeyboardButtonPollType, True, WebAppInfo};
 
 /// This object represents one button of the reply keyboard.
 ///
@@ -15,11 +15,28 @@ pub struct KeyboardButton {
     /// be sent as a message when the button is pressed.
     pub text: String,
 
-    /// Request something from user.
+    /// Request something from user. This is available in private chats only.
+    ///
     /// - If `Some(Contact)`, the user's phone number will be sent as a contact
-    ///   when the button is pressed. Available in private chats only
+    ///   when the button is pressed.
     /// - If `Some(Location)`, the user's current location will be sent when the
-    ///   button is pressed. Available in private chats only
+    ///   button is pressed.
+    /// - If `Some(Poll(_))`, the user will be asked to create a poll and send
+    ///   it to the bot when the button is pressed.
+    /// - If `Some(WebApp(_))`, the described Web App will be launched when the
+    ///   button is pressed. The Web App will be able to send a “web_app_data”
+    ///   service message.
+    ///
+    /// **Note:** `Contact` and `Location` options will only work in Telegram
+    /// versions released after 9 April, 2016. Older clients will display
+    /// unsupported message.
+    ///
+    /// **Note:** `Poll(_)` option will only work in Telegram versions released
+    /// after 23 January, 2020. Older clients will display unsupported message.
+    ///
+    /// **Note:** `WebApp(_)` option will only work in Telegram versions
+    /// released after 16 April, 2022. Older clients will display unsupported
+    /// message.
     #[serde(flatten)]
     pub request: Option<ButtonRequest>,
 }
@@ -45,11 +62,13 @@ impl KeyboardButton {
 }
 
 // Serialize + Deserialize are implemented by hand
+// FIXME: add documentation
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum ButtonRequest {
     Location,
     Contact,
     Poll(KeyboardButtonPollType),
+    WebApp(WebAppInfo),
 }
 
 /// Helper struct for (de)serializing [`ButtonRequest`](ButtonRequest)
@@ -71,6 +90,11 @@ struct RawRequest {
     /// chats only.
     #[serde(rename = "request_poll")]
     poll: Option<KeyboardButtonPollType>,
+
+    /// If specified, the described Web App will be launched when the button is
+    /// pressed. The Web App will be able to send a “web_app_data” service
+    /// message. Available in private chats only.
+    web_app: Option<WebAppInfo>,
 }
 
 impl<'de> Deserialize<'de> for ButtonRequest {
@@ -81,13 +105,21 @@ impl<'de> Deserialize<'de> for ButtonRequest {
         let raw = RawRequest::deserialize(deserializer)?;
         match raw {
             RawRequest {
-                contact: Some(_),
-                location: Some(_),
-                poll: Some(_),
-            } => Err(D::Error::custom(
-                "`request_contact` and `request_location` fields are mutually exclusive, but both \
-                 were provided",
-            )),
+                contact,
+                location,
+                poll,
+                web_app,
+            } if 1
+                < (contact.is_some() as u8
+                    + location.is_some() as u8
+                    + poll.is_some() as u8
+                    + web_app.is_some() as u8) =>
+            {
+                Err(D::Error::custom(
+                    "`request_contact`, `request_location`, `request_poll` and `web_app` fields \
+                     are mutually exclusive",
+                ))
+            }
             RawRequest {
                 contact: Some(_), ..
             } => Ok(Self::Contact),
@@ -98,8 +130,14 @@ impl<'de> Deserialize<'de> for ButtonRequest {
                 poll: Some(poll_type),
                 ..
             } => Ok(Self::Poll(poll_type)),
+            RawRequest {
+                web_app: Some(web_app),
+                ..
+            } => Ok(Self::WebApp(web_app)),
+
             _ => Err(D::Error::custom(
-                "Either one of `request_contact` and `request_location` fields is required",
+                "Either one of `request_contact`, `request_location`, `request_poll` and \
+                 `web_app` fields is required",
             )),
         }
     }
@@ -110,26 +148,21 @@ impl Serialize for ButtonRequest {
     where
         S: Serializer,
     {
+        let mut raw = RawRequest {
+            contact: None,
+            location: None,
+            poll: None,
+            web_app: None,
+        };
+
         match self {
-            Self::Contact => RawRequest {
-                contact: Some(True),
-                location: None,
-                poll: None,
-            }
-            .serialize(serializer),
-            Self::Location => RawRequest {
-                contact: None,
-                location: Some(True),
-                poll: None,
-            }
-            .serialize(serializer),
-            Self::Poll(poll_type) => RawRequest {
-                contact: None,
-                location: None,
-                poll: Some(poll_type.clone()),
-            }
-            .serialize(serializer),
-        }
+            Self::Contact => raw.contact = Some(True),
+            Self::Location => raw.location = Some(True),
+            Self::Poll(poll_type) => raw.poll = Some(poll_type.clone()),
+            Self::WebApp(web_app) => raw.web_app = Some(web_app.clone()),
+        };
+
+        raw.serialize(serializer)
     }
 }
 
diff --git a/src/types/menu_button.rs b/src/types/menu_button.rs
new file mode 100644
index 00000000..6e056932
--- /dev/null
+++ b/src/types/menu_button.rs
@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+
+use crate::types::WebAppInfo;
+
+/// This object describes the bot's menu button in a private chat.
+///
+/// If a menu button other than `MenuButton::Default` is set for a private chat,
+/// then it is applied in the chat. Otherwise the default menu button is
+/// applied. By default, the menu button opens the list of bot commands.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "type")]
+pub enum MenuButton {
+    /// Represents a menu button, which opens the bot's list of commands.
+    Commands,
+
+    /// Represents a menu button, which launches a [Web App].
+    ///
+    /// [Web App]: https://core.telegram.org/bots/webapps
+    WebApp {
+        /// Text on the button.
+        text: String,
+
+        /// Description of the Web App that will be launched when the user
+        /// presses the button. The Web App will be able to send an arbitrary
+        /// message on behalf of the user using the method
+        /// [`AnswerWebAppQuery`].
+        ///
+        /// [`AnswerWebAppQuery`]: crate::payloads::AnswerWebAppQuery
+        web_app: WebAppInfo,
+    },
+
+    /// Describes that no specific value for the menu button was set.
+    Default,
+}
diff --git a/src/types/message.rs b/src/types/message.rs
index ac8d4c72..9fc29897 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -8,7 +8,7 @@ use crate::types::{
     InlineKeyboardMarkup, Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity,
     PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User,
     Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
-    VoiceChatScheduled, VoiceChatStarted,
+    VoiceChatScheduled, VoiceChatStarted, WebAppData,
 };
 
 /// This object represents a message.
@@ -58,6 +58,7 @@ pub enum MessageKind {
     VoiceChatStarted(MessageVoiceChatStarted),
     VoiceChatEnded(MessageVoiceChatEnded),
     VoiceChatParticipantsInvited(MessageVoiceChatParticipantsInvited),
+    WebAppData(MessageWebAppData),
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -515,6 +516,12 @@ pub struct MessageVoiceChatParticipantsInvited {
     pub voice_chat_participants_invited: VoiceChatParticipantsInvited,
 }
 
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct MessageWebAppData {
+    /// Service message: data sent by a Web App.
+    pub web_app_data: WebAppData,
+}
+
 mod getters {
     use chrono::{DateTime, Utc};
     use std::ops::Deref;
diff --git a/src/types/sent_web_app_message.rs b/src/types/sent_web_app_message.rs
new file mode 100644
index 00000000..2f39381d
--- /dev/null
+++ b/src/types/sent_web_app_message.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+/// Contains information about an inline message sent by a [Web App] on behalf
+/// of a user.
+///
+/// [Web App]: https://core.telegram.org/bots/webapps
+#[serde_with_macros::skip_serializing_none]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct SentWebAppMessage {
+    /// Identifier of the sent inline message. Available only if there is an
+    /// inline keyboard attached to the message.
+    pub inline_message_id: Option<String>,
+}
diff --git a/src/types/web_app_data.rs b/src/types/web_app_data.rs
new file mode 100644
index 00000000..d287168c
--- /dev/null
+++ b/src/types/web_app_data.rs
@@ -0,0 +1,13 @@
+use serde::{Deserialize, Serialize};
+
+/// Contains data sent from a Web App to the bot.
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct WebAppData {
+    /// The data. Be aware that a bad client can send arbitrary data in this
+    /// field.
+    pub data: String,
+
+    /// Text of the web_app keyboard button, from which the Web App was opened.
+    /// Be aware that a bad client can send arbitrary data in this field.
+    pub button_text: String,
+}
diff --git a/src/types/web_app_info.rs b/src/types/web_app_info.rs
new file mode 100644
index 00000000..946f6181
--- /dev/null
+++ b/src/types/web_app_info.rs
@@ -0,0 +1,14 @@
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+/// Contains information about a [Web App].
+///
+/// [Web App]: https://core.telegram.org/bots/webapps
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct WebAppInfo {
+    /// An HTTPS URL of a Web App to be opened with additional data as specified
+    /// in [Initializing Web Apps].
+    ///
+    /// [Initializing Web Apps]: https://core.telegram.org/bots/webapps#initializing-web-apps
+    pub url: Url,
+}
diff --git a/src/types/webhook_info.rs b/src/types/webhook_info.rs
index 6c9d031f..8fef2259 100644
--- a/src/types/webhook_info.rs
+++ b/src/types/webhook_info.rs
@@ -34,6 +34,11 @@ pub struct WebhookInfo {
     /// happened when trying to deliver an update via webhook.
     pub last_error_message: Option<String>,
 
+    /// Time of the most recent error that happened when trying to synchronize
+    /// available updates with Telegram data-centers.
+    #[serde(default, with = "crate::types::serde_opt_date_from_unix_timestamp")]
+    pub last_synchronization_error_date: Option<DateTime<Utc>>,
+
     /// Maximum allowed number of simultaneous HTTPS connections to the webhook
     /// for update delivery.
     pub max_connections: Option<u32>,
@@ -55,6 +60,7 @@ fn empty_url() {
         ip_address: None,
         last_error_date: None,
         last_error_message: None,
+        last_synchronization_error_date: None,
         max_connections: None,
         allowed_updates: Some(vec![AllowedUpdate::Message]),
     };

From cb8f373054cb64b44a31356480b357dca8374a60 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 16:19:23 +0400
Subject: [PATCH 573/755] TBA 6.0 field renaming

---
 src/types/chat_member.rs                     | 15 ++++++++++-----
 src/types/message.rs                         | 12 ++++++------
 src/types/voice_chat_ended.rs                |  2 +-
 src/types/voice_chat_participants_invited.rs |  2 +-
 src/types/voice_chat_scheduled.rs            |  2 +-
 src/types/voice_chat_started.rs              |  2 +-
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 0bfd5607..1dae0fad 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -76,7 +76,7 @@ pub struct Administrator {
     pub can_delete_messages: bool,
 
     /// `true` if the administrator can manage voice chats.
-    pub can_manage_voice_chats: bool,
+    pub can_manage_video_chats: bool,
 
     /// `true` if the administrator can invite new users to the chat.
     pub can_invite_users: bool,
@@ -403,17 +403,22 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
-    pub fn can_manage_voice_chats(&self) -> bool {
+    pub fn can_manage_video_chats(&self) -> bool {
         match self {
             Self::Owner(_) => true,
             Self::Administrator(Administrator {
-                can_manage_voice_chats,
+                can_manage_video_chats,
                 ..
-            }) => *can_manage_voice_chats,
+            }) => *can_manage_video_chats,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
 
+    #[deprecated(since = "0.6.0", note = "renamed to `can_manage_video_chats`")]
+    pub fn can_manage_voice_chats(&self) -> bool {
+        self.can_manage_video_chats()
+    }
+
     /// Returns `true` if the user can can invite new users to the chat.
     ///
     /// I.e. returns `true` if the user
@@ -636,7 +641,7 @@ mod tests {
                 can_post_messages: None,
                 can_edit_messages: None,
                 can_delete_messages: true,
-                can_manage_voice_chats: true,
+                can_manage_video_chats: true,
                 can_invite_users: true,
                 can_restrict_members: true,
                 can_pin_messages: Some(true),
diff --git a/src/types/message.rs b/src/types/message.rs
index 9fc29897..9b13acab 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -7,8 +7,8 @@ use crate::types::{
     Animation, Audio, BareChatId, Chat, ChatId, Contact, Dice, Document, Game,
     InlineKeyboardMarkup, Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity,
     PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User,
-    Venue, Video, VideoNote, Voice, VoiceChatEnded, VoiceChatParticipantsInvited,
-    VoiceChatScheduled, VoiceChatStarted, WebAppData,
+    Venue, Video, VideoChatEnded, VideoChatParticipantsInvited, VideoChatScheduled,
+    VideoChatStarted, VideoNote, Voice, WebAppData,
 };
 
 /// This object represents a message.
@@ -495,25 +495,25 @@ pub struct MessageProximityAlertTriggered {
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageVoiceChatScheduled {
     /// Service message: voice chat scheduled
-    pub voice_chat_scheduled: VoiceChatScheduled,
+    pub video_chat_scheduled: VideoChatScheduled,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageVoiceChatStarted {
     /// Service message: voice chat started.
-    pub voice_chat_started: VoiceChatStarted,
+    pub video_chat_started: VideoChatStarted,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageVoiceChatEnded {
     /// Service message: voice chat ended.
-    pub voice_chat_ended: VoiceChatEnded,
+    pub video_chat_ended: VideoChatEnded,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MessageVoiceChatParticipantsInvited {
     /// Service message: new participants invited to a voice chat.
-    pub voice_chat_participants_invited: VoiceChatParticipantsInvited,
+    pub video_chat_participants_invited: VideoChatParticipantsInvited,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
diff --git a/src/types/voice_chat_ended.rs b/src/types/voice_chat_ended.rs
index 1c8ef3d6..9a49b763 100644
--- a/src/types/voice_chat_ended.rs
+++ b/src/types/voice_chat_ended.rs
@@ -3,4 +3,4 @@ use serde::{Deserialize, Serialize};
 /// This object represents a service message about a voice chat ended in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatEnded {}
+pub struct VideoChatEnded {}
diff --git a/src/types/voice_chat_participants_invited.rs b/src/types/voice_chat_participants_invited.rs
index b02d5fa8..2e1b90a1 100644
--- a/src/types/voice_chat_participants_invited.rs
+++ b/src/types/voice_chat_participants_invited.rs
@@ -5,7 +5,7 @@ use crate::types::User;
 /// This object represents a service message about new members invited to a
 /// voice chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatParticipantsInvited {
+pub struct VideoChatParticipantsInvited {
     /// New members that were invited to the voice chat
     pub users: Option<Vec<User>>,
 }
diff --git a/src/types/voice_chat_scheduled.rs b/src/types/voice_chat_scheduled.rs
index 06ca85cf..a0f26a8a 100644
--- a/src/types/voice_chat_scheduled.rs
+++ b/src/types/voice_chat_scheduled.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 /// This object represents a service message about a voice chat scheduled in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatScheduled {
+pub struct VideoChatScheduled {
     /// Point in time when the voice chat is supposed to be started by a chat
     /// administrator.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
diff --git a/src/types/voice_chat_started.rs b/src/types/voice_chat_started.rs
index 1aeec86f..11c9db07 100644
--- a/src/types/voice_chat_started.rs
+++ b/src/types/voice_chat_started.rs
@@ -3,4 +3,4 @@ use serde::{Deserialize, Serialize};
 /// This object represents a service message about a voice chat started in the
 /// chat. Currently holds no information.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-pub struct VoiceChatStarted {}
+pub struct VideoChatStarted {}

From d61fe4f85d5d7397dadb3ad618ad8b72b05c16a2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 19:01:57 +0400
Subject: [PATCH 574/755] Add TBA 6.0 methods

---
 src/adaptors/auto_send.rs                     |  2 +-
 src/adaptors/cache_me.rs                      |  2 +-
 src/adaptors/erased.rs                        | 48 ++++++++++++++++++-
 src/adaptors/parse_mode.rs                    |  2 +-
 src/adaptors/throttle/requester_impl.rs       |  2 +-
 src/adaptors/trace.rs                         |  2 +-
 src/bot/api.rs                                | 46 ++++++++++++++++++
 src/local_macros.rs                           | 40 ++++++++++++++++
 src/payloads.rs                               | 16 ++++++-
 src/payloads/answer_web_app_query.rs          | 26 ++++++++++
 src/payloads/get_chat_menu_button.rs          | 23 +++++++++
 .../get_my_default_administrator_rights.rs    | 23 +++++++++
 src/payloads/promote_chat_member.rs           |  2 +-
 src/payloads/set_chat_menu_button.rs          | 25 ++++++++++
 .../set_my_default_administrator_rights.rs    | 25 ++++++++++
 src/payloads/setters.rs                       | 35 +++++++-------
 src/requests/requester.rs                     | 41 +++++++++++++++-
 17 files changed, 333 insertions(+), 27 deletions(-)
 create mode 100644 src/payloads/answer_web_app_query.rs
 create mode 100644 src/payloads/get_chat_menu_button.rs
 create mode 100644 src/payloads/get_my_default_administrator_rights.rs
 create mode 100644 src/payloads/set_chat_menu_button.rs
 create mode 100644 src/payloads/set_my_default_administrator_rights.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index b1312b95..76a8cf57 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -97,7 +97,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 04a3c902..66909f25 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -104,7 +104,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 6dd77a1b..1eb57243 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -170,7 +170,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
@@ -523,6 +523,18 @@ trait ErasableRequester<'a> {
 
     fn get_my_commands(&self) -> ErasedRequest<'a, GetMyCommands, Self::Err>;
 
+    fn set_chat_menu_button(&self) -> ErasedRequest<'a, SetChatMenuButton, Self::Err>;
+
+    fn get_chat_menu_button(&self) -> ErasedRequest<'a, GetChatMenuButton, Self::Err>;
+
+    fn set_my_default_administrator_rights(
+        &self,
+    ) -> ErasedRequest<'a, SetMyDefaultAdministratorRights, Self::Err>;
+
+    fn get_my_default_administrator_rights(
+        &self,
+    ) -> ErasedRequest<'a, GetMyDefaultAdministratorRights, Self::Err>;
+
     fn delete_my_commands(&self) -> ErasedRequest<'a, DeleteMyCommands, Self::Err>;
 
     fn answer_inline_query(
@@ -531,6 +543,12 @@ trait ErasableRequester<'a> {
         results: Vec<InlineQueryResult>,
     ) -> ErasedRequest<'a, AnswerInlineQuery, Self::Err>;
 
+    fn answer_web_app_query(
+        &self,
+        web_app_query_id: String,
+        result: InlineQueryResult,
+    ) -> ErasedRequest<'a, AnswerWebAppQuery, Self::Err>;
+
     fn edit_message_text(
         &self,
         chat_id: Recipient,
@@ -1169,6 +1187,26 @@ where
         Requester::get_my_commands(self).erase()
     }
 
+    fn set_chat_menu_button(&self) -> ErasedRequest<'a, SetChatMenuButton, Self::Err> {
+        Requester::set_chat_menu_button(self).erase()
+    }
+
+    fn get_chat_menu_button(&self) -> ErasedRequest<'a, GetChatMenuButton, Self::Err> {
+        Requester::get_chat_menu_button(self).erase()
+    }
+
+    fn set_my_default_administrator_rights(
+        &self,
+    ) -> ErasedRequest<'a, SetMyDefaultAdministratorRights, Self::Err> {
+        Requester::set_my_default_administrator_rights(self).erase()
+    }
+
+    fn get_my_default_administrator_rights(
+        &self,
+    ) -> ErasedRequest<'a, GetMyDefaultAdministratorRights, Self::Err> {
+        Requester::get_my_default_administrator_rights(self).erase()
+    }
+
     fn delete_my_commands(&self) -> ErasedRequest<'a, DeleteMyCommands, Self::Err> {
         Requester::delete_my_commands(self).erase()
     }
@@ -1181,6 +1219,14 @@ where
         Requester::answer_inline_query(self, inline_query_id, results).erase()
     }
 
+    fn answer_web_app_query(
+        &self,
+        web_app_query_id: String,
+        result: InlineQueryResult,
+    ) -> ErasedRequest<'a, AnswerWebAppQuery, Self::Err> {
+        Requester::answer_web_app_query(self, web_app_query_id, result).erase()
+    }
+
     fn edit_message_text(
         &self,
         chat_id: Recipient,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index 62649ce5..d896a411 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -109,7 +109,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
         get_sticker_set, upload_sticker_file, create_new_sticker_set,
diff --git a/src/adaptors/throttle/requester_impl.rs b/src/adaptors/throttle/requester_impl.rs
index a3c45e42..a2661eed 100644
--- a/src/adaptors/throttle/requester_impl.rs
+++ b/src/adaptors/throttle/requester_impl.rs
@@ -82,7 +82,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count,
         get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
-        answer_callback_query, set_my_commands, get_my_commands, delete_my_commands, answer_inline_query,
+        answer_callback_query, set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query,
         edit_message_text, edit_message_text_inline, edit_message_caption,
         edit_message_caption_inline, edit_message_media, edit_message_media_inline,
         edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index eedeea3f..33c2d616 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -129,7 +129,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 396c935d..71e60fef 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -689,6 +689,36 @@ impl Requester for Bot {
         Self::GetMyCommands::new(self.clone(), payloads::GetMyCommands::new())
     }
 
+    type SetChatMenuButton = JsonRequest<payloads::SetChatMenuButton>;
+
+    fn set_chat_menu_button(&self) -> Self::SetChatMenuButton {
+        Self::SetChatMenuButton::new(self.clone(), payloads::SetChatMenuButton::new())
+    }
+
+    type GetChatMenuButton = JsonRequest<payloads::GetChatMenuButton>;
+
+    fn get_chat_menu_button(&self) -> Self::GetChatMenuButton {
+        Self::GetChatMenuButton::new(self.clone(), payloads::GetChatMenuButton::new())
+    }
+
+    type SetMyDefaultAdministratorRights = JsonRequest<payloads::SetMyDefaultAdministratorRights>;
+
+    fn set_my_default_administrator_rights(&self) -> Self::SetMyDefaultAdministratorRights {
+        Self::SetMyDefaultAdministratorRights::new(
+            self.clone(),
+            payloads::SetMyDefaultAdministratorRights::new(),
+        )
+    }
+
+    type GetMyDefaultAdministratorRights = JsonRequest<payloads::GetMyDefaultAdministratorRights>;
+
+    fn get_my_default_administrator_rights(&self) -> Self::GetMyDefaultAdministratorRights {
+        Self::GetMyDefaultAdministratorRights::new(
+            self.clone(),
+            payloads::GetMyDefaultAdministratorRights::new(),
+        )
+    }
+
     type DeleteMyCommands = JsonRequest<payloads::DeleteMyCommands>;
 
     fn delete_my_commands(&self) -> Self::DeleteMyCommands {
@@ -708,6 +738,22 @@ impl Requester for Bot {
         )
     }
 
+    type AnswerWebAppQuery = JsonRequest<payloads::AnswerWebAppQuery>;
+
+    fn answer_web_app_query<W>(
+        &self,
+        web_app_query_id: W,
+        result: InlineQueryResult,
+    ) -> Self::AnswerWebAppQuery
+    where
+        W: Into<String>,
+    {
+        Self::AnswerWebAppQuery::new(
+            self.clone(),
+            payloads::AnswerWebAppQuery::new(web_app_query_id, result),
+        )
+    }
+
     type EditMessageText = JsonRequest<payloads::EditMessageText>;
 
     fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 9971da25..6553b411 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -943,6 +943,38 @@ macro_rules! requester_forward {
             $body!(get_my_commands this ())
         }
     };
+    (@method set_chat_menu_button $body:ident $ty:ident) => {
+        type SetChatMenuButton = $ty![SetChatMenuButton];
+
+        fn set_chat_menu_button(&self) -> Self::SetChatMenuButton {
+            let this = self;
+            $body!(set_chat_menu_button this ())
+        }
+    };
+    (@method get_chat_menu_button $body:ident $ty:ident) => {
+        type GetChatMenuButton = $ty![GetChatMenuButton];
+
+        fn get_chat_menu_button(&self) -> Self::GetChatMenuButton {
+            let this = self;
+            $body!(get_chat_menu_button this ())
+        }
+    };
+    (@method set_my_default_administrator_rights $body:ident $ty:ident) => {
+        type SetMyDefaultAdministratorRights = $ty![SetMyDefaultAdministratorRights];
+
+        fn set_my_default_administrator_rights(&self) -> Self::SetMyDefaultAdministratorRights {
+            let this = self;
+            $body!(set_my_default_administrator_rights this ())
+        }
+    };
+    (@method get_my_default_administrator_rights $body:ident $ty:ident) => {
+        type GetMyDefaultAdministratorRights = $ty![GetMyDefaultAdministratorRights];
+
+        fn get_my_default_administrator_rights(&self) -> Self::GetMyDefaultAdministratorRights {
+            let this = self;
+            $body!(get_my_default_administrator_rights this ())
+        }
+    };
     (@method delete_my_commands $body:ident $ty:ident) => {
         type DeleteMyCommands = $ty![DeleteMyCommands];
 
@@ -960,6 +992,14 @@ macro_rules! requester_forward {
             $body!(answer_inline_query this (inline_query_id: I, results: R))
         }
     };
+    (@method answer_web_app_query $body:ident $ty:ident) => {
+        type AnswerWebAppQuery = $ty![AnswerWebAppQuery];
+
+        fn answer_web_app_query<W>(&self, web_app_query_id: W, result: InlineQueryResult) -> Self::AnswerWebAppQuery where W: Into<String> {
+            let this = self;
+            $body!(answer_web_app_query this (web_app_query_id: W, result: InlineQueryResult))
+        }
+    };
     (@method edit_message_text $body:ident $ty:ident) => {
         type EditMessageText = $ty![EditMessageText];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index 5e8d33cb..8f5cb81b 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -25,6 +25,7 @@ mod answer_callback_query;
 mod answer_inline_query;
 mod answer_pre_checkout_query;
 mod answer_shipping_query;
+mod answer_web_app_query;
 mod approve_chat_join_request;
 mod ban_chat_member;
 mod ban_chat_sender_chat;
@@ -57,10 +58,12 @@ mod get_chat_administrators;
 mod get_chat_member;
 mod get_chat_member_count;
 mod get_chat_members_count;
+mod get_chat_menu_button;
 mod get_file;
 mod get_game_high_scores;
 mod get_me;
 mod get_my_commands;
+mod get_my_default_administrator_rights;
 mod get_sticker_set;
 mod get_updates;
 mod get_user_profile_photos;
@@ -92,6 +95,7 @@ mod send_video_note;
 mod send_voice;
 mod set_chat_administrator_custom_title;
 mod set_chat_description;
+mod set_chat_menu_button;
 mod set_chat_permissions;
 mod set_chat_photo;
 mod set_chat_sticker_set;
@@ -99,6 +103,7 @@ mod set_chat_title;
 mod set_game_score;
 mod set_game_score_inline;
 mod set_my_commands;
+mod set_my_default_administrator_rights;
 mod set_passport_data_errors;
 mod set_sticker_position_in_set;
 mod set_sticker_set_thumb;
@@ -117,6 +122,7 @@ pub use answer_callback_query::{AnswerCallbackQuery, AnswerCallbackQuerySetters}
 pub use answer_inline_query::{AnswerInlineQuery, AnswerInlineQuerySetters};
 pub use answer_pre_checkout_query::{AnswerPreCheckoutQuery, AnswerPreCheckoutQuerySetters};
 pub use answer_shipping_query::{AnswerShippingQuery, AnswerShippingQuerySetters};
+pub use answer_web_app_query::{AnswerWebAppQuery, AnswerWebAppQuerySetters};
 pub use approve_chat_join_request::{ApproveChatJoinRequest, ApproveChatJoinRequestSetters};
 pub use ban_chat_member::{BanChatMember, BanChatMemberSetters};
 pub use ban_chat_sender_chat::{BanChatSenderChat, BanChatSenderChatSetters};
@@ -153,10 +159,14 @@ pub use get_chat_administrators::{GetChatAdministrators, GetChatAdministratorsSe
 pub use get_chat_member::{GetChatMember, GetChatMemberSetters};
 pub use get_chat_member_count::{GetChatMemberCount, GetChatMemberCountSetters};
 pub use get_chat_members_count::{GetChatMembersCount, GetChatMembersCountSetters};
+pub use get_chat_menu_button::{GetChatMenuButton, GetChatMenuButtonSetters};
 pub use get_file::{GetFile, GetFileSetters};
 pub use get_game_high_scores::{GetGameHighScores, GetGameHighScoresSetters};
 pub use get_me::{GetMe, GetMeSetters};
 pub use get_my_commands::{GetMyCommands, GetMyCommandsSetters};
+pub use get_my_default_administrator_rights::{
+    GetMyDefaultAdministratorRights, GetMyDefaultAdministratorRightsSetters,
+};
 pub use get_sticker_set::{GetStickerSet, GetStickerSetSetters};
 pub use get_updates::{GetUpdates, GetUpdatesSetters};
 pub use get_user_profile_photos::{GetUserProfilePhotos, GetUserProfilePhotosSetters};
@@ -190,6 +200,7 @@ pub use set_chat_administrator_custom_title::{
     SetChatAdministratorCustomTitle, SetChatAdministratorCustomTitleSetters,
 };
 pub use set_chat_description::{SetChatDescription, SetChatDescriptionSetters};
+pub use set_chat_menu_button::{SetChatMenuButton, SetChatMenuButtonSetters};
 pub use set_chat_permissions::{SetChatPermissions, SetChatPermissionsSetters};
 pub use set_chat_photo::{SetChatPhoto, SetChatPhotoSetters};
 pub use set_chat_sticker_set::{SetChatStickerSet, SetChatStickerSetSetters};
@@ -197,6 +208,9 @@ pub use set_chat_title::{SetChatTitle, SetChatTitleSetters};
 pub use set_game_score::{SetGameScore, SetGameScoreSetters};
 pub use set_game_score_inline::{SetGameScoreInline, SetGameScoreInlineSetters};
 pub use set_my_commands::{SetMyCommands, SetMyCommandsSetters};
+pub use set_my_default_administrator_rights::{
+    SetMyDefaultAdministratorRights, SetMyDefaultAdministratorRightsSetters,
+};
 pub use set_passport_data_errors::{SetPassportDataErrors, SetPassportDataErrorsSetters};
 pub use set_sticker_position_in_set::{SetStickerPositionInSet, SetStickerPositionInSetSetters};
 pub use set_sticker_set_thumb::{SetStickerSetThumb, SetStickerSetThumbSetters};
@@ -211,5 +225,3 @@ pub use unban_chat_sender_chat::{UnbanChatSenderChat, UnbanChatSenderChatSetters
 pub use unpin_all_chat_messages::{UnpinAllChatMessages, UnpinAllChatMessagesSetters};
 pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
-
-// end of auto generated block
diff --git a/src/payloads/answer_web_app_query.rs b/src/payloads/answer_web_app_query.rs
new file mode 100644
index 00000000..feeeed3f
--- /dev/null
+++ b/src/payloads/answer_web_app_query.rs
@@ -0,0 +1,26 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{InlineQueryResult, SentWebAppMessage};
+
+impl_payload! {
+    /// Use this method to set the result of an interaction with a [Web App] and send a corresponding message on behalf of the user to the chat from which the query originated.
+    ///
+    /// [Web App]: https://core.telegram.org/bots/webapps
+    #[derive(Debug, PartialEq, Clone, Serialize)]
+    pub AnswerWebAppQuery (AnswerWebAppQuerySetters) => SentWebAppMessage {
+        required {
+            /// Unique identifier for the query to be answered
+            pub web_app_query_id: String [into],
+            /// A JSON-serialized object describing the message to be sent
+            pub result: InlineQueryResult,
+        }
+    }
+}
diff --git a/src/payloads/get_chat_menu_button.rs b/src/payloads/get_chat_menu_button.rs
new file mode 100644
index 00000000..c2097e3a
--- /dev/null
+++ b/src/payloads/get_chat_menu_button.rs
@@ -0,0 +1,23 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, MenuButton};
+
+impl_payload! {
+    /// Use this method to get the current value of the bot's menu button in a private chat, or the default menu button.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub GetChatMenuButton (GetChatMenuButtonSetters) => MenuButton {
+
+        optional {
+            /// Unique identifier for the target private chat. If not specified, default bot's menu button will be returned
+            pub chat_id: ChatId [into],
+        }
+    }
+}
diff --git a/src/payloads/get_my_default_administrator_rights.rs b/src/payloads/get_my_default_administrator_rights.rs
new file mode 100644
index 00000000..d45e708b
--- /dev/null
+++ b/src/payloads/get_my_default_administrator_rights.rs
@@ -0,0 +1,23 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::ChatAdministratorRights;
+
+impl_payload! {
+    /// Use this method to get the current value of the bot's menu button in a private chat, or the default menu button.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub GetMyDefaultAdministratorRights (GetMyDefaultAdministratorRightsSetters) => ChatAdministratorRights {
+
+        optional {
+            /// Pass _True_ to get default administrator rights of the bot in channels. Otherwise, default administrator rights of the bot for groups and supergroups will be returned.
+            pub for_channels: bool,
+        }
+    }
+}
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 8af4b0b9..30437165 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -34,7 +34,7 @@ impl_payload! {
             /// Pass True, if the administrator can delete messages of other users
             pub can_delete_messages: bool,
             /// Pass True, if the administrator can manage voice chats, supergroups only
-            pub can_manage_voice_chats: bool,
+            pub can_manage_video_chats: bool,
             /// Pass True, if the administrator can invite new users to the chat
             pub can_invite_users: bool,
             /// Pass True, if the administrator can restrict, ban or unban chat members
diff --git a/src/payloads/set_chat_menu_button.rs b/src/payloads/set_chat_menu_button.rs
new file mode 100644
index 00000000..88cfea43
--- /dev/null
+++ b/src/payloads/set_chat_menu_button.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatId, MenuButton, True};
+
+impl_payload! {
+    /// Use this method to change the bot's menu button in a private chat, or the default menu button.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub SetChatMenuButton (SetChatMenuButtonSetters) => True {
+
+        optional {
+            /// Unique identifier for the target private chat. If not specified, default bot's menu button will be changed.
+            pub chat_id: ChatId [into],
+            /// An object for the new bot's menu button. Defaults to MenuButtonDefault
+            pub menu_button: MenuButton,
+        }
+    }
+}
diff --git a/src/payloads/set_my_default_administrator_rights.rs b/src/payloads/set_my_default_administrator_rights.rs
new file mode 100644
index 00000000..547e45f3
--- /dev/null
+++ b/src/payloads/set_my_default_administrator_rights.rs
@@ -0,0 +1,25 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::{ChatAdministratorRights, True};
+
+impl_payload! {
+    /// Use this method to change the default administrator rights requested by the bot when it's added as an administrator to groups or channels. These rights will be suggested to users, but they are are free to modify the list before adding the bot.
+    #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
+    pub SetMyDefaultAdministratorRights (SetMyDefaultAdministratorRightsSetters) => True {
+
+        optional {
+            /// A JSON-serialized object describing new default administrator rights. If not specified, the default administrator rights will be cleared.
+            pub rights: ChatAdministratorRights,
+            /// Pass _True_ to change the default administrator rights of the bot in channels. Otherwise, the default administrator rights of the bot for groups and supergroups will be changed.
+            pub for_channels: bool,
+        }
+    }
+}
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 1fb5ead2..aaa1606d 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -10,20 +10,22 @@
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
     AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
-    ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _, BanChatSenderChatSetters as _,
-    CloseSetters as _, CopyMessageSetters as _, CreateChatInviteLinkSetters as _,
-    CreateNewStickerSetSetters as _, DeclineChatJoinRequestSetters as _,
-    DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _, DeleteMessageSetters as _,
-    DeleteMyCommandsSetters as _, DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _,
-    EditChatInviteLinkSetters as _, EditMessageCaptionInlineSetters as _,
-    EditMessageCaptionSetters as _, EditMessageLiveLocationInlineSetters as _,
-    EditMessageLiveLocationSetters as _, EditMessageMediaInlineSetters as _,
-    EditMessageMediaSetters as _, EditMessageReplyMarkupInlineSetters as _,
-    EditMessageReplyMarkupSetters as _, EditMessageTextInlineSetters as _,
-    EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    AnswerWebAppQuerySetters as _, ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _,
+    BanChatSenderChatSetters as _, CloseSetters as _, CopyMessageSetters as _,
+    CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
+    DeclineChatJoinRequestSetters as _, DeleteChatPhotoSetters as _,
+    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteMyCommandsSetters as _,
+    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
+    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
+    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
+    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
+    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
+    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
+    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberCountSetters as _, GetChatMemberSetters as _,
-    GetChatMembersCountSetters as _, GetChatSetters as _, GetFileSetters as _,
-    GetGameHighScoresSetters as _, GetMeSetters as _, GetMyCommandsSetters as _,
+    GetChatMembersCountSetters as _, GetChatMenuButtonSetters as _, GetChatSetters as _,
+    GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
+    GetMyCommandsSetters as _, GetMyDefaultAdministratorRightsSetters as _,
     GetStickerSetSetters as _, GetUpdatesSetters as _, GetUserProfilePhotosSetters as _,
     GetWebhookInfoSetters as _, KickChatMemberSetters as _, LeaveChatSetters as _,
     LogOutSetters as _, PinChatMessageSetters as _, PromoteChatMemberSetters as _,
@@ -34,9 +36,10 @@ pub use crate::payloads::{
     SendPhotoSetters as _, SendPollSetters as _, SendStickerSetters as _, SendVenueSetters as _,
     SendVideoNoteSetters as _, SendVideoSetters as _, SendVoiceSetters as _,
     SetChatAdministratorCustomTitleSetters as _, SetChatDescriptionSetters as _,
-    SetChatPermissionsSetters as _, SetChatPhotoSetters as _, SetChatStickerSetSetters as _,
-    SetChatTitleSetters as _, SetGameScoreInlineSetters as _, SetGameScoreSetters as _,
-    SetMyCommandsSetters as _, SetPassportDataErrorsSetters as _,
+    SetChatMenuButtonSetters as _, SetChatPermissionsSetters as _, SetChatPhotoSetters as _,
+    SetChatStickerSetSetters as _, SetChatTitleSetters as _, SetGameScoreInlineSetters as _,
+    SetGameScoreSetters as _, SetMyCommandsSetters as _,
+    SetMyDefaultAdministratorRightsSetters as _, SetPassportDataErrorsSetters as _,
     SetStickerPositionInSetSetters as _, SetStickerSetThumbSetters as _, SetWebhookSetters as _,
     StopMessageLiveLocationInlineSetters as _, StopMessageLiveLocationSetters as _,
     StopPollSetters as _, UnbanChatMemberSetters as _, UnbanChatSenderChatSetters as _,
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 282e5ba4..fe474610 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -590,6 +590,32 @@ pub trait Requester {
     /// For Telegram documentation see [`GetMyCommands`].
     fn get_my_commands(&self) -> Self::GetMyCommands;
 
+    type SetChatMenuButton: Request<Payload = SetChatMenuButton, Err = Self::Err>;
+
+    /// For Telegram documentation see [`SetChatMenuButton`].
+    fn set_chat_menu_button(&self) -> Self::SetChatMenuButton;
+
+    type GetChatMenuButton: Request<Payload = GetChatMenuButton, Err = Self::Err>;
+
+    /// For Telegram documentation see [`GetChatMenuButton`].
+    fn get_chat_menu_button(&self) -> Self::GetChatMenuButton;
+
+    type SetMyDefaultAdministratorRights: Request<
+        Payload = SetMyDefaultAdministratorRights,
+        Err = Self::Err,
+    >;
+
+    /// For Telegram documentation see [`SetMyDefaultAdministratorRights`].
+    fn set_my_default_administrator_rights(&self) -> Self::SetMyDefaultAdministratorRights;
+
+    type GetMyDefaultAdministratorRights: Request<
+        Payload = GetMyDefaultAdministratorRights,
+        Err = Self::Err,
+    >;
+
+    /// For Telegram documentation see [`GetMyDefaultAdministratorRights`].
+    fn get_my_default_administrator_rights(&self) -> Self::GetMyDefaultAdministratorRights;
+
     type DeleteMyCommands: Request<Payload = DeleteMyCommands, Err = Self::Err>;
 
     /// For Telegram documentation see [`DeleteMyCommands`].
@@ -603,6 +629,17 @@ pub trait Requester {
         I: Into<String>,
         R: IntoIterator<Item = InlineQueryResult>;
 
+    type AnswerWebAppQuery: Request<Payload = AnswerWebAppQuery, Err = Self::Err>;
+
+    /// For Telegram documentation see [`AnswerWebAppQuery`].
+    fn answer_web_app_query<W>(
+        &self,
+        web_app_query_id: W,
+        result: InlineQueryResult,
+    ) -> Self::AnswerWebAppQuery
+    where
+        W: Into<String>;
+
     type EditMessageText: Request<Payload = EditMessageText, Err = Self::Err>;
 
     /// For Telegram documentation see [`EditMessageText`].
@@ -902,7 +939,7 @@ macro_rules! forward_all {
             set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
             leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
             set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-            set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+            set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
             edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
             edit_message_media, edit_message_media_inline, edit_message_reply_markup,
             edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
@@ -998,7 +1035,7 @@ where
         set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
         leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
         set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, delete_my_commands, answer_inline_query, edit_message_text,
+        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
         edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
         edit_message_media, edit_message_media_inline, edit_message_reply_markup,
         edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,

From dcc4f57013a6477e1581121397384c35ad8dcbd5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 19:35:08 +0400
Subject: [PATCH 575/755] Reformat requester_forward!{} macro calls

...so they are at least somewhat manageable
---
 src/adaptors/auto_send.rs               | 121 ++++++++++++++++++-----
 src/adaptors/cache_me.rs                | 120 ++++++++++++++++++-----
 src/adaptors/erased.rs                  | 121 ++++++++++++++++++-----
 src/adaptors/parse_mode.rs              | 107 ++++++++++++++++-----
 src/adaptors/throttle/requester_impl.rs | 122 +++++++++++++++++++-----
 src/adaptors/trace.rs                   | 121 ++++++++++++++++++-----
 src/requests/requester.rs               | 121 ++++++++++++++++++-----
 7 files changed, 666 insertions(+), 167 deletions(-)

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 76a8cf57..8f445a86 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -83,30 +83,103 @@ where
     type Err = B::Err;
 
     requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => f, fty
+        get_me,
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        forward_message,
+        copy_message,
+        send_message,
+        send_photo,
+        send_audio,
+        send_document,
+        send_video,
+        send_animation,
+        send_voice,
+        send_video_note,
+        send_media_group,
+        send_location,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_venue,
+        send_contact,
+        send_poll,
+        send_dice,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        send_sticker,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        send_invoice,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        get_game_high_scores,
+        approve_chat_join_request,
+        decline_chat_join_request
+        => f, fty
     }
 }
 
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 66909f25..05798cda 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -90,30 +90,102 @@ where
     }
 
     requester_forward! {
-        log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => f, fty
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        forward_message,
+        copy_message,
+        send_message,
+        send_photo,
+        send_audio,
+        send_document,
+        send_video,
+        send_animation,
+        send_voice,
+        send_video_note,
+        send_media_group,
+        send_location,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_venue,
+        send_contact,
+        send_poll,
+        send_dice,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        send_sticker,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        send_invoice,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        get_game_high_scores,
+        approve_chat_join_request,
+        decline_chat_join_request
+        => f, fty
     }
 }
 
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 1eb57243..6c98cbd0 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -156,30 +156,103 @@ where
     type Err = Err;
 
     requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => fwd_erased, fty
+        get_me,
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        forward_message,
+        copy_message,
+        send_message,
+        send_photo,
+        send_audio,
+        send_document,
+        send_video,
+        send_animation,
+        send_voice,
+        send_video_note,
+        send_media_group,
+        send_location,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_venue,
+        send_contact,
+        send_poll,
+        send_dice,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        send_sticker,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        send_invoice,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        get_game_high_scores,
+        approve_chat_join_request,
+        decline_chat_join_request
+        => fwd_erased, fty
     }
 }
 
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index d896a411..d5b749dc 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -96,28 +96,91 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
     }
 
     requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => fid, fty
+        get_me,
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        forward_message,
+        copy_message,
+        send_video_note,
+        send_media_group,
+        send_location,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_venue,
+        send_contact,
+        send_dice,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        send_sticker,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        send_invoice,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        get_game_high_scores,
+        approve_chat_join_request,
+        decline_chat_join_request
+        => fid, fty
     }
 }
 
diff --git a/src/adaptors/throttle/requester_impl.rs b/src/adaptors/throttle/requester_impl.rs
index a2661eed..c7764172 100644
--- a/src/adaptors/throttle/requester_impl.rs
+++ b/src/adaptors/throttle/requester_impl.rs
@@ -63,35 +63,107 @@ where
     type Err = B::Err;
 
     requester_forward! {
-        send_message, forward_message, copy_message, send_photo, send_audio,
-        send_document, send_video, send_animation, send_voice, send_video_note,
-        send_media_group, send_location, send_venue, send_contact, send_poll,
-        send_dice, send_sticker, send_invoice => f, fty
+        send_message,
+        forward_message,
+        copy_message,
+        send_photo,
+        send_audio,
+        send_document,
+        send_video,
+        send_animation,
+        send_voice,
+        send_video_note,
+        send_media_group,
+        send_location,
+        send_venue,
+        send_contact,
+        send_poll,
+        send_dice,
+        send_sticker,
+        send_invoice
+        => f, fty
     }
 
     requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline,
-        send_chat_action, get_user_profile_photos, get_file, kick_chat_member, ban_chat_member,
-        unban_chat_member, restrict_chat_member, promote_chat_member,
+        get_me,
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
         set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count,
-        get_chat_member, set_chat_sticker_set, delete_chat_sticker_set,
-        answer_callback_query, set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query,
-        edit_message_text, edit_message_text_inline, edit_message_caption,
-        edit_message_caption_inline, edit_message_media, edit_message_media_inline,
-        edit_message_reply_markup, edit_message_reply_markup_inline, stop_poll,
-        delete_message, get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, answer_shipping_query, answer_pre_checkout_query,
-        set_passport_data_errors, send_game, set_game_score, set_game_score_inline,
-        approve_chat_join_request, decline_chat_join_request,
-        get_game_high_scores => fid, ftyid
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        approve_chat_join_request,
+        decline_chat_join_request,
+        get_game_high_scores
+        => fid, ftyid
     }
 }
 
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 33c2d616..46b9db15 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -115,30 +115,103 @@ where
     type Err = B::Err;
 
     requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => fwd_inner, fty
+        get_me,
+        log_out,
+        close,
+        get_updates,
+        set_webhook,
+        delete_webhook,
+        get_webhook_info,
+        forward_message,
+        copy_message,
+        send_message,
+        send_photo,
+        send_audio,
+        send_document,
+        send_video,
+        send_animation,
+        send_voice,
+        send_video_note,
+        send_media_group,
+        send_location,
+        edit_message_live_location,
+        edit_message_live_location_inline,
+        stop_message_live_location,
+        stop_message_live_location_inline,
+        send_venue,
+        send_contact,
+        send_poll,
+        send_dice,
+        send_chat_action,
+        get_user_profile_photos,
+        get_file,
+        kick_chat_member,
+        ban_chat_member,
+        unban_chat_member,
+        restrict_chat_member,
+        promote_chat_member,
+        set_chat_administrator_custom_title,
+        ban_chat_sender_chat,
+        unban_chat_sender_chat,
+        set_chat_permissions,
+        export_chat_invite_link,
+        create_chat_invite_link,
+        edit_chat_invite_link,
+        revoke_chat_invite_link,
+        set_chat_photo,
+        delete_chat_photo,
+        set_chat_title,
+        set_chat_description,
+        pin_chat_message,
+        unpin_chat_message,
+        unpin_all_chat_messages,
+        leave_chat,
+        get_chat,
+        get_chat_administrators,
+        get_chat_members_count,
+        get_chat_member_count,
+        get_chat_member,
+        set_chat_sticker_set,
+        delete_chat_sticker_set,
+        answer_callback_query,
+        set_my_commands,
+        get_my_commands,
+        set_chat_menu_button,
+        get_chat_menu_button,
+        set_my_default_administrator_rights,
+        get_my_default_administrator_rights,
+        delete_my_commands,
+        answer_inline_query,
+        answer_web_app_query,
+        edit_message_text,
+        edit_message_text_inline,
+        edit_message_caption,
+        edit_message_caption_inline,
+        edit_message_media,
+        edit_message_media_inline,
+        edit_message_reply_markup,
+        edit_message_reply_markup_inline,
+        stop_poll,
+        delete_message,
+        send_sticker,
+        get_sticker_set,
+        upload_sticker_file,
+        create_new_sticker_set,
+        add_sticker_to_set,
+        set_sticker_position_in_set,
+        delete_sticker_from_set,
+        set_sticker_set_thumb,
+        send_invoice,
+        answer_shipping_query,
+        answer_pre_checkout_query,
+        set_passport_data_errors,
+        send_game,
+        set_game_score,
+        set_game_score_inline,
+        get_game_high_scores,
+        approve_chat_join_request,
+        decline_chat_join_request
+        => fwd_inner, fty
     }
 }
 
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index fe474610..b15aee7b 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -925,30 +925,103 @@ macro_rules! fwd_deref {
 macro_rules! forward_all {
     () => {
         requester_forward! {
-            get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-            forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-            send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-            edit_message_live_location, edit_message_live_location_inline,
-            stop_message_live_location, stop_message_live_location_inline, send_venue,
-            send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-            get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-            promote_chat_member, set_chat_administrator_custom_title,
-            ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-            export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-            revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-            set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-            leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-            set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-            set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-            edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-            edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-            edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-            get_sticker_set, upload_sticker_file, create_new_sticker_set,
-            add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-            set_sticker_set_thumb, send_invoice, answer_shipping_query,
-            answer_pre_checkout_query, set_passport_data_errors, send_game,
-            set_game_score, set_game_score_inline, get_game_high_scores,
-            approve_chat_join_request, decline_chat_join_request => fwd_deref, fty
+            get_me,
+            log_out,
+            close,
+            get_updates,
+            set_webhook,
+            delete_webhook,
+            get_webhook_info,
+            forward_message,
+            copy_message,
+            send_message,
+            send_photo,
+            send_audio,
+            send_document,
+            send_video,
+            send_animation,
+            send_voice,
+            send_video_note,
+            send_media_group,
+            send_location,
+            edit_message_live_location,
+            edit_message_live_location_inline,
+            stop_message_live_location,
+            stop_message_live_location_inline,
+            send_venue,
+            send_contact,
+            send_poll,
+            send_dice,
+            send_chat_action,
+            get_user_profile_photos,
+            get_file,
+            kick_chat_member,
+            ban_chat_member,
+            unban_chat_member,
+            restrict_chat_member,
+            promote_chat_member,
+            set_chat_administrator_custom_title,
+            ban_chat_sender_chat,
+            unban_chat_sender_chat,
+            set_chat_permissions,
+            export_chat_invite_link,
+            create_chat_invite_link,
+            edit_chat_invite_link,
+            revoke_chat_invite_link,
+            set_chat_photo,
+            delete_chat_photo,
+            set_chat_title,
+            set_chat_description,
+            pin_chat_message,
+            unpin_chat_message,
+            unpin_all_chat_messages,
+            leave_chat,
+            get_chat,
+            get_chat_administrators,
+            get_chat_members_count,
+            get_chat_member_count,
+            get_chat_member,
+            set_chat_sticker_set,
+            delete_chat_sticker_set,
+            answer_callback_query,
+            set_my_commands,
+            get_my_commands,
+            set_chat_menu_button,
+            get_chat_menu_button,
+            set_my_default_administrator_rights,
+            get_my_default_administrator_rights,
+            delete_my_commands,
+            answer_inline_query,
+            answer_web_app_query,
+            edit_message_text,
+            edit_message_text_inline,
+            edit_message_caption,
+            edit_message_caption_inline,
+            edit_message_media,
+            edit_message_media_inline,
+            edit_message_reply_markup,
+            edit_message_reply_markup_inline,
+            stop_poll,
+            delete_message,
+            send_sticker,
+            get_sticker_set,
+            upload_sticker_file,
+            create_new_sticker_set,
+            add_sticker_to_set,
+            set_sticker_position_in_set,
+            delete_sticker_from_set,
+            set_sticker_set_thumb,
+            send_invoice,
+            answer_shipping_query,
+            answer_pre_checkout_query,
+            set_passport_data_errors,
+            send_game,
+            set_game_score,
+            set_game_score_inline,
+            get_game_high_scores,
+            approve_chat_join_request,
+            decline_chat_join_request
+            => fwd_deref, fty
         }
     };
 }

From 852feaeda48334256ebaaa83a8aa3639023bde7e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 20:10:52 +0400
Subject: [PATCH 576/755] Update changelog and stuff

---
 CHANGELOG.md | 5 +++++
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fb5bebe..c1a85c23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
+  - Note that some field were renamed
+
 ## 0.5.1 - 2022-04-18
 
 ### Fixed
diff --git a/README.md b/README.md
index 1b65c62e..ec1d3296 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%205.7%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.0%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/lib.rs b/src/lib.rs
index b4d27cff..77239872 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `5.3` is supported) with ease. The library is fully
+//! (Currently, version `6.0` is supported) with ease. The library is fully
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml

From b44bbde329a0c040c6a0f6942302c69f49a90a52 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 21 Apr 2022 21:07:03 +0400
Subject: [PATCH 577/755] Fix tests

---
 src/types/chat_member.rs | 2 +-
 src/types/message.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 1dae0fad..b61c239f 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -617,7 +617,7 @@ mod tests {
             "can_manage_chat": true,
             "can_change_info": true,
             "can_delete_messages": true,
-            "can_manage_voice_chats": true,
+            "can_manage_video_chats": true,
             "can_invite_users": true,
             "can_restrict_members": true,
             "can_pin_messages": true,
diff --git a/src/types/message.rs b/src/types/message.rs
index 9b13acab..b0a80500 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1462,7 +1462,7 @@ mod tests {
     /// Regression test for <https://github.com/teloxide/teloxide/issues/475>
     #[test]
     fn issue_475() {
-        let json = r#"{"message_id":198295,"from":{"id":1087968824,"is_bot":true,"first_name":"Group","username":"GroupAnonymousBot"},"sender_chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"date":1638236631,"voice_chat_started":{}}"#;
+        let json = r#"{"message_id":198295,"from":{"id":1087968824,"is_bot":true,"first_name":"Group","username":"GroupAnonymousBot"},"sender_chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"chat":{"id":-1001331354980,"title":"C++ Together 2.0","username":"cpptogether","type":"supergroup"},"date":1638236631,"video_chat_started":{}}"#;
 
         let message: Message = serde_json::from_str(json).unwrap();
 

From 012fb94044bf3f6ef4460dfa58fa694448a3dbb3 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sat, 23 Apr 2022 23:57:42 +0600
Subject: [PATCH 578/755] Accept `IntoIterator` in `KeyboardMarkup::append_row`

---
 CHANGELOG.md                       | 4 ++++
 src/types/reply_keyboard_markup.rs | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fb5bebe..65f93025 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Changed
+
+ - Accept `IntoIterator` in `KeyboardMarkup::append_row`.
+
 ## 0.5.1 - 2022-04-18
 
 ### Fixed
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index 3553f710..05d87ff3 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -67,8 +67,11 @@ impl KeyboardMarkup {
         }
     }
 
-    pub fn append_row(mut self, buttons: Vec<KeyboardButton>) -> Self {
-        self.keyboard.push(buttons);
+    pub fn append_row<R>(mut self, buttons: R) -> Self
+    where
+        R: IntoIterator<Item = KeyboardButton>,
+    {
+        self.keyboard.push(buttons.into_iter().collect());
         self
     }
 

From 9440609a3c53ed389c31f88aed9121ccac0a5c29 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 00:02:28 +0600
Subject: [PATCH 579/755] Accept `Into<String>` in `InlineKeyboardButton`'s
 methods

---
 CHANGELOG.md                        |  1 +
 src/types/inline_keyboard_button.rs | 43 +++++++++++++++++++----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65f93025..45d2168b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
  - Accept `IntoIterator` in `KeyboardMarkup::append_row`.
+ - Accept `Into<String>` instead of `String` in `InlineKeyboardButton::{url, callback, switch_inline_query, switch_inline_query_current_chat}`.
 
 ## 0.5.1 - 2022-04-18
 
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 06a70850..92e76ed9 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -114,35 +114,50 @@ pub enum InlineKeyboardButtonKind {
 /// let url_button = InlineKeyboardButton::url("Text".to_string(), url);
 /// ```
 impl InlineKeyboardButton {
-    pub fn url(text: String, url: reqwest::Url) -> InlineKeyboardButton {
+    pub fn url<T>(text: T, url: reqwest::Url) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+    {
         InlineKeyboardButton {
-            text,
+            text: text.into(),
             kind: InlineKeyboardButtonKind::Url(url),
         }
     }
 
-    pub fn callback(text: String, callback_data: String) -> InlineKeyboardButton {
+    pub fn callback<T, C>(text: T, callback_data: C) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+        C: Into<String>,
+    {
         InlineKeyboardButton {
-            text,
-            kind: InlineKeyboardButtonKind::CallbackData(callback_data),
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::CallbackData(callback_data.into()),
         }
     }
 
-    pub fn switch_inline_query(text: String, switch_inline_query: String) -> InlineKeyboardButton {
+    pub fn switch_inline_query<T, Q>(text: T, switch_inline_query: Q) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+        Q: Into<String>,
+    {
         InlineKeyboardButton {
-            text,
-            kind: InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query),
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query.into()),
         }
     }
 
-    pub fn switch_inline_query_current_chat(
-        text: String,
-        switch_inline_query_current_chat: String,
-    ) -> InlineKeyboardButton {
+    pub fn switch_inline_query_current_chat<T, Q>(
+        text: T,
+        switch_inline_query_current_chat: Q,
+    ) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+        Q: Into<String>,
+    {
         InlineKeyboardButton {
-            text,
+            text: text.into(),
             kind: InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat(
-                switch_inline_query_current_chat,
+                switch_inline_query_current_chat.into(),
             ),
         }
     }

From 2387e11dd13c61c3bbd54093b7a5f664180cfab6 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 00:02:53 +0600
Subject: [PATCH 580/755] Remove an unused import in `requester_ext.rs`

---
 src/requests/requester_ext.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 455c7c61..25d790e7 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,6 +1,4 @@
-use crate::{
-    adaptors::DefaultParseMode, errors::AsResponseParameters, requests::Requester, types::ParseMode,
-};
+use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
 
 #[cfg(feature = "cache_me")]
 use crate::adaptors::CacheMe;

From 739d9738d81f1a93e7a9d3efdb23faa193f856f2 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 00:08:59 +0600
Subject: [PATCH 581/755] Revert "Remove an unused import in
 `requester_ext.rs`"

This reverts commit 2387e11dd13c61c3bbd54093b7a5f664180cfab6.
---
 src/requests/requester_ext.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 25d790e7..455c7c61 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,4 +1,6 @@
-use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
+use crate::{
+    adaptors::DefaultParseMode, errors::AsResponseParameters, requests::Requester, types::ParseMode,
+};
 
 #[cfg(feature = "cache_me")]
 use crate::adaptors::CacheMe;

From 1229d783e35330d3425fe3ee8e93069dd7b36474 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 00:44:21 +0600
Subject: [PATCH 582/755] Fix indentation in `CHANGELOG.md`

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a85c23..8b929ddb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
-  - Note that some field were renamed
+- Note that some field were renamed
 
 ## 0.5.1 - 2022-04-18
 

From daa43e4dbfc3645b657e9d23692630587270c7ca Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 00:45:57 +0600
Subject: [PATCH 583/755] Revert "Fix indentation in `CHANGELOG.md`"

This reverts commit 1229d783e35330d3425fe3ee8e93069dd7b36474.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b929ddb..c1a85c23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
-- Note that some field were renamed
+  - Note that some field were renamed
 
 ## 0.5.1 - 2022-04-18
 

From 304267b101a61446a3b3f062139793b07a7e701e Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Sun, 24 Apr 2022 01:26:08 +0600
Subject: [PATCH 584/755] Update `reqwest` to v0.11.10

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index e631f00c..b603cb1d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ tokio = { version = "1.12.0", features = ["fs"] }
 tokio-util = "0.6.0"
 pin-project = "1.0.3"
 bytes = "1.0.0"
-reqwest = { version = "0.11.0", features = ["json", "stream", "multipart"], default-features = false }
+reqwest = { version = "0.11.10", features = ["json", "stream", "multipart"], default-features = false }
 url = { version = "2", features = ["serde"] }
 log = "0.4"
 

From 2bedd358b206b4fe00e58ee14563f85538117383 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sun, 24 Apr 2022 03:01:07 +0800
Subject: [PATCH 585/755] Add method `MessageEntity::user_mention`

---
 src/types/message_entity.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 7fe19381..4733258f 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::User;
+use crate::types::{User, UserId};
 
 /// This object represents one special entity in a text message.
 ///
@@ -28,6 +28,16 @@ impl MessageEntity {
         }
     }
 
+    /// Create a message entity representing a text link in the form of
+    /// `tg://user/?id=...` that mentions user with `user_id`.
+    pub fn user_mention(user_id: UserId, offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::TextLink { url: user_id.url() },
+            offset,
+            length,
+        }
+    }
+
     pub fn kind(mut self, val: MessageEntityKind) -> Self {
         self.kind = val;
         self

From f5f1fa974f5e0ec98f088e26be939d96974d59f2 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Sun, 24 Apr 2022 03:05:38 +0800
Subject: [PATCH 586/755] Update changelog

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a85c23..899731ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
   - Note that some field were renamed
+- Method `MessageEntity::user_mention` ([#208][pr208])
+
+[pr208]: https://github.com/teloxide/teloxide-core/pull/208
 
 ## 0.5.1 - 2022-04-18
 
@@ -186,8 +189,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Throttle` adaptor not honouring chat/min limits ([#121][pr121])
 - Make `SendPoll::type_` optional ([#133][pr133])
 - Bug with `caption_entities`, see issue [#473][issue473]
-- Type of response for `CopyMessage` method ([#141](pr141), [#142](pr142))
-- Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145](pr145))
+- Type of response for `CopyMessage` method ([#141][pr141], [#142][pr142])
+- Bad request serialization when the `language` field of `MessageEntityKind::Pre` is `None` ([#145][pr145])
 - Deserialization of `MediaKind::Venue` ([#147][pr147])
 - Deserialization of `VoiceChat{Started,Ended}` messages ([#153][pr153])
 - Serialization of `BotCommandScope::Chat{,Administrators}` ([#154][pr154])

From e901012b97090e660b97bea08b3f006a6f4b349b Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Mon, 25 Apr 2022 13:57:56 +0800
Subject: [PATCH 587/755] Add shortcuts for other kinds of entities

---
 src/types/message_entity.rs | 88 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 1 deletion(-)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 4733258f..8d4e5c40 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -28,9 +28,95 @@ impl MessageEntity {
         }
     }
 
+    /// Create a message entity representing a bold text.
+    pub const fn bold(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Bold,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing an italic text.
+    pub const fn italic(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Italic,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing an underline text.
+    pub const fn underline(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Underline,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a strikethrough text.
+    pub const fn strikethrough(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Strikethrough,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a spoiler text.
+    pub const fn spoiler(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Spoiler,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a monowidth text.
+    pub const fn code(offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Code,
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a monowidth block.
+    pub const fn pre(language: Option<String>, offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::Pre { language },
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a clickable text URL.
+    pub const fn text_link(url: reqwest::Url, offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::TextLink { url },
+            offset,
+            length,
+        }
+    }
+
+    /// Create a message entity representing a text mention.
+    ///
+    /// # Note
+    ///
+    /// If you don't have a complete [`User`] value, please use
+    /// [`MessageEntity::text_mention_id`] instead.
+    pub fn text_mention(user: User, offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::TextMention { user },
+            offset,
+            length,
+        }
+    }
+
     /// Create a message entity representing a text link in the form of
     /// `tg://user/?id=...` that mentions user with `user_id`.
-    pub fn user_mention(user_id: UserId, offset: usize, length: usize) -> Self {
+    pub fn text_mention_id(user_id: UserId, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::TextLink { url: user_id.url() },
             offset,

From 6107d8bbdfa6d1814a6655bbd31e1e8c55b97bd7 Mon Sep 17 00:00:00 2001
From: Sprite <SpriteOvO@gmail.com>
Date: Mon, 25 Apr 2022 14:03:29 +0800
Subject: [PATCH 588/755] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47af4efa..9a34c9c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
   - Note that some field were renamed
-- Method `MessageEntity::user_mention` ([#208][pr208])
+- Shortcut methods for `MessageEntity` ([#208][pr208], [#210][pr210])
 
 [pr208]: https://github.com/teloxide/teloxide-core/pull/208
+[pr210]: https://github.com/teloxide/teloxide-core/pull/210
 
 ### Changed
 

From ecc3bfc8f9ad4748ad8f57b8fc250be9dfddfe46 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 25 Apr 2022 14:24:34 +0400
Subject: [PATCH 589/755] Rename (voice* => video*) things that were missed
 while TBA 6.0 update

---
 src/payloads/promote_chat_member.rs           |  2 +-
 src/types.rs                                  | 16 ++++++------
 src/types/chat_member.rs                      |  8 +++---
 src/types/message.rs                          | 26 +++++++++----------
 ...oice_chat_ended.rs => video_chat_ended.rs} |  2 +-
 ....rs => video_chat_participants_invited.rs} |  4 +--
 ...t_scheduled.rs => video_chat_scheduled.rs} |  4 +--
 ..._chat_started.rs => video_chat_started.rs} |  2 +-
 8 files changed, 32 insertions(+), 32 deletions(-)
 rename src/types/{voice_chat_ended.rs => video_chat_ended.rs} (71%)
 rename src/types/{voice_chat_participants_invited.rs => video_chat_participants_invited.rs} (79%)
 rename src/types/{voice_chat_scheduled.rs => video_chat_scheduled.rs} (72%)
 rename src/types/{voice_chat_started.rs => video_chat_started.rs} (75%)

diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 30437165..84e56bb6 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -33,7 +33,7 @@ impl_payload! {
             pub can_edit_messages: bool,
             /// Pass True, if the administrator can delete messages of other users
             pub can_delete_messages: bool,
-            /// Pass True, if the administrator can manage voice chats, supergroups only
+            /// Pass True, if the administrator can manage video chats, supergroups only
             pub can_manage_video_chats: bool,
             /// Pass True, if the administrator can invite new users to the chat
             pub can_invite_users: bool,
diff --git a/src/types.rs b/src/types.rs
index 1551e36f..6f35de8a 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -100,12 +100,12 @@ pub use user::*;
 pub use user_profile_photos::*;
 pub use venue::*;
 pub use video::*;
+pub use video_chat_ended::*;
+pub use video_chat_participants_invited::*;
+pub use video_chat_scheduled::*;
+pub use video_chat_started::*;
 pub use video_note::*;
 pub use voice::*;
-pub use voice_chat_ended::*;
-pub use voice_chat_participants_invited::*;
-pub use voice_chat_scheduled::*;
-pub use voice_chat_started::*;
 pub use web_app_data::*;
 pub use web_app_info::*;
 pub use webhook_info::*;
@@ -183,12 +183,12 @@ mod user;
 mod user_profile_photos;
 mod venue;
 mod video;
+mod video_chat_ended;
+mod video_chat_participants_invited;
+mod video_chat_scheduled;
+mod video_chat_started;
 mod video_note;
 mod voice;
-mod voice_chat_ended;
-mod voice_chat_participants_invited;
-mod voice_chat_scheduled;
-mod voice_chat_started;
 mod web_app_data;
 mod web_app_info;
 mod webhook_info;
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index b61c239f..b6e3c824 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -75,7 +75,7 @@ pub struct Administrator {
     /// `true` if the administrator can delete messages of other users.
     pub can_delete_messages: bool,
 
-    /// `true` if the administrator can manage voice chats.
+    /// `true` if the administrator can manage video chats.
     pub can_manage_video_chats: bool,
 
     /// `true` if the administrator can invite new users to the chat.
@@ -394,15 +394,15 @@ impl ChatMemberKind {
         }
     }
 
-    /// Returns `true` if the user can manage voice chats.
+    /// Returns `true` if the user can manage video chats.
     ///
     /// I.e. returns `true` if the user
     /// - is the owner of the chat
     /// - is an administrator in the given chat and has the
-    ///   [`can_manage_voice_chats`] privilege.
+    ///   [`can_manage_video_chats`] privilege.
     /// Returns `false` otherwise.
     ///
-    /// [`can_manage_voice_chats`]: Administrator::can_manage_voice_chats
+    /// [`can_manage_video_chats`]: Administrator::can_manage_video_chats
     pub fn can_manage_video_chats(&self) -> bool {
         match self {
             Self::Owner(_) => true,
diff --git a/src/types/message.rs b/src/types/message.rs
index b0a80500..1765bab9 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -54,10 +54,10 @@ pub enum MessageKind {
     PassportData(MessagePassportData),
     Dice(MessageDice),
     ProximityAlertTriggered(MessageProximityAlertTriggered),
-    VoiceChatScheduled(MessageVoiceChatScheduled),
-    VoiceChatStarted(MessageVoiceChatStarted),
-    VoiceChatEnded(MessageVoiceChatEnded),
-    VoiceChatParticipantsInvited(MessageVoiceChatParticipantsInvited),
+    VideoChatScheduled(MessageVideoChatScheduled),
+    VideoChatStarted(MessageVideoChatStarted),
+    VideoChatEnded(MessageVideoChatEnded),
+    VideoChatParticipantsInvited(MessageVideoChatParticipantsInvited),
     WebAppData(MessageWebAppData),
 }
 
@@ -493,26 +493,26 @@ pub struct MessageProximityAlertTriggered {
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageVoiceChatScheduled {
-    /// Service message: voice chat scheduled
+pub struct MessageVideoChatScheduled {
+    /// Service message: video chat scheduled
     pub video_chat_scheduled: VideoChatScheduled,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageVoiceChatStarted {
-    /// Service message: voice chat started.
+pub struct MessageVideoChatStarted {
+    /// Service message: video chat started.
     pub video_chat_started: VideoChatStarted,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageVoiceChatEnded {
-    /// Service message: voice chat ended.
+pub struct MessageVideoChatEnded {
+    /// Service message: video chat ended.
     pub video_chat_ended: VideoChatEnded,
 }
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageVoiceChatParticipantsInvited {
-    /// Service message: new participants invited to a voice chat.
+pub struct MessageVideoChatParticipantsInvited {
+    /// Service message: new participants invited to a video chat.
     pub video_chat_participants_invited: VideoChatParticipantsInvited,
 }
 
@@ -1466,7 +1466,7 @@ mod tests {
 
         let message: Message = serde_json::from_str(json).unwrap();
 
-        assert!(matches!(message.kind, MessageKind::VoiceChatStarted { .. }));
+        assert!(matches!(message.kind, MessageKind::VideoChatStarted { .. }));
 
         // FIXME(waffle): it seems like we are losing `sender_chat` in some
         // cases inclusing this
diff --git a/src/types/voice_chat_ended.rs b/src/types/video_chat_ended.rs
similarity index 71%
rename from src/types/voice_chat_ended.rs
rename to src/types/video_chat_ended.rs
index 9a49b763..96775afd 100644
--- a/src/types/voice_chat_ended.rs
+++ b/src/types/video_chat_ended.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-/// This object represents a service message about a voice chat ended in the
+/// This object represents a service message about a video chat ended in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VideoChatEnded {}
diff --git a/src/types/voice_chat_participants_invited.rs b/src/types/video_chat_participants_invited.rs
similarity index 79%
rename from src/types/voice_chat_participants_invited.rs
rename to src/types/video_chat_participants_invited.rs
index 2e1b90a1..1a3f364b 100644
--- a/src/types/voice_chat_participants_invited.rs
+++ b/src/types/video_chat_participants_invited.rs
@@ -3,9 +3,9 @@ use serde::{Deserialize, Serialize};
 use crate::types::User;
 
 /// This object represents a service message about new members invited to a
-/// voice chat.
+/// video chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VideoChatParticipantsInvited {
-    /// New members that were invited to the voice chat
+    /// New members that were invited to the video chat
     pub users: Option<Vec<User>>,
 }
diff --git a/src/types/voice_chat_scheduled.rs b/src/types/video_chat_scheduled.rs
similarity index 72%
rename from src/types/voice_chat_scheduled.rs
rename to src/types/video_chat_scheduled.rs
index a0f26a8a..674b76d4 100644
--- a/src/types/voice_chat_scheduled.rs
+++ b/src/types/video_chat_scheduled.rs
@@ -1,11 +1,11 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-/// This object represents a service message about a voice chat scheduled in the
+/// This object represents a service message about a video chat scheduled in the
 /// chat.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VideoChatScheduled {
-    /// Point in time when the voice chat is supposed to be started by a chat
+    /// Point in time when the video chat is supposed to be started by a chat
     /// administrator.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
     pub start_date: DateTime<Utc>,
diff --git a/src/types/voice_chat_started.rs b/src/types/video_chat_started.rs
similarity index 75%
rename from src/types/voice_chat_started.rs
rename to src/types/video_chat_started.rs
index 11c9db07..32796c9b 100644
--- a/src/types/voice_chat_started.rs
+++ b/src/types/video_chat_started.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-/// This object represents a service message about a voice chat started in the
+/// This object represents a service message about a video chat started in the
 /// chat. Currently holds no information.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VideoChatStarted {}

From cb978b226e54e4319a03086e0b9e0aac23b5ceb8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 25 Apr 2022 14:25:35 +0400
Subject: [PATCH 590/755] Fixup changelog

---
 CHANGELOG.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a34c9c7..9ff70325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,23 +9,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022)
+- Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022) ([#206][pr206], [#211][pr211])
   - Note that some field were renamed
 - Shortcut methods for `MessageEntity` ([#208][pr208], [#210][pr210])
 
 [pr208]: https://github.com/teloxide/teloxide-core/pull/208
+[pr206]: https://github.com/teloxide/teloxide-core/pull/206
 [pr210]: https://github.com/teloxide/teloxide-core/pull/210
+[pr211]: https://github.com/teloxide/teloxide-core/pull/211
 
 ### Changed
 
- - Accept `IntoIterator` in `KeyboardMarkup::append_row`.
- - Accept `Into<String>` instead of `String` in `InlineKeyboardButton::{url, callback, switch_inline_query, switch_inline_query_current_chat}`.
+- Make `KeyboardMarkup` creation more convenient ([#207][pr207])
+  - Accept `IntoIterator` in `KeyboardMarkup::append_row`.
+  - Accept `Into<String>` instead of `String` in `InlineKeyboardButton::{url, callback, switch_inline_query, switch_inline_query_current_chat}`.
+
+[pr207]: https://github.com/teloxide/teloxide-core/pull/207
 
 ## 0.5.1 - 2022-04-18
 
 ### Fixed
 
- - Document the `errors` module.
+- Document the `errors` module.
 
 ## 0.5.0 - 2022-04-13
 

From 9dd296659be7078563297a31e0bf4b97294cae72 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 25 Apr 2022 14:30:23 +0400
Subject: [PATCH 591/755] Dump version

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ff70325..d6d3ce6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.0 - 2022-04-25
+
 ### Added
 
 - Support for Telegram Bot API [version 6.0](https://core.telegram.org/bots/api#april-16-2022) ([#206][pr206], [#211][pr211])
diff --git a/Cargo.toml b/Cargo.toml
index b603cb1d..9435445c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.5.1"
+version = "0.6.0"
 edition = "2018"
 
 license = "MIT"
diff --git a/README.md b/README.md
index ec1d3296..88420ef0 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 </div>
 
 ```toml
-teloxide-core = "0.5"
+teloxide-core = "0.6"
 ```
 _Compiler support: requires rustc 1.58+_.
 
diff --git a/src/lib.rs b/src/lib.rs
index 77239872..da97ab3d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.5"
+//! teloxide_core = "0.6"
 //! ```
 //! _Compiler support: requires rustc 1.58+_.
 //!

From 5108c20910fe439e9c3c0062b1acfe53aef12907 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 26 Apr 2022 01:39:24 +0600
Subject: [PATCH 592/755] Fix `DialogueState`

---
 src/dialogue_state.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
index 5178c754..ebb96ad7 100644
--- a/src/dialogue_state.rs
+++ b/src/dialogue_state.rs
@@ -104,7 +104,8 @@ pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
         impl #self_params_with_bounds teloxide::dispatching::HandlerFactory for #enum_ident #self_params #where_clause {
         type Out = #out;
 
-        fn handler() -> dptree::Handler<'static, dptree::di::DependencyMap, Self::Out> {
+        fn handler() -> dptree::Handler<'static, dptree::di::DependencyMap, Self::Out,
+            teloxide::dispatching::DpHandlerDescription> {
             assert_clone::<#enum_ident #self_params>();
 
             dptree::entry()

From c312aa1e543172b9733ba3ff33fdeb237868be15 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 26 Apr 2022 02:12:22 +0600
Subject: [PATCH 593/755] Release v0.6.1

---
 CHANGELOG.md | 6 ++++++
 Cargo.toml   | 2 +-
 LICENSE      | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11aec587..c4d7cc57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.1 - 2022-04-26
+
+### Fixed
+
+ - Fix `#[derive(DialogueState)]` (function return type `dptree::Handler`).
+
 ## 0.6.0 - 2022-04-09
 
 ### Removed
diff --git a/Cargo.toml b/Cargo.toml
index 8225ca26..53ce205f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.6.0"
+version = "0.6.1"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"
diff --git a/LICENSE b/LICENSE
index af7ef486..8e5427af 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,6 @@
-
 MIT License
 
-Copyright (c) 2019-2020 teloxide
+Copyright (c) 2019-2022 teloxide
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 348a17fb822959478de4055c0a8eff56cb413352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=97=E6=B5=A6=E6=9C=88?= <nanpuyue@gmail.com>
Date: Sun, 1 May 2022 22:18:22 +0800
Subject: [PATCH 594/755] fix: rename_by_rule

---
 src/command_enum.rs | 9 ++++++++-
 src/rename_rules.rs | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/command_enum.rs b/src/command_enum.rs
index e3c7e531..18b8bf95 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -24,7 +24,14 @@ impl CommandEnum {
         }
         if let Some(rename_rule) = &rename {
             match rename_rule.as_str() {
-                "lowercase" => {}
+                "lowercase"
+                | "UPPERCASE"
+                | "PascalCase"
+                | "camelCase"
+                | "snake_case"
+                | "SCREAMING_SNAKE_CASE"
+                | "kebab-case"
+                | "SCREAMING-KEBAB-CASE" => {}
                 _ => return Err("disallowed value".to_owned()),
             }
         }
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index e1ef4a1b..40bfa9e9 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -21,7 +21,7 @@ pub fn rename_by_rule(input: &str, rule: &str) -> String {
         "SCREAMING_SNAKE_CASE" => input.to_shouty_snake_case(),
         "kebab-case" => input.to_kebab_case(),
         "SCREAMING-KEBAB-CASE" => input.to_shouty_kebab_case(),
-        _ => input.to_string(),
+        _ => rule.to_string(),
     }
 }
 

From bc638efc9831596ebc3b81aa90400e70a3f46f9b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 5 May 2022 16:03:28 +0400
Subject: [PATCH 595/755] Add `ChatId` and `UserId` to the prelude

---
 CHANGELOG.md   | 4 ++++
 src/prelude.rs | 1 +
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6d3ce6d..c2bd31c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+- Add `ChatId` and `UserId` to the prelude ([#212][pr212])
+
+[pr212]: https://github.com/teloxide/teloxide-core/pull/212
+
 ## 0.6.0 - 2022-04-25
 
 ### Added
diff --git a/src/prelude.rs b/src/prelude.rs
index 13f135c9..e54840cc 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -4,5 +4,6 @@
 pub use crate::{
     payloads::setters::*,
     requests::{Request, Requester, RequesterExt},
+    types::{ChatId, UserId},
     Bot,
 };

From 799fa6330d6fe4be3ef48cf01facc30ab88eede5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 16 May 2022 21:38:38 +0400
Subject: [PATCH 596/755] Remove `log::warn!` from throttle implementation

"Blocking on queue" literally means "nothing is happening, waiting until
something happens". There is no reason to warn users about that.
---
 src/adaptors/throttle/worker.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index 92731da6..a3202f4c 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -359,7 +359,8 @@ async fn freeze(
 
 async fn read_from_rx<T>(rx: &mut mpsc::Receiver<T>, queue: &mut Vec<T>, rx_is_closed: &mut bool) {
     if queue.is_empty() {
-        log::warn!("A-blocking on queue");
+        log::debug!("blocking on queue");
+
         match rx.recv().await {
             Some(req) => queue.push(req),
             None => *rx_is_closed = true,

From ca37bfda9c1008506a6e1815b5821110bf1556a7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 12:06:07 +0400
Subject: [PATCH 597/755] Fix deserialization of ChatMemberStatus

We *don't* deserialize it ever, so it's not a big deal, but it's better
to stay consistent with the telegram representation.
---
 src/types/chat_member.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index b6e3c824..a816f519 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -586,11 +586,13 @@ impl ChatMemberKind {
 #[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ChatMemberStatus {
+    #[serde(rename = "creator")]
     Owner,
     Administrator,
     Member,
     Restricted,
     Left,
+    #[serde(rename = "kicked")]
     Banned,
 }
 

From 8b281ae50beb3672a588ece1316d5c5658713a16 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 12:20:03 +0400
Subject: [PATCH 598/755] Add `is_*` methods to `ChatMemberStatus`

---
 CHANGELOG.md             |  2 ++
 src/types/chat_member.rs | 71 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2bd31c9..fe2e1c0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## unreleased
 
 - Add `ChatId` and `UserId` to the prelude ([#212][pr212])
+- Add `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
 
 [pr212]: https://github.com/teloxide/teloxide-core/pull/212
+[pr216]: https://github.com/teloxide/teloxide-core/pull/216
 
 ## 0.6.0 - 2022-04-25
 
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index a816f519..405a31f6 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -596,6 +596,77 @@ pub enum ChatMemberStatus {
     Banned,
 }
 
+/// Simple methods for checking a user status.
+impl ChatMemberStatus {
+    /// Returns `true` if the user is the [owner] of the given chat.
+    ///
+    /// [owner]: ChatMemberKind::Owner
+    pub fn is_owner(&self) -> bool {
+        matches!(self, Self::Owner { .. })
+    }
+
+    /// Returns `true` if the user is an [administrator] of the given chat.
+    ///
+    /// [administrator]: ChatMemberKind::Administrator
+    ///
+    /// **Note**: this function **doesn't** return `true` if the user is the
+    /// owner of the given chat. See also: [`is_privileged`].
+    ///
+    /// [`is_privileged`]: ChatMemberKind::is_privileged
+    pub fn is_administrator(&self) -> bool {
+        matches!(self, Self::Administrator { .. })
+    }
+
+    /// Returns `true` if the user is a common [member] of the given chat.
+    ///
+    /// [member]: ChatMemberKind::Member
+    pub fn is_member(&self) -> bool {
+        matches!(self, Self::Member { .. })
+    }
+
+    /// Returns `true` if the user is [restricted] in the given chat.
+    ///
+    /// [restricted]: ChatMemberKind::Restricted
+    pub fn is_restricted(&self) -> bool {
+        matches!(self, Self::Restricted { .. })
+    }
+
+    /// Returns `true` if the user [left] the given chat.
+    ///
+    /// [left]: ChatMemberKind::Left
+    pub fn is_left(&self) -> bool {
+        matches!(self, Self::Left { .. })
+    }
+
+    /// Returns `true` if the user is [banned] in the given chat.
+    ///
+    /// [banned]: ChatMemberKind::Banned
+    pub fn is_banned(&self) -> bool {
+        matches!(self, Self::Banned { .. })
+    }
+}
+
+/// Compound methods for checking a user status.
+impl ChatMemberStatus {
+    /// Returns `true` if the user is privileged in the given chat. i.e. if the
+    /// user is either the [owner] or an [administrator] in the given chat.
+    ///
+    /// [owner]: ChatMemberKind::Owner
+    /// [administrator]: ChatMemberKind::Administrator
+    pub fn is_privileged(&self) -> bool {
+        self.is_administrator() || self.is_owner()
+    }
+
+    /// Returns `true` if the user is currently present in the chat. i.e. if the
+    /// user **hasn't** [left] or been [banned].
+    ///
+    /// [left]: ChatMemberKind::Left
+    /// [banned]: ChatMemberKind::Banned
+    pub fn is_present(&self) -> bool {
+        !(self.is_left() || self.is_banned())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::types::UserId;

From 4bfc8191c4e64599af805e84d72e4f0130b3bb9b Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Fri, 27 May 2022 00:06:24 +0600
Subject: [PATCH 599/755] Update the changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4d7cc57..a4281c30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+ - Fix `#[command(rename = "...")]` for custom command names ([issue 633](https://github.com/teloxide/teloxide/issues/633)).
+
 ## 0.6.1 - 2022-04-26
 
 ### Fixed

From 340ecbd7ff9dec73c7e67dc60dedb5a515a6c167 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Fri, 27 May 2022 00:07:32 +0600
Subject: [PATCH 600/755] Release v0.6.2

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4281c30..36ebf4ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.2 - 2022-05-27
+
 ### Fixed
 
  - Fix `#[command(rename = "...")]` for custom command names ([issue 633](https://github.com/teloxide/teloxide/issues/633)).
diff --git a/Cargo.toml b/Cargo.toml
index 53ce205f..1b7021bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.6.1"
+version = "0.6.2"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 5c42e28bd14680692a338240035f9a9fff29f1a0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 26 May 2022 22:32:51 +0400
Subject: [PATCH 601/755] Fix link in documentation

---
 src/types/inline_keyboard_button.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index c20aff5d..1182e294 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -51,7 +51,7 @@ pub enum InlineKeyboardButtonKind {
     Url(reqwest::Url),
 
     /// An HTTP URL used to automatically authorize the user. Can be used as a
-    /// replacement for the [Telegram Login Widget]().
+    /// replacement for the [Telegram Login Widget].
     ///
     /// [Telegram Login Widget]: https://core.telegram.org/widgets/login
     LoginUrl(LoginUrl),

From f732421b8cb2e5947f6eb9d31319a97e4103a093 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 26 May 2022 22:34:16 +0400
Subject: [PATCH 602/755] Add a fixme

---
 src/types/inline_keyboard_button.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 1182e294..f776d54f 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -110,6 +110,7 @@ pub enum InlineKeyboardButtonKind {
     /// row.
     ///
     /// [Pay button]: https://core.telegram.org/bots/api#payments
+    // FIXME(waffle): This should be using `True`
     Pay(bool),
 }
 

From 851722e46cbb02c31640a0c8a1e0433de195f38a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 2 Jun 2022 20:46:41 +0400
Subject: [PATCH 603/755] Fix deserialization of `File` when `file_path` or
 `file_size` are missing

---
 CHANGELOG.md      |  2 ++
 src/types/file.rs | 55 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe2e1c0a..692d9e1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+- Fix deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])
 - Add `ChatId` and `UserId` to the prelude ([#212][pr212])
 - Add `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
 
+[pr220]: https://github.com/teloxide/teloxide-core/pull/220
 [pr212]: https://github.com/teloxide/teloxide-core/pull/212
 [pr216]: https://github.com/teloxide/teloxide-core/pull/216
 
diff --git a/src/types/file.rs b/src/types/file.rs
index 82aa237e..05402ffa 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -22,11 +22,62 @@ pub struct File {
     pub file_unique_id: String,
 
     /// File size, if known.
+    ///
+    /// **Note:** in the Telegram Bot API this field is optional, however it was
+    /// errourneusly marked as required in Teloxide. To workaround this issue,
+    /// when `file_size` is not present, it is deserialized as [`u32::MAX`].
+    #[serde(default = "default_file_size")]
     pub file_size: u32,
 
     /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
     ///
-    /// [`Bot::download_file(file_path, dst)`]:
-    /// crate::net::Download::download_file
+    /// **Note:** in the Telegram Bot API this field is optional, however it was
+    /// errourneusly marked as required in Teloxide. To workaround this issue,
+    /// when `file_path` is not present, it is deserialized as an empty string.
+    ///
+    /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
+    #[serde(default)]
     pub file_path: String,
 }
+
+const fn default_file_size() -> u32 {
+    u32::MAX
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::types::File;
+
+    #[test]
+    fn no_file_size() {
+        let json =
+            r#"{"file_id":"FILE_ID","file_unique_id":"FILE_UNIQUE_ID","file_path":"FILE_PATH"}"#;
+        let file: File = serde_json::from_str(json).unwrap();
+
+        assert_eq!(
+            file,
+            File {
+                file_id: "FILE_ID".to_owned(),
+                file_unique_id: "FILE_UNIQUE_ID".to_owned(),
+                file_size: u32::MAX,
+                file_path: "FILE_PATH".to_owned(),
+            }
+        );
+    }
+
+    #[test]
+    fn no_file_path() {
+        let json = r#"{"file_id":"FILE_ID","file_unique_id":"FILE_UNIQUE_ID","file_size":42}"#;
+        let file: File = serde_json::from_str(json).unwrap();
+
+        assert_eq!(
+            file,
+            File {
+                file_id: "FILE_ID".to_owned(),
+                file_unique_id: "FILE_UNIQUE_ID".to_owned(),
+                file_size: 42,
+                file_path: "".to_owned(),
+            }
+        );
+    }
+}

From b03d9d864b67c4102eb56341722be4aa28f89994 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 30 May 2022 19:14:26 +0400
Subject: [PATCH 604/755] Correct deserialization of `NotFound` and
 `UserDeactivated` errors

---
 CHANGELOG.md  |  2 ++
 src/errors.rs | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe2e1c0a..7522cb07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add `ChatId` and `UserId` to the prelude ([#212][pr212])
 - Add `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
+- Correct how `NotFound` and `UserDeactivated` errors are deserialized ([#219][pr219])
 
 [pr212]: https://github.com/teloxide/teloxide-core/pull/212
 [pr216]: https://github.com/teloxide/teloxide-core/pull/216
+[pr219]: https://github.com/teloxide/teloxide-core/pull/219
 
 ## 0.6.0 - 2022-04-25
 
diff --git a/src/errors.rs b/src/errors.rs
index 0c56c3e7..267cd0a7 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -100,8 +100,8 @@ pub enum ApiError {
     BotBlocked,
 
     /// Occurs when the bot token is incorrect.
-    #[serde(rename = "Forbidden: bot was blocked by the user")]
-    #[error("Forbidden: bot was blocked by the user")]
+    #[serde(rename = "Not Found")]
+    #[error("Not Found")]
     NotFound,
 
     /// Occurs when bot tries to modify a message without modification content.
@@ -684,14 +684,15 @@ pub enum ApiError {
     #[error("Forbidden: bot was kicked from the supergroup chat")]
     BotKickedFromSupergroup,
 
-    /// Occurs when bot tries to send message to deactivated user.
+    /// Occurs when bot tries to send a message to a deactivated user (i.e. a
+    /// user that was banned by telegram).
     ///
     /// May happen in methods:
     /// 1. [`SendMessage`]
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
-    #[serde(rename = "Unauthorized: user is deactivated")]
-    #[error("Unauthorized: user is deactivated")]
+    #[serde(rename = "Forbidden: user is deactivated")]
+    #[error("Forbidden: user is deactivated")]
     UserDeactivated,
 
     /// Occurs when you tries to initiate conversation with a user.

From 46cb2e7f4137a7c582555699d129a8daeed773c2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 2 Jun 2022 21:15:44 +0400
Subject: [PATCH 605/755] Release `teloxide-core` v0.6.1

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b98ce06..358dbef8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.1 - 2022-06-02
+
 - Fix deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])
 - Add `ChatId` and `UserId` to the prelude ([#212][pr212])
 - Add `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
diff --git a/Cargo.toml b/Cargo.toml
index 9435445c..ba614440 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2018"
 
 license = "MIT"

From bcd24d2d53cf6e52ab509153a7e457a7487056b9 Mon Sep 17 00:00:00 2001
From: Kezi <keziolio123@gmail.com>
Date: Fri, 3 Jun 2022 15:17:43 +0200
Subject: [PATCH 606/755] Fix is_channel assert

---
 CHANGELOG.md      | 4 ++++
 src/types/user.rs | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 358dbef8..24b5de51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+- Fix incorrect panic in `User::is_channel` ([#222][pr222])
+
+[pr222]: https://github.com/teloxide/teloxide-core/pull/222
+
 ## 0.6.1 - 2022-06-02
 
 - Fix deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])
diff --git a/src/types/user.rs b/src/types/user.rs
index dbf953ef..f5063112 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -89,9 +89,9 @@ impl User {
         debug_assert!(
             !self.id.is_channel()
                 || (self.is_bot
-                    && self.first_name == "Group"
+                    && self.first_name == "Channel"
                     && self.last_name.is_none()
-                    && self.username.as_deref() == Some("GroupAnonymousBot"))
+                    && self.username.as_deref() == Some("Channel_Bot"))
         );
 
         self.id.is_channel()

From e788dc109faabf63f4f87dcadd7ad2fba52d2698 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 13 Jun 2022 22:23:51 +0400
Subject: [PATCH 607/755] Improve documentation of `file_size` fields

---
 src/types/animation.rs     | 2 +-
 src/types/audio.rs         | 2 +-
 src/types/document.rs      | 2 +-
 src/types/file.rs          | 2 +-
 src/types/passport_file.rs | 4 ++--
 src/types/photo_size.rs    | 2 +-
 src/types/sticker.rs       | 2 +-
 src/types/video.rs         | 2 +-
 src/types/video_note.rs    | 2 +-
 src/types/voice.rs         | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/types/animation.rs b/src/types/animation.rs
index e057aad5..fda13b3f 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -37,7 +37,7 @@ pub struct Animation {
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// A size of a file.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
 
diff --git a/src/types/audio.rs b/src/types/audio.rs
index 57fb3196..a06d4ce6 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -34,7 +34,7 @@ pub struct Audio {
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// A size of a file.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 
     /// A thumbnail of the album cover to which the music file belongs.
diff --git a/src/types/document.rs b/src/types/document.rs
index c3b51792..94a3aaa0 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -32,6 +32,6 @@ pub struct Document {
     #[serde(default, with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// A size of a file.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
diff --git a/src/types/file.rs b/src/types/file.rs
index 05402ffa..8b11e871 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -21,7 +21,7 @@ pub struct File {
     /// file.
     pub file_unique_id: String,
 
-    /// File size, if known.
+    /// File size in bytes, if known.
     ///
     /// **Note:** in the Telegram Bot API this field is optional, however it was
     /// errourneusly marked as required in Teloxide. To workaround this issue,
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index c3c057cd..6f0457aa 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -17,8 +17,8 @@ pub struct PassportFile {
     /// file.
     pub file_unique_id: String,
 
-    /// File size.
-    pub file_size: u64,
+    /// File size in bytes.
+    pub file_size: u64, // FIXME: should be u32
 
     /// Time when the file was uploaded.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index e7527d19..1118361c 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -21,7 +21,7 @@ pub struct PhotoSize {
     /// Photo height.
     pub height: u32,
 
-    /// File size.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
 
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 0f096727..36510976 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -44,6 +44,6 @@ pub struct Sticker {
     /// For mask stickers, the position where the mask should be placed.
     pub mask_position: Option<MaskPosition>,
 
-    /// File size.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
diff --git a/src/types/video.rs b/src/types/video.rs
index c0e1ac46..df873dc9 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -36,6 +36,6 @@ pub struct Video {
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// File size.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index 9a751e20..2b55b657 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -30,6 +30,6 @@ pub struct VideoNote {
     /// Video thumbnail.
     pub thumb: Option<PhotoSize>,
 
-    /// File size.
+    /// File size in bytes.
     pub file_size: Option<u32>,
 }
diff --git a/src/types/voice.rs b/src/types/voice.rs
index 7264b0c4..7a192aa7 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -22,6 +22,6 @@ pub struct Voice {
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// File size.
+    /// File size in bytes.
     pub file_size: Option<u64>,
 }

From 87c9c778eedb01e67891b09985bbfac0d35a5ade Mon Sep 17 00:00:00 2001
From: Shihpin Tseng <deftsp@gmail.com>
Date: Tue, 14 Jun 2022 09:29:17 +0800
Subject: [PATCH 608/755] fix: could not find `codec` in `tokio_util`

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index ba614440..e83badfe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ exclude = [
 [dependencies]
 futures = "0.3.5"
 tokio = { version = "1.12.0", features = ["fs"] }
-tokio-util = "0.6.0"
+tokio-util = { version = "0.6.0", features = ["codec"] }
 pin-project = "1.0.3"
 bytes = "1.0.0"
 reqwest = { version = "0.11.10", features = ["json", "stream", "multipart"], default-features = false }

From 71b0ae04879e580cb199302810bd4d49673db493 Mon Sep 17 00:00:00 2001
From: Shihpin Tseng <deftsp@gmail.com>
Date: Tue, 14 Jun 2022 15:54:58 +0800
Subject: [PATCH 609/755] add CHANGELOG for pr 225

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b5de51..1d445bd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+- Build with particular crates versions (enable `"codec"` feature of `tokio-util`) ([#225][pr225])
 - Fix incorrect panic in `User::is_channel` ([#222][pr222])
 
+[pr225]: https://github.com/teloxide/teloxide-core/pull/225
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
 
 ## 0.6.1 - 2022-06-02

From 06c265cd1112ebeebb0cd0b1c7e6c8e18432e3c9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 13:11:15 +0400
Subject: [PATCH 610/755] Implement message entity parsing

---
 src/types/message.rs        |  18 +++++--
 src/types/message_entity.rs | 101 ++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 1765bab9..8617ff13 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -6,9 +6,9 @@ use serde::{Deserialize, Serialize};
 use crate::types::{
     Animation, Audio, BareChatId, Chat, ChatId, Contact, Dice, Document, Game,
     InlineKeyboardMarkup, Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity,
-    PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker, SuccessfulPayment, True, User,
-    Venue, Video, VideoChatEnded, VideoChatParticipantsInvited, VideoChatScheduled,
-    VideoChatStarted, VideoNote, Voice, WebAppData,
+    MessageEntityRef, PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker,
+    SuccessfulPayment, True, User, Venue, Video, VideoChatEnded, VideoChatParticipantsInvited,
+    VideoChatScheduled, VideoChatStarted, VideoNote, Voice, WebAppData,
 };
 
 /// This object represents a message.
@@ -1095,6 +1095,18 @@ impl Message {
         // /[a-zA-Z0-9_]{5,32}/ and chat/message ids are integers.
         Some(reqwest::Url::parse(&url).unwrap())
     }
+
+    pub fn parse_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
+        self.text()
+            .zip(self.entities())
+            .map(|(t, e)| MessageEntityRef::parse(t, e))
+    }
+
+    pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
+        self.text()
+            .zip(self.entities())
+            .map(|(t, e)| MessageEntityRef::parse(t, e))
+    }
 }
 
 #[cfg(test)]
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 8d4e5c40..e14580b3 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -1,3 +1,5 @@
+use std::{cmp, ops::Range};
+
 use serde::{Deserialize, Serialize};
 
 use crate::types::{User, UserId};
@@ -19,6 +21,18 @@ pub struct MessageEntity {
     pub length: usize,
 }
 
+/// A "parsed" [`MessageEntity`].
+///
+/// [`MessageEntity`] has offsets in UTF-**16** code units, but in Rust we
+/// mostly work with UTF-**8**. In order to use an entity we need to convert
+/// UTF-16 offsets to UTF-8 ones. This type represents a message entity with
+/// converted offsets and a reference to the text.
+pub struct MessageEntityRef<'a> {
+    message: &'a str,
+    range: Range<usize>,
+    kind: &'a MessageEntityKind,
+}
+
 impl MessageEntity {
     pub const fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
         Self {
@@ -140,6 +154,93 @@ impl MessageEntity {
     }
 }
 
+impl<'a> MessageEntityRef<'a> {
+    pub fn kind(&self) -> &'a MessageEntityKind {
+        self.kind
+    }
+
+    pub fn text(&self) -> &'a str {
+        &self.message[self.range.clone()]
+    }
+
+    pub fn range(&self) -> Range<usize> {
+        self.range.clone()
+    }
+
+    pub fn start(&self) -> usize {
+        self.range.start
+    }
+
+    pub fn end(&self) -> usize {
+        self.range.end
+    }
+
+    pub fn len(&self) -> usize {
+        self.range.len()
+    }
+
+    pub fn message_text(&self) -> &'a str {
+        self.message
+    }
+
+    pub fn parse(text: &'a str, entities: &'a [MessageEntity]) -> Vec<Self> {
+        // This creates entities with **wrong** offsets (UTF-16) that we later patch.
+        let mut entities: Vec<_> = entities
+            .iter()
+            .map(|e| Self {
+                message: text,
+                range: e.offset..e.offset + e.length,
+                kind: &e.kind,
+            })
+            .collect();
+
+        // Convert offsets
+
+        // References to all offsets that need patching
+        let mut offsets: Vec<&mut usize> = entities
+            .iter_mut()
+            .flat_map(
+                |Self {
+                     range: Range { start, end },
+                     ..
+                 }| [start, end],
+            )
+            .collect();
+
+        // Sort in decreasing order, so the smallest elements are at the end and can be
+        // removed more easily
+        offsets.sort_unstable_by_key(|&&mut offset| cmp::Reverse(offset));
+
+        let _ = text
+            .chars()
+            .chain(['\0']) // this is needed to process offset pointing at the end of the string
+            .try_fold((0, 0), |(len_utf8, len_utf16), c| {
+                // Stop if there are no more offsets to patch
+                if offsets.is_empty() {
+                    return None;
+                }
+
+                // Patch all offsets that can be patched
+                while offsets
+                    .last()
+                    .map(|&&mut offset| offset <= len_utf16)
+                    .unwrap_or(false)
+                {
+                    let offset = offsets.pop().unwrap();
+                    assert_eq!(*offset, len_utf16, "Invalid utf-16 offset");
+
+                    // Patch the offset to be UTF-8
+                    *offset = len_utf8;
+                }
+
+                // Update "running" length
+                Some((len_utf8 + c.len_utf8(), len_utf16 + c.len_utf16()))
+            });
+
+        entities
+    }
+}
+
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]

From 312af99aa0bc458945daba2b4f3f693c9a1683fe Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 13:50:33 +0400
Subject: [PATCH 611/755] Add tests for `MessageEntity` parsing

---
 Cargo.toml                  |   1 +
 src/types/message_entity.rs | 130 ++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index ba614440..b3ae347e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ vecrem = { version = "0.1", optional = true }
 [dev-dependencies]
 pretty_env_logger = "0.4"
 tokio = { version = "1.8.0", features = ["fs", "macros"] }
+cool_asserts = "2.0.3"
 
 [features]
 default = ["native-tls"]
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index e14580b3..3bff334a 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -27,6 +27,7 @@ pub struct MessageEntity {
 /// mostly work with UTF-**8**. In order to use an entity we need to convert
 /// UTF-16 offsets to UTF-8 ones. This type represents a message entity with
 /// converted offsets and a reference to the text.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct MessageEntityRef<'a> {
     message: &'a str,
     range: Range<usize>,
@@ -267,6 +268,9 @@ pub enum MessageEntityKind {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use cool_asserts::assert_matches;
+    use MessageEntity;
+    use MessageEntityKind::*;
 
     #[test]
     fn recursive_kind() {
@@ -320,4 +324,130 @@ mod tests {
             None
         );
     }
+
+    #[test]
+    fn parse_быба() {
+        let parsed = MessageEntityRef::parse(
+            "быба",
+            &[
+                MessageEntity {
+                    kind: Strikethrough,
+                    offset: 0,
+                    length: 1,
+                },
+                MessageEntity {
+                    kind: Bold,
+                    offset: 1,
+                    length: 1,
+                },
+                MessageEntity {
+                    kind: Italic,
+                    offset: 2,
+                    length: 1,
+                },
+                MessageEntity {
+                    kind: Code,
+                    offset: 3,
+                    length: 1,
+                },
+            ],
+        );
+
+        assert_matches!(
+            parsed,
+            [
+                entity if entity.text() == "б" && entity.kind() == &Strikethrough,
+                entity if entity.text() == "ы" && entity.kind() == &Bold,
+                entity if entity.text() == "б" && entity.kind() == &Italic,
+                entity if entity.text() == "а" && entity.kind() == &Code,
+
+            ]
+        );
+    }
+
+    #[test]
+    fn parse_symbol_24bit() {
+        let parsed = MessageEntityRef::parse(
+            "xx আ #tt",
+            &[MessageEntity {
+                kind: Hashtag,
+                offset: 5,
+                length: 3,
+            }],
+        );
+
+        assert_matches!(
+            parsed,
+            [entity if entity.text() == "#tt" && entity.kind() == &Hashtag]
+        );
+    }
+
+    #[test]
+    fn parse_enclosed() {
+        let parsed = MessageEntityRef::parse(
+            "b i b",
+            // For some reason this is how telegram encodes <b>b <i>i<i/> b<b/>
+            &[
+                MessageEntity {
+                    kind: Bold,
+                    offset: 0,
+                    length: 2,
+                },
+                MessageEntity {
+                    kind: Bold,
+                    offset: 2,
+                    length: 3,
+                },
+                MessageEntity {
+                    kind: Italic,
+                    offset: 2,
+                    length: 1,
+                },
+            ],
+        );
+
+        assert_matches!(
+            parsed,
+            [
+                entity if entity.text() == "b " && entity.kind() == &Bold,
+                entity if entity.text() == "i b" && entity.kind() == &Bold,
+                entity if entity.text() == "i" && entity.kind() == &Italic,
+            ]
+        );
+    }
+
+    #[test]
+    fn parse_nothing() {
+        let parsed = MessageEntityRef::parse("a", &[]);
+        assert_eq!(parsed, []);
+    }
+
+    #[test]
+    fn parse_empty() {
+        // It should be impossible for this to be returned from telegram, but just to be
+        // sure
+        let parsed = MessageEntityRef::parse(
+            "",
+            &[
+                MessageEntity {
+                    kind: Bold,
+                    offset: 0,
+                    length: 0,
+                },
+                MessageEntity {
+                    kind: Italic,
+                    offset: 0,
+                    length: 0,
+                },
+            ],
+        );
+
+        assert_matches!(
+            parsed,
+            [
+                entity if entity.text() == "" && entity.kind() == &Bold,
+                entity if entity.text() == "" && entity.kind() == &Italic,
+            ]
+        );
+    }
 }

From 3da9b4b587115e67a1617cb4e3dd82f37fac2f89 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 16:59:41 +0400
Subject: [PATCH 612/755] Fix examples

---
 examples/erased.rs    | 8 +++++---
 examples/self_info.rs | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/erased.rs b/examples/erased.rs
index 40195ebd..d980ddc3 100644
--- a/examples/erased.rs
+++ b/examples/erased.rs
@@ -6,9 +6,11 @@ use teloxide_core::{adaptors::trace, prelude::*, types::ChatAction};
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     pretty_env_logger::init();
 
-    let chat_id = std::env::var("CHAT_ID")
-        .expect("Expected CHAT_ID env var")
-        .parse::<i64>()?;
+    let chat_id = ChatId(
+        std::env::var("CHAT_ID")
+            .expect("Expected CHAT_ID env var")
+            .parse::<i64>()?,
+    );
 
     let trace_settings = match std::env::var("TRACE").as_deref() {
         Ok("EVERYTHING_VERBOSE") => trace::Settings::TRACE_EVERYTHING_VERBOSE,
diff --git a/examples/self_info.rs b/examples/self_info.rs
index 9c5304ae..b56271c8 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -7,9 +7,11 @@ use teloxide_core::{
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     pretty_env_logger::init();
 
-    let chat_id = std::env::var("CHAT_ID")
-        .expect("Expected CHAT_ID env var")
-        .parse::<i64>()?;
+    let chat_id = ChatId(
+        std::env::var("CHAT_ID")
+            .expect("Expected CHAT_ID env var")
+            .parse::<i64>()?,
+    );
 
     let bot = Bot::from_env()
         .parse_mode(ParseMode::MarkdownV2)

From c7ea3f795a279ca9deafb7f059f6dda33953b8f6 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 17:01:57 +0400
Subject: [PATCH 613/755] Fix `Throttle` docs

---
 src/adaptors/throttle/settings.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/adaptors/throttle/settings.rs b/src/adaptors/throttle/settings.rs
index a1829cc1..289f5b42 100644
--- a/src/adaptors/throttle/settings.rs
+++ b/src/adaptors/throttle/settings.rs
@@ -19,6 +19,8 @@ type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
 /// // use settings in `Throttle::with_settings` or other constructors
 /// # let _ = settings;
 /// ```
+///
+/// [`Throttle`]: crate::adaptors::throttle::Throttle
 #[non_exhaustive]
 pub struct Settings {
     pub limits: Limits,
@@ -35,6 +37,7 @@ pub struct Settings {
 /// particular bot if it has a lot of users (but they may or may not do that).
 ///
 /// [@BotSupport]: https://t.me/botsupport
+/// [`Throttle`]: crate::adaptors::throttle::Throttle
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 pub struct Limits {
     /// Allowed messages in one chat per second.

From 6df51a5e830cece4f13620574b67318435724847 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 17:02:17 +0400
Subject: [PATCH 614/755] Document message entity related functions

---
 src/types/message.rs        | 41 +++++++++++++++++++++++++++++++++++++
 src/types/message_entity.rs | 21 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/types/message.rs b/src/types/message.rs
index 8617ff13..407e1f78 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -655,6 +655,18 @@ mod getters {
             }
         }
 
+        /// Returns message entities that represent text formatting.
+        ///
+        /// **Note:** you probably want to use [`parse_entities`] instead.
+        ///
+        /// This function returns `Some(entities)` for **text messages** and
+        /// `None` for all other kinds of messages (including photos with
+        /// captions).
+        ///
+        /// See also: [`caption_entities`].
+        ///
+        /// [`parse_entities`]: Message::parse_entities
+        /// [`caption_entities`]: Message::caption_entities
         pub fn entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -665,6 +677,18 @@ mod getters {
             }
         }
 
+        /// Returns message entities that represent text formatting.
+        ///
+        /// **Note:** you probably want to use [`parse_caption_entities`]
+        /// instead.
+        ///
+        /// This function returns `Some(entities)` for **media messages** and
+        /// `None` for all other kinds of messages (including text messages).
+        ///
+        /// See also: [`entities`].
+        ///
+        /// [`parse_caption_entities`]: Message::parse_caption_entities
+        /// [`entities`]: Message::entities
         pub fn caption_entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -1096,12 +1120,29 @@ impl Message {
         Some(reqwest::Url::parse(&url).unwrap())
     }
 
+    /// Returns message entities that represent text formatting.
+    ///
+    /// This function returns `Some(entities)` for **text messages** and
+    /// `None` for all other kinds of messages (including photos with
+    /// captions).
+    ///
+    /// See also: [`parse_caption_entities`].
+    ///
+    /// [`parse_caption_entities`]: Message::parse_caption_entities
     pub fn parse_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
         self.text()
             .zip(self.entities())
             .map(|(t, e)| MessageEntityRef::parse(t, e))
     }
 
+    /// Returns message entities that represent text formatting.
+    ///
+    /// This function returns `Some(entities)` for **media messages** and
+    /// `None` for all other kinds of messages (including text messages).
+    ///
+    /// See also: [`parse_entities`].
+    ///
+    /// [`parse_entities`]: Message::parse_entities
     pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
         self.text()
             .zip(self.entities())
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 3bff334a..08635878 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -27,6 +27,14 @@ pub struct MessageEntity {
 /// mostly work with UTF-**8**. In order to use an entity we need to convert
 /// UTF-16 offsets to UTF-8 ones. This type represents a message entity with
 /// converted offsets and a reference to the text.
+///
+/// You can get [`MessageEntityRef`]s by calling [`parse_entities`] and
+/// [`parse_caption_entities`] methods of [`Message`] or by calling
+/// [`MessageEntityRef::parse`].
+///
+/// [`parse_entities`]: crate::types::Message::parse_entities
+/// [`parse_caption_entities`]: crate::types::Message::parse_caption_entities
+/// [`Message`]: crate::types::Message
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct MessageEntityRef<'a> {
     message: &'a str,
@@ -156,34 +164,47 @@ impl MessageEntity {
 }
 
 impl<'a> MessageEntityRef<'a> {
+    /// Returns kind of this entity.
     pub fn kind(&self) -> &'a MessageEntityKind {
         self.kind
     }
 
+    /// Returns the text that this entity is related to.
     pub fn text(&self) -> &'a str {
         &self.message[self.range.clone()]
     }
 
+    /// Returns range that this entity is related to.
+    ///
+    /// The range is in bytes for UTF-8 encoding i.e. you can use it with common
+    /// Rust strings.
     pub fn range(&self) -> Range<usize> {
         self.range.clone()
     }
 
+    /// Returns the offset (in bytes, for UTF-8) to the start of this entity in
+    /// the original message.
     pub fn start(&self) -> usize {
         self.range.start
     }
 
+    /// Returns the offset (in bytes, for UTF-8) to the end of this entity in
+    /// the original message.
     pub fn end(&self) -> usize {
         self.range.end
     }
 
+    /// Returns the length of this entity in bytes for UTF-8 encoding.
     pub fn len(&self) -> usize {
         self.range.len()
     }
 
+    /// Returns the full text of the original message.
     pub fn message_text(&self) -> &'a str {
         self.message
     }
 
+    /// Parses telegram [`MessageEntity`]s converting offsets to UTF-8.
     pub fn parse(text: &'a str, entities: &'a [MessageEntity]) -> Vec<Self> {
         // This creates entities with **wrong** offsets (UTF-16) that we later patch.
         let mut entities: Vec<_> = entities

From b85a5b31793ea1c93550096c7db9dc707cf17ce9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 24 May 2022 18:22:17 +0400
Subject: [PATCH 615/755] Fix clippy

---
 src/types/message_entity.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 08635878..75e48548 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -195,6 +195,7 @@ impl<'a> MessageEntityRef<'a> {
     }
 
     /// Returns the length of this entity in bytes for UTF-8 encoding.
+    #[allow(clippy::len_without_is_empty)]
     pub fn len(&self) -> usize {
         self.range.len()
     }

From f91fcc0a2ad042d8777f5f99a4f01c0f6aac74b4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 14 Jun 2022 15:46:40 +0400
Subject: [PATCH 616/755] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24b5de51..12e76534 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
 
+### Added
+
+- Utilities to parse message entities (see `Message::parse_entities`) ([#217][pr217])
+
+[pr212]: https://github.com/teloxide/teloxide-core/pull/212
+
 ## 0.6.1 - 2022-06-02
 
 - Fix deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])

From ddaf78d891b6d0323bd6a6edfb5c7fd1b3856982 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Jun 2022 13:02:17 +0400
Subject: [PATCH 617/755] Fix `ChatPrivate` serialization

---
 CHANGELOG.md      |  2 ++
 src/types/chat.rs | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73865d26..dd8e331f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+- Fix `ChatPrivate` serialization ([#226][pr226])
 - Build with particular crates versions (enable `"codec"` feature of `tokio-util`) ([#225][pr225])
 - Fix incorrect panic in `User::is_channel` ([#222][pr222])
 
+[pr226]: https://github.com/teloxide/teloxide-core/pull/226
 [pr225]: https://github.com/teloxide/teloxide-core/pull/225
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
 
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 626b4d95..7a10bf55 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -81,6 +81,8 @@ pub struct ChatPrivate {
     /// `private`.
     #[serde(rename = "type")]
     #[serde(deserialize_with = "assert_private_field")]
+    #[serde(serialize_with = "serialize_private_field")]
+    // FIXME(waffle): remove this entirely (replace with custom De/Serialize impl)
     pub type_: (),
 
     /// A username, for private chats, supergroups and channels if
@@ -210,6 +212,13 @@ where
     des.deserialize_str(PrivateChatKindVisitor)
 }
 
+fn serialize_private_field<S>(_: &(), ser: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    ser.serialize_str("private")
+}
+
 impl Chat {
     pub fn is_private(&self) -> bool {
         matches!(self.kind, ChatKind::Private(_))
@@ -443,7 +452,7 @@ impl Chat {
 
 #[cfg(test)]
 mod tests {
-    use serde_json::from_str;
+    use serde_json::{from_str, to_string};
 
     use crate::types::*;
 
@@ -491,6 +500,29 @@ mod tests {
         );
     }
 
+    #[test]
+    fn private_roundtrip() {
+        let chat = Chat {
+            id: ChatId(0),
+            kind: ChatKind::Private(ChatPrivate {
+                type_: (),
+                username: Some("username".into()),
+                first_name: Some("Anon".into()),
+                last_name: None,
+                bio: None,
+                has_private_forwards: None,
+            }),
+            photo: None,
+            pinned_message: None,
+            message_auto_delete_time: None,
+        };
+
+        let json = to_string(&chat).unwrap();
+        let chat2 = from_str::<Chat>(&json).unwrap();
+
+        assert_eq!(chat, chat2);
+    }
+
     #[test]
     fn private_chat_de_wrong_type_field() {
         assert!(from_str::<Chat>(r#"{"id":0,"type":"WRONG"}"#).is_err());

From 3e6b39c48f4aa0e2497038d704bfff1bd7950f7a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 12 Jun 2022 13:06:34 +0400
Subject: [PATCH 618/755] Remove trailing `/` from `Message::url`

---
 CHANGELOG.md         | 2 ++
 src/types/message.rs | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73865d26..5edd55b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Build with particular crates versions (enable `"codec"` feature of `tokio-util`) ([#225][pr225])
 - Fix incorrect panic in `User::is_channel` ([#222][pr222])
+- Remove trailing `/` from `Message::url` (on ios it caused problems) ([#223][pr223])
 
 [pr225]: https://github.com/teloxide/teloxide-core/pull/225
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
+[pr223]: https://github.com/teloxide/teloxide-core/pull/223
 
 ### Added
 
diff --git a/src/types/message.rs b/src/types/message.rs
index 407e1f78..5934242e 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1107,10 +1107,10 @@ impl Message {
         let url = match self.chat.username() {
             // If it's public group (i.e. not DM, not private group), we can produce
             // "normal" t.me link (accessible to everyone).
-            Some(username) => format!("https://t.me/{0}/{1}/", username, self.id),
+            Some(username) => format!("https://t.me/{0}/{1}", username, self.id),
             // For private supergroups and channels we produce "private" t.me/c links. These are
             // only accessible to the group members.
-            None => format!("https://t.me/c/{0}/{1}/", chat_id, self.id),
+            None => format!("https://t.me/c/{0}/{1}", chat_id, self.id),
         };
 
         // UNWRAP:

From 5053d419c3616c85f4f588d5a28a5edec519fde0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 12 Jun 2022 16:52:55 +0400
Subject: [PATCH 619/755] Add functions to `Message` for creating urls

---
 CHANGELOG.md         |   1 +
 src/types/message.rs | 118 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 113 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5edd55b1..1b6db82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Build with particular crates versions (enable `"codec"` feature of `tokio-util`) ([#225][pr225])
 - Fix incorrect panic in `User::is_channel` ([#222][pr222])
 - Remove trailing `/` from `Message::url` (on ios it caused problems) ([#223][pr223])
+- Add `Message::{url_of, comment_url, comment_url_of, url_in_thread, url_in_thread_of}` functions ([#223][pr223])
 
 [pr225]: https://github.com/teloxide/teloxide-core/pull/225
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
diff --git a/src/types/message.rs b/src/types/message.rs
index 5934242e..92ee89ea 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -2,6 +2,7 @@
 
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
+use url::Url;
 
 use crate::types::{
     Animation, Audio, BareChatId, Chat, ChatId, Contact, Dice, Document, Game,
@@ -1077,18 +1078,36 @@ mod getters {
 }
 
 impl Message {
-    /// Produces a direct link to the message.
+    /// Produces a direct link to this message.
     ///
     /// Note that for private groups the link will only be accessible for group
     /// members.
     ///
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
-    pub fn url(&self) -> Option<reqwest::Url> {
+    pub fn url(&self) -> Option<Url> {
+        Self::url_of(self.chat.id, self.chat.username(), self.id)
+    }
+
+    /// Produces a direct link to a message in a chat.
+    ///
+    /// If you have a `Message` object, use [`url`] instead.
+    /// This function should only be used if you have limited information about
+    /// the message (chat id, username of the chat, if any and its id).
+    ///
+    /// Note that for private groups the link will only be accessible for group
+    /// members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
+    ///
+    /// [`url`]: Message::url
+    #[track_caller]
+    pub fn url_of(chat_id: ChatId, chat_username: Option<&str>, message_id: i32) -> Option<Url> {
         use BareChatId::*;
 
         // Note: `t.me` links use bare chat ids
-        let chat_id = match self.chat.id.to_bare() {
+        let chat_id = match chat_id.to_bare() {
             // For private chats (i.e.: DMs) we can't produce "normal" t.me link.
             //
             // There are "tg://openmessage?user_id={0}&message_id={1}" links, which are
@@ -1104,13 +1123,13 @@ impl Message {
             Channel(id) => id,
         };
 
-        let url = match self.chat.username() {
+        let url = match chat_username {
             // If it's public group (i.e. not DM, not private group), we can produce
             // "normal" t.me link (accessible to everyone).
-            Some(username) => format!("https://t.me/{0}/{1}", username, self.id),
+            Some(username) => format!("https://t.me/{0}/{1}", username, message_id),
             // For private supergroups and channels we produce "private" t.me/c links. These are
             // only accessible to the group members.
-            None => format!("https://t.me/c/{0}/{1}", chat_id, self.id),
+            None => format!("https://t.me/c/{0}/{1}", chat_id, message_id),
         };
 
         // UNWRAP:
@@ -1120,6 +1139,93 @@ impl Message {
         Some(reqwest::Url::parse(&url).unwrap())
     }
 
+    /// Produces a direct link to a comment on this post.
+    ///
+    /// Note that for private channels the link will only be accessible for
+    /// channel members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
+    pub fn comment_url(&self, comment_id: i32) -> Option<Url> {
+        Self::comment_url_of(self.chat.id, self.chat.username(), self.id, comment_id)
+    }
+
+    /// Produces a direct link to a comment on a post.
+    ///
+    /// If you have a `Message` object of the channel post, use [`comment_url`]
+    /// instead. This function should only be used if you have limited
+    /// information about the message (channel id, username of the channel,
+    /// if any, post id and comment id).
+    ///
+    /// Note that for private channels the link will only be accessible for
+    /// channel members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
+    ///
+    /// [`comment_url`]: Message::comment_url
+    pub fn comment_url_of(
+        channel_id: ChatId,
+        channel_username: Option<&str>,
+        post_id: i32,
+        comment_id: i32,
+    ) -> Option<Url> {
+        Self::url_of(channel_id, channel_username, post_id).map(|mut url| {
+            url.set_query(Some(&format!("comment={comment_id}")));
+            url
+        })
+    }
+
+    /// Produces a direct link to this message in a given thread.
+    ///
+    /// "Thread" is a group of messages that reply to each other in a tree-like
+    /// structure. `thread_starter_msg_id` is the id of the first message in
+    /// the thread, the root of the tree.
+    ///
+    /// Note that for private groups the link will only be accessible for group
+    /// members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
+    pub fn url_in_thread(&self, thread_starter_msg_id: i32) -> Option<Url> {
+        Self::url_in_thread_of(
+            self.chat.id,
+            self.chat.username(),
+            thread_starter_msg_id,
+            self.id,
+        )
+    }
+
+    /// Produces a direct link to a message in a given thread.
+    ///
+    /// If you have a `Message` object of the channel post, use
+    /// [`url_in_thread`] instead. This function should only be used if you
+    /// have limited information about the message (chat id, username of the
+    /// chat, if any, thread starter id and message id).
+    ///
+    /// "Thread" is a group of messages that reply to each other in a tree-like
+    /// structure. `thread_starter_msg_id` is the id of the first message in
+    /// the thread, the root of the tree.
+    ///
+    /// Note that for private groups the link will only be accessible for group
+    /// members.
+    ///
+    /// Returns `None` for private chats (i.e.: DMs) and private groups (not
+    /// supergroups).
+    ///
+    /// [`url_in_thread`]: Message::url_in_thread
+    pub fn url_in_thread_of(
+        chat_id: ChatId,
+        chat_username: Option<&str>,
+        thread_starter_msg_id: i32,
+        message_id: i32,
+    ) -> Option<Url> {
+        Self::url_of(chat_id, chat_username, message_id).map(|mut url| {
+            url.set_query(Some(&format!("thread={thread_starter_msg_id}")));
+            url
+        })
+    }
+
     /// Returns message entities that represent text formatting.
     ///
     /// This function returns `Some(entities)` for **text messages** and

From 987f594f95b97f1f9dbb314e419dd8d74b895b29 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Jun 2022 23:04:30 +0400
Subject: [PATCH 620/755] Fix changelog format

---
 CHANGELOG.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b193f947..593c5447 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,35 +7,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
 - Fix `ChatPrivate` serialization ([#226][pr226])
 - Build with particular crates versions (enable `"codec"` feature of `tokio-util`) ([#225][pr225])
-- Fix incorrect panic in `User::is_channel` ([#222][pr222])
 - Remove trailing `/` from `Message::url` (on ios it caused problems) ([#223][pr223])
-- Add `Message::{url_of, comment_url, comment_url_of, url_in_thread, url_in_thread_of}` functions ([#223][pr223])
+- Fix incorrect panic in `User::is_channel` ([#222][pr222])
 
 [pr226]: https://github.com/teloxide/teloxide-core/pull/226
 [pr225]: https://github.com/teloxide/teloxide-core/pull/225
 [pr222]: https://github.com/teloxide/teloxide-core/pull/222
-[pr223]: https://github.com/teloxide/teloxide-core/pull/223
 
 ### Added
 
+- `Message::{url_of, comment_url, comment_url_of, url_in_thread, url_in_thread_of}` functions ([#223][pr223])
 - Utilities to parse message entities (see `Message::parse_entities`) ([#217][pr217])
 
+[pr223]: https://github.com/teloxide/teloxide-core/pull/223
 [pr212]: https://github.com/teloxide/teloxide-core/pull/212
 
 ## 0.6.1 - 2022-06-02
 
-- Fix deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])
-- Add `ChatId` and `UserId` to the prelude ([#212][pr212])
-- Add `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
+### Fixed
+
+- Deserialization of `File` when `file_path` or `file_size` are missing ([#220][pr220])
 - Correct how `NotFound` and `UserDeactivated` errors are deserialized ([#219][pr219])
 
 [pr220]: https://github.com/teloxide/teloxide-core/pull/220
-[pr212]: https://github.com/teloxide/teloxide-core/pull/212
-[pr216]: https://github.com/teloxide/teloxide-core/pull/216
 [pr219]: https://github.com/teloxide/teloxide-core/pull/219
 
+### Added
+
+- `is_*` methods to `ChatMemberStatus` analogous to the `ChatMember{,Kind}` methods ([#216][pr216])
+- `ChatId` and `UserId` to the prelude ([#212][pr212])
+
+[pr216]: https://github.com/teloxide/teloxide-core/pull/216
+[pr212]: https://github.com/teloxide/teloxide-core/pull/212
+
 ## 0.6.0 - 2022-04-25
 
 ### Added

From 0da3eec6dec7ab672e2374dd446ac8c10ada71b8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 16 Jun 2022 23:06:09 +0400
Subject: [PATCH 621/755] bump version

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 593c5447..944166d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.2 - 2022-06-16
+
 ### Fixed
 
 - Fix `ChatPrivate` serialization ([#226][pr226])
diff --git a/Cargo.toml b/Cargo.toml
index d34de1f9..f20d1702 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2018"
 
 license = "MIT"

From d2068db38c2b92489d1fb5bb701cc2fee37da84e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 17 Jun 2022 12:54:38 +0400
Subject: [PATCH 622/755] Fix unused import when throttle feature is not
 enabled

---
 src/requests/requester_ext.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 455c7c61..0bcf438e 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -1,6 +1,4 @@
-use crate::{
-    adaptors::DefaultParseMode, errors::AsResponseParameters, requests::Requester, types::ParseMode,
-};
+use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
 
 #[cfg(feature = "cache_me")]
 use crate::adaptors::CacheMe;
@@ -63,7 +61,7 @@ pub trait RequesterExt: Requester {
     fn throttle(self, limits: Limits) -> Throttle<Self>
     where
         Self: Sized + Clone + Send + Sync + 'static,
-        Self::Err: AsResponseParameters,
+        Self::Err: crate::errors::AsResponseParameters,
         Self::GetChat: Send,
     {
         Throttle::new_spawn(self, limits)

From 1f495cff36be56420c123fae471e1ee70e5a08f4 Mon Sep 17 00:00:00 2001
From: Crax97 <gsolimeno97@gmail.com>
Date: Sun, 19 Jun 2022 23:00:13 +0200
Subject: [PATCH 623/755] Add test for Message::parse_caption_entities in
 message.rs

message.rs: remove unused import in mod test
---
 src/types/message.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/src/types/message.rs b/src/types/message.rs
index 92ee89ea..c815cc08 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1631,4 +1631,72 @@ mod tests {
         // cases inclusing this
         // assert!(message.sender_chat().is_some());
     }
+
+    #[test]
+    fn parse_caption_entities() {
+        let json = r#"
+        {
+            "message_id": 3460,
+            "from": {
+              "id": 27433968,
+              "is_bot": false,
+              "first_name": "Crax | rats addict",
+              "username": "tacocrasco",
+              "language_code": "en"
+            },
+            "chat": {
+              "id": 27433968,
+              "first_name": "Crax | rats addict",
+              "username": "tacocrasco",
+              "type": "private"
+            },
+            "date": 1655671349,
+            "photo": [
+              {
+                "file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADcwADJAQ",
+                "file_unique_id": "AQADabwxGxJmgVF4",
+                "file_size": 2077,
+                "width": 90,
+                "height": 90
+              },
+              {
+                "file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADbQADJAQ",
+                "file_unique_id": "AQADabwxGxJmgVFy",
+                "file_size": 27640,
+                "width": 320,
+                "height": 320
+              },
+              {
+                "file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADeAADJAQ",
+                "file_unique_id": "AQADabwxGxJmgVF9",
+                "file_size": 99248,
+                "width": 800,
+                "height": 800
+              },
+              {
+                "file_id": "AgACAgQAAxkBAAINhGKvijUVSn2i3980bQIIc1fqWGNCAAJpvDEbEmaBUfuA43fR-BnlAQADAgADeQADJAQ",
+                "file_unique_id": "AQADabwxGxJmgVF-",
+                "file_size": 162061,
+                "width": 1280,
+                "height": 1280
+              }
+            ],
+            "caption": "www.example.com",
+            "caption_entities": [
+              {
+                "offset": 0,
+                "length": 15,
+                "type": "url"
+              }
+            ]
+        }"#;
+
+        let message: Message = serde_json::from_str(json).unwrap();
+        let entities = message.parse_caption_entities();
+        assert!(entities.is_some());
+
+        let entities = entities.unwrap();
+        assert!(entities.len() > 0);
+        assert_eq!(entities[0].kind().clone(), MessageEntityKind::Url);
+    }
 }

From 70f0438c7bb2417654e7984f6624142600b38298 Mon Sep 17 00:00:00 2001
From: Crax97 <gsolimeno97@gmail.com>
Date: Sun, 19 Jun 2022 23:03:26 +0200
Subject: [PATCH 624/755] Bugfix: use correct functions to parse caption
 entities in 'parse_caption_entities'

---
 src/types/message.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index c815cc08..c4776f47 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1250,8 +1250,8 @@ impl Message {
     ///
     /// [`parse_entities`]: Message::parse_entities
     pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
-        self.text()
-            .zip(self.entities())
+        self.caption()
+            .zip(self.caption_entities())
             .map(|(t, e)| MessageEntityRef::parse(t, e))
     }
 }

From 021372bd1b471483a6f32b4556baf0257ecd35b6 Mon Sep 17 00:00:00 2001
From: Crax97 <gsolimeno97@gmail.com>
Date: Sun, 19 Jun 2022 23:35:41 +0200
Subject: [PATCH 625/755] Update CHANGELOG.md to reflect latest bugfix

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 944166d0..47b49010 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.3 - 2022-06-19
+
+### Fixed
+
+- Fix `Message::parse_caption_entities` ([#229][pr229])
+
+[pr229]: https://github.com/teloxide/teloxide-core/pull/229
+
 ## 0.6.2 - 2022-06-16
 
 ### Fixed

From b7eac69d668184859592650295422e624207ff49 Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Mon, 20 Jun 2022 01:53:05 +0400
Subject: [PATCH 626/755] remove version from changelog until it's released

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b49010..4e814850 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
-## 0.6.3 - 2022-06-19
-
 ### Fixed
 
 - Fix `Message::parse_caption_entities` ([#229][pr229])

From c3e2f817044a281087d70a74c412055b9de0ea3e Mon Sep 17 00:00:00 2001
From: Crax <gsolimeno97@gmail.com>
Date: Mon, 20 Jun 2022 00:12:28 +0200
Subject: [PATCH 627/755] Apply clippy suggestions

---
 src/types/message.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index c4776f47..db798fa6 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1696,7 +1696,7 @@ mod tests {
         assert!(entities.is_some());
 
         let entities = entities.unwrap();
-        assert!(entities.len() > 0);
+        assert!(!entities.is_empty());
         assert_eq!(entities[0].kind().clone(), MessageEntityKind::Url);
     }
 }

From 72ac288ed2166e6860dc08f087ba5f35e894ba67 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 21 Jun 2022 16:25:51 +0400
Subject: [PATCH 628/755] bump version

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e814850..bbbf6458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.3 - 2022-06-21
+
 ### Fixed
 
 - Fix `Message::parse_caption_entities` ([#229][pr229])
diff --git a/Cargo.toml b/Cargo.toml
index f20d1702..fcbd0d55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.6.2"
+version = "0.6.3"
 edition = "2018"
 
 license = "MIT"

From c1c20005f6304ea6d74d4c0a6f8cb9d32ec63750 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:45:33 +0400
Subject: [PATCH 629/755] Remove `ChatPrivate::type_`

---
 CHANGELOG.md        |   6 +++
 src/types/chat.rs   | 111 ++++++++++++++++++++++++++------------------
 src/types/update.rs |   1 -
 3 files changed, 73 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbbf6458..ca38d080 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Removed
+
+- `ChatPrivate::type_` field ([#232][pr232])
+
+[pr232]: https://github.com/teloxide/teloxide-core/pull/232
+
 ## 0.6.3 - 2022-06-21
 
 ### Fixed
diff --git a/src/types/chat.rs b/src/types/chat.rs
index 7a10bf55..e7d9f004 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -76,15 +76,8 @@ pub struct ChatPublic {
 
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(from = "serde_helper::ChatPrivate", into = "serde_helper::ChatPrivate")]
 pub struct ChatPrivate {
-    /// A dummy field. Used to ensure that the `type` field is equal to
-    /// `private`.
-    #[serde(rename = "type")]
-    #[serde(deserialize_with = "assert_private_field")]
-    #[serde(serialize_with = "serialize_private_field")]
-    // FIXME(waffle): remove this entirely (replace with custom De/Serialize impl)
-    pub type_: (),
-
     /// A username, for private chats, supergroups and channels if
     /// available.
     pub username: Option<String>,
@@ -185,40 +178,6 @@ pub struct PublicChatSupergroup {
     pub location: Option<ChatLocation>,
 }
 
-struct PrivateChatKindVisitor;
-
-impl<'de> serde::de::Visitor<'de> for PrivateChatKindVisitor {
-    type Value = ();
-
-    fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        write!(f, r#"field equal to "private""#)
-    }
-
-    fn visit_str<E: serde::de::Error>(self, v: &str) -> Result<Self::Value, E> {
-        match v {
-            "private" => Ok(()),
-            _ => Err(E::invalid_value(
-                serde::de::Unexpected::Str(v),
-                &r#""private""#,
-            )),
-        }
-    }
-}
-
-fn assert_private_field<'de, D>(des: D) -> Result<(), D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    des.deserialize_str(PrivateChatKindVisitor)
-}
-
-fn serialize_private_field<S>(_: &(), ser: S) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    ser.serialize_str("private")
-}
-
 impl Chat {
     pub fn is_private(&self) -> bool {
         matches!(self.kind, ChatKind::Private(_))
@@ -450,6 +409,72 @@ impl Chat {
     }
 }
 
+mod serde_helper {
+    use crate::types::True;
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Serialize, Deserialize)]
+    enum Type {
+        #[allow(non_camel_case_types)]
+        private,
+    }
+
+    #[derive(Serialize, Deserialize)]
+    pub(super) struct ChatPrivate {
+        /// A dummy field. Used to ensure that the `type` field is equal to
+        /// `private`.
+        r#type: Type,
+
+        username: Option<String>,
+        first_name: Option<String>,
+        last_name: Option<String>,
+        bio: Option<String>,
+        has_private_forwards: Option<True>,
+    }
+
+    impl From<ChatPrivate> for super::ChatPrivate {
+        fn from(
+            ChatPrivate {
+                r#type: _,
+                username,
+                first_name,
+                last_name,
+                bio,
+                has_private_forwards,
+            }: ChatPrivate,
+        ) -> Self {
+            Self {
+                username,
+                first_name,
+                last_name,
+                bio,
+                has_private_forwards,
+            }
+        }
+    }
+
+    impl From<super::ChatPrivate> for ChatPrivate {
+        fn from(
+            super::ChatPrivate {
+                username,
+                first_name,
+                last_name,
+                bio,
+                has_private_forwards,
+            }: super::ChatPrivate,
+        ) -> Self {
+            Self {
+                r#type: Type::private,
+                username,
+                first_name,
+                last_name,
+                bio,
+                has_private_forwards,
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::{from_str, to_string};
@@ -484,7 +509,6 @@ mod tests {
             Chat {
                 id: ChatId(0),
                 kind: ChatKind::Private(ChatPrivate {
-                    type_: (),
                     username: Some("username".into()),
                     first_name: Some("Anon".into()),
                     last_name: None,
@@ -505,7 +529,6 @@ mod tests {
         let chat = Chat {
             id: ChatId(0),
             kind: ChatKind::Private(ChatPrivate {
-                type_: (),
                 username: Some("username".into()),
                 first_name: Some("Anon".into()),
                 last_name: None,
diff --git a/src/types/update.rs b/src/types/update.rs
index 05a316e7..0e9d1378 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -337,7 +337,6 @@ mod test {
                 chat: Chat {
                     id: ChatId(218_485_655),
                     kind: ChatKind::Private(ChatPrivate {
-                        type_: (),
                         username: Some(String::from("WaffleLapkin")),
                         first_name: Some(String::from("Waffle")),
                         last_name: None,

From 9b44eb794cc173b8521dea665bdd4e161249fab2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 28 Jun 2022 18:35:28 +0400
Subject: [PATCH 630/755] Add features needed for examples to dev-dependencies

this makes running/checking examples much easier
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index fcbd0d55..c49e7528 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ vecrem = { version = "0.1", optional = true }
 
 [dev-dependencies]
 pretty_env_logger = "0.4"
-tokio = { version = "1.8.0", features = ["fs", "macros"] }
+tokio = { version = "1.8.0", features = ["fs", "macros", "macros", "rt-multi-thread"] }
 cool_asserts = "2.0.3"
 
 [features]

From e2289aad14917abeb7c7a99d68ad52339d8309c1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 28 Jun 2022 18:36:02 +0400
Subject: [PATCH 631/755] experiment with CI

---
 .github/workflows/ci.yml | 114 +++++++++++++++++++++++++++++++--------
 1 file changed, 92 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d75c311..ba094f7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,3 +1,5 @@
+name: Continuous integration
+
 on:
   push:
     branches:
@@ -6,29 +8,63 @@ on:
     branches:
     - master
 
-name: Continuous integration
+env:
+  RUSTFLAGS: -Dwarnings
+  RUST_BACKTRACE: short
+
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+  rust_nightly: nightly-2022-01-17
+  # When updating this, also update:
+  # - README.md
+  # - src/lib.rs
+  # - down below in a matrix
+  rust_msrv: 1.58.0
 
 jobs:
-  style:
+  # Depends on all action that are required for a "successful" CI run.
+  ci-pass:
+    name: CI succeeded
+    runs-on: ubuntu-latest
+
+    needs:
+      - fmt
+      - test
+      - check-examples
+      - clippy
+
+    steps:
+      - run: exit 0
+
+  fmt:
+    name: fmt
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
+      - name: Install Rust ${{ env.rust_nightly }}
+        uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-01-17
+          toolchain: ${{ env.rust_nightly }}
           override: true
           components: rustfmt
 
-      - name: fmt
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
+      - name: Check formatting
         uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: --all -- --check 
+          args: --all -- --check
 
   test:
+    name: Test
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -49,45 +85,79 @@ jobs:
             toolchain: nightly-2022-01-17
             features: "--all-features"
           - rust: msrv
+            toolchain: 1.58.0
             features: "--features full"
-            toolchain: "1.58.0"
 
-    steps:
-      - uses: actions/checkout@v1
-        
-      - uses: actions-rs/toolchain@v1
+    steps:      
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust ${{ matrix.toolchain }}
+        uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.toolchain }}
           override: true
-      
-      - name: build 
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
+      - name: Compile 
         uses: actions-rs/cargo@v1
         with:
-          command: build
-          args: --verbose ${{ matrix.features }}
+          command: test
+          args: --no-run --verbose ${{ matrix.features }}
       
-      - name: test 
+      - name: Test
         uses: actions-rs/cargo@v1
         with:
           command: test
           args: --verbose ${{ matrix.features }}
 
-  clippy:
+  check-examples:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout
+        uses: actions/checkout@v3
 
-      - uses: actions-rs/toolchain@v1
+      - name: Install Rust stable
+        uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-01-17
+          toolchain: stable
+          override: true
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
+      - name: Check examples
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --examples --features full
+
+  clippy:
+    name: Run linter
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust ${{ env.rust_nightly }}
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ env.rust_nightly }}
           override: true
           components: clippy
 
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
       - name: clippy
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets --all-features -- -D warnings
+          args: --all-targets --all-features

From 3b94e9c05b1cb20808706bf0d19d31e6a298df7c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 28 Jun 2022 20:12:36 +0400
Subject: [PATCH 632/755] check docs on CI

---
 .github/workflows/ci.yml | 25 +++++++++++++++++++++++++
 src/lib.rs               |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba094f7f..ac784ce3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ on:
 
 env:
   RUSTFLAGS: -Dwarnings
+  RUSTDOCFLAGS: -Dwarnings
   RUST_BACKTRACE: short
 
   CARGO_INCREMENTAL: 0
@@ -34,6 +35,7 @@ jobs:
       - test
       - check-examples
       - clippy
+      - doc
 
     steps:
       - run: exit 0
@@ -161,3 +163,26 @@ jobs:
         with:
           command: clippy
           args: --all-targets --all-features
+
+  doc:
+    name: check docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust ${{ env.rust_nightly }}
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ env.rust_nightly }}
+          override: true
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
+      - name: rustdoc
+        uses: actions-rs/cargo@v1
+        with:
+          command: docs # from .cargo/config.toml
diff --git a/src/lib.rs b/src/lib.rs
index da97ab3d..04d6691b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,6 +90,8 @@
 #![warn(clippy::print_stdout, clippy::dbg_macro)]
 // Unless this becomes machine applicable, I'm not adding 334 #[must_use]s (waffle)
 #![allow(clippy::return_self_not_must_use)]
+// Workaround for CI
+#![allow(rustdoc::bare_urls)]
 
 // The internal helper macros.
 #[macro_use]

From 3a2c8a8ffe86cbf4512d022b44934a9142d64c75 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:04:23 +0400
Subject: [PATCH 633/755] Make `InlineKeyboardButtonKind::Pay.0` have type
 `True`

---
 src/types/inline_keyboard_button.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index f776d54f..add4988a 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -1,4 +1,4 @@
-use crate::types::{CallbackGame, LoginUrl, WebAppInfo};
+use crate::types::{CallbackGame, LoginUrl, True, WebAppInfo};
 use serde::{Deserialize, Serialize};
 
 /// This object represents one button of an inline keyboard.
@@ -110,8 +110,7 @@ pub enum InlineKeyboardButtonKind {
     /// row.
     ///
     /// [Pay button]: https://core.telegram.org/bots/api#payments
-    // FIXME(waffle): This should be using `True`
-    Pay(bool),
+    Pay(True),
 }
 
 /// Build buttons.

From 71555ba43e9d22e1aee6c7726c896967ea2920c7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:05:16 +0400
Subject: [PATCH 634/755] Add more constructors to `InlineKeyboardButton`

---
 src/types/inline_keyboard_button.rs | 97 +++++++++++++++++++----------
 1 file changed, 63 insertions(+), 34 deletions(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index add4988a..7c7cd018 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -13,31 +13,6 @@ pub struct InlineKeyboardButton {
     pub kind: InlineKeyboardButtonKind,
 }
 
-impl InlineKeyboardButton {
-    pub fn new<S>(text: S, kind: InlineKeyboardButtonKind) -> Self
-    where
-        S: Into<String>,
-    {
-        Self {
-            text: text.into(),
-            kind,
-        }
-    }
-
-    pub fn text<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.text = val.into();
-        self
-    }
-
-    pub fn kind(mut self, val: InlineKeyboardButtonKind) -> Self {
-        self.kind = val;
-        self
-    }
-}
-
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum InlineKeyboardButtonKind {
@@ -113,16 +88,17 @@ pub enum InlineKeyboardButtonKind {
     Pay(True),
 }
 
-/// Build buttons.
-///
-/// # Examples
-/// ```
-/// use teloxide_core::types::InlineKeyboardButton;
-///
-/// let url = url::Url::parse("https://example.com").unwrap();
-/// let url_button = InlineKeyboardButton::url("Text".to_string(), url);
-/// ```
 impl InlineKeyboardButton {
+    pub fn new<S>(text: S, kind: InlineKeyboardButtonKind) -> Self
+    where
+        S: Into<String>,
+    {
+        Self {
+            text: text.into(),
+            kind,
+        }
+    }
+
     pub fn url<T>(text: T, url: reqwest::Url) -> InlineKeyboardButton
     where
         T: Into<String>,
@@ -133,6 +109,16 @@ impl InlineKeyboardButton {
         }
     }
 
+    pub fn login<T>(text: T, url: LoginUrl) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+    {
+        InlineKeyboardButton {
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::LoginUrl(url),
+        }
+    }
+
     pub fn callback<T, C>(text: T, callback_data: C) -> InlineKeyboardButton
     where
         T: Into<String>,
@@ -144,6 +130,16 @@ impl InlineKeyboardButton {
         }
     }
 
+    pub fn web_app<T>(text: T, info: WebAppInfo) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+    {
+        InlineKeyboardButton {
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::WebApp(info),
+        }
+    }
+
     pub fn switch_inline_query<T, Q>(text: T, switch_inline_query: Q) -> InlineKeyboardButton
     where
         T: Into<String>,
@@ -170,4 +166,37 @@ impl InlineKeyboardButton {
             ),
         }
     }
+
+    pub fn callback_game<T>(text: T, game: CallbackGame) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+    {
+        InlineKeyboardButton {
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::CallbackGame(game),
+        }
+    }
+
+    pub fn pay<T>(text: T) -> InlineKeyboardButton
+    where
+        T: Into<String>,
+    {
+        InlineKeyboardButton {
+            text: text.into(),
+            kind: InlineKeyboardButtonKind::Pay(True),
+        }
+    }
+
+    pub fn text<S>(mut self, val: S) -> Self
+    where
+        S: Into<String>,
+    {
+        self.text = val.into();
+        self
+    }
+
+    pub fn kind(mut self, val: InlineKeyboardButtonKind) -> Self {
+        self.kind = val;
+        self
+    }
 }

From adacbe90c27980aba023ea1a8ba6a1967a750ea7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:10:37 +0400
Subject: [PATCH 635/755] Make code in `inline_keyboard_button.rs` nicer

---
 src/types/inline_keyboard_button.rs | 65 +++++++++++------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 7c7cd018..fb36bbd2 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -99,92 +99,77 @@ impl InlineKeyboardButton {
         }
     }
 
-    pub fn url<T>(text: T, url: reqwest::Url) -> InlineKeyboardButton
+    pub fn url<T>(text: T, url: reqwest::Url) -> Self
     where
         T: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::Url(url),
-        }
+        Self::new(text, InlineKeyboardButtonKind::Url(url))
     }
 
-    pub fn login<T>(text: T, url: LoginUrl) -> InlineKeyboardButton
+    pub fn login<T>(text: T, url: LoginUrl) -> Self
     where
         T: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::LoginUrl(url),
-        }
+        Self::new(text, InlineKeyboardButtonKind::LoginUrl(url))
     }
 
-    pub fn callback<T, C>(text: T, callback_data: C) -> InlineKeyboardButton
+    pub fn callback<T, C>(text: T, callback_data: C) -> Self
     where
         T: Into<String>,
         C: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::CallbackData(callback_data.into()),
-        }
+        Self::new(
+            text,
+            InlineKeyboardButtonKind::CallbackData(callback_data.into()),
+        )
     }
 
-    pub fn web_app<T>(text: T, info: WebAppInfo) -> InlineKeyboardButton
+    pub fn web_app<T>(text: T, info: WebAppInfo) -> Self
     where
         T: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::WebApp(info),
-        }
+        Self::new(text, InlineKeyboardButtonKind::WebApp(info))
     }
 
-    pub fn switch_inline_query<T, Q>(text: T, switch_inline_query: Q) -> InlineKeyboardButton
+    pub fn switch_inline_query<T, Q>(text: T, switch_inline_query: Q) -> Self
     where
         T: Into<String>,
         Q: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query.into()),
-        }
+        Self::new(
+            text,
+            InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query.into()),
+        )
     }
 
     pub fn switch_inline_query_current_chat<T, Q>(
         text: T,
         switch_inline_query_current_chat: Q,
-    ) -> InlineKeyboardButton
+    ) -> Self
     where
         T: Into<String>,
         Q: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat(
+        Self::new(
+            text,
+            InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat(
                 switch_inline_query_current_chat.into(),
             ),
-        }
+        )
     }
 
-    pub fn callback_game<T>(text: T, game: CallbackGame) -> InlineKeyboardButton
+    pub fn callback_game<T>(text: T, game: CallbackGame) -> Self
     where
         T: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::CallbackGame(game),
-        }
+        Self::new(text, InlineKeyboardButtonKind::CallbackGame(game))
     }
 
-    pub fn pay<T>(text: T) -> InlineKeyboardButton
+    pub fn pay<T>(text: T) -> Self
     where
         T: Into<String>,
     {
-        InlineKeyboardButton {
-            text: text.into(),
-            kind: InlineKeyboardButtonKind::Pay(True),
-        }
+        Self::new(text, InlineKeyboardButtonKind::Pay(True))
     }
 
     pub fn text<S>(mut self, val: S) -> Self

From 0a8434ed066fbabef92be43899906b163f80175a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:11:17 +0400
Subject: [PATCH 636/755] Deprecate useless `InlineKeyboardButton::{text,
 kind}`

---
 src/types/inline_keyboard_button.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index fb36bbd2..01f949d2 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -171,7 +171,13 @@ impl InlineKeyboardButton {
     {
         Self::new(text, InlineKeyboardButtonKind::Pay(True))
     }
+}
 
+impl InlineKeyboardButton {
+    #[deprecated(
+        since = "0.7.0",
+        note = "set correct text in the constructor or access the field directly"
+    )]
     pub fn text<S>(mut self, val: S) -> Self
     where
         S: Into<String>,
@@ -180,6 +186,10 @@ impl InlineKeyboardButton {
         self
     }
 
+    #[deprecated(
+        since = "0.7.0",
+        note = "set correct kind in the constructor or access the field directly"
+    )]
     pub fn kind(mut self, val: InlineKeyboardButtonKind) -> Self {
         self.kind = val;
         self

From 9e2f5dc6ccf6aa5ffe6c50d7ed96a31f6408278d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:15:12 +0400
Subject: [PATCH 637/755] Document `InlineKeyboardButton` constructors

---
 src/types/inline_keyboard_button.rs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 01f949d2..334f4545 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -74,6 +74,7 @@ pub enum InlineKeyboardButtonKind {
     /// button.
     ///
     /// ## Note
+    ///
     /// This type of button **must** always be the first button in the first
     /// row.
     CallbackGame(CallbackGame),
@@ -81,6 +82,7 @@ pub enum InlineKeyboardButtonKind {
     /// Specify True, to send a [Pay button].
     ///
     /// ## Note
+    ///
     /// This type of button **must** always be the first button in the first
     /// row.
     ///
@@ -89,6 +91,7 @@ pub enum InlineKeyboardButtonKind {
 }
 
 impl InlineKeyboardButton {
+    /// Creates a new `InlineKeyboardButton`.
     pub fn new<S>(text: S, kind: InlineKeyboardButtonKind) -> Self
     where
         S: Into<String>,
@@ -99,6 +102,9 @@ impl InlineKeyboardButton {
         }
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`Url`] kind.
+    ///
+    /// [`Url`]: InlineKeyboardButtonKind::Url
     pub fn url<T>(text: T, url: reqwest::Url) -> Self
     where
         T: Into<String>,
@@ -106,6 +112,9 @@ impl InlineKeyboardButton {
         Self::new(text, InlineKeyboardButtonKind::Url(url))
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`LoginUrl`] kind.
+    ///
+    /// [`LoginUrl`]: InlineKeyboardButtonKind::LoginUrl
     pub fn login<T>(text: T, url: LoginUrl) -> Self
     where
         T: Into<String>,
@@ -113,6 +122,9 @@ impl InlineKeyboardButton {
         Self::new(text, InlineKeyboardButtonKind::LoginUrl(url))
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`CallbackData`] kind.
+    ///
+    /// [`CallbackData`]: InlineKeyboardButtonKind::CallbackData
     pub fn callback<T, C>(text: T, callback_data: C) -> Self
     where
         T: Into<String>,
@@ -124,6 +136,9 @@ impl InlineKeyboardButton {
         )
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`WebApp`] kind.
+    ///
+    /// [`WebApp`]: InlineKeyboardButtonKind::WebApp
     pub fn web_app<T>(text: T, info: WebAppInfo) -> Self
     where
         T: Into<String>,
@@ -131,6 +146,9 @@ impl InlineKeyboardButton {
         Self::new(text, InlineKeyboardButtonKind::WebApp(info))
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`SwitchInlineQuery`] kind.
+    ///
+    /// [`SwitchInlineQuery`]: InlineKeyboardButtonKind::SwitchInlineQuery
     pub fn switch_inline_query<T, Q>(text: T, switch_inline_query: Q) -> Self
     where
         T: Into<String>,
@@ -142,6 +160,10 @@ impl InlineKeyboardButton {
         )
     }
 
+    /// Constructor for `InlineKeyboardButton` with
+    /// [`SwitchInlineQueryCurrentChat`] kind.
+    ///
+    /// [`SwitchInlineQueryCurrentChat`]: InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat
     pub fn switch_inline_query_current_chat<T, Q>(
         text: T,
         switch_inline_query_current_chat: Q,
@@ -158,6 +180,9 @@ impl InlineKeyboardButton {
         )
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`CallbackGame`] kind.
+    ///
+    /// [`CallbackGame`]: InlineKeyboardButtonKind::CallbackGame
     pub fn callback_game<T>(text: T, game: CallbackGame) -> Self
     where
         T: Into<String>,
@@ -165,6 +190,9 @@ impl InlineKeyboardButton {
         Self::new(text, InlineKeyboardButtonKind::CallbackGame(game))
     }
 
+    /// Constructor for `InlineKeyboardButton` with [`Pay`] kind.
+    ///
+    /// [`Pay`]: InlineKeyboardButtonKind::Pay
     pub fn pay<T>(text: T) -> Self
     where
         T: Into<String>,

From 108caf80511f37895d33297c41cd1582a102a099 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:19:30 +0400
Subject: [PATCH 638/755] Fix link

---
 src/types/inline_keyboard_button.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 334f4545..464f10d8 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -58,7 +58,7 @@ pub enum InlineKeyboardButtonKind {
     /// switched from, skipping the chat selection screen.
     ///
     /// [inline mode]: https://core.telegram.org/bots/inline
-    /// [switch_pm…]: https://core.telegram.org/bots/api#answerinlinequery
+    /// [switch_pm…]: crate::payloads::AnswerInlineQuery
     SwitchInlineQuery(String),
 
     /// If set, pressing the button will insert the bot‘s username and the

From 0d787ce92a467b8ce8112472c722218fe44a244e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 20:24:13 +0400
Subject: [PATCH 639/755] Update changelog

---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca38d080..75e0c53f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
+
+### Changed
+
+-  `InlineKeyboardButtonKind::Pay`'s only field now has type `True` ([#231][pr231])
+
+### Deprecated
+
+- `InlineKeyboardButton::{text, kind}` functions ([#231][pr231])
+
+[pr231]: https://github.com/teloxide/teloxide-core/pull/231
+
 ### Removed
 
 - `ChatPrivate::type_` field ([#232][pr232])

From 44e4ead3851909a9740625475765a380813036ff Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 19:10:54 +0400
Subject: [PATCH 640/755] [TBA-6.1] Support new `Chat` fields

---
 src/types/chat.rs | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index e7d9f004..fc0314c3 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -176,6 +176,18 @@ pub struct PublicChatSupergroup {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub location: Option<ChatLocation>,
+
+    /// True, if users need to join the supergroup before they can send
+    /// messages. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub join_to_send_messages: Option<True>,
+
+    /// True, if all users directly joining the supergroup need to be approved
+    /// by supergroup administrators. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub join_by_request: Option<True>,
 }
 
 impl Chat {
@@ -331,6 +343,34 @@ impl Chat {
         None
     }
 
+    /// True, if users need to join the supergroup before they can send
+    /// messages. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn join_to_send_messages(&self) -> Option<True> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.join_to_send_messages;
+            }
+        }
+
+        None
+    }
+
+    /// True, if all users directly joining the supergroup need to be approved
+    /// by supergroup administrators. Returned only in [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub fn join_by_request(&self) -> Option<True> {
+        if let ChatKind::Public(this) = &self.kind {
+            if let PublicChatKind::Supergroup(this) = &this.kind {
+                return this.join_by_request;
+            }
+        }
+
+        None
+    }
+
     /// A description, for groups, supergroups and channel chats. Returned
     /// only in [`GetChat`].
     ///

From 46ffd51ec9df7955f0482204b31298ad08b8b59e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 19:30:35 +0400
Subject: [PATCH 641/755] [TBA-6.1] Support premium stuff

---
 src/types/animation.rs | 2 +-
 src/types/audio.rs     | 2 +-
 src/types/document.rs  | 2 +-
 src/types/file.rs      | 8 ++++----
 src/types/me.rs        | 1 +
 src/types/sticker.rs   | 5 ++++-
 src/types/user.rs      | 7 +++++++
 src/types/video.rs     | 2 +-
 8 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/types/animation.rs b/src/types/animation.rs
index fda13b3f..de54253e 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -38,7 +38,7 @@ pub struct Animation {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    pub file_size: Option<u64>,
 }
 
 #[cfg(test)]
diff --git a/src/types/audio.rs b/src/types/audio.rs
index a06d4ce6..febc4980 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -35,7 +35,7 @@ pub struct Audio {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    pub file_size: Option<u64>,
 
     /// A thumbnail of the album cover to which the music file belongs.
     pub thumb: Option<PhotoSize>,
diff --git a/src/types/document.rs b/src/types/document.rs
index 94a3aaa0..864443c2 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -33,5 +33,5 @@ pub struct Document {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    pub file_size: Option<u64>,
 }
diff --git a/src/types/file.rs b/src/types/file.rs
index 8b11e871..3de6521f 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -27,7 +27,7 @@ pub struct File {
     /// errourneusly marked as required in Teloxide. To workaround this issue,
     /// when `file_size` is not present, it is deserialized as [`u32::MAX`].
     #[serde(default = "default_file_size")]
-    pub file_size: u32,
+    pub file_size: u64,
 
     /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
     ///
@@ -40,8 +40,8 @@ pub struct File {
     pub file_path: String,
 }
 
-const fn default_file_size() -> u32 {
-    u32::MAX
+const fn default_file_size() -> u64 {
+    u64::MAX
 }
 
 #[cfg(test)]
@@ -59,7 +59,7 @@ mod tests {
             File {
                 file_id: "FILE_ID".to_owned(),
                 file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: u32::MAX,
+                file_size: u64::MAX,
                 file_path: "FILE_PATH".to_owned(),
             }
         );
diff --git a/src/types/me.rs b/src/types/me.rs
index 9ecfb574..b0d82b8c 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -66,6 +66,7 @@ mod tests {
                 last_name: None,
                 username: Some("SomethingSomethingBot".to_owned()),
                 language_code: None,
+                is_premium: false,
             },
             can_join_groups: false,
             can_read_all_group_messages: false,
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 36510976..4066350b 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{MaskPosition, PhotoSize};
+use crate::types::{File, MaskPosition, PhotoSize};
 
 /// This object represents a sticker.
 ///
@@ -41,6 +41,9 @@ pub struct Sticker {
     /// Name of the sticker set to which the sticker belongs.
     pub set_name: Option<String>,
 
+    /// Premium animation for the sticker, if the sticker is premium.
+    pub premium_animation: Option<File>,
+
     /// For mask stickers, the position where the mask should be placed.
     pub mask_position: Option<MaskPosition>,
 
diff --git a/src/types/user.rs b/src/types/user.rs
index f5063112..0eecb3c2 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -27,6 +27,10 @@ pub struct User {
     ///
     /// [IETF language tag]: https://en.wikipedia.org/wiki/IETF_language_tag
     pub language_code: Option<String>,
+
+    /// `true`, if this user is a Telegram Premium user.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub is_premium: bool,
 }
 
 impl User {
@@ -137,6 +141,7 @@ mod tests {
             last_name: Some("lastName".to_string()),
             username: Some("Username".to_string()),
             language_code: Some(String::from("ru")),
+            is_premium: false,
         };
         let actual = serde_json::from_str::<User>(json).unwrap();
         assert_eq!(actual, expected)
@@ -151,6 +156,7 @@ mod tests {
             last_name: Some("Last".to_owned()),
             username: Some("aaaaaaaaaaaaaaaa".to_owned()),
             language_code: None,
+            is_premium: false,
         };
 
         let user_b = User {
@@ -160,6 +166,7 @@ mod tests {
             last_name: None,
             username: None,
             language_code: None,
+            is_premium: false,
         };
 
         assert_eq!(user_a.full_name(), "First Last");
diff --git a/src/types/video.rs b/src/types/video.rs
index df873dc9..08e484d5 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -37,5 +37,5 @@ pub struct Video {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    pub file_size: Option<u64>,
 }

From f14bc79ddaef6fc60588525fb316f58bad661146 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 19:33:32 +0400
Subject: [PATCH 642/755] Fix `File` fields optionability

---
 CHANGELOG.md      |  5 +++++
 src/types/file.rs | 26 ++++++--------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75e0c53f..bee843cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
 
+### Fixed
+
+- `File::{file_size, file_path}` are now optional ([#233][pr233])
+
 ### Changed
 
 -  `InlineKeyboardButtonKind::Pay`'s only field now has type `True` ([#231][pr231])
@@ -20,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `InlineKeyboardButton::{text, kind}` functions ([#231][pr231])
 
 [pr231]: https://github.com/teloxide/teloxide-core/pull/231
+[pr233]: https://github.com/teloxide/teloxide-core/pull/233
 
 ### Removed
 
diff --git a/src/types/file.rs b/src/types/file.rs
index 3de6521f..9dfb5860 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -22,26 +22,12 @@ pub struct File {
     pub file_unique_id: String,
 
     /// File size in bytes, if known.
-    ///
-    /// **Note:** in the Telegram Bot API this field is optional, however it was
-    /// errourneusly marked as required in Teloxide. To workaround this issue,
-    /// when `file_size` is not present, it is deserialized as [`u32::MAX`].
-    #[serde(default = "default_file_size")]
-    pub file_size: u64,
+    pub file_size: Option<u64>,
 
     /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
     ///
-    /// **Note:** in the Telegram Bot API this field is optional, however it was
-    /// errourneusly marked as required in Teloxide. To workaround this issue,
-    /// when `file_path` is not present, it is deserialized as an empty string.
-    ///
     /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
-    #[serde(default)]
-    pub file_path: String,
-}
-
-const fn default_file_size() -> u64 {
-    u64::MAX
+    pub file_path: Option<String>,
 }
 
 #[cfg(test)]
@@ -59,8 +45,8 @@ mod tests {
             File {
                 file_id: "FILE_ID".to_owned(),
                 file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: u64::MAX,
-                file_path: "FILE_PATH".to_owned(),
+                file_size: None,
+                file_path: Some("FILE_PATH".to_owned()),
             }
         );
     }
@@ -75,8 +61,8 @@ mod tests {
             File {
                 file_id: "FILE_ID".to_owned(),
                 file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: 42,
-                file_path: "".to_owned(),
+                file_size: Some(42),
+                file_path: Some("".to_owned()),
             }
         );
     }

From b1aab1a6e1a242dfa9297c179a6f4aa77d64814c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 19:42:03 +0400
Subject: [PATCH 643/755] [TBA-6.1] Add weird user field

(seriously, does anyone know what is this about?)
---
 src/types/user.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/types/user.rs b/src/types/user.rs
index 0eecb3c2..78b1f617 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -31,6 +31,10 @@ pub struct User {
     /// `true`, if this user is a Telegram Premium user.
     #[serde(default, skip_serializing_if = "std::ops::Not::not")]
     pub is_premium: bool,
+
+    /// `true`, if this user added the bot to the attachment menu.
+    #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+    pub added_to_attachment_menu: bool,
 }
 
 impl User {

From 1a81ba5fef42d8a39c192d87d22dad21ece39051 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 19:53:39 +0400
Subject: [PATCH 644/755] [TBA-6.1] Clarify in docs that login url must be
 https

---
 src/types/inline_keyboard_button.rs |  2 +-
 src/types/login_url.rs              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 464f10d8..59282fac 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -25,7 +25,7 @@ pub enum InlineKeyboardButtonKind {
     /// message_.
     Url(reqwest::Url),
 
-    /// An HTTP URL used to automatically authorize the user. Can be used as a
+    /// An HTTPS URL used to automatically authorize the user. Can be used as a
     /// replacement for the [Telegram Login Widget].
     ///
     /// [Telegram Login Widget]: https://core.telegram.org/widgets/login
diff --git a/src/types/login_url.rs b/src/types/login_url.rs
index ba2c0d78..ef8e9a36 100644
--- a/src/types/login_url.rs
+++ b/src/types/login_url.rs
@@ -15,11 +15,11 @@ use serde::{Deserialize, Serialize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct LoginUrl {
-    /// An HTTP URL to be opened with user authorization data added to the query
-    /// string when the button is pressed. If the user refuses to provide
-    /// authorization data, the original URL without information about the user
-    /// will be opened. The data added is the same as described in [Receiving
-    /// authorization data].
+    /// An HTTPS URL to be opened with user authorization data added to the
+    /// query string when the button is pressed. If the user refuses to
+    /// provide authorization data, the original URL without information
+    /// about the user will be opened. The data added is the same as
+    /// described in [Receiving authorization data].
     ///
     /// [Receiving authorization data]: https://core.telegram.org/widgets/login#receiving-authorization-data
     ///

From 6630fe0b695a83d2d795012d2041b146d68c33cf Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 21:51:00 +0400
Subject: [PATCH 645/755] [TBA-6.1] Method changes

---
 src/adaptors/auto_send.rs               |  1 +
 src/adaptors/cache_me.rs                |  1 +
 src/adaptors/erased.rs                  | 34 +++++++++++++
 src/adaptors/parse_mode.rs              |  1 +
 src/adaptors/throttle/requester_impl.rs |  1 +
 src/adaptors/trace.rs                   |  1 +
 src/bot/api.rs                          | 33 +++++++++++++
 src/local_macros.rs                     | 13 +++++
 src/payloads.rs                         |  2 +
 src/payloads/create_invoice_link.rs     | 66 +++++++++++++++++++++++++
 src/payloads/send_invoice.rs            |  2 +-
 src/payloads/set_webhook.rs             |  2 +
 src/payloads/setters.rs                 | 20 ++++----
 src/requests/requester.rs               | 55 ++++++++++-----------
 14 files changed, 193 insertions(+), 39 deletions(-)
 create mode 100644 src/payloads/create_invoice_link.rs

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 8f445a86..e10f763f 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -170,6 +170,7 @@ where
         delete_sticker_from_set,
         set_sticker_set_thumb,
         send_invoice,
+        create_invoice_link,
         answer_shipping_query,
         answer_pre_checkout_query,
         set_passport_data_errors,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 05798cda..b1918ab8 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -176,6 +176,7 @@ where
         delete_sticker_from_set,
         set_sticker_set_thumb,
         send_invoice,
+        create_invoice_link,
         answer_shipping_query,
         answer_pre_checkout_query,
         set_passport_data_errors,
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 6c98cbd0..4dbae3a8 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -243,6 +243,7 @@ where
         delete_sticker_from_set,
         set_sticker_set_thumb,
         send_invoice,
+        create_invoice_link,
         answer_shipping_query,
         answer_pre_checkout_query,
         set_passport_data_errors,
@@ -743,6 +744,17 @@ trait ErasableRequester<'a> {
         prices: Vec<LabeledPrice>,
     ) -> ErasedRequest<'a, SendInvoice, Self::Err>;
 
+    #[allow(clippy::too_many_arguments)]
+    fn create_invoice_link(
+        &self,
+        title: String,
+        description: String,
+        payload: String,
+        provider_token: String,
+        currency: String,
+        prices: Vec<LabeledPrice>,
+    ) -> ErasedRequest<'a, CreateInvoiceLink, Self::Err>;
+
     fn answer_shipping_query(
         &self,
         shipping_query_id: String,
@@ -1467,6 +1479,28 @@ where
         .erase()
     }
 
+    #[allow(clippy::too_many_arguments)]
+    fn create_invoice_link(
+        &self,
+        title: String,
+        description: String,
+        payload: String,
+        provider_token: String,
+        currency: String,
+        prices: Vec<LabeledPrice>,
+    ) -> ErasedRequest<'a, CreateInvoiceLink, Self::Err> {
+        Requester::create_invoice_link(
+            self,
+            title,
+            description,
+            payload,
+            provider_token,
+            currency,
+            prices,
+        )
+        .erase()
+    }
+
     fn answer_shipping_query(
         &self,
         shipping_query_id: String,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index d5b749dc..ca53a67e 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -171,6 +171,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         delete_sticker_from_set,
         set_sticker_set_thumb,
         send_invoice,
+        create_invoice_link,
         answer_shipping_query,
         answer_pre_checkout_query,
         set_passport_data_errors,
diff --git a/src/adaptors/throttle/requester_impl.rs b/src/adaptors/throttle/requester_impl.rs
index c7764172..50cbccf6 100644
--- a/src/adaptors/throttle/requester_impl.rs
+++ b/src/adaptors/throttle/requester_impl.rs
@@ -155,6 +155,7 @@ where
         delete_sticker_from_set,
         set_sticker_set_thumb,
         answer_shipping_query,
+        create_invoice_link,
         answer_pre_checkout_query,
         set_passport_data_errors,
         send_game,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 46b9db15..a3b3fcfa 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -202,6 +202,7 @@ where
         delete_sticker_from_set,
         set_sticker_set_thumb,
         send_invoice,
+        create_invoice_link,
         answer_shipping_query,
         answer_pre_checkout_query,
         set_passport_data_errors,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 71e60fef..cbf76372 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1036,6 +1036,39 @@ impl Requester for Bot {
         )
     }
 
+    type CreateInvoiceLink = JsonRequest<payloads::CreateInvoiceLink>;
+
+    /// For Telegram documentation see [`CreateInvoiceLink`].
+    fn create_invoice_link<T, D, Pa, P, C, Pri>(
+        &self,
+        title: T,
+        description: D,
+        payload: Pa,
+        provider_token: P,
+        currency: C,
+        prices: Pri,
+    ) -> Self::CreateInvoiceLink
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice>,
+    {
+        Self::CreateInvoiceLink::new(
+            self.clone(),
+            payloads::CreateInvoiceLink::new(
+                title,
+                description,
+                payload,
+                provider_token,
+                currency,
+                prices,
+            ),
+        )
+    }
+
     type AnswerShippingQuery = JsonRequest<payloads::AnswerShippingQuery>;
 
     fn answer_shipping_query<S>(&self, shipping_query_id: S, ok: bool) -> Self::AnswerShippingQuery
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 6553b411..ff4889b3 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1163,6 +1163,19 @@ macro_rules! requester_forward {
             $body!(send_invoice this (chat_id: Ch, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri))
         }
     };
+    (@method create_invoice_link $body:ident $ty:ident) => {
+        type CreateInvoiceLink = $ty![CreateInvoiceLink];
+
+        fn create_invoice_link<T, D, Pa, P, C, Pri>(&self, title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri) -> Self::CreateInvoiceLink where T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice> {
+            let this = self;
+            $body!(create_invoice_link this (title: T, description: D, payload: Pa, provider_token: P, currency: C, prices: Pri))
+        }
+    };
     (@method answer_shipping_query $body:ident $ty:ident) => {
         type AnswerShippingQuery = $ty![AnswerShippingQuery];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index 8f5cb81b..2a4d2419 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -32,6 +32,7 @@ mod ban_chat_sender_chat;
 mod close;
 mod copy_message;
 mod create_chat_invite_link;
+mod create_invoice_link;
 mod create_new_sticker_set;
 mod decline_chat_join_request;
 mod delete_chat_photo;
@@ -129,6 +130,7 @@ pub use ban_chat_sender_chat::{BanChatSenderChat, BanChatSenderChatSetters};
 pub use close::{Close, CloseSetters};
 pub use copy_message::{CopyMessage, CopyMessageSetters};
 pub use create_chat_invite_link::{CreateChatInviteLink, CreateChatInviteLinkSetters};
+pub use create_invoice_link::{CreateInvoiceLink, CreateInvoiceLinkSetters};
 pub use create_new_sticker_set::{CreateNewStickerSet, CreateNewStickerSetSetters};
 pub use decline_chat_join_request::{DeclineChatJoinRequest, DeclineChatJoinRequestSetters};
 pub use delete_chat_photo::{DeleteChatPhoto, DeleteChatPhotoSetters};
diff --git a/src/payloads/create_invoice_link.rs b/src/payloads/create_invoice_link.rs
new file mode 100644
index 00000000..6b39fb68
--- /dev/null
+++ b/src/payloads/create_invoice_link.rs
@@ -0,0 +1,66 @@
+// This file is auto generated by [`cg`] from [`schema`].
+//
+// **DO NOT EDIT THIS FILE**,
+//
+// Edit `cg` or `schema` instead.
+//
+// [cg]: https://github.com/teloxide/cg
+// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+use serde::Serialize;
+
+use crate::types::LabeledPrice;
+
+impl_payload! {
+    /// Use this method to create a link for an invoice. Returns the created invoice link as String on success.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub CreateInvoiceLink (CreateInvoiceLinkSetters) => String {
+        required {
+            /// Product name, 1-32 characters
+            pub title: String [into],
+            /// Product description, 1-255 characters
+            pub description: String [into],
+            /// Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes.
+            pub payload: String [into],
+            /// Payments provider token, obtained via [Botfather]
+            ///
+            /// [Botfather]: https://t.me/botfather
+            pub provider_token: String [into],
+            /// Three-letter ISO 4217 currency code, see more on currencies
+            pub currency: String [into],
+            /// Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
+            pub prices: Vec<LabeledPrice> [collect],
+        }
+        optional {
+            /// The maximum accepted amount for tips in the smallest units of the currency (integer, **not** float/double). For example, for a maximum tip of `US$ 1.45` pass `max_tip_amount = 145`. See the exp parameter in [`currencies.json`], it shows the number of digits past the decimal point for each currency (2 for the majority of currencies). Defaults to 0
+            ///
+            /// [`currencies.json`]: https://core.telegram.org/bots/payments/currencies.json
+            pub max_tip_amount: u32,
+            /// A JSON-serialized array of suggested amounts of tips in the smallest units of the currency (integer, **not** float/double). At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed _max_tip_amount_.
+            pub suggested_tip_amounts: Vec<u32> [collect],
+            /// A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.
+            pub provider_data: String [into],
+            /// URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
+            pub photo_url: String [into],
+            /// Photo size in bytes
+            pub photo_size: String [into],
+            /// Photo width
+            pub photo_width: String [into],
+            /// Photo height
+            pub photo_height: String [into],
+            /// Pass _True_, if you require the user's full name to complete the order
+            pub need_name: bool,
+            /// Pass _True_, if you require the user's phone number to complete the order
+            pub need_phone_number: bool,
+            /// Pass _True_, if you require the user's email address to complete the order
+            pub need_email: bool,
+            /// Pass _True_, if you require the user's shipping address to complete the order
+            pub need_shipping_address: bool,
+            /// Pass _True_, if user's phone number should be sent to provider
+            pub send_phone_number_to_provider: bool,
+            /// Pass _True_, if user's email address should be sent to provider
+            pub send_email_to_provider: bool,
+            /// Pass _True_, if the final price depends on the shipping method
+            pub is_flexible: bool,
+        }
+    }
+}
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 7a68601d..6ac80104 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -48,7 +48,7 @@ impl_payload! {
             pub provider_data: String [into],
             /// URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.
             pub photo_url: Url,
-            /// Photo size
+            /// Photo size in bytes
             pub photo_size: String [into],
             /// Photo width
             pub photo_width: String [into],
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index b2ca66cf..f282696a 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -41,6 +41,8 @@ impl_payload! {
             pub allowed_updates: Vec<AllowedUpdate> [collect],
             /// Pass _True_ to drop all pending updates
             pub drop_pending_updates: bool,
+            /// A secret token to be sent in a header “X-Telegram-Bot-Api-Secret-Token” in every webhook request, 1-256 characters. Only characters `A-Z`, `a-z`, `0-9`, `_` and `-` are allowed. The header is useful to ensure that the request comes from a webhook set by you.
+            pub secret_token: String [into],
         }
     }
 }
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index aaa1606d..17bdddf6 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -12,16 +12,16 @@ pub use crate::payloads::{
     AnswerPreCheckoutQuerySetters as _, AnswerShippingQuerySetters as _,
     AnswerWebAppQuerySetters as _, ApproveChatJoinRequestSetters as _, BanChatMemberSetters as _,
     BanChatSenderChatSetters as _, CloseSetters as _, CopyMessageSetters as _,
-    CreateChatInviteLinkSetters as _, CreateNewStickerSetSetters as _,
-    DeclineChatJoinRequestSetters as _, DeleteChatPhotoSetters as _,
-    DeleteChatStickerSetSetters as _, DeleteMessageSetters as _, DeleteMyCommandsSetters as _,
-    DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _, EditChatInviteLinkSetters as _,
-    EditMessageCaptionInlineSetters as _, EditMessageCaptionSetters as _,
-    EditMessageLiveLocationInlineSetters as _, EditMessageLiveLocationSetters as _,
-    EditMessageMediaInlineSetters as _, EditMessageMediaSetters as _,
-    EditMessageReplyMarkupInlineSetters as _, EditMessageReplyMarkupSetters as _,
-    EditMessageTextInlineSetters as _, EditMessageTextSetters as _,
-    ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
+    CreateChatInviteLinkSetters as _, CreateInvoiceLinkSetters as _,
+    CreateNewStickerSetSetters as _, DeclineChatJoinRequestSetters as _,
+    DeleteChatPhotoSetters as _, DeleteChatStickerSetSetters as _, DeleteMessageSetters as _,
+    DeleteMyCommandsSetters as _, DeleteStickerFromSetSetters as _, DeleteWebhookSetters as _,
+    EditChatInviteLinkSetters as _, EditMessageCaptionInlineSetters as _,
+    EditMessageCaptionSetters as _, EditMessageLiveLocationInlineSetters as _,
+    EditMessageLiveLocationSetters as _, EditMessageMediaInlineSetters as _,
+    EditMessageMediaSetters as _, EditMessageReplyMarkupInlineSetters as _,
+    EditMessageReplyMarkupSetters as _, EditMessageTextInlineSetters as _,
+    EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberCountSetters as _, GetChatMemberSetters as _,
     GetChatMembersCountSetters as _, GetChatMenuButtonSetters as _, GetChatSetters as _,
     GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index b15aee7b..6bc4fffc 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -843,6 +843,26 @@ pub trait Requester {
         C: Into<String>,
         Pri: IntoIterator<Item = LabeledPrice>;
 
+    type CreateInvoiceLink: Request<Payload = CreateInvoiceLink, Err = Self::Err>;
+
+    /// For Telegram documentation see [`CreateInvoiceLink`].
+    fn create_invoice_link<T, D, Pa, P, C, Pri>(
+        &self,
+        title: T,
+        description: D,
+        payload: Pa,
+        provider_token: P,
+        currency: C,
+        prices: Pri,
+    ) -> Self::CreateInvoiceLink
+    where
+        T: Into<String>,
+        D: Into<String>,
+        Pa: Into<String>,
+        P: Into<String>,
+        C: Into<String>,
+        Pri: IntoIterator<Item = LabeledPrice>;
+
     type AnswerShippingQuery: Request<Payload = AnswerShippingQuery, Err = Self::Err>;
 
     /// For Telegram documentation see [`AnswerShippingQuery`].
@@ -923,7 +943,7 @@ macro_rules! fwd_deref {
 }
 
 macro_rules! forward_all {
-    () => {
+    ($body:ident, $ty:ident) => {
         requester_forward! {
             get_me,
             log_out,
@@ -1012,6 +1032,7 @@ macro_rules! forward_all {
             delete_sticker_from_set,
             set_sticker_set_thumb,
             send_invoice,
+            create_invoice_link,
             answer_shipping_query,
             answer_pre_checkout_query,
             set_passport_data_errors,
@@ -1021,9 +1042,12 @@ macro_rules! forward_all {
             get_game_high_scores,
             approve_chat_join_request,
             decline_chat_join_request
-            => fwd_deref, fty
+            => $body, $ty
         }
     };
+    () => {
+        forward_all! { fwd_deref, fty }
+    };
 }
 
 impl<B> Requester for &B
@@ -1093,30 +1117,5 @@ where
 {
     type Err = LR::Err;
 
-    requester_forward! {
-        get_me, log_out, close, get_updates, set_webhook, delete_webhook, get_webhook_info,
-        forward_message, copy_message, send_message, send_photo, send_audio, send_document,
-        send_video, send_animation, send_voice, send_video_note, send_media_group, send_location,
-        edit_message_live_location, edit_message_live_location_inline,
-        stop_message_live_location, stop_message_live_location_inline, send_venue,
-        send_contact, send_poll, send_dice, send_chat_action, get_user_profile_photos,
-        get_file, kick_chat_member, ban_chat_member, unban_chat_member, restrict_chat_member,
-        promote_chat_member, set_chat_administrator_custom_title,
-        ban_chat_sender_chat, unban_chat_sender_chat, set_chat_permissions,
-        export_chat_invite_link, create_chat_invite_link, edit_chat_invite_link,
-        revoke_chat_invite_link, set_chat_photo, delete_chat_photo, set_chat_title,
-        set_chat_description, pin_chat_message, unpin_chat_message, unpin_all_chat_messages,
-        leave_chat, get_chat, get_chat_administrators, get_chat_members_count, get_chat_member_count, get_chat_member,
-        set_chat_sticker_set, delete_chat_sticker_set, answer_callback_query,
-        set_my_commands, get_my_commands, set_chat_menu_button, get_chat_menu_button, set_my_default_administrator_rights, get_my_default_administrator_rights, delete_my_commands, answer_inline_query, answer_web_app_query, edit_message_text,
-        edit_message_text_inline, edit_message_caption, edit_message_caption_inline,
-        edit_message_media, edit_message_media_inline, edit_message_reply_markup,
-        edit_message_reply_markup_inline, stop_poll, delete_message, send_sticker,
-        get_sticker_set, upload_sticker_file, create_new_sticker_set,
-        add_sticker_to_set, set_sticker_position_in_set, delete_sticker_from_set,
-        set_sticker_set_thumb, send_invoice, answer_shipping_query,
-        answer_pre_checkout_query, set_passport_data_errors, send_game,
-        set_game_score, set_game_score_inline, get_game_high_scores,
-        approve_chat_join_request, decline_chat_join_request => fwd_either, fty_either
-    }
+    forward_all! { fwd_either, fty_either }
 }

From 16cbc07c9c7f9891726d9afb8f090a02b6565abb Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 21:59:27 +0400
Subject: [PATCH 646/755] Update changelog & supported API version

---
 CHANGELOG.md | 1 +
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bee843cd..271b4386 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
+- Support for Telegram Bot API [version 6.1](https://core.telegram.org/bots/api#june-20-2022) ([#233][pr233])
 
 ### Fixed
 
diff --git a/README.md b/README.md
index 88420ef0..46992ce0 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.0%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.1%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/lib.rs b/src/lib.rs
index da97ab3d..52bbb4a9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `6.0` is supported) with ease. The library is fully
+//! (Currently, version `6.1` is supported) with ease. The library is fully
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml

From 6945ff11330236a7b36d78bd147ac9070c05f59e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 26 Jun 2022 23:36:02 +0400
Subject: [PATCH 647/755] fix tests

---
 src/net/download.rs         | 2 +-
 src/types/callback_query.rs | 2 ++
 src/types/chat_member.rs    | 2 ++
 src/types/file.rs           | 2 +-
 src/types/me.rs             | 1 +
 src/types/message.rs        | 2 ++
 src/types/update.rs         | 2 ++
 src/types/user.rs           | 3 +++
 8 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/net/download.rs b/src/net/download.rs
index da05352d..394af6fe 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -44,7 +44,7 @@ pub trait Download<'w>
     ///
     /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
     /// let mut file = File::create("/tmp/test.png").await?;
-    /// bot.download_file(&file_path, &mut file).await?;
+    /// bot.download_file(&file_path.unwrap(), &mut file).await?;
     /// # Ok(()) }
     /// ```
     ///
diff --git a/src/types/callback_query.rs b/src/types/callback_query.rs
index 92d2f920..5cfa0fa8 100644
--- a/src/types/callback_query.rs
+++ b/src/types/callback_query.rs
@@ -78,6 +78,8 @@ mod tests {
                 last_name: None,
                 username: None,
                 language_code: None,
+                is_premium: false,
+                added_to_attachment_menu: false,
             },
             chat_instance: "123456".to_string(),
             message: None,
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 405a31f6..7ddc7a77 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -704,6 +704,8 @@ mod tests {
                 last_name: Some("Last".to_string()),
                 username: Some("fl".to_string()),
                 language_code: Some("en".to_string()),
+                is_premium: false,
+                added_to_attachment_menu: false,
             },
             kind: ChatMemberKind::Administrator(Administrator {
                 custom_title: None,
diff --git a/src/types/file.rs b/src/types/file.rs
index 9dfb5860..ba132755 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -62,7 +62,7 @@ mod tests {
                 file_id: "FILE_ID".to_owned(),
                 file_unique_id: "FILE_UNIQUE_ID".to_owned(),
                 file_size: Some(42),
-                file_path: Some("".to_owned()),
+                file_path: None,
             }
         );
     }
diff --git a/src/types/me.rs b/src/types/me.rs
index b0d82b8c..2d101558 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -67,6 +67,7 @@ mod tests {
                 username: Some("SomethingSomethingBot".to_owned()),
                 language_code: None,
                 is_premium: false,
+                added_to_attachment_menu: false,
             },
             can_join_groups: false,
             can_read_all_group_messages: false,
diff --git a/src/types/message.rs b/src/types/message.rs
index db798fa6..666c206c 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1511,6 +1511,8 @@ mod tests {
                     slow_mode_delay: None,
                     linked_chat_id: None,
                     location: None,
+                    join_by_request: None,
+                    join_to_send_messages: None,
                 }),
                 description: None,
                 invite_link: None,
diff --git a/src/types/update.rs b/src/types/update.rs
index 0e9d1378..81f35224 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -355,6 +355,8 @@ mod test {
                         last_name: None,
                         username: Some(String::from("WaffleLapkin")),
                         language_code: Some(String::from("en")),
+                        is_premium: false,
+                        added_to_attachment_menu: false,
                     }),
                     reply_to_message: None,
                     forward: None,
diff --git a/src/types/user.rs b/src/types/user.rs
index 78b1f617..7d155464 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -146,6 +146,7 @@ mod tests {
             username: Some("Username".to_string()),
             language_code: Some(String::from("ru")),
             is_premium: false,
+            added_to_attachment_menu: false,
         };
         let actual = serde_json::from_str::<User>(json).unwrap();
         assert_eq!(actual, expected)
@@ -161,6 +162,7 @@ mod tests {
             username: Some("aaaaaaaaaaaaaaaa".to_owned()),
             language_code: None,
             is_premium: false,
+            added_to_attachment_menu: false,
         };
 
         let user_b = User {
@@ -171,6 +173,7 @@ mod tests {
             username: None,
             language_code: None,
             is_premium: false,
+            added_to_attachment_menu: false,
         };
 
         assert_eq!(user_a.full_name(), "First Last");

From 5ac8dff53a551764287211ef943b0a353f4d2cf9 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 29 Jun 2022 19:49:16 +0400
Subject: [PATCH 648/755] ugh

---
 src/bot/api.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bot/api.rs b/src/bot/api.rs
index cbf76372..4ea83ae3 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -1038,7 +1038,6 @@ impl Requester for Bot {
 
     type CreateInvoiceLink = JsonRequest<payloads::CreateInvoiceLink>;
 
-    /// For Telegram documentation see [`CreateInvoiceLink`].
     fn create_invoice_link<T, D, Pa, P, C, Pri>(
         &self,
         title: T,

From 34aff5f4c508da632928e6c852d9dd7087384b43 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 11 Jul 2022 12:28:24 +0400
Subject: [PATCH 649/755] remove a fixme

---
 src/local_macros.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/local_macros.rs b/src/local_macros.rs
index ff4889b3..13333232 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -7,14 +7,7 @@ macro_rules! req_future {
         $(where $($wh:tt)*)?
     ) => {
         #[pin_project::pin_project]
-        pub
-        // FIXME(waffle):
-        // The `pub` above should ideally be `$v`, but we currently can't do
-        // this due to compiler bug, see:
-        // - pin_project bug report <https://github.com/taiki-e/pin-project/issues/312>
-        // - related rustc issue <https://github.com/rust-lang/rust/issues/81007>
-        // - original fix (closed) <https://github.com/rust-lang/rust/pull/81029>
-        // - second iteration of the fix <https://github.com/rust-lang/rust/pull/81177>
+        $v
         struct $i<$T>
         $(where $($wh)*)?
         {

From 9b0104dade7534122527f0084b88bd85a66813fd Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Jul 2022 17:47:42 +0400
Subject: [PATCH 650/755] Properly fix file size/path

---
 CHANGELOG.md                        | 10 +--
 src/net/download.rs                 |  2 +-
 src/payloads/upload_sticker_file.rs |  4 +-
 src/types/animation.rs              |  7 +-
 src/types/audio.rs                  |  7 +-
 src/types/document.rs               |  3 +-
 src/types/file.rs                   | 99 ++++++++++++++++++++++++-----
 src/types/passport_file.rs          |  2 +-
 src/types/photo_size.rs             |  5 +-
 src/types/sticker.rs                |  7 +-
 src/types/video.rs                  |  3 +-
 src/types/video_note.rs             |  3 +-
 src/types/voice.rs                  |  3 +-
 13 files changed, 116 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271b4386..04b29859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,13 +12,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
 - Support for Telegram Bot API [version 6.1](https://core.telegram.org/bots/api#june-20-2022) ([#233][pr233])
 
-### Fixed
-
-- `File::{file_size, file_path}` are now optional ([#233][pr233])
-
 ### Changed
 
--  `InlineKeyboardButtonKind::Pay`'s only field now has type `True` ([#231][pr231])
+- `InlineKeyboardButtonKind::Pay`'s only field now has type `True` ([#231][pr231])
+- `file_size` fields are now always `u32` ([#237][pr237])
+- `File` is now split into `File` and `FileMeta`, the latter is used in `UploadStickerFile` and `Sticker::premium_animation` ([#237][pr237])
+
+[pr237]: https://github.com/teloxide/teloxide-core/pull/237
 
 ### Deprecated
 
diff --git a/src/net/download.rs b/src/net/download.rs
index 394af6fe..da05352d 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -44,7 +44,7 @@ pub trait Download<'w>
     ///
     /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
     /// let mut file = File::create("/tmp/test.png").await?;
-    /// bot.download_file(&file_path.unwrap(), &mut file).await?;
+    /// bot.download_file(&file_path, &mut file).await?;
     /// # Ok(()) }
     /// ```
     ///
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index 77c5468b..ba2f6660 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -8,13 +8,13 @@
 // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 use serde::Serialize;
 
-use crate::types::{File, InputFile, UserId};
+use crate::types::{FileMeta, InputFile, UserId};
 
 impl_payload! {
     @[multipart = png_sticker]
     /// Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success.
     #[derive(Debug, Clone, Serialize)]
-    pub UploadStickerFile (UploadStickerFileSetters) => File {
+    pub UploadStickerFile (UploadStickerFileSetters) => FileMeta {
         required {
             /// User identifier of sticker file owner
             pub user_id: UserId,
diff --git a/src/types/animation.rs b/src/types/animation.rs
index de54253e..1d33d5ff 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -38,7 +38,8 @@ pub struct Animation {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u64>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
 
 #[cfg(test)]
@@ -74,11 +75,11 @@ mod tests {
                 file_unique_id: "".to_string(),
                 width: 320,
                 height: 320,
-                file_size: Some(3452),
+                file_size: 3452,
             }),
             file_name: Some("some".to_string()),
             mime_type: Some("video/gif".parse().unwrap()),
-            file_size: Some(6500),
+            file_size: 6500,
         };
         let actual = serde_json::from_str::<Animation>(json).unwrap();
         assert_eq!(actual, expected)
diff --git a/src/types/audio.rs b/src/types/audio.rs
index febc4980..cfbfa888 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -35,7 +35,8 @@ pub struct Audio {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u64>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 
     /// A thumbnail of the album cover to which the music file belongs.
     pub thumb: Option<PhotoSize>,
@@ -70,13 +71,13 @@ mod tests {
             performer: Some("Performer".to_string()),
             title: Some("Title".to_string()),
             mime_type: Some("application/zip".parse().unwrap()),
-            file_size: Some(123_456),
+            file_size: 123_456,
             thumb: Some(PhotoSize {
                 file_id: "id".to_string(),
                 file_unique_id: "".to_string(),
                 width: 320,
                 height: 320,
-                file_size: Some(3452),
+                file_size: 3452,
             }),
             file_name: None,
         };
diff --git a/src/types/document.rs b/src/types/document.rs
index 864443c2..d391dee4 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -33,5 +33,6 @@ pub struct Document {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u64>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
diff --git a/src/types/file.rs b/src/types/file.rs
index ba132755..892b382c 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -1,3 +1,5 @@
+use std::ops::Deref;
+
 use serde::{Deserialize, Serialize};
 
 /// This object represents a file ready to be downloaded.
@@ -13,6 +15,22 @@ use serde::{Deserialize, Serialize};
 /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct File {
+    /// Metadata of the file.
+    ///
+    /// Note that [`FileMeta`]'s fields are available on `File` too (via deref
+    /// coercion).
+    #[serde(flatten)]
+    pub meta: FileMeta,
+
+    /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
+    ///
+    /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
+    pub file_path: String,
+}
+
+/// Metadata of the [`File`].
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+pub struct FileMeta {
     /// Identifier for this file.
     pub file_id: String,
 
@@ -21,19 +39,49 @@ pub struct File {
     /// file.
     pub file_unique_id: String,
 
-    /// File size in bytes, if known.
-    pub file_size: Option<u64>,
+    /// File size in bytes.
+    // This should never be necessary in practice,
+    // but just in case something goes wrong with the TBA server
+    // (see the test below)
+    #[serde(default = "file_size_fallback")]
+    pub file_size: u32,
+}
 
-    /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
-    ///
-    /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
-    pub file_path: Option<String>,
+pub(crate) const fn file_size_fallback() -> u32 {
+    u32::MAX
+}
+
+/// Allows access to [`FileMeta`]'s fields for [`File`].
+///
+/// ## Examples
+///
+/// ```rust
+/// use teloxide_core::types::File;
+/// #
+/// # let get_file = || File { meta: teloxide_core::types::FileMeta { file_id: String::new(), file_unique_id: String::new(), file_size: 0 }, file_path: String::new() };
+/// let file: File = get_file();
+///
+/// let file_id: &str = &file.file_id;
+/// let file_unique_id: &str = &file.file_unique_id;
+/// let file_size: u32 = file.file_size;
+/// #
+/// # let _ = (file_id, file_unique_id, file_size);
+/// ```
+impl Deref for File {
+    type Target = FileMeta;
+
+    fn deref(&self) -> &Self::Target {
+        &self.meta
+    }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::types::File;
+    use crate::types::{File, FileMeta};
 
+    // As per <https://github.com/tdlib/telegram-bot-api/issues/192> file size is **not** optional,
+    // But <https://github.com/tdlib/telegram-bot-api/issues/294> suggests that it can be missing in case Telegram servers are going insane.
+    // To be safe, we use a placeholder value.
     #[test]
     fn no_file_size() {
         let json =
@@ -43,26 +91,47 @@ mod tests {
         assert_eq!(
             file,
             File {
+                meta: FileMeta {
+                    file_id: "FILE_ID".to_owned(),
+                    file_unique_id: "FILE_UNIQUE_ID".to_owned(),
+                    file_size: u32::MAX,
+                },
+                file_path: "FILE_PATH".to_owned(),
+            }
+        );
+    }
+
+    // In some places file metadata w/o path is returned. Make sure that we can
+    // deserialize it.
+    #[test]
+    fn no_file_path() {
+        let json = r#"{"file_id":"FILE_ID","file_unique_id":"FILE_UNIQUE_ID","file_size":42}"#;
+        let file: FileMeta = serde_json::from_str(json).unwrap();
+
+        assert_eq!(
+            file,
+            FileMeta {
                 file_id: "FILE_ID".to_owned(),
                 file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: None,
-                file_path: Some("FILE_PATH".to_owned()),
+                file_size: 42,
             }
         );
     }
 
     #[test]
-    fn no_file_path() {
-        let json = r#"{"file_id":"FILE_ID","file_unique_id":"FILE_UNIQUE_ID","file_size":42}"#;
+    fn full_file() {
+        let json = r#"{"file_id":"FILE_ID","file_unique_id":"FILE_UNIQUE_ID","file_size":42,"file_path":"FILE_PATH"}"#;
         let file: File = serde_json::from_str(json).unwrap();
 
         assert_eq!(
             file,
             File {
-                file_id: "FILE_ID".to_owned(),
-                file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: Some(42),
-                file_path: None,
+                meta: FileMeta {
+                    file_id: "FILE_ID".to_owned(),
+                    file_unique_id: "FILE_UNIQUE_ID".to_owned(),
+                    file_size: 42,
+                },
+                file_path: "FILE_PATH".to_owned(),
             }
         );
     }
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index 6f0457aa..68a62972 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -18,7 +18,7 @@ pub struct PassportFile {
     pub file_unique_id: String,
 
     /// File size in bytes.
-    pub file_size: u64, // FIXME: should be u32
+    pub file_size: u32,
 
     /// Time when the file was uploaded.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 1118361c..6efc0e0d 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -22,7 +22,8 @@ pub struct PhotoSize {
     pub height: u32,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
 
 #[cfg(test)]
@@ -38,7 +39,7 @@ mod tests {
             file_unique_id: "".to_string(),
             width: 320,
             height: 320,
-            file_size: Some(3452),
+            file_size: 3452,
         };
         let actual = serde_json::from_str::<PhotoSize>(json).unwrap();
         assert_eq!(actual, expected);
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 4066350b..fd1317ab 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{File, MaskPosition, PhotoSize};
+use crate::types::{FileMeta, MaskPosition, PhotoSize};
 
 /// This object represents a sticker.
 ///
@@ -42,11 +42,12 @@ pub struct Sticker {
     pub set_name: Option<String>,
 
     /// Premium animation for the sticker, if the sticker is premium.
-    pub premium_animation: Option<File>,
+    pub premium_animation: Option<FileMeta>,
 
     /// For mask stickers, the position where the mask should be placed.
     pub mask_position: Option<MaskPosition>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
diff --git a/src/types/video.rs b/src/types/video.rs
index 08e484d5..3cb11ab1 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -37,5 +37,6 @@ pub struct Video {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u64>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index 2b55b657..980f15c9 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -31,5 +31,6 @@ pub struct VideoNote {
     pub thumb: Option<PhotoSize>,
 
     /// File size in bytes.
-    pub file_size: Option<u32>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }
diff --git a/src/types/voice.rs b/src/types/voice.rs
index 7a192aa7..e44cfc7c 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -23,5 +23,6 @@ pub struct Voice {
     pub mime_type: Option<Mime>,
 
     /// File size in bytes.
-    pub file_size: Option<u64>,
+    #[serde(default = "crate::types::file::file_size_fallback")]
+    pub file_size: u32,
 }

From 8b4ac2260be04f7cd4ef53ef046e0fc39f3ca011 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 18 Jul 2022 18:55:05 +0400
Subject: [PATCH 651/755] Add `StickerKind`

---
 CHANGELOG.md             |   3 ++
 src/types/sticker.rs     | 114 +++++++++++++++++++++++++++++++++++----
 src/types/sticker_set.rs |  33 ++++++++----
 3 files changed, 131 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271b4386..e8dc5913 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
 - Support for Telegram Bot API [version 6.1](https://core.telegram.org/bots/api#june-20-2022) ([#233][pr233])
+- `StickerKind` that is now used instead of `is_animated` and `is_video` fields of `Sticker` and `StickerSet` ([#238][pr238])
+
+[pr238]: https://github.com/teloxide/teloxide-core/pull/238
 
 ### Fixed
 
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 4066350b..2862699d 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -1,3 +1,5 @@
+use std::{convert::TryFrom, ops::Deref};
+
 use serde::{Deserialize, Serialize};
 
 use crate::types::{File, MaskPosition, PhotoSize};
@@ -22,15 +24,9 @@ pub struct Sticker {
     /// Sticker height.
     pub height: u16,
 
-    /// `true`, if the sticker is [animated].
-    ///
-    /// [animated]: https://telegram.org/blog/animated-stickers
-    pub is_animated: bool,
-
-    /// `true`, if the sticker is a [video sticker].
-    ///
-    /// [video sticker]: https://telegram.org/blog/video-stickers-better-reactions
-    pub is_video: bool,
+    /// Kind of this sticker - webp, animated or video.
+    #[serde(flatten)]
+    pub kind: StickerKind,
 
     /// Sticker thumbnail in the .webp or .jpg format.
     pub thumb: Option<PhotoSize>,
@@ -50,3 +46,103 @@ pub struct Sticker {
     /// File size in bytes.
     pub file_size: Option<u32>,
 }
+
+/// Kind of a sticker - webp, animated or video.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(try_from = "StickerKindRaw", into = "StickerKindRaw")]
+pub enum StickerKind {
+    /// "Normal", raster sticker.
+    Webp,
+    /// [Animated] sticker.
+    ///
+    /// [Animated]: https://telegram.org/blog/animated-stickers
+    Animated,
+    /// [Video] sticker.
+    ///
+    /// [Video]: https://telegram.org/blog/video-stickers-better-reactions
+    Video,
+}
+
+/// This allows calling [`StickerKind`]'s methods directly on [`Sticker`].
+///
+/// ```no_run
+/// use teloxide_core::types::Sticker;
+///
+/// let sticker: Sticker = todo!();
+///
+/// let _ = sticker.is_video();
+/// let _ = sticker.kind.is_video();
+/// ```
+impl Deref for Sticker {
+    type Target = StickerKind;
+
+    fn deref(&self) -> &Self::Target {
+        &self.kind
+    }
+}
+
+impl StickerKind {
+    /// Returns `true` is this is a "normal" raster sticker.
+    pub fn is_webp(&self) -> bool {
+        matches!(self, Self::Webp)
+    }
+
+    /// Returns `true` is this is an [animated] sticker.
+    ///
+    /// [animated]: https://telegram.org/blog/animated-stickers
+    pub fn is_animated(&self) -> bool {
+        matches!(self, Self::Animated)
+    }
+
+    /// Returns `true` is this is a [video] sticker.
+    ///
+    /// [video]: https://telegram.org/blog/video-stickers-better-reactions
+    pub fn is_video(&self) -> bool {
+        matches!(self, Self::Video)
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+struct StickerKindRaw {
+    is_animated: bool,
+    is_video: bool,
+}
+
+impl TryFrom<StickerKindRaw> for StickerKind {
+    type Error = &'static str;
+
+    fn try_from(
+        StickerKindRaw {
+            is_animated,
+            is_video,
+        }: StickerKindRaw,
+    ) -> Result<Self, Self::Error> {
+        let ret = match (is_animated, is_video) {
+            (false, false) => Self::Webp,
+            (true, false) => Self::Animated,
+            (false, true) => Self::Video,
+            (true, true) => return Err("`is_animated` and `is_video` present at the same time"),
+        };
+
+        Ok(ret)
+    }
+}
+
+impl From<StickerKind> for StickerKindRaw {
+    fn from(kind: StickerKind) -> Self {
+        match kind {
+            StickerKind::Webp => Self {
+                is_animated: false,
+                is_video: false,
+            },
+            StickerKind::Animated => Self {
+                is_animated: true,
+                is_video: false,
+            },
+            StickerKind::Video => Self {
+                is_animated: false,
+                is_video: true,
+            },
+        }
+    }
+}
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index 3150518e..e666c1c8 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -1,6 +1,8 @@
+use std::ops::Deref;
+
 use serde::{Deserialize, Serialize};
 
-use crate::types::{PhotoSize, Sticker};
+use crate::types::{PhotoSize, Sticker, StickerKind};
 
 /// This object represents a sticker set.
 ///
@@ -13,15 +15,8 @@ pub struct StickerSet {
     /// Sticker set title.
     pub title: String,
 
-    /// `true`, if the sticker set contains [animated stickers].
-    ///
-    /// [animates stickers]: https://telegram.org/blog/animated-stickers
-    pub is_animated: bool,
-
-    /// `true`, if the sticker is a [video sticker].
-    ///
-    /// [video sticker]: https://telegram.org/blog/video-stickers-better-reactions
-    pub is_video: bool,
+    /// Sticker kind shared by all stickers in this set.
+    pub kind: StickerKind,
 
     /// `true`, if the sticker set contains masks.
     pub contains_masks: bool,
@@ -32,3 +27,21 @@ pub struct StickerSet {
     /// Sticker set thumbnail in the .WEBP or .TGS format.
     pub thumb: Option<PhotoSize>,
 }
+
+/// This allows calling [`StickerKind`]'s methods directly on [`StickerSet`].
+///
+/// ```no_run
+/// use teloxide_core::types::StickerSet;
+///
+/// let sticker: StickerSet = todo!();
+///
+/// let _ = sticker.is_video();
+/// let _ = sticker.kind.is_video();
+/// ```
+impl Deref for StickerSet {
+    type Target = StickerKind;
+
+    fn deref(&self) -> &Self::Target {
+        &self.kind
+    }
+}

From c9f0406e347cfa0770c42818297ad80051bc4e5c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 19 Jul 2022 13:51:51 +0400
Subject: [PATCH 652/755] update dependencies

---
 Cargo.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c49e7528..36440dcc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ exclude = [
 [dependencies]
 futures = "0.3.5"
 tokio = { version = "1.12.0", features = ["fs"] }
-tokio-util = { version = "0.6.0", features = ["codec"] }
+tokio-util = { version = "0.7.0", features = ["codec"] }
 pin-project = "1.0.3"
 bytes = "1.0.0"
 reqwest = { version = "0.11.10", features = ["json", "stream", "multipart"], default-features = false }
@@ -32,8 +32,8 @@ log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
-serde_with_macros = "1.4.1"
-uuid = { version = "0.8.1", features = ["v4"] } # for attaching input files
+serde_with_macros = "2.0.0"
+uuid = { version = "1.1.0", features = ["v4"] } # for attaching input files
  
 derive_more = "0.99.9"
 mime = "0.3.16"

From 79257fe91de1cc91cf39adc846225940a69fd35c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 19 Jul 2022 13:53:17 +0400
Subject: [PATCH 653/755] bump version

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bead061..d959ea1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.7.0 - 2022-07-19
+
 ### Added
 
 - `InlineKeyboardButton::{pay, login, web_app, callback_game, pay}` constructors ([#231][pr231])
diff --git a/Cargo.toml b/Cargo.toml
index 36440dcc..f1c4d396 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.6.3"
+version = "0.7.0"
 edition = "2018"
 
 license = "MIT"
diff --git a/README.md b/README.md
index 46992ce0..e3aedce7 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 </div>
 
 ```toml
-teloxide-core = "0.6"
+teloxide-core = "0.7"
 ```
 _Compiler support: requires rustc 1.58+_.
 
diff --git a/src/lib.rs b/src/lib.rs
index e2ff169c..111df60c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.6"
+//! teloxide_core = "0.7"
 //! ```
 //! _Compiler support: requires rustc 1.58+_.
 //!

From 69f7a8b4343b5458a963909cb5506a00141d166a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 19 Jul 2022 14:06:51 +0400
Subject: [PATCH 654/755] fixup `serde_with_macros` version

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f1c4d396..37498446 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ log = "0.4"
 
 serde = { version = "1.0.114", features = ["derive"] }
 serde_json = "1.0.55"
-serde_with_macros = "2.0.0"
+serde_with_macros = "1.5.2"
 uuid = { version = "1.1.0", features = ["v4"] } # for attaching input files
  
 derive_more = "0.99.9"

From bde8222e5a095b09b08518c7cd43490dc51066ad Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 19 Jul 2022 21:06:56 +0600
Subject: [PATCH 655/755] Allow specifying a path as a `parse_with` argument

---
 src/fields_parse.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 40e5887c..e30aff58 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,6 +1,6 @@
 extern crate quote;
 
-use quote::{__private::Span, quote, ToTokens};
+use quote::{quote, ToTokens};
 use syn::{FieldsNamed, FieldsUnnamed, Type};
 
 #[derive(Debug)]
@@ -89,8 +89,10 @@ fn create_parser<'a>(
             count_args,
         ),
         ParserType::Custom(s) => {
-            let ident = syn::Ident::new(s, Span::call_site());
-            quote! { #ident }
+            let path = syn::parse_str::<syn::Path>(s).expect(&format!(
+                "Failed to parse a custom command parser, {s}"
+            ));
+            quote! { #path }
         }
     };
     quote! {

From 84f3bee7641a41e924467fca11b5687943d517d3 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 19 Jul 2022 21:16:08 +0600
Subject: [PATCH 656/755] Fix Clippy

---
 src/fields_parse.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index e30aff58..eff529c8 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -89,9 +89,9 @@ fn create_parser<'a>(
             count_args,
         ),
         ParserType::Custom(s) => {
-            let path = syn::parse_str::<syn::Path>(s).expect(&format!(
-                "Failed to parse a custom command parser, {s}"
-            ));
+            let path = syn::parse_str::<syn::Path>(s).unwrap_or_else(|_| {
+                panic!("Failed to parse a custom command parser, {}", s)
+            });
             quote! { #path }
         }
     };

From 44d91c56c4af21db7f149fb25605d54f6ddd6a11 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 19 Jul 2022 21:19:34 +0600
Subject: [PATCH 657/755] Update `CHANGELOG.md`

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36ebf4ae..4c63f14e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+ - Allow specifying a path to a command handler in `parse_with` ([PR #27](https://github.com/teloxide/teloxide-macros/pull/27)).
+
 ## 0.6.2 - 2022-05-27
 
 ### Fixed

From 21a157347d208e3d67f4721bf4a401de088521c7 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Tue, 19 Jul 2022 21:56:59 +0600
Subject: [PATCH 658/755] Release v0.6.3

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c63f14e..02c6215d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.6.3 - 2022-07-19
+
 ### Fixed
 
  - Allow specifying a path to a command handler in `parse_with` ([PR #27](https://github.com/teloxide/teloxide-macros/pull/27)).
diff --git a/Cargo.toml b/Cargo.toml
index 1b7021bc..91213f15 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.6.2"
+version = "0.6.3"
 description = "The teloxide's procedural macros"
 authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"

From 353d26fa002d557aa25ee7fa662e3653efb18b20 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 4 Aug 2022 18:16:42 +0400
Subject: [PATCH 659/755] Implement `From<_> for RequestError` for more types

---
 src/errors.rs | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/errors.rs b/src/errors.rs
index 267cd0a7..f6529608 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -12,7 +12,7 @@ use crate::types::ResponseParameters;
 pub enum RequestError {
     /// A Telegram API error.
     #[error("A Telegram's error: {0}")]
-    Api(#[source] ApiError),
+    Api(#[from] ApiError),
 
     /// The group has been migrated to a supergroup with the specified
     /// identifier.
@@ -26,7 +26,7 @@ pub enum RequestError {
 
     /// Network error while sending a request to Telegram.
     #[error("A network error: {0}")]
-    // NOTE: this variant must not be created by anything except the From impl
+    // NOTE: this variant must not be created by anything except the explicit From impl
     Network(#[source] reqwest::Error),
 
     /// Error while parsing a response from Telegram.
@@ -45,7 +45,7 @@ pub enum RequestError {
 
     /// Occurs when trying to send a file to Telegram.
     #[error("An I/O error: {0}")]
-    Io(#[source] io::Error),
+    Io(#[from] io::Error),
 }
 
 /// An error caused by downloading a file.
@@ -53,7 +53,7 @@ pub enum RequestError {
 pub enum DownloadError {
     /// A network error while downloading a file from Telegram.
     #[error("A network error: {0}")]
-    // NOTE: this variant must not be created by anything except the From impl
+    // NOTE: this variant must not be created by anything except the explicit From impl
     Network(#[source] reqwest::Error),
 
     /// An I/O error while writing a file to destination.
@@ -762,6 +762,32 @@ pub enum ApiError {
     Unknown(String),
 }
 
+/// This impl allows to use `?` to propagate [`DownloadError`]s in function
+/// returning [`RequestError`]s. For example:
+///
+/// ```rust
+/// # use teloxide_core::errors::{DownloadError, RequestError};
+///
+/// async fn handler() -> Result<(), RequestError> {
+///     download_file().await?; // `?` just works
+///
+///     Ok(())
+/// }
+///
+/// async fn download_file() -> Result<(), DownloadError> {
+///     /* download file here */
+///     Ok(())
+/// }
+/// ```
+impl From<DownloadError> for RequestError {
+    fn from(download_err: DownloadError) -> Self {
+        match download_err {
+            DownloadError::Network(err) => RequestError::Network(err),
+            DownloadError::Io(err) => RequestError::Io(err),
+        }
+    }
+}
+
 impl From<reqwest::Error> for DownloadError {
     fn from(error: reqwest::Error) -> Self {
         DownloadError::Network(hide_token(error))

From 06608934e81173ec8c5741d6e9558c508b7ad5b4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 4 Aug 2022 18:22:00 +0400
Subject: [PATCH 660/755] Update changelog

---
 CHANGELOG.md | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d959ea1e..91b7e20b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added
+
+- `From<ApiError>`, `From<DownloadError>` and `From<std::io::Error>` impls for `RequestError` ([#241][pr241])
+
+[pr241]: https://github.com/teloxide/teloxide-core/pull/241
+
 ## 0.7.0 - 2022-07-19
 
 ### Added
@@ -117,7 +123,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `errors` module and `errors::AsResponseParameters` trait ([#130][pr130])
-- `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197]) 
+- `UserId::{url, is_anonymous, is_channel, is_telegram}` convenience functions ([#197][pr197])
 - `User::{tme_url, preferably_tme_url}` convenience functions ([#197][pr197])
 - `Me::username` and `Deref<Target = User>` implementation for `Me` ([#197][pr197])
 - `Me::{mention, tme_url}` ([#197][pr197])
@@ -337,7 +343,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `DefaultParseMode::parse_mode` which allows to get currently used default parse mode ([#77][pr77])
 - `Thrrotle::{limits,set_limits}` functions ([#77][pr77])
 - `Throttle::{with_settings,spawn_with_settings}` and `throttle::Settings` ([#96][pr96])
-- Getters for fields nested in `Chat` ([#80][pr80]) 
+- Getters for fields nested in `Chat` ([#80][pr80])
 - API errors: `ApiError::NotEnoughRightsToManagePins`, `ApiError::BotKickedFromSupergroup` ([#84][pr84])
 - Telegram bot API 5.2 support ([#86][pr86])
 - Telegram bot API 5.3 support ([#99][pr99])
@@ -355,7 +361,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- `Message::url` now returns links to messages in private groups too ([#80][pr80]) 
+- `Message::url` now returns links to messages in private groups too ([#80][pr80])
 - Refactor `ChatMember` methods ([#74][pr74])
   - impl `Deref<Target = ChatMemberKind>` to make `ChatMemberKind`'s methods callable directly on `ChatMember`
   - Add `ChatMemberKind::is_{creator,administrator,member,restricted,left,kicked}` which check `kind` along with `is_privileged` and `is_in_chat` which combine some of the above.
@@ -369,8 +375,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - telegram_response: fix issue `retry_after` and `migrate_to_chat_id` handling ([#94][pr94])
-- Type of `PublicChatSupergroup::slow_mode_delay` field: `Option<i32>`=> `Option<u32>` ([#80][pr80]) 
-- Add missing `Chat::message_auto_delete_time` field ([#80][pr80]) 
+- Type of `PublicChatSupergroup::slow_mode_delay` field: `Option<i32>`=> `Option<u32>` ([#80][pr80])
+- Add missing `Chat::message_auto_delete_time` field ([#80][pr80])
 - Output types of `LeaveChat` `PinChatMessage`, `SetChatDescription`, `SetChatPhoto` `SetChatTitle`, `UnpinAllChatMessages` and `UnpinChatMessage`: `String` => `True` ([#79][pr79])
 - `SendChatAction` output type `Message` => `True` ([#75][pr75])
 - `GetChatAdministrators` output type `ChatMember` => `Vec<ChatMember>` ([#73][pr73])
@@ -396,7 +402,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## 0.2.1 - 2020-03-19
 
-### Fixed 
+### Fixed
 
 - Types fields privacy (make fields of some types public) ([#68][pr68])
   - `Dice::{emoji, value}`
@@ -451,7 +457,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
- - `NonStrictVec` -> `SemiparsedVec`.
+- `NonStrictVec` -> `SemiparsedVec`.
 
 ## 0.1.1 - 2020-02-17
 
@@ -483,16 +489,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `Output<T>` alias to `<<T as HasPayload>::Payload as Payload>::Output`
 - `Payload`, `HasPayload` and `Request` traits which represent different parts of the request ([#5][pr5])
 - `GetUpdatesNonStrict` 'telegram' method, that behaves just like `GetUpdates` but doesn't [#2][pr2]
-  fail if one of updates fails to be deserialized 
+  fail if one of updates fails to be deserialized
 - Move core code here from the [`teloxide`] main repo, for older changes see it's [`CHANGELOG.md`].
   - Following modules were moved:
     - `bot`
     - `requests` [except `requests::respond` function]
     - `types`
     - `errors`
-    - `net` [private] 
+    - `net` [private]
   - `client_from_env` was moved from `teloxide::utils` to crate root of `teloxide-core`
-  - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>` 
+  - To simplify `GetUpdates` request it was changed to simply return `Vec<Update>`
     (instead of `Vec<Result<Update, (Value, serde_json::Error)>>`)
 
 [pr2]: https://github.com/teloxide/teloxide-core/pull/2
@@ -523,8 +529,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Make `net` module public
   - Move `Bot::download_file{,_stream}` methods to a new `Download` trait
     - Impl `Download` for all bot adaptors & the `Bot` itself
-  - Change return type of `download_file_stream` — return `Stream<Result<Bytes>>``,
-    instead of `Future<Result<Stream<Result<Bytes>>>>``
+  - Change return type of `download_file_stream` — return ` Stream<Result<Bytes>>``, instead of  `Future<Result<Stream<Result<Bytes>>>>``
   - Add `api_url` param to standalone versions of `download_file{,_stream}`
   - Make `net::{TELEGRAM_API_URL, download_file{,_stream}}` pub
 - Refactor `Bot` ([#29][pr29]):
@@ -565,7 +570,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr4]: https://github.com/teloxide/teloxide-core/pull/4
 [pr44]: https://github.com/teloxide/teloxide-core/pull/44
-  
-
 [`teloxide`]: https://github.com/teloxide/teloxide
-[`CHANGELOG.md`]: https://github.com/teloxide/teloxide/blob/master/CHANGELOG.md
+[`changelog.md`]: https://github.com/teloxide/teloxide/blob/master/CHANGELOG.md

From 6f3aa993afcdcccad59b903a1e907961b4d3416b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 7 Aug 2022 22:47:20 +0400
Subject: [PATCH 661/755] Add `#[must_use]`s

---
 src/adaptors/throttle/settings.rs             |  1 +
 src/bot.rs                                    |  4 ++
 src/net.rs                                    |  1 +
 src/types/chat.rs                             | 22 +++++++
 src/types/chat_id.rs                          |  3 +
 src/types/chat_member.rs                      | 38 ++++++++++++
 src/types/force_reply.rs                      |  2 +
 src/types/inline_keyboard_button.rs           |  1 +
 src/types/inline_keyboard_markup.rs           |  1 +
 src/types/inline_query.rs                     |  2 +
 src/types/inline_query_result_article.rs      |  7 +++
 src/types/inline_query_result_audio.rs        |  4 ++
 src/types/inline_query_result_cached_audio.rs |  3 +
 .../inline_query_result_cached_document.rs    |  3 +
 src/types/inline_query_result_cached_gif.rs   |  3 +
 .../inline_query_result_cached_mpeg4_gif.rs   |  3 +
 src/types/inline_query_result_cached_photo.rs |  3 +
 .../inline_query_result_cached_sticker.rs     |  2 +
 src/types/inline_query_result_cached_video.rs |  3 +
 src/types/inline_query_result_cached_voice.rs |  3 +
 src/types/inline_query_result_contact.rs      |  5 ++
 src/types/inline_query_result_document.rs     |  8 +++
 src/types/inline_query_result_game.rs         |  1 +
 src/types/inline_query_result_gif.rs          |  8 +++
 src/types/inline_query_result_location.rs     | 11 ++++
 src/types/inline_query_result_mpeg4_gif.rs    |  8 +++
 src/types/inline_query_result_photo.rs        |  7 +++
 src/types/inline_query_result_venue.rs        |  7 +++
 src/types/inline_query_result_video.rs        |  9 +++
 src/types/inline_query_result_voice.rs        |  5 ++
 src/types/input_file.rs                       |  1 +
 src/types/input_message_content.rs            | 21 +++++++
 src/types/label_price.rs                      |  1 +
 src/types/login_url.rs                        |  2 +
 src/types/mask_position.rs                    |  3 +
 src/types/me.rs                               |  3 +
 src/types/message.rs                          | 61 +++++++++++++++++++
 src/types/message_entity.rs                   | 22 +++++++
 src/types/passport_element_error.rs           | 10 +++
 src/types/reply_keyboard_markup.rs            |  1 +
 src/types/reply_keyboard_remove.rs            |  2 +
 src/types/reply_markup.rs                     |  2 +
 src/types/sticker.rs                          |  3 +
 src/types/update.rs                           |  2 +
 src/types/user.rs                             |  8 +++
 src/types/user_id.rs                          |  4 ++
 46 files changed, 324 insertions(+)

diff --git a/src/adaptors/throttle/settings.rs b/src/adaptors/throttle/settings.rs
index 289f5b42..57b38e9a 100644
--- a/src/adaptors/throttle/settings.rs
+++ b/src/adaptors/throttle/settings.rs
@@ -21,6 +21,7 @@ type BoxedFuture = Pin<Box<dyn Future<Output = ()> + Send>>;
 /// ```
 ///
 /// [`Throttle`]: crate::adaptors::throttle::Throttle
+#[must_use]
 #[non_exhaustive]
 pub struct Settings {
     pub limits: Limits,
diff --git a/src/bot.rs b/src/bot.rs
index 0b7cb67e..2b3f6893 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -51,6 +51,7 @@ const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 ///
 /// [`Arc`]: std::sync::Arc
 /// [Telegram Bot API]: https://core.telegram.org/bots/api
+#[must_use]
 #[derive(Debug, Clone)]
 pub struct Bot {
     token: Arc<str>,
@@ -186,16 +187,19 @@ impl Bot {
 /// Getters
 impl Bot {
     /// Returns currently used token.
+    #[must_use]
     pub fn token(&self) -> &str {
         &self.token
     }
 
     /// Returns currently used http-client.
+    #[must_use]
     pub fn client(&self) -> &Client {
         &self.client
     }
 
     /// Returns currently used token API url.
+    #[must_use]
     pub fn api_url(&self) -> reqwest::Url {
         reqwest::Url::clone(&*self.api_url)
     }
diff --git a/src/net.rs b/src/net.rs
index 75b41dad..4f76fdb1 100644
--- a/src/net.rs
+++ b/src/net.rs
@@ -34,6 +34,7 @@ pub const TELEGRAM_API_URL: &str = "https://api.telegram.org";
 /// ## Panics
 ///
 /// If `TELOXIDE_PROXY` exists, but isn't correct url.
+#[must_use]
 pub fn client_from_env() -> reqwest::Client {
     use reqwest::Proxy;
 
diff --git a/src/types/chat.rs b/src/types/chat.rs
index fc0314c3..6131b87d 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -191,10 +191,12 @@ pub struct PublicChatSupergroup {
 }
 
 impl Chat {
+    #[must_use]
     pub fn is_private(&self) -> bool {
         matches!(self.kind, ChatKind::Private(_))
     }
 
+    #[must_use]
     pub fn is_group(&self) -> bool {
         matches!(
             self.kind,
@@ -205,6 +207,7 @@ impl Chat {
         )
     }
 
+    #[must_use]
     pub fn is_supergroup(&self) -> bool {
         matches!(
             self.kind,
@@ -215,6 +218,7 @@ impl Chat {
         )
     }
 
+    #[must_use]
     pub fn is_channel(&self) -> bool {
         matches!(
             self.kind,
@@ -225,6 +229,7 @@ impl Chat {
         )
     }
 
+    #[must_use]
     pub fn is_chat(&self) -> bool {
         self.is_private() || self.is_group() || self.is_supergroup()
     }
@@ -233,6 +238,7 @@ impl Chat {
 /// Getters
 impl Chat {
     /// A title, for supergroups, channels and group chats.
+    #[must_use]
     pub fn title(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Public(this) => this.title.as_deref(),
@@ -241,6 +247,7 @@ impl Chat {
     }
 
     /// A username, for private chats, supergroups and channels if available.
+    #[must_use]
     pub fn username(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Public(this) => match &this.kind {
@@ -258,6 +265,7 @@ impl Chat {
     /// identifier for a channel and vice versa. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn linked_chat_id(&self) -> Option<i64> {
         match &self.kind {
             ChatKind::Public(this) => match &this.kind {
@@ -275,6 +283,7 @@ impl Chat {
     /// only from [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn permissions(&self) -> Option<ChatPermissions> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Group(PublicChatGroup { permissions })
@@ -291,6 +300,7 @@ impl Chat {
     /// [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn sticker_set_name(&self) -> Option<&str> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -305,6 +315,7 @@ impl Chat {
     /// from [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn can_set_sticker_set(&self) -> Option<bool> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -319,6 +330,7 @@ impl Chat {
     /// unpriviledged user. Returned only from [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn slow_mode_delay(&self) -> Option<u32> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -333,6 +345,7 @@ impl Chat {
     /// [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn location(&self) -> Option<&ChatLocation> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -347,6 +360,7 @@ impl Chat {
     /// messages. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn join_to_send_messages(&self) -> Option<True> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -361,6 +375,7 @@ impl Chat {
     /// by supergroup administrators. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn join_by_request(&self) -> Option<True> {
         if let ChatKind::Public(this) = &self.kind {
             if let PublicChatKind::Supergroup(this) = &this.kind {
@@ -375,6 +390,7 @@ impl Chat {
     /// only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn description(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Public(this) => this.description.as_deref(),
@@ -392,6 +408,7 @@ impl Chat {
     /// crate::payloads::ExportChatInviteLink
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn invite_link(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Public(this) => this.invite_link.as_deref(),
@@ -403,6 +420,7 @@ impl Chat {
     /// Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn has_protected_content(&self) -> Option<True> {
         match &self.kind {
             ChatKind::Public(this) => this.has_protected_content,
@@ -411,6 +429,7 @@ impl Chat {
     }
 
     /// A first name of the other party in a private chat.
+    #[must_use]
     pub fn first_name(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Private(this) => this.first_name.as_deref(),
@@ -419,6 +438,7 @@ impl Chat {
     }
 
     /// A last name of the other party in a private chat.
+    #[must_use]
     pub fn last_name(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Private(this) => this.last_name.as_deref(),
@@ -429,6 +449,7 @@ impl Chat {
     /// Bio of the other party in a private chat. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn bio(&self) -> Option<&str> {
         match &self.kind {
             ChatKind::Private(this) => this.bio.as_deref(),
@@ -441,6 +462,7 @@ impl Chat {
     /// user. Returned only in [`GetChat`].
     ///
     /// [`GetChat`]: crate::payloads::GetChat
+    #[must_use]
     pub fn has_private_forwards(&self) -> Option<True> {
         match &self.kind {
             ChatKind::Private(this) => this.has_private_forwards,
diff --git a/src/types/chat_id.rs b/src/types/chat_id.rs
index cca06e41..a7a53224 100644
--- a/src/types/chat_id.rs
+++ b/src/types/chat_id.rs
@@ -31,6 +31,7 @@ pub(crate) enum BareChatId {
 
 impl ChatId {
     /// Returns `true` if this is an id of a user.
+    #[must_use]
     pub fn is_user(self) -> bool {
         matches!(self.to_bare(), BareChatId::User(_))
     }
@@ -38,11 +39,13 @@ impl ChatId {
     /// Returns `true` if this is an id of a group.
     ///
     /// Note: supergroup is **not** considered a group.
+    #[must_use]
     pub fn is_group(self) -> bool {
         matches!(self.to_bare(), BareChatId::Group(_))
     }
 
     /// Returns `true` if this is an id of a channel.
+    #[must_use]
     pub fn is_channel_or_supergroup(self) -> bool {
         matches!(self.to_bare(), BareChatId::Channel(_))
     }
diff --git a/src/types/chat_member.rs b/src/types/chat_member.rs
index 7ddc7a77..affed635 100644
--- a/src/types/chat_member.rs
+++ b/src/types/chat_member.rs
@@ -147,6 +147,7 @@ impl Deref for ChatMember {
 /// Simple methods for checking a user status.
 impl ChatMemberKind {
     /// Returns chat member status.
+    #[must_use]
     pub fn status(&self) -> ChatMemberStatus {
         match self {
             ChatMemberKind::Owner(_) => ChatMemberStatus::Owner,
@@ -161,6 +162,7 @@ impl ChatMemberKind {
     /// Returns `true` if the user is the [owner] of the given chat.
     ///
     /// [owner]: ChatMemberKind::Owner
+    #[must_use]
     pub fn is_owner(&self) -> bool {
         matches!(self, Self::Owner { .. })
     }
@@ -173,6 +175,7 @@ impl ChatMemberKind {
     /// owner of the given chat. See also: [`is_privileged`].
     ///
     /// [`is_privileged`]: ChatMemberKind::is_privileged
+    #[must_use]
     pub fn is_administrator(&self) -> bool {
         matches!(self, Self::Administrator { .. })
     }
@@ -180,6 +183,7 @@ impl ChatMemberKind {
     /// Returns `true` if the user is a common [member] of the given chat.
     ///
     /// [member]: ChatMemberKind::Member
+    #[must_use]
     pub fn is_member(&self) -> bool {
         matches!(self, Self::Member { .. })
     }
@@ -187,6 +191,7 @@ impl ChatMemberKind {
     /// Returns `true` if the user is [restricted] in the given chat.
     ///
     /// [restricted]: ChatMemberKind::Restricted
+    #[must_use]
     pub fn is_restricted(&self) -> bool {
         matches!(self, Self::Restricted { .. })
     }
@@ -194,6 +199,7 @@ impl ChatMemberKind {
     /// Returns `true` if the user [left] the given chat.
     ///
     /// [left]: ChatMemberKind::Left
+    #[must_use]
     pub fn is_left(&self) -> bool {
         matches!(self, Self::Left { .. })
     }
@@ -201,6 +207,7 @@ impl ChatMemberKind {
     /// Returns `true` if the user is [banned] in the given chat.
     ///
     /// [banned]: ChatMemberKind::Banned
+    #[must_use]
     pub fn is_banned(&self) -> bool {
         matches!(self, Self::Banned { .. })
     }
@@ -209,6 +216,7 @@ impl ChatMemberKind {
     ///
     /// [kicked]: ChatMemberKind::Banned
     #[deprecated = "use `is_banned` instead"]
+    #[must_use]
     pub fn is_kicked(&self) -> bool {
         self.is_banned()
     }
@@ -217,6 +225,7 @@ impl ChatMemberKind {
     ///
     /// [creator]: ChatMemberKind::Owner
     #[deprecated = "use `is_owner` instead"]
+    #[must_use]
     pub fn is_creator(&self) -> bool {
         self.is_owner()
     }
@@ -229,6 +238,7 @@ impl ChatMemberKind {
     ///
     /// [owner]: ChatMemberKind::Owner
     /// [administrator]: ChatMemberKind::Administrator
+    #[must_use]
     pub fn is_privileged(&self) -> bool {
         self.is_administrator() || self.is_owner()
     }
@@ -238,6 +248,7 @@ impl ChatMemberKind {
     ///
     /// [left]: ChatMemberKind::Left
     /// [banned]: ChatMemberKind::Banned
+    #[must_use]
     pub fn is_present(&self) -> bool {
         !(self.is_left() || self.is_banned())
     }
@@ -246,6 +257,7 @@ impl ChatMemberKind {
 impl ChatMemberKind {
     /// Getter for [`Administrator::custom_title`] and [`Owner::custom_title`]
     /// fields.
+    #[must_use]
     pub fn custom_title(&self) -> Option<&str> {
         match &self {
             Self::Administrator(Administrator { custom_title, .. })
@@ -261,6 +273,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_chat`]: Administrator::can_manage_chat
+    #[must_use]
     pub fn is_anonymous(&self) -> bool {
         match self {
             Self::Owner(Owner { is_anonymous, .. })
@@ -270,6 +283,7 @@ impl ChatMemberKind {
     }
 
     /// Getter for [`Restricted::until_date`] and [`Banned::until_date`] fields.
+    #[must_use]
     pub fn until_date(&self) -> Option<UntilDate> {
         match &self {
             Self::Owner(_) | Self::Administrator(_) | Self::Member | Self::Left => None,
@@ -283,6 +297,7 @@ impl ChatMemberKind {
 impl ChatMemberKind {
     /// Returns `true` if the user is an administrator in the given chat and the
     /// bot is allowed to edit administrator privileges of that user.
+    #[must_use]
     pub fn can_be_edited(&self) -> bool {
         match self {
             Self::Administrator(Administrator { can_be_edited, .. }) => *can_be_edited,
@@ -305,6 +320,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_chat`]: Administrator::can_manage_chat
+    #[must_use]
     pub fn can_manage_chat(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -325,6 +341,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_change_info`]: Administrator::can_change_info
+    #[must_use]
     pub fn can_change_info(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -344,6 +361,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_post_messages`]: Administrator::can_post_messages
+    #[must_use]
     pub fn can_post_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -364,6 +382,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_edit_messages`]: Administrator::can_edit_messages
+    #[must_use]
     pub fn can_edit_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -383,6 +402,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_delete_messages`]: Administrator::can_delete_messages
+    #[must_use]
     pub fn can_delete_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -403,6 +423,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_manage_video_chats`]: Administrator::can_manage_video_chats
+    #[must_use]
     pub fn can_manage_video_chats(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -415,6 +436,7 @@ impl ChatMemberKind {
     }
 
     #[deprecated(since = "0.6.0", note = "renamed to `can_manage_video_chats`")]
+    #[must_use]
     pub fn can_manage_voice_chats(&self) -> bool {
         self.can_manage_video_chats()
     }
@@ -428,6 +450,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_invite_users`]: Administrator::can_invite_users
+    #[must_use]
     pub fn can_invite_users(&self) -> bool {
         match &self {
             Self::Owner(_) => true,
@@ -447,6 +470,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_restrict_members`]: Administrator::can_restrict_members
+    #[must_use]
     pub fn can_restrict_members(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -467,6 +491,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_pin_messages`]: Administrator::can_pin_messages
+    #[must_use]
     pub fn can_pin_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -489,6 +514,7 @@ impl ChatMemberKind {
     /// Returns `false` otherwise.
     ///
     /// [`can_promote_members`]: Administrator::can_promote_members
+    #[must_use]
     pub fn can_promote_members(&self) -> bool {
         match self {
             Self::Owner(_) => true,
@@ -512,6 +538,7 @@ impl ChatMemberKind {
     /// Returns `true` otherwise.
     ///
     /// [`can_send_messages`]: Restricted::can_send_messages
+    #[must_use]
     pub fn can_send_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
@@ -531,6 +558,7 @@ impl ChatMemberKind {
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    #[must_use]
     pub fn can_send_media_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
@@ -551,6 +579,7 @@ impl ChatMemberKind {
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    #[must_use]
     pub fn can_send_other_messages(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
@@ -571,6 +600,7 @@ impl ChatMemberKind {
     /// Returns `true` otherwise.
     ///
     /// [`can_send_media_messages`]: Restricted::can_send_media_messages
+    #[must_use]
     pub fn can_add_web_page_previews(&self) -> bool {
         match &self {
             Self::Restricted(Restricted {
@@ -601,6 +631,7 @@ impl ChatMemberStatus {
     /// Returns `true` if the user is the [owner] of the given chat.
     ///
     /// [owner]: ChatMemberKind::Owner
+    #[must_use]
     pub fn is_owner(&self) -> bool {
         matches!(self, Self::Owner { .. })
     }
@@ -613,6 +644,7 @@ impl ChatMemberStatus {
     /// owner of the given chat. See also: [`is_privileged`].
     ///
     /// [`is_privileged`]: ChatMemberKind::is_privileged
+    #[must_use]
     pub fn is_administrator(&self) -> bool {
         matches!(self, Self::Administrator { .. })
     }
@@ -620,6 +652,7 @@ impl ChatMemberStatus {
     /// Returns `true` if the user is a common [member] of the given chat.
     ///
     /// [member]: ChatMemberKind::Member
+    #[must_use]
     pub fn is_member(&self) -> bool {
         matches!(self, Self::Member { .. })
     }
@@ -627,6 +660,7 @@ impl ChatMemberStatus {
     /// Returns `true` if the user is [restricted] in the given chat.
     ///
     /// [restricted]: ChatMemberKind::Restricted
+    #[must_use]
     pub fn is_restricted(&self) -> bool {
         matches!(self, Self::Restricted { .. })
     }
@@ -634,6 +668,7 @@ impl ChatMemberStatus {
     /// Returns `true` if the user [left] the given chat.
     ///
     /// [left]: ChatMemberKind::Left
+    #[must_use]
     pub fn is_left(&self) -> bool {
         matches!(self, Self::Left { .. })
     }
@@ -641,6 +676,7 @@ impl ChatMemberStatus {
     /// Returns `true` if the user is [banned] in the given chat.
     ///
     /// [banned]: ChatMemberKind::Banned
+    #[must_use]
     pub fn is_banned(&self) -> bool {
         matches!(self, Self::Banned { .. })
     }
@@ -653,6 +689,7 @@ impl ChatMemberStatus {
     ///
     /// [owner]: ChatMemberKind::Owner
     /// [administrator]: ChatMemberKind::Administrator
+    #[must_use]
     pub fn is_privileged(&self) -> bool {
         self.is_administrator() || self.is_owner()
     }
@@ -662,6 +699,7 @@ impl ChatMemberStatus {
     ///
     /// [left]: ChatMemberKind::Left
     /// [banned]: ChatMemberKind::Banned
+    #[must_use]
     pub fn is_present(&self) -> bool {
         !(self.is_left() || self.is_banned())
     }
diff --git a/src/types/force_reply.rs b/src/types/force_reply.rs
index b641fc99..471a55a6 100644
--- a/src/types/force_reply.rs
+++ b/src/types/force_reply.rs
@@ -33,6 +33,7 @@ pub struct ForceReply {
 }
 
 impl ForceReply {
+    #[must_use]
     pub const fn new() -> Self {
         Self {
             force_reply: True,
@@ -49,6 +50,7 @@ impl ForceReply {
         self
     }
 
+    #[must_use]
     pub const fn selective(mut self, val: bool) -> Self {
         self.selective = Some(val);
         self
diff --git a/src/types/inline_keyboard_button.rs b/src/types/inline_keyboard_button.rs
index 59282fac..651f8931 100644
--- a/src/types/inline_keyboard_button.rs
+++ b/src/types/inline_keyboard_button.rs
@@ -218,6 +218,7 @@ impl InlineKeyboardButton {
         since = "0.7.0",
         note = "set correct kind in the constructor or access the field directly"
     )]
+    #[must_use]
     pub fn kind(mut self, val: InlineKeyboardButtonKind) -> Self {
         self.kind = val;
         self
diff --git a/src/types/inline_keyboard_markup.rs b/src/types/inline_keyboard_markup.rs
index 21365f4f..f0c61fd1 100644
--- a/src/types/inline_keyboard_markup.rs
+++ b/src/types/inline_keyboard_markup.rs
@@ -66,6 +66,7 @@ impl InlineKeyboardMarkup {
         self
     }
 
+    #[must_use]
     pub fn append_to_row(mut self, index: usize, button: InlineKeyboardButton) -> Self {
         match self.inline_keyboard.get_mut(index) {
             Some(buttons) => buttons.push(button),
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
index 8089cd54..41f687c7 100644
--- a/src/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -60,11 +60,13 @@ impl InlineQuery {
         self
     }
 
+    #[must_use]
     pub fn from(mut self, val: User) -> Self {
         self.from = val;
         self
     }
 
+    #[must_use]
     pub fn location(mut self, val: Location) -> Self {
         self.location = Some(val);
         self
diff --git a/src/types/inline_query_result_article.rs b/src/types/inline_query_result_article.rs
index 2ec6daf3..5e0d3be9 100644
--- a/src/types/inline_query_result_article.rs
+++ b/src/types/inline_query_result_article.rs
@@ -76,21 +76,25 @@ impl InlineQueryResultArticle {
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = val;
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn url(mut self, val: reqwest::Url) -> Self {
         self.url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn hide_url(mut self, val: bool) -> Self {
         self.hide_url = Some(val);
         self
@@ -104,16 +108,19 @@ impl InlineQueryResultArticle {
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_width(mut self, val: i32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_height(mut self, val: i32) -> Self {
         self.thumb_height = Some(val);
         self
diff --git a/src/types/inline_query_result_audio.rs b/src/types/inline_query_result_audio.rs
index 9e2fbd99..7fa9e988 100644
--- a/src/types/inline_query_result_audio.rs
+++ b/src/types/inline_query_result_audio.rs
@@ -79,6 +79,7 @@ impl InlineQueryResultAudio {
         self
     }
 
+    #[must_use]
     pub fn audio_url(mut self, val: reqwest::Url) -> Self {
         self.audio_url = val;
         self
@@ -100,6 +101,7 @@ impl InlineQueryResultAudio {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -129,11 +131,13 @@ impl InlineQueryResultAudio {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_audio.rs b/src/types/inline_query_result_cached_audio.rs
index e74c3954..cb5463b8 100644
--- a/src/types/inline_query_result_cached_audio.rs
+++ b/src/types/inline_query_result_cached_audio.rs
@@ -83,6 +83,7 @@ impl InlineQueryResultCachedAudio {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -96,11 +97,13 @@ impl InlineQueryResultCachedAudio {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_document.rs b/src/types/inline_query_result_cached_document.rs
index 79de0b16..104ca26b 100644
--- a/src/types/inline_query_result_cached_document.rs
+++ b/src/types/inline_query_result_cached_document.rs
@@ -108,6 +108,7 @@ impl InlineQueryResultCachedDocument {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -121,11 +122,13 @@ impl InlineQueryResultCachedDocument {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_gif.rs b/src/types/inline_query_result_cached_gif.rs
index cc51a823..889096c9 100644
--- a/src/types/inline_query_result_cached_gif.rs
+++ b/src/types/inline_query_result_cached_gif.rs
@@ -96,6 +96,7 @@ impl InlineQueryResultCachedGif {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -109,11 +110,13 @@ impl InlineQueryResultCachedGif {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/src/types/inline_query_result_cached_mpeg4_gif.rs
index 05ccb521..26dbfd5d 100644
--- a/src/types/inline_query_result_cached_mpeg4_gif.rs
+++ b/src/types/inline_query_result_cached_mpeg4_gif.rs
@@ -88,6 +88,7 @@ impl InlineQueryResultCachedMpeg4Gif {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -101,11 +102,13 @@ impl InlineQueryResultCachedMpeg4Gif {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_photo.rs b/src/types/inline_query_result_cached_photo.rs
index 2a9c2bad..fda7e735 100644
--- a/src/types/inline_query_result_cached_photo.rs
+++ b/src/types/inline_query_result_cached_photo.rs
@@ -107,6 +107,7 @@ impl InlineQueryResultCachedPhoto {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -120,11 +121,13 @@ impl InlineQueryResultCachedPhoto {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_sticker.rs b/src/types/inline_query_result_cached_sticker.rs
index 66c4138f..ab3ac3d2 100644
--- a/src/types/inline_query_result_cached_sticker.rs
+++ b/src/types/inline_query_result_cached_sticker.rs
@@ -57,11 +57,13 @@ impl InlineQueryResultCachedSticker {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_video.rs b/src/types/inline_query_result_cached_video.rs
index 50bad2c0..35c38f57 100644
--- a/src/types/inline_query_result_cached_video.rs
+++ b/src/types/inline_query_result_cached_video.rs
@@ -108,6 +108,7 @@ impl InlineQueryResultCachedVideo {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -121,11 +122,13 @@ impl InlineQueryResultCachedVideo {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_cached_voice.rs b/src/types/inline_query_result_cached_voice.rs
index 50733059..90f002df 100644
--- a/src/types/inline_query_result_cached_voice.rs
+++ b/src/types/inline_query_result_cached_voice.rs
@@ -96,6 +96,7 @@ impl InlineQueryResultCachedVoice {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -109,11 +110,13 @@ impl InlineQueryResultCachedVoice {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_contact.rs b/src/types/inline_query_result_contact.rs
index 8b41f239..16ae652b 100644
--- a/src/types/inline_query_result_contact.rs
+++ b/src/types/inline_query_result_contact.rs
@@ -109,26 +109,31 @@ impl InlineQueryResultContact {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_width(mut self, val: i32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_height(mut self, val: i32) -> Self {
         self.thumb_height = Some(val);
         self
diff --git a/src/types/inline_query_result_document.rs b/src/types/inline_query_result_document.rs
index 959469b1..329f411d 100644
--- a/src/types/inline_query_result_document.rs
+++ b/src/types/inline_query_result_document.rs
@@ -87,6 +87,7 @@ impl InlineQueryResultDocument {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -100,11 +101,13 @@ impl InlineQueryResultDocument {
         self
     }
 
+    #[must_use]
     pub fn document_url(mut self, val: reqwest::Url) -> Self {
         self.document_url = val;
         self
     }
 
+    #[must_use]
     pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = val;
         self
@@ -118,26 +121,31 @@ impl InlineQueryResultDocument {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_width(mut self, val: i32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_height(mut self, val: i32) -> Self {
         self.thumb_height = Some(val);
         self
diff --git a/src/types/inline_query_result_game.rs b/src/types/inline_query_result_game.rs
index 9e6c074e..68d01a2e 100644
--- a/src/types/inline_query_result_game.rs
+++ b/src/types/inline_query_result_game.rs
@@ -51,6 +51,7 @@ impl InlineQueryResultGame {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
diff --git a/src/types/inline_query_result_gif.rs b/src/types/inline_query_result_gif.rs
index 0154bbf2..8c1200f2 100644
--- a/src/types/inline_query_result_gif.rs
+++ b/src/types/inline_query_result_gif.rs
@@ -86,26 +86,31 @@ impl InlineQueryResultGif {
         self
     }
 
+    #[must_use]
     pub fn gif_url(mut self, val: reqwest::Url) -> Self {
         self.gif_url = val;
         self
     }
 
+    #[must_use]
     pub fn gif_width(mut self, val: i32) -> Self {
         self.gif_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn gif_height(mut self, val: i32) -> Self {
         self.gif_height = Some(val);
         self
     }
 
+    #[must_use]
     pub fn gif_duration(mut self, val: i32) -> Self {
         self.gif_duration = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = val;
         self
@@ -127,6 +132,7 @@ impl InlineQueryResultGif {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -140,11 +146,13 @@ impl InlineQueryResultGif {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_location.rs b/src/types/inline_query_result_location.rs
index 1ecb1dc5..aa8d6a66 100644
--- a/src/types/inline_query_result_location.rs
+++ b/src/types/inline_query_result_location.rs
@@ -89,11 +89,13 @@ impl InlineQueryResultLocation {
         self
     }
 
+    #[must_use]
     pub fn latitude(mut self, val: f64) -> Self {
         self.latitude = val;
         self
     }
 
+    #[must_use]
     pub fn longitude(mut self, val: f64) -> Self {
         self.longitude = val;
         self
@@ -107,46 +109,55 @@ impl InlineQueryResultLocation {
         self
     }
 
+    #[must_use]
     pub fn horizontal_accuracy<S>(mut self, val: f64) -> Self {
         self.horizontal_accuracy = Some(val);
         self
     }
 
+    #[must_use]
     pub fn live_period(mut self, val: i32) -> Self {
         self.live_period = Some(val);
         self
     }
 
+    #[must_use]
     pub fn heading(mut self, val: u16) -> Self {
         self.heading = Some(val);
         self
     }
 
+    #[must_use]
     pub fn proximity_alert_radius(mut self, val: u32) -> Self {
         self.proximity_alert_radius = Some(val);
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_width(mut self, val: u32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_height(mut self, val: u32) -> Self {
         self.thumb_height = Some(val);
         self
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/src/types/inline_query_result_mpeg4_gif.rs
index 2b700fac..134f38f2 100644
--- a/src/types/inline_query_result_mpeg4_gif.rs
+++ b/src/types/inline_query_result_mpeg4_gif.rs
@@ -87,26 +87,31 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
+    #[must_use]
     pub fn mpeg4_url(mut self, val: reqwest::Url) -> Self {
         self.mpeg4_url = val;
         self
     }
 
+    #[must_use]
     pub fn mpeg4_width(mut self, val: i32) -> Self {
         self.mpeg4_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn mpeg4_height(mut self, val: i32) -> Self {
         self.mpeg4_height = Some(val);
         self
     }
 
+    #[must_use]
     pub fn mpeg4_duration(mut self, val: i32) -> Self {
         self.mpeg4_duration = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = val;
         self
@@ -128,6 +133,7 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -141,11 +147,13 @@ impl InlineQueryResultMpeg4Gif {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_photo.rs b/src/types/inline_query_result_photo.rs
index 69cdf7ab..83ca4786 100644
--- a/src/types/inline_query_result_photo.rs
+++ b/src/types/inline_query_result_photo.rs
@@ -87,21 +87,25 @@ impl InlineQueryResultPhoto {
         self
     }
 
+    #[must_use]
     pub fn photo_url(mut self, val: reqwest::Url) -> Self {
         self.photo_url = val;
         self
     }
 
+    #[must_use]
     pub fn thumb_url<S>(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = val;
         self
     }
 
+    #[must_use]
     pub fn photo_width(mut self, val: i32) -> Self {
         self.photo_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn photo_height(mut self, val: i32) -> Self {
         self.photo_height = Some(val);
         self
@@ -131,6 +135,7 @@ impl InlineQueryResultPhoto {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -144,11 +149,13 @@ impl InlineQueryResultPhoto {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_venue.rs b/src/types/inline_query_result_venue.rs
index 6b6820bf..43f57364 100644
--- a/src/types/inline_query_result_venue.rs
+++ b/src/types/inline_query_result_venue.rs
@@ -94,11 +94,13 @@ impl InlineQueryResultVenue {
         self
     }
 
+    #[must_use]
     pub fn latitude(mut self, val: f64) -> Self {
         self.latitude = val;
         self
     }
 
+    #[must_use]
     pub fn longitude(mut self, val: f64) -> Self {
         self.longitude = val;
         self
@@ -152,26 +154,31 @@ impl InlineQueryResultVenue {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_width(mut self, val: i32) -> Self {
         self.thumb_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn thumb_height(mut self, val: i32) -> Self {
         self.thumb_height = Some(val);
         self
diff --git a/src/types/inline_query_result_video.rs b/src/types/inline_query_result_video.rs
index 51e53a3b..1ece1c8c 100644
--- a/src/types/inline_query_result_video.rs
+++ b/src/types/inline_query_result_video.rs
@@ -109,16 +109,19 @@ impl InlineQueryResultVideo {
         self
     }
 
+    #[must_use]
     pub fn video_url(mut self, val: reqwest::Url) -> Self {
         self.video_url = val;
         self
     }
 
+    #[must_use]
     pub fn mime_type(mut self, val: Mime) -> Self {
         self.mime_type = val;
         self
     }
 
+    #[must_use]
     pub fn thumb_url(mut self, val: reqwest::Url) -> Self {
         self.thumb_url = val;
         self
@@ -140,6 +143,7 @@ impl InlineQueryResultVideo {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -153,16 +157,19 @@ impl InlineQueryResultVideo {
         self
     }
 
+    #[must_use]
     pub fn video_width(mut self, val: i32) -> Self {
         self.video_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn video_height(mut self, val: i32) -> Self {
         self.video_height = Some(val);
         self
     }
 
+    #[must_use]
     pub fn video_duration(mut self, val: i32) -> Self {
         self.video_duration = Some(val);
         self
@@ -176,11 +183,13 @@ impl InlineQueryResultVideo {
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/inline_query_result_voice.rs b/src/types/inline_query_result_voice.rs
index 7b9cc1bc..c529ae34 100644
--- a/src/types/inline_query_result_voice.rs
+++ b/src/types/inline_query_result_voice.rs
@@ -76,6 +76,7 @@ impl InlineQueryResultVoice {
         self
     }
 
+    #[must_use]
     pub fn voice_url(mut self, val: reqwest::Url) -> Self {
         self.voice_url = val;
         self
@@ -97,6 +98,7 @@ impl InlineQueryResultVoice {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -110,16 +112,19 @@ impl InlineQueryResultVoice {
         self
     }
 
+    #[must_use]
     pub fn voice_duration(mut self, value: i32) -> Self {
         self.voice_duration = Some(value);
         self
     }
 
+    #[must_use]
     pub fn reply_markup(mut self, val: InlineKeyboardMarkup) -> Self {
         self.reply_markup = Some(val);
         self
     }
 
+    #[must_use]
     pub fn input_message_content(mut self, val: InputMessageContent) -> Self {
         self.input_message_content = Some(val);
         self
diff --git a/src/types/input_file.rs b/src/types/input_file.rs
index f36e5fc0..f0131db5 100644
--- a/src/types/input_file.rs
+++ b/src/types/input_file.rs
@@ -64,6 +64,7 @@ impl InputFile {
     /// [`SendAudio`]: crate::payloads::SendAudio
     /// [`SendDocument`]: crate::payloads::SendDocument
     /// [`SendVoice`]: crate::payloads::SendVoice
+    #[must_use]
     pub fn url(url: url::Url) -> Self {
         Self::new(Url(url))
     }
diff --git a/src/types/input_message_content.rs b/src/types/input_message_content.rs
index 5ece7563..e41d00f8 100644
--- a/src/types/input_message_content.rs
+++ b/src/types/input_message_content.rs
@@ -61,6 +61,7 @@ impl InputMessageContentText {
         self
     }
 
+    #[must_use]
     pub fn parse_mode(mut self, val: ParseMode) -> Self {
         self.parse_mode = Some(val);
         self
@@ -74,6 +75,7 @@ impl InputMessageContentText {
         self
     }
 
+    #[must_use]
     pub fn disable_web_page_preview(mut self, val: bool) -> Self {
         self.disable_web_page_preview = Some(val);
         self
@@ -109,6 +111,7 @@ pub struct InputMessageContentLocation {
 }
 
 impl InputMessageContentLocation {
+    #[must_use]
     pub const fn new(latitude: f64, longitude: f64) -> Self {
         Self {
             latitude,
@@ -120,16 +123,19 @@ impl InputMessageContentLocation {
         }
     }
 
+    #[must_use]
     pub const fn latitude(mut self, val: f64) -> Self {
         self.latitude = val;
         self
     }
 
+    #[must_use]
     pub const fn longitude(mut self, val: f64) -> Self {
         self.longitude = val;
         self
     }
 
+    #[must_use]
     pub const fn live_period(mut self, val: u32) -> Self {
         self.live_period = Some(val);
         self
@@ -188,11 +194,13 @@ impl InputMessageContentVenue {
         }
     }
 
+    #[must_use]
     pub fn latitude(mut self, val: f64) -> Self {
         self.latitude = val;
         self
     }
 
+    #[must_use]
     pub fn longitude(mut self, val: f64) -> Self {
         self.longitude = val;
         self
@@ -465,6 +473,7 @@ impl InputMessageContentInvoice {
         self
     }
 
+    #[must_use]
     pub fn currency(mut self, val: Currency) -> Self {
         self.currency = val;
         self
@@ -478,6 +487,7 @@ impl InputMessageContentInvoice {
         self
     }
 
+    #[must_use]
     pub fn max_tip_amount(mut self, val: u32) -> Self {
         self.max_tip_amount = Some(val);
         self
@@ -499,57 +509,68 @@ impl InputMessageContentInvoice {
         self
     }
 
+    #[must_use]
     pub fn photo_url(mut self, val: Url) -> Self {
         self.photo_url = Some(val);
         self
     }
 
+    #[must_use]
     pub fn photo_size(mut self, val: u32) -> Self {
         self.photo_size = Some(val);
         self
     }
 
+    #[must_use]
     pub fn photo_width(mut self, val: u32) -> Self {
         self.photo_width = Some(val);
         self
     }
 
+    #[must_use]
     pub fn photo_height(mut self, val: u32) -> Self {
         self.photo_height = Some(val);
         self
     }
 
+    #[must_use]
     pub fn need_name(mut self, val: bool) -> Self {
         self.need_name = Some(val);
         self
     }
 
+    #[must_use]
     pub fn need_phone_number(mut self, val: bool) -> Self {
         self.need_phone_number = Some(val);
         self
     }
 
+    #[must_use]
     pub fn need_email(mut self, val: bool) -> Self {
         self.need_email = Some(val);
         self
     }
 
+    #[must_use]
     pub fn need_shipping_address(mut self, val: bool) -> Self {
         self.need_shipping_address = Some(val);
         self
     }
 
+    #[must_use]
     pub fn send_phone_number_to_provider(mut self, val: bool) -> Self {
         self.send_phone_number_to_provider = Some(val);
         self
     }
 
+    #[must_use]
     pub fn send_email_to_provider(mut self, val: bool) -> Self {
         self.send_email_to_provider = Some(val);
         self
     }
 
     #[allow(clippy::wrong_self_convention)]
+    #[must_use]
     pub fn is_flexible(mut self, val: bool) -> Self {
         self.is_flexible = Some(val);
         self
diff --git a/src/types/label_price.rs b/src/types/label_price.rs
index 0a5a2f72..33cdd3f4 100644
--- a/src/types/label_price.rs
+++ b/src/types/label_price.rs
@@ -38,6 +38,7 @@ impl LabeledPrice {
         self
     }
 
+    #[must_use]
     pub fn amount(mut self, val: i32) -> Self {
         self.amount = val;
         self
diff --git a/src/types/login_url.rs b/src/types/login_url.rs
index ef8e9a36..dd0146ca 100644
--- a/src/types/login_url.rs
+++ b/src/types/login_url.rs
@@ -46,6 +46,7 @@ pub struct LoginUrl {
 }
 
 impl LoginUrl {
+    #[must_use]
     pub fn url(mut self, val: reqwest::Url) -> Self {
         self.url = val;
         self
@@ -67,6 +68,7 @@ impl LoginUrl {
         self
     }
 
+    #[must_use]
     pub fn request_write_access(mut self, val: bool) -> Self {
         self.request_write_access = Some(val);
         self
diff --git a/src/types/mask_position.rs b/src/types/mask_position.rs
index bf52eccf..f6fd809a 100644
--- a/src/types/mask_position.rs
+++ b/src/types/mask_position.rs
@@ -45,16 +45,19 @@ impl MaskPosition {
         self
     }
 
+    #[must_use]
     pub fn x_shift(mut self, val: f64) -> Self {
         self.x_shift = val;
         self
     }
 
+    #[must_use]
     pub fn y_shift(mut self, val: f64) -> Self {
         self.y_shift = val;
         self
     }
 
+    #[must_use]
     pub fn scale(mut self, val: f64) -> Self {
         self.scale = val;
         self
diff --git a/src/types/me.rs b/src/types/me.rs
index 2d101558..b9cf3fe8 100644
--- a/src/types/me.rs
+++ b/src/types/me.rs
@@ -26,6 +26,7 @@ pub struct Me {
 
 impl Me {
     /// Returns the username of the bot.
+    #[must_use]
     pub fn username(&self) -> &str {
         self.user
             .username
@@ -34,11 +35,13 @@ impl Me {
     }
 
     /// Returns a username mention of this bot.
+    #[must_use]
     pub fn mention(&self) -> String {
         format!("@{}", self.username())
     }
 
     /// Returns an URL that links to this bot in the form of `t.me/<...>`.
+    #[must_use]
     pub fn tme_url(&self) -> reqwest::Url {
         format!("https://t.me/{}", self.username()).parse().unwrap()
     }
diff --git a/src/types/message.rs b/src/types/message.rs
index 666c206c..54cc09af 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -544,6 +544,7 @@ mod getters {
     /// [Message]: crate::types::Message
     /// [telegram docs]: https://core.telegram.org/bots/api#message
     impl Message {
+        #[must_use]
         pub fn from(&self) -> Option<&User> {
             match &self.kind {
                 Common(MessageCommon { from, .. }) => from.as_ref(),
@@ -551,6 +552,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn author_signature(&self) -> Option<&str> {
             match &self.kind {
                 Common(MessageCommon {
@@ -560,6 +562,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn sender_chat(&self) -> Option<&Chat> {
             match &self.kind {
                 Common(MessageCommon { sender_chat, .. }) => sender_chat.as_ref(),
@@ -568,22 +571,27 @@ mod getters {
         }
 
         #[deprecated(since = "0.4.2", note = "use `.chat.id` field instead")]
+        #[must_use]
         pub fn chat_id(&self) -> ChatId {
             self.chat.id
         }
 
+        #[must_use]
         pub fn forward(&self) -> Option<&Forward> {
             self.common().and_then(|m| m.forward.as_ref())
         }
 
+        #[must_use]
         pub fn forward_date(&self) -> Option<DateTime<Utc>> {
             self.forward().map(|f| f.date)
         }
 
+        #[must_use]
         pub fn forward_from(&self) -> Option<&ForwardedFrom> {
             self.forward().map(|f| &f.from)
         }
 
+        #[must_use]
         pub fn forward_from_user(&self) -> Option<&User> {
             self.forward_from().and_then(|from| match from {
                 ForwardedFrom::User(user) => Some(user),
@@ -591,6 +599,7 @@ mod getters {
             })
         }
 
+        #[must_use]
         pub fn forward_from_chat(&self) -> Option<&Chat> {
             self.forward_from().and_then(|from| match from {
                 ForwardedFrom::Chat(chat) => Some(chat),
@@ -598,6 +607,7 @@ mod getters {
             })
         }
 
+        #[must_use]
         pub fn forward_from_sender_name(&self) -> Option<&str> {
             self.forward_from().and_then(|from| match from {
                 ForwardedFrom::SenderName(sender_name) => Some(&**sender_name),
@@ -605,18 +615,22 @@ mod getters {
             })
         }
 
+        #[must_use]
         pub fn forward_from_message_id(&self) -> Option<i32> {
             self.forward().and_then(|f| f.message_id)
         }
 
+        #[must_use]
         pub fn forward_signature(&self) -> Option<&str> {
             self.forward().and_then(|f| f.signature.as_deref())
         }
 
+        #[must_use]
         pub fn reply_to_message(&self) -> Option<&Message> {
             self.common().and_then(|m| m.reply_to_message.as_deref())
         }
 
+        #[must_use]
         pub fn edit_date(&self) -> Option<&DateTime<Utc>> {
             match &self.kind {
                 Common(MessageCommon { edit_date, .. }) => edit_date.as_ref(),
@@ -624,6 +638,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn media_group_id(&self) -> Option<&str> {
             match &self.kind {
                 Common(MessageCommon {
@@ -646,6 +661,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn text(&self) -> Option<&str> {
             match &self.kind {
                 Common(MessageCommon {
@@ -668,6 +684,7 @@ mod getters {
         ///
         /// [`parse_entities`]: Message::parse_entities
         /// [`caption_entities`]: Message::caption_entities
+        #[must_use]
         pub fn entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -690,6 +707,7 @@ mod getters {
         ///
         /// [`parse_caption_entities`]: Message::parse_caption_entities
         /// [`entities`]: Message::entities
+        #[must_use]
         pub fn caption_entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -738,6 +756,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn audio(&self) -> Option<&types::Audio> {
             match &self.kind {
                 Common(MessageCommon {
@@ -748,6 +767,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn document(&self) -> Option<&types::Document> {
             match &self.kind {
                 Common(MessageCommon {
@@ -758,6 +778,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn animation(&self) -> Option<&types::Animation> {
             match &self.kind {
                 Common(MessageCommon {
@@ -768,6 +789,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn game(&self) -> Option<&types::Game> {
             match &self.kind {
                 Common(MessageCommon {
@@ -778,6 +800,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn photo(&self) -> Option<&[PhotoSize]> {
             match &self.kind {
                 Common(MessageCommon {
@@ -788,6 +811,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn sticker(&self) -> Option<&types::Sticker> {
             match &self.kind {
                 Common(MessageCommon {
@@ -798,6 +822,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn video(&self) -> Option<&types::Video> {
             match &self.kind {
                 Common(MessageCommon {
@@ -808,6 +833,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn voice(&self) -> Option<&types::Voice> {
             match &self.kind {
                 Common(MessageCommon {
@@ -818,6 +844,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn video_note(&self) -> Option<&types::VideoNote> {
             match &self.kind {
                 Common(MessageCommon {
@@ -828,6 +855,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn caption(&self) -> Option<&str> {
             match &self.kind {
                 Common(MessageCommon { media_kind, .. }) => match media_kind {
@@ -845,6 +873,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn contact(&self) -> Option<&types::Contact> {
             match &self.kind {
                 Common(MessageCommon {
@@ -855,6 +884,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn location(&self) -> Option<&types::Location> {
             match &self.kind {
                 Common(MessageCommon {
@@ -865,6 +895,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn venue(&self) -> Option<&types::Venue> {
             match &self.kind {
                 Common(MessageCommon {
@@ -875,6 +906,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn poll(&self) -> Option<&types::Poll> {
             match &self.kind {
                 Common(MessageCommon {
@@ -885,6 +917,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn new_chat_members(&self) -> Option<&[User]> {
             match &self.kind {
                 NewChatMembers(MessageNewChatMembers { new_chat_members }) => {
@@ -894,6 +927,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn left_chat_member(&self) -> Option<&User> {
             match &self.kind {
                 LeftChatMember(MessageLeftChatMember { left_chat_member }) => {
@@ -903,6 +937,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn new_chat_title(&self) -> Option<&str> {
             match &self.kind {
                 NewChatTitle(MessageNewChatTitle { new_chat_title }) => Some(new_chat_title),
@@ -910,6 +945,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn new_chat_photo(&self) -> Option<&[PhotoSize]> {
             match &self.kind {
                 NewChatPhoto(MessageNewChatPhoto { new_chat_photo }) => Some(new_chat_photo),
@@ -919,6 +955,7 @@ mod getters {
 
         // TODO: OK, `Option<True>` is weird, can we do something with it?
         //       mb smt like `is_delete_chat_photo(&self) -> bool`?
+        #[must_use]
         pub fn delete_chat_photo(&self) -> Option<True> {
             match &self.kind {
                 DeleteChatPhoto(MessageDeleteChatPhoto { delete_chat_photo }) => {
@@ -928,6 +965,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn group_chat_created(&self) -> Option<True> {
             match &self.kind {
                 GroupChatCreated(MessageGroupChatCreated { group_chat_created }) => {
@@ -937,6 +975,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn super_group_chat_created(&self) -> Option<True> {
             match &self.kind {
                 SupergroupChatCreated(MessageSupergroupChatCreated {
@@ -946,6 +985,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn channel_chat_created(&self) -> Option<True> {
             match &self.kind {
                 ChannelChatCreated(MessageChannelChatCreated {
@@ -955,6 +995,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn chat_migration(&self) -> Option<ChatMigration> {
             match &self.kind {
                 Common(MessageCommon {
@@ -965,6 +1006,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn migrate_to_chat_id(&self) -> Option<ChatId> {
             match &self.kind {
                 Common(MessageCommon {
@@ -975,6 +1017,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn migrate_from_chat_id(&self) -> Option<ChatId> {
             match &self.kind {
                 Common(MessageCommon {
@@ -985,6 +1028,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn pinned_message(&self) -> Option<&Message> {
             match &self.kind {
                 Pinned(MessagePinned { pinned }) => Some(pinned),
@@ -992,6 +1036,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn invoice(&self) -> Option<&types::Invoice> {
             match &self.kind {
                 Invoice(MessageInvoice { invoice }) => Some(invoice),
@@ -999,6 +1044,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn successful_payment(&self) -> Option<&types::SuccessfulPayment> {
             match &self.kind {
                 SuccessfulPayment(MessageSuccessfulPayment { successful_payment }) => {
@@ -1008,6 +1054,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn connected_website(&self) -> Option<&str> {
             match &self.kind {
                 ConnectedWebsite(MessageConnectedWebsite { connected_website }) => {
@@ -1017,6 +1064,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn passport_data(&self) -> Option<&types::PassportData> {
             match &self.kind {
                 PassportData(MessagePassportData { passport_data }) => Some(passport_data),
@@ -1024,6 +1072,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn dice(&self) -> Option<&types::Dice> {
             match &self.kind {
                 Dice(MessageDice { dice }) => Some(dice),
@@ -1031,6 +1080,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn proximity_alert_triggered(&self) -> Option<&types::ProximityAlertTriggered> {
             match &self.kind {
                 ProximityAlertTriggered(MessageProximityAlertTriggered {
@@ -1040,6 +1090,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn reply_markup(&self) -> Option<&types::InlineKeyboardMarkup> {
             match &self.kind {
                 Common(MessageCommon { reply_markup, .. }) => reply_markup.as_ref(),
@@ -1047,6 +1098,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn is_automatic_forward(&self) -> bool {
             match &self.kind {
                 Common(MessageCommon {
@@ -1057,6 +1109,7 @@ mod getters {
             }
         }
 
+        #[must_use]
         pub fn has_protected_content(&self) -> bool {
             match &self.kind {
                 Common(MessageCommon {
@@ -1085,6 +1138,7 @@ impl Message {
     ///
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
+    #[must_use]
     pub fn url(&self) -> Option<Url> {
         Self::url_of(self.chat.id, self.chat.username(), self.id)
     }
@@ -1103,6 +1157,7 @@ impl Message {
     ///
     /// [`url`]: Message::url
     #[track_caller]
+    #[must_use]
     pub fn url_of(chat_id: ChatId, chat_username: Option<&str>, message_id: i32) -> Option<Url> {
         use BareChatId::*;
 
@@ -1146,6 +1201,7 @@ impl Message {
     ///
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
+    #[must_use]
     pub fn comment_url(&self, comment_id: i32) -> Option<Url> {
         Self::comment_url_of(self.chat.id, self.chat.username(), self.id, comment_id)
     }
@@ -1164,6 +1220,7 @@ impl Message {
     /// supergroups).
     ///
     /// [`comment_url`]: Message::comment_url
+    #[must_use]
     pub fn comment_url_of(
         channel_id: ChatId,
         channel_username: Option<&str>,
@@ -1187,6 +1244,7 @@ impl Message {
     ///
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
+    #[must_use]
     pub fn url_in_thread(&self, thread_starter_msg_id: i32) -> Option<Url> {
         Self::url_in_thread_of(
             self.chat.id,
@@ -1214,6 +1272,7 @@ impl Message {
     /// supergroups).
     ///
     /// [`url_in_thread`]: Message::url_in_thread
+    #[must_use]
     pub fn url_in_thread_of(
         chat_id: ChatId,
         chat_username: Option<&str>,
@@ -1235,6 +1294,7 @@ impl Message {
     /// See also: [`parse_caption_entities`].
     ///
     /// [`parse_caption_entities`]: Message::parse_caption_entities
+    #[must_use]
     pub fn parse_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
         self.text()
             .zip(self.entities())
@@ -1249,6 +1309,7 @@ impl Message {
     /// See also: [`parse_entities`].
     ///
     /// [`parse_entities`]: Message::parse_entities
+    #[must_use]
     pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
         self.caption()
             .zip(self.caption_entities())
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 75e48548..4ac72484 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -43,6 +43,7 @@ pub struct MessageEntityRef<'a> {
 }
 
 impl MessageEntity {
+    #[must_use]
     pub const fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
         Self {
             kind,
@@ -52,6 +53,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a bold text.
+    #[must_use]
     pub const fn bold(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Bold,
@@ -61,6 +63,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing an italic text.
+    #[must_use]
     pub const fn italic(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Italic,
@@ -70,6 +73,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing an underline text.
+    #[must_use]
     pub const fn underline(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Underline,
@@ -79,6 +83,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a strikethrough text.
+    #[must_use]
     pub const fn strikethrough(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Strikethrough,
@@ -88,6 +93,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a spoiler text.
+    #[must_use]
     pub const fn spoiler(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Spoiler,
@@ -97,6 +103,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a monowidth text.
+    #[must_use]
     pub const fn code(offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Code,
@@ -106,6 +113,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a monowidth block.
+    #[must_use]
     pub const fn pre(language: Option<String>, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::Pre { language },
@@ -115,6 +123,7 @@ impl MessageEntity {
     }
 
     /// Create a message entity representing a clickable text URL.
+    #[must_use]
     pub const fn text_link(url: reqwest::Url, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::TextLink { url },
@@ -129,6 +138,7 @@ impl MessageEntity {
     ///
     /// If you don't have a complete [`User`] value, please use
     /// [`MessageEntity::text_mention_id`] instead.
+    #[must_use]
     pub fn text_mention(user: User, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::TextMention { user },
@@ -139,6 +149,7 @@ impl MessageEntity {
 
     /// Create a message entity representing a text link in the form of
     /// `tg://user/?id=...` that mentions user with `user_id`.
+    #[must_use]
     pub fn text_mention_id(user_id: UserId, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::TextLink { url: user_id.url() },
@@ -147,16 +158,19 @@ impl MessageEntity {
         }
     }
 
+    #[must_use]
     pub fn kind(mut self, val: MessageEntityKind) -> Self {
         self.kind = val;
         self
     }
 
+    #[must_use]
     pub const fn offset(mut self, val: usize) -> Self {
         self.offset = val;
         self
     }
 
+    #[must_use]
     pub const fn length(mut self, val: usize) -> Self {
         self.length = val;
         self
@@ -165,11 +179,13 @@ impl MessageEntity {
 
 impl<'a> MessageEntityRef<'a> {
     /// Returns kind of this entity.
+    #[must_use]
     pub fn kind(&self) -> &'a MessageEntityKind {
         self.kind
     }
 
     /// Returns the text that this entity is related to.
+    #[must_use]
     pub fn text(&self) -> &'a str {
         &self.message[self.range.clone()]
     }
@@ -178,34 +194,40 @@ impl<'a> MessageEntityRef<'a> {
     ///
     /// The range is in bytes for UTF-8 encoding i.e. you can use it with common
     /// Rust strings.
+    #[must_use]
     pub fn range(&self) -> Range<usize> {
         self.range.clone()
     }
 
     /// Returns the offset (in bytes, for UTF-8) to the start of this entity in
     /// the original message.
+    #[must_use]
     pub fn start(&self) -> usize {
         self.range.start
     }
 
     /// Returns the offset (in bytes, for UTF-8) to the end of this entity in
     /// the original message.
+    #[must_use]
     pub fn end(&self) -> usize {
         self.range.end
     }
 
     /// Returns the length of this entity in bytes for UTF-8 encoding.
     #[allow(clippy::len_without_is_empty)]
+    #[must_use]
     pub fn len(&self) -> usize {
         self.range.len()
     }
 
     /// Returns the full text of the original message.
+    #[must_use]
     pub fn message_text(&self) -> &'a str {
         self.message
     }
 
     /// Parses telegram [`MessageEntity`]s converting offsets to UTF-8.
+    #[must_use]
     pub fn parse(text: &'a str, entities: &'a [MessageEntity]) -> Vec<Self> {
         // This creates entities with **wrong** offsets (UTF-16) that we later patch.
         let mut entities: Vec<_> = entities
diff --git a/src/types/passport_element_error.rs b/src/types/passport_element_error.rs
index dd594ba7..3021bc69 100644
--- a/src/types/passport_element_error.rs
+++ b/src/types/passport_element_error.rs
@@ -32,6 +32,7 @@ impl PassportElementError {
         self
     }
 
+    #[must_use]
     pub fn kind(mut self, val: PassportElementErrorKind) -> Self {
         self.kind = val;
         self
@@ -104,6 +105,7 @@ impl PassportElementErrorDataField {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorDataFieldType) -> Self {
         self.r#type = val;
         self
@@ -153,6 +155,7 @@ impl PassportElementErrorFrontSide {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorFrontSideType) -> Self {
         self.r#type = val;
         self
@@ -194,6 +197,7 @@ impl PassportElementErrorReverseSide {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorReverseSideType) -> Self {
         self.r#type = val;
         self
@@ -233,6 +237,7 @@ impl PassportElementErrorSelfie {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorSelfieType) -> Self {
         self.r#type = val;
         self
@@ -273,6 +278,7 @@ impl PassportElementErrorFile {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorFileType) -> Self {
         self.r#type = val;
         self
@@ -313,6 +319,7 @@ impl PassportElementErrorFiles {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorFilesType) -> Self {
         self.r#type = val;
         self
@@ -354,6 +361,7 @@ impl PassportElementErrorTranslationFile {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorTranslationFileType) -> Self {
         self.r#type = val;
         self
@@ -394,6 +402,7 @@ impl PassportElementErrorTranslationFiles {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorTranslationFilesType) -> Self {
         self.r#type = val;
         self
@@ -434,6 +443,7 @@ impl PassportElementErrorUnspecified {
         }
     }
 
+    #[must_use]
     pub fn r#type(mut self, val: PassportElementErrorUnspecifiedType) -> Self {
         self.r#type = val;
         self
diff --git a/src/types/reply_keyboard_markup.rs b/src/types/reply_keyboard_markup.rs
index 05d87ff3..8a80cb7b 100644
--- a/src/types/reply_keyboard_markup.rs
+++ b/src/types/reply_keyboard_markup.rs
@@ -75,6 +75,7 @@ impl KeyboardMarkup {
         self
     }
 
+    #[must_use]
     pub fn append_to_row(mut self, index: usize, button: KeyboardButton) -> Self {
         match self.keyboard.get_mut(index) {
             Some(buttons) => buttons.push(button),
diff --git a/src/types/reply_keyboard_remove.rs b/src/types/reply_keyboard_remove.rs
index 7e8490c7..4f2e85e1 100644
--- a/src/types/reply_keyboard_remove.rs
+++ b/src/types/reply_keyboard_remove.rs
@@ -38,6 +38,7 @@ pub struct KeyboardRemove {
 }
 
 impl KeyboardRemove {
+    #[must_use]
     pub const fn new() -> Self {
         Self {
             remove_keyboard: True,
@@ -45,6 +46,7 @@ impl KeyboardRemove {
         }
     }
 
+    #[must_use]
     pub const fn selective(mut self, val: bool) -> Self {
         self.selective = Some(val);
         self
diff --git a/src/types/reply_markup.rs b/src/types/reply_markup.rs
index 7f9c07a0..d2e179bf 100644
--- a/src/types/reply_markup.rs
+++ b/src/types/reply_markup.rs
@@ -50,6 +50,7 @@ impl ReplyMarkup {
     /// `ReplyMarkup::KeyboardRemove(ReplyKeyboardRemove::new()))`.
     ///
     /// [`KeyboardRemove`]: ReplyMarkup::KeyboardRemove
+    #[must_use]
     pub fn kb_remove() -> Self {
         Self::KeyboardRemove(KeyboardRemove::new())
     }
@@ -59,6 +60,7 @@ impl ReplyMarkup {
     /// This is a shortcut to `ReplyMarkup::ForceReply(ForceReply::new())`.
     ///
     /// [`ForceReply`]: ReplyMarkup::KeyboardRemove
+    #[must_use]
     pub fn force_reply() -> Self {
         Self::ForceReply(ForceReply::new())
     }
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index e48afb4d..3d96af32 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -84,6 +84,7 @@ impl Deref for Sticker {
 
 impl StickerKind {
     /// Returns `true` is this is a "normal" raster sticker.
+    #[must_use]
     pub fn is_webp(&self) -> bool {
         matches!(self, Self::Webp)
     }
@@ -91,6 +92,7 @@ impl StickerKind {
     /// Returns `true` is this is an [animated] sticker.
     ///
     /// [animated]: https://telegram.org/blog/animated-stickers
+    #[must_use]
     pub fn is_animated(&self) -> bool {
         matches!(self, Self::Animated)
     }
@@ -98,6 +100,7 @@ impl StickerKind {
     /// Returns `true` is this is a [video] sticker.
     ///
     /// [video]: https://telegram.org/blog/video-stickers-better-reactions
+    #[must_use]
     pub fn is_video(&self) -> bool {
         matches!(self, Self::Video)
     }
diff --git a/src/types/update.rs b/src/types/update.rs
index 81f35224..05b55133 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -29,6 +29,7 @@ pub struct Update {
 }
 
 impl Update {
+    #[must_use]
     pub fn user(&self) -> Option<&User> {
         match &self.kind {
             UpdateKind::Message(m) => m.from(),
@@ -43,6 +44,7 @@ impl Update {
         }
     }
 
+    #[must_use]
     pub fn chat(&self) -> Option<&Chat> {
         match &self.kind {
             UpdateKind::Message(m) => Some(&m.chat),
diff --git a/src/types/user.rs b/src/types/user.rs
index 7d155464..4d6a2da4 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -40,6 +40,7 @@ pub struct User {
 impl User {
     /// Returns full name of this user, ie first and last names joined with a
     /// space.
+    #[must_use]
     pub fn full_name(&self) -> String {
         match &self.last_name {
             Some(last_name) => (format!("{0} {1}", self.first_name, last_name)),
@@ -49,18 +50,21 @@ impl User {
 
     /// Returns a username mention of this user. Returns `None` if
     /// `self.username.is_none()`.
+    #[must_use]
     pub fn mention(&self) -> Option<String> {
         Some(format!("@{}", self.username.as_ref()?))
     }
 
     /// Returns an URL that links to this user in the form of
     /// `tg://user/?id=<...>`.
+    #[must_use]
     pub fn url(&self) -> reqwest::Url {
         self.id.url()
     }
 
     /// Returns an URL that links to this user in the form of `t.me/<...>`.
     /// Returns `None` if `self.username.is_none()`.
+    #[must_use]
     pub fn tme_url(&self) -> Option<reqwest::Url> {
         Some(
             format!("https://t.me/{}", self.username.as_ref()?)
@@ -71,12 +75,14 @@ impl User {
 
     /// Returns an URL that links to this user in the form of `t.me/<...>` or
     /// `tg://user/?id=<...>`, preferring `t.me` one when possible.
+    #[must_use]
     pub fn preferably_tme_url(&self) -> reqwest::Url {
         self.tme_url().unwrap_or_else(|| self.url())
     }
 
     /// Returns `true` if this is the special user used by telegram bot API to
     /// denote an anonymous user that sends messages on behalf of a group.
+    #[must_use]
     pub fn is_anonymous(&self) -> bool {
         // Sanity check
         debug_assert!(
@@ -92,6 +98,7 @@ impl User {
 
     /// Returns `true` if this is the special user used by telegram bot API to
     /// denote an anonymous user that sends messages on behalf of a channel.
+    #[must_use]
     pub fn is_channel(&self) -> bool {
         // Sanity check
         debug_assert!(
@@ -110,6 +117,7 @@ impl User {
     /// It is sometimes also used as a fallback, for example when a channel post
     /// is automatically forwarded to a group, bots in a group will get a
     /// message where `from` is the Telegram user.
+    #[must_use]
     pub fn is_telegram(&self) -> bool {
         // Sanity check
         debug_assert!(
diff --git a/src/types/user_id.rs b/src/types/user_id.rs
index fe31e573..a767234c 100644
--- a/src/types/user_id.rs
+++ b/src/types/user_id.rs
@@ -11,6 +11,7 @@ pub struct UserId(pub u64);
 impl UserId {
     /// Returns an URL that links to the user with this id in the form of
     /// `tg://user/?id=<...>`.
+    #[must_use]
     pub fn url(self) -> reqwest::Url {
         reqwest::Url::parse(&format!("tg://user/?id={}", self)).unwrap()
     }
@@ -18,6 +19,7 @@ impl UserId {
     /// Returns `true` if this is the id of the special user used by telegram
     /// bot API to denote an anonymous user that sends messages on behalf of
     /// a group.
+    #[must_use]
     pub fn is_anonymous(self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4941-L4943
         const ANON_ID: UserId = UserId(1087968824);
@@ -28,6 +30,7 @@ impl UserId {
     /// Returns `true` if this is the id of the special user used by telegram
     /// bot API to denote an anonymous user that sends messages on behalf of
     /// a channel.
+    #[must_use]
     pub fn is_channel(self) -> bool {
         // https://github.com/tdlib/td/blob/4791fb6a2af0257f6cad8396e10424a79ee5f768/td/telegram/ContactsManager.cpp#L4945-L4947
         const ANON_CHANNEL_ID: UserId = UserId(136817688);
@@ -41,6 +44,7 @@ impl UserId {
     /// It is sometimes also used as a fallback, for example when a channel post
     /// is automatically forwarded to a group, bots in a group will get a
     /// message where `from` is the Telegram user.
+    #[must_use]
     pub fn is_telegram(self) -> bool {
         const TELEGRAM_USER_ID: UserId = UserId(777000);
 

From e26c839d1a9792b45d11af2a73277b9ba348a1ff Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Mon, 15 Aug 2022 20:08:20 +0400
Subject: [PATCH 662/755] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91b7e20b..2f2e9445 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr241]: https://github.com/teloxide/teloxide-core/pull/241
 
+### Changed
+
+- More functions are now marked with `#[must_use]` ([#242][PR242])
+
+[pr242]: https://github.com/teloxide/teloxide-core/pull/242
+
 ## 0.7.0 - 2022-07-19
 
 ### Added

From d30d4f36cd76cc179156275ade1f21cbc960b892 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 15 Aug 2022 20:10:16 +0400
Subject: [PATCH 663/755] Remove useless parentheses

---
 src/types/user.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/user.rs b/src/types/user.rs
index 4d6a2da4..07c14052 100644
--- a/src/types/user.rs
+++ b/src/types/user.rs
@@ -43,7 +43,7 @@ impl User {
     #[must_use]
     pub fn full_name(&self) -> String {
         match &self.last_name {
-            Some(last_name) => (format!("{0} {1}", self.first_name, last_name)),
+            Some(last_name) => format!("{0} {1}", self.first_name, last_name),
             None => self.first_name.clone(),
         }
     }

From d3eb94b69502261e212b0589ccda34bbcac5f4bc Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 19 Aug 2022 06:05:25 +0400
Subject: [PATCH 664/755] Fix `Clone` implementation for `ErasedRequester`

---
 CHANGELOG.md           |  6 ++++++
 src/adaptors/erased.rs | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91b7e20b..cfe9d101 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Fixed
+
+- `ErasedRequester<E>` now implements `Clone` even if `E` is not `Clone` ([#244][pr244])
+
+[pr244]: https://github.com/teloxide/teloxide-core/pull/244
+
 ### Added
 
 - `From<ApiError>`, `From<DownloadError>` and `From<std::io::Error>` impls for `RequestError` ([#241][pr241])
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 4dbae3a8..98dd2c95 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -10,7 +10,6 @@ use crate::{
 };
 
 /// [`Requester`] with erased type.
-#[derive(Clone)]
 pub struct ErasedRequester<'a, E> {
     inner: Arc<dyn ErasableRequester<'a, Err = E> + 'a>,
 }
@@ -37,6 +36,15 @@ impl<E> std::fmt::Debug for ErasedRequester<'_, E> {
     }
 }
 
+// NB. hand-written impl to avoid `E: Clone` bound
+impl<E> Clone for ErasedRequester<'_, E> {
+    fn clone(&self) -> Self {
+        Self {
+            inner: Arc::clone(&self.inner),
+        }
+    }
+}
+
 /// [`Request`] with erased type.
 #[must_use = "Requests are lazy and do nothing unless sent"]
 pub struct ErasedRequest<'a, T, E> {

From 3d6a5ea26f5ca7ad4b23415d6724c27f7c84b304 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 19 Aug 2022 06:21:06 +0400
Subject: [PATCH 665/755] dump version

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6681038..3c7844c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.7.1 - 2022-08-19
+
 ### Fixed
 
 - `ErasedRequester<E>` now implements `Clone` even if `E` is not `Clone` ([#244][pr244])
diff --git a/Cargo.toml b/Cargo.toml
index 37498446..0395ae15 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2018"
 
 license = "MIT"

From 845cd453d65b3b62a694fef5ca16240b8f7d118e Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 15:21:20 +0400
Subject: [PATCH 666/755] Remove `derive(DialogueState)` macro

It was already deprecated and it doesn't seem valuable to keep/refactor
it.
---
 src/dialogue_state.rs | 229 ------------------------------------------
 src/lib.rs            |  13 +--
 2 files changed, 1 insertion(+), 241 deletions(-)
 delete mode 100644 src/dialogue_state.rs

diff --git a/src/dialogue_state.rs b/src/dialogue_state.rs
deleted file mode 100644
index ebb96ad7..00000000
--- a/src/dialogue_state.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-use proc_macro2::{Ident, Span, TokenStream};
-use quote::{format_ident, quote, ToTokens};
-use syn::{
-    parse::{Parse, ParseStream},
-    spanned::Spanned,
-    Fields, FieldsNamed, GenericParam, ItemEnum, Path, Type,
-};
-
-pub fn expand(item: ItemEnum) -> Result<TokenStream, syn::Error> {
-    let enum_ident = &item.ident;
-    let self_params_with_bounds = {
-        let params = &item.generics.params;
-        if !params.is_empty() {
-            quote! { < #params > }
-        } else {
-            quote! {}
-        }
-    };
-    let self_params = {
-        let params = &item.generics.params;
-        if !params.is_empty() {
-            let mut params = quote! { < };
-            item.generics.params.iter().for_each(|param| match param {
-                GenericParam::Type(ty) => {
-                    let ident = &ty.ident;
-                    params.extend(quote! { #ident, });
-                }
-                GenericParam::Lifetime(li) => {
-                    let li = &li.lifetime;
-                    params.extend(quote! { #li, })
-                }
-                GenericParam::Const(_par) => todo!(),
-            });
-            params.extend(quote! { > });
-            params
-        } else {
-            quote! {}
-        }
-    };
-    let where_clause = match item.generics.where_clause.clone() {
-        Some(mut clause) => {
-            let predicate = quote! { Self: Clone + Send + Sync + 'static };
-            clause.predicates.push(syn::parse2(predicate).unwrap());
-            Some(clause)
-        }
-        x => x,
-    };
-    let out = parse_out_type(item.ident.span(), &item.attrs)?;
-
-    let mut branches = quote! {};
-    for variant in item.variants.iter() {
-        let handler = {
-            let handler_attr = variant
-                .attrs
-                .iter()
-                .find(|attr| attr.path.is_ident("handler"))
-                .ok_or_else(|| {
-                    syn::Error::new(
-                        variant.span(),
-                        "Expected `handler` attribute.",
-                    )
-                })?;
-            handler_attr.parse_args::<HandlerAttr>()?
-        };
-
-        branches.extend(match &variant.fields {
-            Fields::Named(fields) => create_branch_multiple_fields_named(
-                enum_ident,
-                &self_params,
-                &variant.ident,
-                &handler.func,
-                fields,
-            ),
-            Fields::Unnamed(fields) => match fields.unnamed.len() {
-                1 => create_branch_one_field(
-                    enum_ident,
-                    &self_params,
-                    &variant.ident,
-                    &handler.func,
-                ),
-                len => create_branch_multiple_fields(
-                    enum_ident,
-                    &self_params,
-                    &variant.ident,
-                    &handler.func,
-                    len,
-                ),
-            },
-            Fields::Unit => create_branch_no_fields(
-                enum_ident,
-                &self_params,
-                &variant.ident,
-                &handler.func,
-            ),
-        });
-    }
-
-    Ok(quote! {const _: () = {
-        fn assert_clone<T: Clone>() {}
-
-        use teloxide::dptree;
-        use teloxide::dispatching::dialogue::Dialogue;
-
-        impl #self_params_with_bounds teloxide::dispatching::HandlerFactory for #enum_ident #self_params #where_clause {
-        type Out = #out;
-
-        fn handler() -> dptree::Handler<'static, dptree::di::DependencyMap, Self::Out,
-            teloxide::dispatching::DpHandlerDescription> {
-            assert_clone::<#enum_ident #self_params>();
-
-            dptree::entry()
-                #branches
-        }
-    }
-    };})
-}
-
-fn create_branch_no_fields(
-    state: &Ident,
-    state_generics: impl ToTokens,
-    kind: &Ident,
-    handler: &Path,
-) -> TokenStream {
-    quote! {
-        .branch(
-            dptree::filter(|state: #state #state_generics| {
-                match state { #state::#kind => true, _ => false }
-            }).endpoint(#handler)
-        )
-    }
-}
-
-fn create_branch_one_field(
-    state: &Ident,
-    state_generics: impl ToTokens,
-    kind: &Ident,
-    handler: &Path,
-) -> TokenStream {
-    quote! {
-        .branch(
-            dptree::filter_map(|state: #state #state_generics| {
-                match state { #state::#kind(arg) => Some(arg), _ => None }
-            }).endpoint(#handler)
-        )
-    }
-}
-
-fn create_branch_multiple_fields(
-    state: &Ident,
-    state_generics: impl ToTokens,
-    kind: &Ident,
-    handler: &Path,
-    fields_count: usize,
-) -> TokenStream {
-    let fields = gen_variant_field_names(fields_count);
-
-    quote! {
-        .branch(
-            dptree::filter_map(|state: #state #state_generics| {
-                match state { #state::#kind(#fields) => Some((#fields)), _ => None }
-            }).endpoint(#handler)
-        )
-    }
-}
-
-fn gen_variant_field_names(len: usize) -> TokenStream {
-    let mut fields = quote! {};
-
-    for i in 0..len {
-        let idx = format_ident!("_{}", i);
-        fields.extend(quote! { #idx, });
-    }
-
-    fields
-}
-
-fn create_branch_multiple_fields_named(
-    state: &Ident,
-    state_generics: impl ToTokens,
-    kind: &Ident,
-    handler: &Path,
-    fields_named: &FieldsNamed,
-) -> TokenStream {
-    let mut fields = quote! {};
-
-    for field in fields_named.named.iter() {
-        let ident =
-            field.ident.as_ref().expect("Named fields must have identifiers");
-        fields.extend(quote! { #ident, });
-    }
-
-    quote! {
-        .branch(
-            dptree::filter_map(|state: #state #state_generics| {
-                match state { #state::#kind { #fields } => Some((#fields)), _ => None }
-            }).endpoint(#handler)
-        )
-    }
-}
-
-fn parse_out_type(
-    span: Span,
-    attrs: &[syn::Attribute],
-) -> Result<Type, syn::Error> {
-    let mut out = None;
-    for x in attrs {
-        if x.path.is_ident("handler_out") {
-            out = Some(x.parse_args::<Type>()?);
-        }
-    }
-    if let Some(out) = out {
-        return Ok(out);
-    }
-    Err(syn::Error::new(
-        span,
-        "You must specify #[handler_out()] argument in which declare output \
-         type of handlers. For example, #[handler_out(Result<(), Error>)]",
-    ))
-}
-
-pub struct HandlerAttr {
-    func: Path,
-}
-
-impl Parse for HandlerAttr {
-    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
-        Ok(Self { func: input.parse::<Path>()? })
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
index 8baeaa34..fc20f3fa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,7 +3,6 @@
 mod attr;
 mod command;
 mod command_enum;
-mod dialogue_state;
 mod fields_parse;
 mod rename_rules;
 
@@ -18,17 +17,7 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Fields, ItemEnum};
-
-#[proc_macro_derive(DialogueState, attributes(handler, handler_out, store))]
-#[deprecated(note = "Use teloxide::handler! instead")]
-pub fn derive_dialogue_state(item: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(item as ItemEnum);
-    match dialogue_state::expand(input) {
-        Ok(s) => s.into(),
-        Err(e) => e.to_compile_error().into(),
-    }
-}
+use syn::{parse_macro_input, DeriveInput, Fields};
 
 macro_rules! get_or_return {
     ($($some:tt)*) => {

From af6e18149f611f47ef1cccd001fb216c18057d80 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 15:32:57 +0400
Subject: [PATCH 667/755] Remove `get_or_return!`, use `?`/`Result` instead

---
 src/lib.rs | 53 +++++++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index fc20f3fa..b1419e38 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,29 +17,21 @@ use crate::{
 };
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, Fields};
-
-macro_rules! get_or_return {
-    ($($some:tt)*) => {
-        match $($some)* {
-            Ok(elem) => elem,
-            Err(e) => return e
-        }
-    }
-}
+use syn::{DeriveInput, Fields};
 
 #[proc_macro_derive(BotCommands, attributes(command))]
-pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(tokens as DeriveInput);
+pub fn bot_commands_derive(tokens: TokenStream) -> TokenStream {
+    bot_commands_impl(tokens).unwrap_or_else(|err| err)
+}
 
-    let data_enum: &syn::DataEnum = get_or_return!(get_enum_data(&input));
+fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, TokenStream> {
+    let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)
+        .map_err(|e| compile_error(e.to_compile_error()))?;
 
-    let enum_attrs: Vec<Attr> = get_or_return!(parse_attributes(&input.attrs));
-
-    let command_enum = match CommandEnum::try_from(enum_attrs.as_slice()) {
-        Ok(command_enum) => command_enum,
-        Err(e) => return compile_error(e),
-    };
+    let data_enum: &syn::DataEnum = get_enum_data(&input)?;
+    let enum_attrs: Vec<Attr> = parse_attributes(&input.attrs)?;
+    let command_enum =
+        CommandEnum::try_from(enum_attrs.as_slice()).map_err(compile_error)?;
 
     let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
 
@@ -47,19 +39,16 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
     for variant in variants.iter() {
         let mut attrs = Vec::new();
         for attr in &variant.attrs {
-            match attr.parse_args::<VecAttrs>() {
-                Ok(mut attrs_) => {
-                    attrs.append(attrs_.data.as_mut());
-                }
-                Err(e) => {
-                    return compile_error(e.to_compile_error());
-                }
-            }
-        }
-        match Command::try_from(attrs.as_slice(), &variant.ident.to_string()) {
-            Ok(command) => variant_infos.push(command),
-            Err(e) => return compile_error(e),
+            let mut attrs_ = attr
+                .parse_args::<VecAttrs>()
+                .map_err(|e| compile_error(e.to_compile_error()))?;
+            attrs.append(attrs_.data.as_mut());
         }
+        let command =
+            Command::try_from(attrs.as_slice(), &variant.ident.to_string())
+                .map_err(compile_error)?;
+
+        variant_infos.push(command);
     }
 
     let mut vec_impl_create = vec![];
@@ -99,7 +88,7 @@ pub fn derive_telegram_command_enum(tokens: TokenStream) -> TokenStream {
         }
     };
 
-    TokenStream::from(trait_impl)
+    Ok(TokenStream::from(trait_impl))
 }
 
 fn impl_commands(

From 3580fd35c51e3c6fa131d94231dbe8b06d699d3c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 15:34:30 +0400
Subject: [PATCH 668/755] Don't use `quote::__private`

---
 src/fields_parse.rs | 8 ++++----
 src/lib.rs          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index eff529c8..bd10063a 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -24,7 +24,7 @@ pub fn impl_parse_args_unnamed(
     data: &FieldsUnnamed,
     variant: impl ToTokens,
     parser_type: &ParserType,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let get_arguments = create_parser(
         parser_type,
         data.unnamed.iter().map(|f| &f.ty),
@@ -48,7 +48,7 @@ pub fn impl_parse_args_named(
     data: &FieldsNamed,
     variant: impl ToTokens,
     parser_type: &ParserType,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let get_arguments = create_parser(
         parser_type,
         data.named.iter().map(|f| &f.ty),
@@ -69,7 +69,7 @@ fn create_parser<'a>(
     parser_type: &ParserType,
     mut types: impl Iterator<Item = &'a Type>,
     count_args: usize,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let function_to_parse = match parser_type {
         ParserType::Default => match count_args {
             1 => {
@@ -104,7 +104,7 @@ fn parser_with_separator<'a>(
     separator: &str,
     types: impl Iterator<Item = &'a Type>,
     count_args: usize,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let inner = quote! { let mut splited = s.split(#separator); };
     let i = 0..count_args;
     let inner2 = quote! {
diff --git a/src/lib.rs b/src/lib.rs
index b1419e38..fb256d9c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -94,7 +94,7 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, TokenStream> {
 fn impl_commands(
     infos: &[Command],
     global: &CommandEnum,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let commands_to_list = infos.iter().filter_map(|command| {
         if command.description == Some("off".into()) {
             None
@@ -115,7 +115,7 @@ fn impl_commands(
 fn impl_descriptions(
     infos: &[Command],
     global: &CommandEnum,
-) -> quote::__private::TokenStream {
+) -> proc_macro2::TokenStream {
     let command_descriptions = infos.iter().filter_map(|c| {
         let (prefix, command) = c.get_matched_value2(global);
         let description = c.description.clone().unwrap_or_default();
@@ -143,8 +143,8 @@ fn impl_descriptions(
 fn impl_parse(
     infos: &[Command],
     global: &CommandEnum,
-    variants_initialization: &[quote::__private::TokenStream],
-) -> quote::__private::TokenStream {
+    variants_initialization: &[proc_macro2::TokenStream],
+) -> proc_macro2::TokenStream {
     let matching_values = infos.iter().map(|c| c.get_matched_value(global));
 
     quote! {

From b16256b8ea3c9c979e7b21eda8464403981fa2f2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 15:55:25 +0400
Subject: [PATCH 669/755] Improve error handling by adding custom `Error` type

---
 src/command.rs      |  9 +++++----
 src/command_enum.rs | 11 +++++++----
 src/error.rs        | 25 +++++++++++++++++++++++++
 src/lib.rs          | 31 +++++++++++--------------------
 4 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 src/error.rs

diff --git a/src/command.rs b/src/command.rs
index 446017e1..15216041 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -3,9 +3,10 @@ use crate::{
     command_enum::CommandEnum,
     fields_parse::ParserType,
     rename_rules::rename_by_rule,
+    Result,
 };
 
-pub struct Command {
+pub(crate) struct Command {
     pub prefix: Option<String>,
     pub description: Option<String>,
     pub parser: Option<ParserType>,
@@ -14,7 +15,7 @@ pub struct Command {
 }
 
 impl Command {
-    pub fn try_from(attrs: &[Attr], name: &str) -> Result<Self, String> {
+    pub fn try_from(attrs: &[Attr], name: &str) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
         let mut new_name = name.to_string();
         let mut renamed = false;
@@ -64,7 +65,7 @@ impl Command {
     }
 }
 
-pub struct CommandAttrs {
+pub(crate) struct CommandAttrs {
     pub(crate) prefix: Option<String>,
     pub(crate) description: Option<String>,
     pub(crate) rename: Option<String>,
@@ -72,7 +73,7 @@ pub struct CommandAttrs {
     pub(crate) separator: Option<String>,
 }
 
-pub fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs, String> {
+pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
     let mut prefix = None;
     let mut description = None;
     let mut rename_rule = None;
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 18b8bf95..46b12a1e 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,7 +1,10 @@
-use crate::{attr::Attr, command::parse_attrs, fields_parse::ParserType};
+use crate::{
+    attr::Attr, command::parse_attrs, error::compile_error,
+    fields_parse::ParserType, Result,
+};
 
 #[derive(Debug)]
-pub struct CommandEnum {
+pub(crate) struct CommandEnum {
     pub prefix: Option<String>,
     pub description: Option<String>,
     pub rename_rule: Option<String>,
@@ -9,7 +12,7 @@ pub struct CommandEnum {
 }
 
 impl CommandEnum {
-    pub fn try_from(attrs: &[Attr]) -> Result<Self, String> {
+    pub fn try_from(attrs: &[Attr]) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
 
         let prefix = attrs.prefix;
@@ -32,7 +35,7 @@ impl CommandEnum {
                 | "SCREAMING_SNAKE_CASE"
                 | "kebab-case"
                 | "SCREAMING-KEBAB-CASE" => {}
-                _ => return Err("disallowed value".to_owned()),
+                _ => return Err(compile_error("disallowed value")),
             }
         }
         Ok(Self {
diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 00000000..950a85d9
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,25 @@
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
+
+pub(crate) type Result<T, E = Error> = std::result::Result<T, E>;
+
+pub(crate) struct Error(TokenStream);
+
+pub(crate) fn compile_error<T>(data: T) -> Error
+where
+    T: ToTokens,
+{
+    Error(TokenStream::from(quote! { compile_error!(#data) }))
+}
+
+impl From<Error> for proc_macro::TokenStream {
+    fn from(Error(e): Error) -> Self {
+        e.into()
+    }
+}
+
+impl From<syn::Error> for Error {
+    fn from(e: syn::Error) -> Self {
+        Self(e.to_compile_error())
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index fb256d9c..a4406f88 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,6 +3,7 @@
 mod attr;
 mod command;
 mod command_enum;
+mod error;
 mod fields_parse;
 mod rename_rules;
 
@@ -16,22 +17,22 @@ use crate::{
     fields_parse::{impl_parse_args_named, impl_parse_args_unnamed},
 };
 use proc_macro::TokenStream;
-use quote::{quote, ToTokens};
+use quote::quote;
 use syn::{DeriveInput, Fields};
 
+pub(crate) use error::{compile_error, Error, Result};
+
 #[proc_macro_derive(BotCommands, attributes(command))]
 pub fn bot_commands_derive(tokens: TokenStream) -> TokenStream {
-    bot_commands_impl(tokens).unwrap_or_else(|err| err)
+    bot_commands_impl(tokens).unwrap_or_else(Error::into)
 }
 
-fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, TokenStream> {
-    let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)
-        .map_err(|e| compile_error(e.to_compile_error()))?;
+fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
+    let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)?;
 
     let data_enum: &syn::DataEnum = get_enum_data(&input)?;
     let enum_attrs: Vec<Attr> = parse_attributes(&input.attrs)?;
-    let command_enum =
-        CommandEnum::try_from(enum_attrs.as_slice()).map_err(compile_error)?;
+    let command_enum = CommandEnum::try_from(enum_attrs.as_slice())?;
 
     let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
 
@@ -45,8 +46,7 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, TokenStream> {
             attrs.append(attrs_.data.as_mut());
         }
         let command =
-            Command::try_from(attrs.as_slice(), &variant.ident.to_string())
-                .map_err(compile_error)?;
+            Command::try_from(attrs.as_slice(), &variant.ident.to_string())?;
 
         variant_infos.push(command);
     }
@@ -176,16 +176,14 @@ fn impl_parse(
     }
 }
 
-fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum, TokenStream> {
+fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
     match &input.data {
         syn::Data::Enum(data) => Ok(data),
         _ => Err(compile_error("TelegramBotCommand allowed only for enums")),
     }
 }
 
-fn parse_attributes(
-    input: &[syn::Attribute],
-) -> Result<Vec<Attr>, TokenStream> {
+fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<Attr>> {
     let mut enum_attrs = Vec::new();
     for attr in input.iter() {
         match attr.parse_args::<VecAttrs>() {
@@ -199,10 +197,3 @@ fn parse_attributes(
     }
     Ok(enum_attrs)
 }
-
-fn compile_error<T>(data: T) -> TokenStream
-where
-    T: ToTokens,
-{
-    TokenStream::from(quote! { compile_error!(#data) })
-}

From 88449531a697ced3bec19c58aeccc0a75106d7e5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 16:00:36 +0400
Subject: [PATCH 670/755] Mark top-level items as `pub(crate)`

this way we'll get better compiler diagnostics (for example it'll warn
against unused fields and such).
---
 src/attr.rs         |  6 +++---
 src/command.rs      | 10 +++++-----
 src/fields_parse.rs |  6 +++---
 src/rename_rules.rs |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/attr.rs b/src/attr.rs
index 949e1659..c15cfb76 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -3,7 +3,7 @@ use syn::{
     LitStr, Token,
 };
 
-pub enum BotCommandAttribute {
+pub(crate) enum BotCommandAttribute {
     Prefix,
     Description,
     RenameRule,
@@ -25,7 +25,7 @@ impl Parse for BotCommandAttribute {
     }
 }
 
-pub struct Attr {
+pub(crate) struct Attr {
     name: BotCommandAttribute,
     value: String,
 }
@@ -50,7 +50,7 @@ impl Attr {
     }
 }
 
-pub struct VecAttrs {
+pub(crate) struct VecAttrs {
     pub data: Vec<Attr>,
 }
 
diff --git a/src/command.rs b/src/command.rs
index 15216041..023e765e 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -66,11 +66,11 @@ impl Command {
 }
 
 pub(crate) struct CommandAttrs {
-    pub(crate) prefix: Option<String>,
-    pub(crate) description: Option<String>,
-    pub(crate) rename: Option<String>,
-    pub(crate) parser: Option<ParserType>,
-    pub(crate) separator: Option<String>,
+    pub prefix: Option<String>,
+    pub description: Option<String>,
+    pub rename: Option<String>,
+    pub parser: Option<ParserType>,
+    pub separator: Option<String>,
 }
 
 pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index bd10063a..d9d52337 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -4,7 +4,7 @@ use quote::{quote, ToTokens};
 use syn::{FieldsNamed, FieldsUnnamed, Type};
 
 #[derive(Debug)]
-pub enum ParserType {
+pub(crate) enum ParserType {
     Default,
     Split { separator: Option<String> },
     Custom(String),
@@ -20,7 +20,7 @@ impl ParserType {
     }
 }
 
-pub fn impl_parse_args_unnamed(
+pub(crate) fn impl_parse_args_unnamed(
     data: &FieldsUnnamed,
     variant: impl ToTokens,
     parser_type: &ParserType,
@@ -44,7 +44,7 @@ pub fn impl_parse_args_unnamed(
     res
 }
 
-pub fn impl_parse_args_named(
+pub(crate) fn impl_parse_args_named(
     data: &FieldsNamed,
     variant: impl ToTokens,
     parser_type: &ParserType,
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index 40bfa9e9..085dd3c9 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -11,7 +11,7 @@ use heck::{
 /// The possible `rule` can be: `lowercase`, `UPPERCASE`, `PascalCase`,
 /// `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`,
 /// `SCREAMING-KEBAB-CASE`. See tests for the details how it will work.
-pub fn rename_by_rule(input: &str, rule: &str) -> String {
+pub(crate) fn rename_by_rule(input: &str, rule: &str) -> String {
     match rule {
         "lowercase" => input.to_lowercase(),
         "UPPERCASE" => input.to_uppercase(),

From ddacee966e6c86160d37e7d9c97c4c9bc545d606 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 17:36:36 +0400
Subject: [PATCH 671/755] Cleanup renaming

(this technically breaks `#[rename = "actual_name"]` but we wanted to
split `rename` VS `rename_rule` anyway, so this is ok)
---
 src/command.rs      |  54 ++++++---------
 src/command_enum.rs |  21 ++----
 src/error.rs        |   1 +
 src/rename_rules.rs | 156 +++++++++++++++++++++++++++++---------------
 4 files changed, 131 insertions(+), 101 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 023e765e..090c9c46 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -2,7 +2,7 @@ use crate::{
     attr::{Attr, BotCommandAttribute},
     command_enum::CommandEnum,
     fields_parse::ParserType,
-    rename_rules::rename_by_rule,
+    rename_rules::RenameRule,
     Result,
 };
 
@@ -11,24 +11,22 @@ pub(crate) struct Command {
     pub description: Option<String>,
     pub parser: Option<ParserType>,
     pub name: String,
-    pub renamed: bool,
 }
 
 impl Command {
     pub fn try_from(attrs: &[Attr], name: &str) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
-        let mut new_name = name.to_string();
-        let mut renamed = false;
+        let CommandAttrs {
+            prefix,
+            description,
+            rename_rule,
+            parser,
+            separator: _,
+        } = attrs;
 
-        let prefix = attrs.prefix;
-        let description = attrs.description;
-        let rename = attrs.rename;
-        let parser = attrs.parser;
-        if let Some(rename_rule) = rename {
-            new_name = rename_by_rule(name, &rename_rule);
-            renamed = true;
-        }
-        Ok(Self { prefix, description, parser, name: new_name, renamed })
+        let name = rename_rule.apply(name);
+
+        Ok(Self { prefix, description, parser, name })
     }
 
     pub fn get_matched_value(&self, global_parameters: &CommandEnum) -> String {
@@ -39,11 +37,8 @@ impl Command {
         } else {
             "/"
         };
-        if let Some(rule) = &global_parameters.rename_rule {
-            String::from(prefix) + &rename_by_rule(&self.name, rule.as_str())
-        } else {
-            String::from(prefix) + &self.name
-        }
+
+        String::from(prefix) + &global_parameters.rename_rule.apply(&self.name)
     }
 
     pub fn get_matched_value2(
@@ -57,18 +52,15 @@ impl Command {
         } else {
             "/"
         };
-        if let Some(rule) = &global_parameters.rename_rule {
-            (String::from(prefix), rename_by_rule(&self.name, rule.as_str()))
-        } else {
-            (String::from(prefix), self.name.clone())
-        }
+
+        (String::from(prefix), global_parameters.rename_rule.apply(&self.name))
     }
 }
 
 pub(crate) struct CommandAttrs {
     pub prefix: Option<String>,
     pub description: Option<String>,
-    pub rename: Option<String>,
+    pub rename_rule: RenameRule,
     pub parser: Option<ParserType>,
     pub separator: Option<String>,
 }
@@ -76,7 +68,7 @@ pub(crate) struct CommandAttrs {
 pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
     let mut prefix = None;
     let mut description = None;
-    let mut rename_rule = None;
+    let mut rename_rule = RenameRule::Identity;
     let mut parser = None;
     let mut separator = None;
 
@@ -86,7 +78,9 @@ pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
             BotCommandAttribute::Description => {
                 description = Some(attr.value())
             }
-            BotCommandAttribute::RenameRule => rename_rule = Some(attr.value()),
+            BotCommandAttribute::RenameRule => {
+                rename_rule = RenameRule::parse(&attr.value())?
+            }
             BotCommandAttribute::CustomParser => {
                 parser = Some(ParserType::parse(&attr.value()))
             }
@@ -94,11 +88,5 @@ pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
         }
     }
 
-    Ok(CommandAttrs {
-        prefix,
-        description,
-        rename: rename_rule,
-        parser,
-        separator,
-    })
+    Ok(CommandAttrs { prefix, description, rename_rule, parser, separator })
 }
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 46b12a1e..271a4ab5 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,13 +1,13 @@
 use crate::{
-    attr::Attr, command::parse_attrs, error::compile_error,
-    fields_parse::ParserType, Result,
+    attr::Attr, command::parse_attrs, fields_parse::ParserType,
+    rename_rules::RenameRule, Result,
 };
 
 #[derive(Debug)]
 pub(crate) struct CommandEnum {
     pub prefix: Option<String>,
     pub description: Option<String>,
-    pub rename_rule: Option<String>,
+    pub rename_rule: RenameRule,
     pub parser_type: ParserType,
 }
 
@@ -17,7 +17,7 @@ impl CommandEnum {
 
         let prefix = attrs.prefix;
         let description = attrs.description;
-        let rename = attrs.rename;
+        let rename = attrs.rename_rule;
         let separator = attrs.separator;
         let mut parser = attrs.parser.unwrap_or(ParserType::Default);
         if let (ParserType::Split { separator }, Some(s)) =
@@ -25,19 +25,6 @@ impl CommandEnum {
         {
             *separator = Some(s.clone())
         }
-        if let Some(rename_rule) = &rename {
-            match rename_rule.as_str() {
-                "lowercase"
-                | "UPPERCASE"
-                | "PascalCase"
-                | "camelCase"
-                | "snake_case"
-                | "SCREAMING_SNAKE_CASE"
-                | "kebab-case"
-                | "SCREAMING-KEBAB-CASE" => {}
-                _ => return Err(compile_error("disallowed value")),
-            }
-        }
         Ok(Self {
             prefix,
             description,
diff --git a/src/error.rs b/src/error.rs
index 950a85d9..60796612 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -3,6 +3,7 @@ use quote::{quote, ToTokens};
 
 pub(crate) type Result<T, E = Error> = std::result::Result<T, E>;
 
+#[derive(Debug)]
 pub(crate) struct Error(TokenStream);
 
 pub(crate) fn compile_error<T>(data: T) -> Error
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index 085dd3c9..7069a011 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -5,23 +5,75 @@ use heck::{
     ToShoutySnakeCase, ToSnakeCase,
 };
 
-/// Apply a renaming rule to an enum variant,
-/// returning the version expected in the source.
-///
-/// The possible `rule` can be: `lowercase`, `UPPERCASE`, `PascalCase`,
-/// `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`,
-/// `SCREAMING-KEBAB-CASE`. See tests for the details how it will work.
-pub(crate) fn rename_by_rule(input: &str, rule: &str) -> String {
-    match rule {
-        "lowercase" => input.to_lowercase(),
-        "UPPERCASE" => input.to_uppercase(),
-        "PascalCase" => input.to_pascal_case(),
-        "camelCase" => input.to_lower_camel_case(),
-        "snake_case" => input.to_snake_case(),
-        "SCREAMING_SNAKE_CASE" => input.to_shouty_snake_case(),
-        "kebab-case" => input.to_kebab_case(),
-        "SCREAMING-KEBAB-CASE" => input.to_shouty_kebab_case(),
-        _ => rule.to_string(),
+use crate::error::{compile_error, Result};
+
+#[derive(Copy, Clone, Debug)]
+pub(crate) enum RenameRule {
+    /// -> `lowercase`
+    LowerCase,
+    /// -> `UPPERCASE`
+    UpperCase,
+    /// -> `PascalCase`
+    PascalCase,
+    /// -> `camelCase`
+    CamelCase,
+    /// -> `snake_case`
+    SnakeCase,
+    /// -> `SCREAMING_SNAKE_CASE`
+    ScreamingSnakeCase,
+    /// -> `kebab-case`
+    KebabCase,
+    /// -> `SCREAMING-KEBAB-CASE`
+    ScreamingKebabCase,
+    /// Leaves input as-is
+    Identity,
+}
+
+impl RenameRule {
+    /// Apply a renaming rule to a string, returning the version expected in the
+    /// source.
+    ///
+    /// See tests for the details how it will work.
+    pub fn apply(self, input: &str) -> String {
+        use RenameRule::*;
+
+        match self {
+            LowerCase => input.to_lowercase(),
+            UpperCase => input.to_uppercase(),
+            PascalCase => input.to_pascal_case(),
+            CamelCase => input.to_lower_camel_case(),
+            SnakeCase => input.to_snake_case(),
+            ScreamingSnakeCase => input.to_shouty_snake_case(),
+            KebabCase => input.to_kebab_case(),
+            ScreamingKebabCase => input.to_shouty_kebab_case(),
+            Identity => input.to_owned(),
+        }
+    }
+
+    pub fn parse(rule: &str) -> Result<Self> {
+        use RenameRule::*;
+
+        let rule = match rule {
+            "lowercase" => LowerCase,
+            "UPPERCASE" => UpperCase,
+            "PascalCase" => PascalCase,
+            "camelCase" => CamelCase,
+            "snake_case" => SnakeCase,
+            "SCREAMING_SNAKE_CASE" => ScreamingSnakeCase,
+            "kebab-case" => KebabCase,
+            "SCREAMING-KEBAB-CASE" => ScreamingKebabCase,
+            "identity" => Identity,
+            invalid => {
+                return Err(compile_error(format!(
+                    "invalid rename rule `{invalid}` (supported rules: \
+                     `lowercase`, `UPPERCASE`, `PascalCase`, `camelCase`, \
+                     `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`, \
+                     `SCREAMING-KEBAB-CASE` and `identity`)"
+                )))
+            }
+        };
+
+        Ok(rule)
     }
 }
 
@@ -30,8 +82,10 @@ mod tests {
     use super::*;
 
     macro_rules! test_eq {
-        ($lval:expr, $rval:expr) => {
-            assert_eq!(rename_by_rule($lval, TYPE), $rval);
+        ($lval:expr => $rval:expr) => {
+            let rule = RenameRule::parse(TYPE).unwrap();
+
+            assert_eq!(rule.apply($lval), $rval);
         };
     }
 
@@ -39,79 +93,79 @@ mod tests {
     fn test_lowercase() {
         const TYPE: &str = "lowercase";
 
-        test_eq!("HelloWorld", "helloworld");
-        test_eq!("Hello_World", "hello_world");
-        test_eq!("Hello-World", "hello-world");
-        test_eq!("helloWorld", "helloworld");
+        test_eq!("HelloWorld" => "helloworld");
+        test_eq!("Hello_World" => "hello_world");
+        test_eq!("Hello-World" => "hello-world");
+        test_eq!("helloWorld" => "helloworld");
     }
 
     #[test]
     fn test_uppercase() {
         const TYPE: &str = "UPPERCASE";
 
-        test_eq!("HelloWorld", "HELLOWORLD");
-        test_eq!("Hello_World", "HELLO_WORLD");
-        test_eq!("Hello-World", "HELLO-WORLD");
-        test_eq!("helloWorld", "HELLOWORLD");
+        test_eq!("HelloWorld" => "HELLOWORLD");
+        test_eq!("Hello_World" => "HELLO_WORLD");
+        test_eq!("Hello-World" => "HELLO-WORLD");
+        test_eq!("helloWorld" => "HELLOWORLD");
     }
 
     #[test]
     fn test_pascalcase() {
         const TYPE: &str = "PascalCase";
 
-        test_eq!("HelloWorld", "HelloWorld");
-        test_eq!("Hello_World", "HelloWorld");
-        test_eq!("Hello-World", "HelloWorld");
-        test_eq!("helloWorld", "HelloWorld");
+        test_eq!("HelloWorld" => "HelloWorld");
+        test_eq!("Hello_World" => "HelloWorld");
+        test_eq!("Hello-World" => "HelloWorld");
+        test_eq!("helloWorld" => "HelloWorld");
     }
 
     #[test]
     fn test_camelcase() {
         const TYPE: &str = "camelCase";
 
-        test_eq!("HelloWorld", "helloWorld");
-        test_eq!("Hello_World", "helloWorld");
-        test_eq!("Hello-World", "helloWorld");
-        test_eq!("helloWorld", "helloWorld");
+        test_eq!("HelloWorld" => "helloWorld");
+        test_eq!("Hello_World" => "helloWorld");
+        test_eq!("Hello-World" => "helloWorld");
+        test_eq!("helloWorld" => "helloWorld");
     }
 
     #[test]
     fn test_snakecase() {
         const TYPE: &str = "snake_case";
 
-        test_eq!("HelloWorld", "hello_world");
-        test_eq!("Hello_World", "hello_world");
-        test_eq!("Hello-World", "hello_world");
-        test_eq!("helloWorld", "hello_world");
+        test_eq!("HelloWorld" => "hello_world");
+        test_eq!("Hello_World" => "hello_world");
+        test_eq!("Hello-World" => "hello_world");
+        test_eq!("helloWorld" => "hello_world");
     }
 
     #[test]
     fn test_screaming_snakecase() {
         const TYPE: &str = "SCREAMING_SNAKE_CASE";
 
-        test_eq!("HelloWorld", "HELLO_WORLD");
-        test_eq!("Hello_World", "HELLO_WORLD");
-        test_eq!("Hello-World", "HELLO_WORLD");
-        test_eq!("helloWorld", "HELLO_WORLD");
+        test_eq!("HelloWorld" => "HELLO_WORLD");
+        test_eq!("Hello_World" => "HELLO_WORLD");
+        test_eq!("Hello-World" => "HELLO_WORLD");
+        test_eq!("helloWorld" => "HELLO_WORLD");
     }
 
     #[test]
     fn test_kebabcase() {
         const TYPE: &str = "kebab-case";
 
-        test_eq!("HelloWorld", "hello-world");
-        test_eq!("Hello_World", "hello-world");
-        test_eq!("Hello-World", "hello-world");
-        test_eq!("helloWorld", "hello-world");
+        test_eq!("HelloWorld" => "hello-world");
+        test_eq!("Hello_World" => "hello-world");
+        test_eq!("Hello-World" => "hello-world");
+        test_eq!("helloWorld" => "hello-world");
     }
 
     #[test]
     fn test_screaming_kebabcase() {
         const TYPE: &str = "SCREAMING-KEBAB-CASE";
 
-        test_eq!("HelloWorld", "HELLO-WORLD");
-        test_eq!("Hello_World", "HELLO-WORLD");
-        test_eq!("Hello-World", "HELLO-WORLD");
-        test_eq!("helloWorld", "HELLO-WORLD");
+        test_eq!("HelloWorld" => "HELLO-WORLD");
+        test_eq!("Hello_World" => "HELLO-WORLD");
+        test_eq!("Hello-World" => "HELLO-WORLD");
+        test_eq!("helloWorld" => "HELLO-WORLD");
     }
 }

From 66ad49ab7cfa93089b5432c8cdaf2525ab061e51 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 18:18:44 +0400
Subject: [PATCH 672/755] Clean up attribute handling a bit

---
 src/attr.rs         | 72 ++++++++++++++++++++++-----------------------
 src/command.rs      | 26 +++++++---------
 src/command_enum.rs |  4 +--
 src/lib.rs          | 18 ++++++------
 4 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/src/attr.rs b/src/attr.rs
index c15cfb76..953c819c 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -1,38 +1,47 @@
 use syn::{
     parse::{Parse, ParseStream},
+    punctuated::Punctuated,
     LitStr, Token,
 };
 
-pub(crate) enum BotCommandAttribute {
+pub(crate) enum CommandAttrName {
     Prefix,
     Description,
-    RenameRule,
-    CustomParser,
+    Rename,
+    ParseWith,
     Separator,
 }
 
-impl Parse for BotCommandAttribute {
-    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
+impl Parse for CommandAttrName {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
         let name_arg: syn::Ident = input.parse()?;
+
         match name_arg.to_string().as_str() {
-            "prefix" => Ok(BotCommandAttribute::Prefix),
-            "description" => Ok(BotCommandAttribute::Description),
-            "rename" => Ok(BotCommandAttribute::RenameRule),
-            "parse_with" => Ok(BotCommandAttribute::CustomParser),
-            "separator" => Ok(BotCommandAttribute::Separator),
-            _ => Err(syn::Error::new(name_arg.span(), "unexpected argument")),
+            "prefix" => Ok(CommandAttrName::Prefix),
+            "description" => Ok(CommandAttrName::Description),
+            "rename" => Ok(CommandAttrName::Rename),
+            "parse_with" => Ok(CommandAttrName::ParseWith),
+            "separator" => Ok(CommandAttrName::Separator),
+            _ => Err(syn::Error::new(
+                name_arg.span(),
+                "unexpected attribute name (expected one of `prefix`, \
+                 `description`, `rename`, `parse_with`, `separator`",
+            )),
         }
     }
 }
 
-pub(crate) struct Attr {
-    name: BotCommandAttribute,
-    value: String,
+pub(crate) struct CommandAttr {
+    pub name: CommandAttrName,
+    pub value: String,
 }
 
-impl Parse for Attr {
-    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
-        let name = input.parse::<BotCommandAttribute>()?;
+impl Parse for CommandAttr {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let name = input.parse::<CommandAttrName>()?;
+
+        // FIXME: this should support value-less attrs, as well as
+        //        non-string-literal values
         input.parse::<Token![=]>()?;
         let value = input.parse::<LitStr>()?.value();
 
@@ -40,29 +49,20 @@ impl Parse for Attr {
     }
 }
 
-impl Attr {
-    pub fn name(&self) -> &BotCommandAttribute {
-        &self.name
-    }
+pub(crate) struct CommandAttrs(Punctuated<CommandAttr, Token![,]>);
 
-    pub fn value(&self) -> String {
-        self.value.clone()
+impl Parse for CommandAttrs {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        input.parse_terminated(CommandAttr::parse).map(Self)
     }
 }
 
-pub(crate) struct VecAttrs {
-    pub data: Vec<Attr>,
-}
+impl IntoIterator for CommandAttrs {
+    type Item = CommandAttr;
 
-impl Parse for VecAttrs {
-    fn parse(input: ParseStream) -> Result<Self, syn::Error> {
-        let mut data = vec![];
-        while !input.is_empty() {
-            data.push(input.parse()?);
-            if !input.is_empty() {
-                input.parse::<Token![,]>()?;
-            }
-        }
-        Ok(Self { data })
+    type IntoIter = syn::punctuated::IntoIter<CommandAttr>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
     }
 }
diff --git a/src/command.rs b/src/command.rs
index 090c9c46..b830c7c5 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr::{Attr, BotCommandAttribute},
+    attr::{CommandAttr, CommandAttrName},
     command_enum::CommandEnum,
     fields_parse::ParserType,
     rename_rules::RenameRule,
@@ -14,7 +14,7 @@ pub(crate) struct Command {
 }
 
 impl Command {
-    pub fn try_from(attrs: &[Attr], name: &str) -> Result<Self> {
+    pub fn try_from(attrs: &[CommandAttr], name: &str) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
         let CommandAttrs {
             prefix,
@@ -65,26 +65,22 @@ pub(crate) struct CommandAttrs {
     pub separator: Option<String>,
 }
 
-pub(crate) fn parse_attrs(attrs: &[Attr]) -> Result<CommandAttrs> {
+pub(crate) fn parse_attrs(attrs: &[CommandAttr]) -> Result<CommandAttrs> {
     let mut prefix = None;
     let mut description = None;
     let mut rename_rule = RenameRule::Identity;
     let mut parser = None;
     let mut separator = None;
 
-    for attr in attrs {
-        match attr.name() {
-            BotCommandAttribute::Prefix => prefix = Some(attr.value()),
-            BotCommandAttribute::Description => {
-                description = Some(attr.value())
+    for CommandAttr { name, value } in attrs {
+        match name {
+            CommandAttrName::Prefix => prefix = Some(value.clone()),
+            CommandAttrName::Description => description = Some(value.clone()),
+            CommandAttrName::Rename => rename_rule = RenameRule::parse(value)?,
+            CommandAttrName::ParseWith => {
+                parser = Some(ParserType::parse(value))
             }
-            BotCommandAttribute::RenameRule => {
-                rename_rule = RenameRule::parse(&attr.value())?
-            }
-            BotCommandAttribute::CustomParser => {
-                parser = Some(ParserType::parse(&attr.value()))
-            }
-            BotCommandAttribute::Separator => separator = Some(attr.value()),
+            CommandAttrName::Separator => separator = Some(value.clone()),
         }
     }
 
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 271a4ab5..c3248d6a 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr::Attr, command::parse_attrs, fields_parse::ParserType,
+    attr::CommandAttr, command::parse_attrs, fields_parse::ParserType,
     rename_rules::RenameRule, Result,
 };
 
@@ -12,7 +12,7 @@ pub(crate) struct CommandEnum {
 }
 
 impl CommandEnum {
-    pub fn try_from(attrs: &[Attr]) -> Result<Self> {
+    pub fn try_from(attrs: &[CommandAttr]) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
 
         let prefix = attrs.prefix;
diff --git a/src/lib.rs b/src/lib.rs
index a4406f88..8fd93007 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,7 @@ extern crate proc_macro;
 extern crate quote;
 extern crate syn;
 use crate::{
-    attr::{Attr, VecAttrs},
+    attr::{CommandAttr, CommandAttrs},
     command::Command,
     command_enum::CommandEnum,
     fields_parse::{impl_parse_args_named, impl_parse_args_unnamed},
@@ -31,7 +31,7 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
     let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)?;
 
     let data_enum: &syn::DataEnum = get_enum_data(&input)?;
-    let enum_attrs: Vec<Attr> = parse_attributes(&input.attrs)?;
+    let enum_attrs: Vec<CommandAttr> = parse_attributes(&input.attrs)?;
     let command_enum = CommandEnum::try_from(enum_attrs.as_slice())?;
 
     let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
@@ -40,10 +40,10 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
     for variant in variants.iter() {
         let mut attrs = Vec::new();
         for attr in &variant.attrs {
-            let mut attrs_ = attr
-                .parse_args::<VecAttrs>()
+            let attrs_ = attr
+                .parse_args::<CommandAttrs>()
                 .map_err(|e| compile_error(e.to_compile_error()))?;
-            attrs.append(attrs_.data.as_mut());
+            attrs.extend(attrs_);
         }
         let command =
             Command::try_from(attrs.as_slice(), &variant.ident.to_string())?;
@@ -183,12 +183,12 @@ fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
     }
 }
 
-fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<Attr>> {
+fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<CommandAttr>> {
     let mut enum_attrs = Vec::new();
     for attr in input.iter() {
-        match attr.parse_args::<VecAttrs>() {
-            Ok(mut attrs_) => {
-                enum_attrs.append(attrs_.data.as_mut());
+        match attr.parse_args::<CommandAttrs>() {
+            Ok(attrs) => {
+                enum_attrs.extend(attrs);
             }
             Err(e) => {
                 return Err(compile_error(e.to_compile_error()));

From 59b8aa21b5280d2cb8be17756b9565398d72db71 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 18:22:31 +0400
Subject: [PATCH 673/755] fix typos & such

---
 src/lib.rs          | 14 +++++++-------
 src/rename_rules.rs |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8fd93007..e7b8ae12 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -54,22 +54,22 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
     let mut vec_impl_create = vec![];
     for (variant, info) in variants.iter().zip(variant_infos.iter()) {
         let var = &variant.ident;
-        let variantt = quote! { Self::#var };
+        let variant_ = quote! { Self::#var };
         match &variant.fields {
             Fields::Unnamed(fields) => {
                 let parser =
                     info.parser.as_ref().unwrap_or(&command_enum.parser_type);
                 vec_impl_create
-                    .push(impl_parse_args_unnamed(fields, variantt, parser));
+                    .push(impl_parse_args_unnamed(fields, variant_, parser));
             }
             Fields::Unit => {
-                vec_impl_create.push(variantt);
+                vec_impl_create.push(variant_);
             }
             Fields::Named(named) => {
                 let parser =
                     info.parser.as_ref().unwrap_or(&command_enum.parser_type);
                 vec_impl_create
-                    .push(impl_parse_args_named(named, variantt, parser));
+                    .push(impl_parse_args_named(named, variant_, parser));
             }
         }
     }
@@ -156,9 +156,9 @@ fn impl_parse(
               use teloxide::utils::command::ParseError;
 
               let mut words = s.splitn(2, ' ');
-              let mut splited = words.next().expect("First item will be always.").split('@');
-              let command_raw = splited.next().expect("First item will be always.");
-              let bot = splited.next();
+              let mut splitted = words.next().expect("First item will be always.").split('@');
+              let command_raw = splitted.next().expect("First item will be always.");
+              let bot = splitted.next();
               let bot_name = bot_name.into();
               match bot {
                   Some(name) if name.eq_ignore_ascii_case(&bot_name) => {}
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index 7069a011..159724a1 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -82,10 +82,10 @@ mod tests {
     use super::*;
 
     macro_rules! test_eq {
-        ($lval:expr => $rval:expr) => {
+        ($input:expr => $output:expr) => {
             let rule = RenameRule::parse(TYPE).unwrap();
 
-            assert_eq!(rule.apply($lval), $rval);
+            assert_eq!(rule.apply($input), $output);
         };
     }
 

From cfe75ae8441a8989df53d43bb5b545c13a273cd5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 22 Aug 2022 18:59:25 +0400
Subject: [PATCH 674/755] Refactor attributes some more

---
 src/attr.rs         | 44 +++++++++++++++++++++++++++++++++--------
 src/command.rs      | 16 +++++++--------
 src/command_enum.rs |  4 ++--
 src/lib.rs          | 48 +++++++++++++--------------------------------
 4 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/src/attr.rs b/src/attr.rs
index 953c819c..765cff7c 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -1,9 +1,10 @@
 use syn::{
-    parse::{Parse, ParseStream},
-    punctuated::Punctuated,
-    LitStr, Token,
+    parse::{Parse, ParseBuffer, ParseStream},
+    Attribute, LitStr, Token,
 };
 
+use crate::Result;
+
 pub(crate) enum CommandAttrName {
     Prefix,
     Description,
@@ -49,20 +50,47 @@ impl Parse for CommandAttr {
     }
 }
 
-pub(crate) struct CommandAttrs(Punctuated<CommandAttr, Token![,]>);
+pub(crate) struct CommandAttrs(Vec<CommandAttr>);
 
-impl Parse for CommandAttrs {
-    fn parse(input: ParseStream) -> syn::Result<Self> {
-        input.parse_terminated(CommandAttr::parse).map(Self)
+impl CommandAttrs {
+    pub fn from_attributes(attributes: &[Attribute]) -> Result<Self> {
+        let mut attrs = Vec::new();
+
+        for attribute in attributes.iter().filter(is_command_attribute) {
+            let attrs_ = attribute.parse_args_with(|input: &ParseBuffer| {
+                input.parse_terminated::<_, Token![,]>(CommandAttr::parse)
+            })?;
+
+            attrs.extend(attrs_);
+        }
+
+        Ok(Self(attrs))
+    }
+}
+
+impl<'a> IntoIterator for &'a CommandAttrs {
+    type Item = &'a CommandAttr;
+
+    type IntoIter = std::slice::Iter<'a, CommandAttr>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.iter()
     }
 }
 
 impl IntoIterator for CommandAttrs {
     type Item = CommandAttr;
 
-    type IntoIter = syn::punctuated::IntoIter<CommandAttr>;
+    type IntoIter = std::vec::IntoIter<CommandAttr>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.0.into_iter()
     }
 }
+
+fn is_command_attribute(a: &&Attribute) -> bool {
+    match a.path.get_ident() {
+        Some(ident) => ident == "command",
+        _ => false,
+    }
+}
diff --git a/src/command.rs b/src/command.rs
index b830c7c5..0c6dd064 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr::{CommandAttr, CommandAttrName},
+    attr::{self, CommandAttr, CommandAttrName},
     command_enum::CommandEnum,
     fields_parse::ParserType,
     rename_rules::RenameRule,
@@ -14,7 +14,7 @@ pub(crate) struct Command {
 }
 
 impl Command {
-    pub fn try_from(attrs: &[CommandAttr], name: &str) -> Result<Self> {
+    pub fn try_from(attrs: attr::CommandAttrs, name: &str) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
         let CommandAttrs {
             prefix,
@@ -65,7 +65,7 @@ pub(crate) struct CommandAttrs {
     pub separator: Option<String>,
 }
 
-pub(crate) fn parse_attrs(attrs: &[CommandAttr]) -> Result<CommandAttrs> {
+pub(crate) fn parse_attrs(attrs: attr::CommandAttrs) -> Result<CommandAttrs> {
     let mut prefix = None;
     let mut description = None;
     let mut rename_rule = RenameRule::Identity;
@@ -74,13 +74,13 @@ pub(crate) fn parse_attrs(attrs: &[CommandAttr]) -> Result<CommandAttrs> {
 
     for CommandAttr { name, value } in attrs {
         match name {
-            CommandAttrName::Prefix => prefix = Some(value.clone()),
-            CommandAttrName::Description => description = Some(value.clone()),
-            CommandAttrName::Rename => rename_rule = RenameRule::parse(value)?,
+            CommandAttrName::Prefix => prefix = Some(value),
+            CommandAttrName::Description => description = Some(value),
+            CommandAttrName::Rename => rename_rule = RenameRule::parse(&value)?,
             CommandAttrName::ParseWith => {
-                parser = Some(ParserType::parse(value))
+                parser = Some(ParserType::parse(&value))
             }
-            CommandAttrName::Separator => separator = Some(value.clone()),
+            CommandAttrName::Separator => separator = Some(value),
         }
     }
 
diff --git a/src/command_enum.rs b/src/command_enum.rs
index c3248d6a..14aa0381 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr::CommandAttr, command::parse_attrs, fields_parse::ParserType,
+    attr, command::parse_attrs, fields_parse::ParserType,
     rename_rules::RenameRule, Result,
 };
 
@@ -12,7 +12,7 @@ pub(crate) struct CommandEnum {
 }
 
 impl CommandEnum {
-    pub fn try_from(attrs: &[CommandAttr]) -> Result<Self> {
+    pub fn try_from(attrs: attr::CommandAttrs) -> Result<Self> {
         let attrs = parse_attrs(attrs)?;
 
         let prefix = attrs.prefix;
diff --git a/src/lib.rs b/src/lib.rs
index e7b8ae12..9a870d0d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,7 @@ extern crate proc_macro;
 extern crate quote;
 extern crate syn;
 use crate::{
-    attr::{CommandAttr, CommandAttrs},
+    attr::CommandAttrs,
     command::Command,
     command_enum::CommandEnum,
     fields_parse::{impl_parse_args_named, impl_parse_args_unnamed},
@@ -31,28 +31,23 @@ fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
     let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)?;
 
     let data_enum: &syn::DataEnum = get_enum_data(&input)?;
-    let enum_attrs: Vec<CommandAttr> = parse_attributes(&input.attrs)?;
-    let command_enum = CommandEnum::try_from(enum_attrs.as_slice())?;
+    let enum_attrs = CommandAttrs::from_attributes(&input.attrs)?;
+    let command_enum = CommandEnum::try_from(enum_attrs)?;
 
-    let variants: Vec<&syn::Variant> = data_enum.variants.iter().collect();
+    let variant_infos = data_enum
+        .variants
+        .iter()
+        .map(|variant| {
+            let attrs = CommandAttrs::from_attributes(&variant.attrs)?;
+            let command = Command::try_from(attrs, &variant.ident.to_string())?;
 
-    let mut variant_infos = vec![];
-    for variant in variants.iter() {
-        let mut attrs = Vec::new();
-        for attr in &variant.attrs {
-            let attrs_ = attr
-                .parse_args::<CommandAttrs>()
-                .map_err(|e| compile_error(e.to_compile_error()))?;
-            attrs.extend(attrs_);
-        }
-        let command =
-            Command::try_from(attrs.as_slice(), &variant.ident.to_string())?;
-
-        variant_infos.push(command);
-    }
+            Ok(command)
+        })
+        .collect::<Result<Vec<_>, Error>>()?;
 
     let mut vec_impl_create = vec![];
-    for (variant, info) in variants.iter().zip(variant_infos.iter()) {
+
+    for (variant, info) in data_enum.variants.iter().zip(variant_infos.iter()) {
         let var = &variant.ident;
         let variant_ = quote! { Self::#var };
         match &variant.fields {
@@ -182,18 +177,3 @@ fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
         _ => Err(compile_error("TelegramBotCommand allowed only for enums")),
     }
 }
-
-fn parse_attributes(input: &[syn::Attribute]) -> Result<Vec<CommandAttr>> {
-    let mut enum_attrs = Vec::new();
-    for attr in input.iter() {
-        match attr.parse_args::<CommandAttrs>() {
-            Ok(attrs) => {
-                enum_attrs.extend(attrs);
-            }
-            Err(e) => {
-                return Err(compile_error(e.to_compile_error()));
-            }
-        }
-    }
-    Ok(enum_attrs)
-}

From f03264e694c01984969688f54364321d0d6c6e2d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 23 Aug 2022 20:37:23 +0400
Subject: [PATCH 675/755] Iterator ftw

---
 src/command.rs      |  4 +++
 src/fields_parse.rs | 24 ++++++++++---
 src/lib.rs          | 88 +++++++++++++++++++--------------------------
 src/unzip.rs        | 20 +++++++++++
 4 files changed, 80 insertions(+), 56 deletions(-)
 create mode 100644 src/unzip.rs

diff --git a/src/command.rs b/src/command.rs
index 0c6dd064..b06038f1 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -55,6 +55,10 @@ impl Command {
 
         (String::from(prefix), global_parameters.rename_rule.apply(&self.name))
     }
+
+    pub(crate) fn description_is_enabled(&self) -> bool {
+        self.description != Some("off".to_owned())
+    }
 }
 
 pub(crate) struct CommandAttrs {
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index d9d52337..19b518a6 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,7 +1,7 @@
 extern crate quote;
 
-use quote::{quote, ToTokens};
-use syn::{FieldsNamed, FieldsUnnamed, Type};
+use quote::quote;
+use syn::{Fields, FieldsNamed, FieldsUnnamed, Type};
 
 #[derive(Debug)]
 pub(crate) enum ParserType {
@@ -20,9 +20,25 @@ impl ParserType {
     }
 }
 
+pub(crate) fn impl_parse_args(
+    fields: &Fields,
+    self_variant: proc_macro2::TokenStream,
+    parser: &ParserType,
+) -> proc_macro2::TokenStream {
+    match fields {
+        Fields::Unit => self_variant,
+        Fields::Unnamed(fields) => {
+            impl_parse_args_unnamed(fields, self_variant, parser)
+        }
+        Fields::Named(named) => {
+            impl_parse_args_named(named, self_variant, parser)
+        }
+    }
+}
+
 pub(crate) fn impl_parse_args_unnamed(
     data: &FieldsUnnamed,
-    variant: impl ToTokens,
+    variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
     let get_arguments = create_parser(
@@ -46,7 +62,7 @@ pub(crate) fn impl_parse_args_unnamed(
 
 pub(crate) fn impl_parse_args_named(
     data: &FieldsNamed,
-    variant: impl ToTokens,
+    variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
     let get_arguments = create_parser(
diff --git a/src/lib.rs b/src/lib.rs
index 9a870d0d..eba47a57 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,19 +6,18 @@ mod command_enum;
 mod error;
 mod fields_parse;
 mod rename_rules;
+mod unzip;
 
 extern crate proc_macro;
 extern crate quote;
 extern crate syn;
 use crate::{
-    attr::CommandAttrs,
-    command::Command,
-    command_enum::CommandEnum,
-    fields_parse::{impl_parse_args_named, impl_parse_args_unnamed},
+    attr::CommandAttrs, command::Command, command_enum::CommandEnum,
+    fields_parse::impl_parse_args, unzip::Unzip,
 };
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{DeriveInput, Fields};
+use syn::DeriveInput;
 
 pub(crate) use error::{compile_error, Error, Result};
 
@@ -30,53 +29,35 @@ pub fn bot_commands_derive(tokens: TokenStream) -> TokenStream {
 fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
     let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)?;
 
-    let data_enum: &syn::DataEnum = get_enum_data(&input)?;
+    let data_enum = get_enum_data(&input)?;
     let enum_attrs = CommandAttrs::from_attributes(&input.attrs)?;
     let command_enum = CommandEnum::try_from(enum_attrs)?;
 
-    let variant_infos = data_enum
+    let Unzip(var_init, var_info) = data_enum
         .variants
         .iter()
         .map(|variant| {
             let attrs = CommandAttrs::from_attributes(&variant.attrs)?;
             let command = Command::try_from(attrs, &variant.ident.to_string())?;
 
-            Ok(command)
+            let variant_name = &variant.ident;
+            let self_variant = quote! { Self::#variant_name };
+
+            let parser =
+                command.parser.as_ref().unwrap_or(&command_enum.parser_type);
+            let parse = impl_parse_args(&variant.fields, self_variant, parser);
+
+            Ok((parse, command))
         })
-        .collect::<Result<Vec<_>, Error>>()?;
+        .collect::<Result<Unzip<Vec<_>, Vec<_>>, Error>>()?;
 
-    let mut vec_impl_create = vec![];
-
-    for (variant, info) in data_enum.variants.iter().zip(variant_infos.iter()) {
-        let var = &variant.ident;
-        let variant_ = quote! { Self::#var };
-        match &variant.fields {
-            Fields::Unnamed(fields) => {
-                let parser =
-                    info.parser.as_ref().unwrap_or(&command_enum.parser_type);
-                vec_impl_create
-                    .push(impl_parse_args_unnamed(fields, variant_, parser));
-            }
-            Fields::Unit => {
-                vec_impl_create.push(variant_);
-            }
-            Fields::Named(named) => {
-                let parser =
-                    info.parser.as_ref().unwrap_or(&command_enum.parser_type);
-                vec_impl_create
-                    .push(impl_parse_args_named(named, variant_, parser));
-            }
-        }
-    }
-
-    let ident = &input.ident;
-
-    let fn_descriptions = impl_descriptions(&variant_infos, &command_enum);
-    let fn_parse = impl_parse(&variant_infos, &command_enum, &vec_impl_create);
-    let fn_commands = impl_commands(&variant_infos, &command_enum);
+    let type_name = &input.ident;
+    let fn_descriptions = impl_descriptions(&var_info, &command_enum);
+    let fn_parse = impl_parse(&var_info, &command_enum, &var_init);
+    let fn_commands = impl_commands(&var_info, &command_enum);
 
     let trait_impl = quote! {
-        impl BotCommands for #ident {
+        impl BotCommands for #type_name {
             #fn_descriptions
             #fn_parse
             #fn_commands
@@ -90,19 +71,19 @@ fn impl_commands(
     infos: &[Command],
     global: &CommandEnum,
 ) -> proc_macro2::TokenStream {
-    let commands_to_list = infos.iter().filter_map(|command| {
-        if command.description == Some("off".into()) {
-            None
-        } else {
+    let commands = infos
+        .iter()
+        .filter(|command| command.description_is_enabled())
+        .map(|command| {
             let c = command.get_matched_value(global);
             let d = command.description.as_deref().unwrap_or_default();
-            Some(quote! { BotCommand::new(#c,#d) })
-        }
-    });
+            quote! { BotCommand::new(#c,#d) }
+        });
+
     quote! {
         fn bot_commands() -> Vec<teloxide::types::BotCommand> {
             use teloxide::types::BotCommand;
-            vec![#(#commands_to_list),*]
+            vec![#(#commands),*]
         }
     }
 }
@@ -111,11 +92,14 @@ fn impl_descriptions(
     infos: &[Command],
     global: &CommandEnum,
 ) -> proc_macro2::TokenStream {
-    let command_descriptions = infos.iter().filter_map(|c| {
-        let (prefix, command) = c.get_matched_value2(global);
-        let description = c.description.clone().unwrap_or_default();
-        (description != "off").then(|| quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } })
-    });
+    let command_descriptions = infos
+        .iter()
+        .filter(|command| command.description_is_enabled())
+        .map(|c| {
+            let (prefix, command) = c.get_matched_value2(global);
+            let description = c.description.clone().unwrap_or_default();
+            quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } }
+        });
 
     let global_description = match global.description.as_deref() {
         Some(gd) => quote! { .global_description(#gd) },
diff --git a/src/unzip.rs b/src/unzip.rs
new file mode 100644
index 00000000..372ad2e2
--- /dev/null
+++ b/src/unzip.rs
@@ -0,0 +1,20 @@
+use std::iter::FromIterator;
+
+pub(crate) struct Unzip<A, B>(pub A, pub B);
+
+impl<A, B, T, U> FromIterator<(T, U)> for Unzip<A, B>
+where
+    A: Default + Extend<T>,
+    B: Default + Extend<U>,
+{
+    fn from_iter<I: IntoIterator<Item = (T, U)>>(iter: I) -> Self {
+        let (mut a, mut b): (A, B) = Default::default();
+
+        for (t, u) in iter {
+            a.extend([t]);
+            b.extend([u]);
+        }
+
+        Unzip(a, b)
+    }
+}

From f13e3b6e4a07af9822149c0b3f581c4cd0c679cf Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 25 Aug 2022 17:01:03 +0400
Subject: [PATCH 676/755] refactor generated code

---
 src/fields_parse.rs | 100 +++++++++++++++++++++++++-------------------
 src/lib.rs          |  26 +++++++-----
 2 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 19b518a6..af33a490 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -41,11 +41,8 @@ pub(crate) fn impl_parse_args_unnamed(
     variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
-    let get_arguments = create_parser(
-        parser_type,
-        data.unnamed.iter().map(|f| &f.ty),
-        data.unnamed.len(),
-    );
+    let get_arguments =
+        create_parser(parser_type, data.unnamed.iter().map(|f| &f.ty));
     let iter = (0..data.unnamed.len()).map(syn::Index::from);
     let mut initialization = quote! {};
     for i in iter {
@@ -65,12 +62,9 @@ pub(crate) fn impl_parse_args_named(
     variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
-    let get_arguments = create_parser(
-        parser_type,
-        data.named.iter().map(|f| &f.ty),
-        data.named.len(),
-    );
-    let i = (0..data.named.len()).map(syn::Index::from);
+    let get_arguments =
+        create_parser(parser_type, data.named.iter().map(|f| &f.ty));
+    let i = (0..).map(syn::Index::from);
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
         {
@@ -83,26 +77,30 @@ pub(crate) fn impl_parse_args_named(
 
 fn create_parser<'a>(
     parser_type: &ParserType,
-    mut types: impl Iterator<Item = &'a Type>,
-    count_args: usize,
+    mut types: impl ExactSizeIterator<Item = &'a Type>,
 ) -> proc_macro2::TokenStream {
     let function_to_parse = match parser_type {
-        ParserType::Default => match count_args {
+        ParserType::Default => match types.len() {
             1 => {
-                let ty = types.next().expect("count_args != types.len()");
-                quote! { (|s: String| {
-                    let res = <#ty>::from_str(&s)
-                        .map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error + Send + Sync + 'static> = e.into(); e }))?;
-                    Ok((res, ))
-                 })
+                let ty = types.next().unwrap();
+                quote! {
+                    (
+                        |s: String| {
+                            let res = <#ty>::from_str(&s)
+                                .map_err(|e| ParseError::IncorrectFormat(e.into()))?;
+
+                            Ok((res,))
+                        }
+                    )
                 }
             }
-            _ => quote! { compile_error!("Expected exactly 1 argument") },
+            _ => {
+                quote! { compile_error!("Default parser works only with exactly 1 field") }
+            }
         },
         ParserType::Split { separator } => parser_with_separator(
             &separator.clone().unwrap_or_else(|| " ".to_owned()),
             types,
-            count_args,
         ),
         ParserType::Custom(s) => {
             let path = syn::parse_str::<syn::Path>(s).unwrap_or_else(|_| {
@@ -111,6 +109,7 @@ fn create_parser<'a>(
             quote! { #path }
         }
     };
+
     quote! {
         let arguments = #function_to_parse(args)?;
     }
@@ -118,31 +117,46 @@ fn create_parser<'a>(
 
 fn parser_with_separator<'a>(
     separator: &str,
-    types: impl Iterator<Item = &'a Type>,
-    count_args: usize,
+    types: impl ExactSizeIterator<Item = &'a Type>,
 ) -> proc_macro2::TokenStream {
-    let inner = quote! { let mut splited = s.split(#separator); };
-    let i = 0..count_args;
-    let inner2 = quote! {
-        #(<#types>::from_str(splited.next().ok_or(ParseError::TooFewArguments {
-            expected: #count_args,
-            found: #i,
-            message: format!("Expected but not found arg number {}", #i + 1),
-        })?).map_err(|e|ParseError::IncorrectFormat({ let e: Box<dyn std::error::Error + Send + Sync + 'static> = e.into(); e }))?,)*
+    let expected = types.len();
+    let res = {
+        let found = 0usize..;
+        quote! {
+            (
+                #(
+                    {
+                        let s = splitted.next().ok_or(ParseError::TooFewArguments {
+                            expected: #expected,
+                            found: #found,
+                            message: format!("Expected but not found arg number {}", #found + 1),
+                        })?;
+
+                        <#types>::from_str(s).map_err(|e| ParseError::IncorrectFormat(e.into()))?
+                    }
+                ),*
+            )
+        }
     };
+
     let res = quote! {
-        (|s: String| {
-            #inner
-            let res = (#inner2);
-            match splited.next() {
-                Some(d) => Err(ParseError::TooManyArguments {
-                    expected: #count_args,
-                    found: #count_args + 1,
-                    message: format!("Excess argument: {}", d),
-                }),
-                None => Ok(res)
+        (
+            |s: String| {
+                let mut splitted = s.split(#separator);
+
+                let res = #res;
+
+                match splitted.next() {
+                    Some(d) => Err(ParseError::TooManyArguments {
+                        expected: #expected,
+                        found: #expected + 1,
+                        message: format!("Excess argument: {}", d),
+                    }),
+                    None => Ok(res)
+                }
             }
-        })
+        )
     };
+
     res
 }
diff --git a/src/lib.rs b/src/lib.rs
index eba47a57..1475255b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -131,25 +131,31 @@ fn impl_parse(
          where
               N: Into<String>
          {
+              // FIXME: we should probably just call a helper function from `teloxide`, instead of parsing command syntax ourselves
               use std::str::FromStr;
               use teloxide::utils::command::ParseError;
 
+              // 2 is used to only split once (=> in two parts),
+              // we only need to split the command and the rest of arguments.
               let mut words = s.splitn(2, ' ');
-              let mut splitted = words.next().expect("First item will be always.").split('@');
-              let command_raw = splitted.next().expect("First item will be always.");
-              let bot = splitted.next();
-              let bot_name = bot_name.into();
-              match bot {
-                  Some(name) if name.eq_ignore_ascii_case(&bot_name) => {}
+
+              // Unwrap: split iterators always have at least one item
+              let mut full_command = words.next().unwrap().split('@');
+              let command = full_command.next().unwrap();
+
+              let bot_username = full_command.next();
+              match bot_username {
                   None => {}
-                  Some(n) => return Err(ParseError::WrongBotName(n.to_string())),
+                  Some(username) if username.eq_ignore_ascii_case(&bot_name.into()) => {}
+                  Some(n) => return Err(ParseError::WrongBotName(n.to_owned())),
               }
-              let mut args = words.next().unwrap_or("").to_string();
-              match command_raw {
+
+              let args = words.next().unwrap_or("").to_owned();
+              match command {
                    #(
                         #matching_values => Ok(#variants_initialization),
                    )*
-                   _ => Err(ParseError::UnknownCommand(command_raw.to_string())),
+                   _ => Err(ParseError::UnknownCommand(command.to_owned())),
               }
          }
     }

From 66ee68c13bcf74220e97ba10c7b3dc4f37a098d5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 25 Aug 2022 17:01:13 +0400
Subject: [PATCH 677/755] fix `compiler_error!` invocations

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

diff --git a/src/error.rs b/src/error.rs
index 60796612..96d0c694 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -10,7 +10,7 @@ pub(crate) fn compile_error<T>(data: T) -> Error
 where
     T: ToTokens,
 {
-    Error(TokenStream::from(quote! { compile_error!(#data) }))
+    Error(TokenStream::from(quote! { compile_error! { #data } }))
 }
 
 impl From<Error> for proc_macro::TokenStream {

From 5d39e3c06dc6b2dc108a8256d97e7e6c26a988c4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 25 Aug 2022 18:06:41 +0400
Subject: [PATCH 678/755] fix error message

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

diff --git a/src/lib.rs b/src/lib.rs
index 1475255b..f6397f26 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -164,6 +164,6 @@ fn impl_parse(
 fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
     match &input.data {
         syn::Data::Enum(data) => Ok(data),
-        _ => Err(compile_error("TelegramBotCommand allowed only for enums")),
+        _ => Err(compile_error("`BotCommands` is only allowed for enums")),
     }
 }

From 5477535834df61230a8a74c6545fff3e6068822d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 25 Aug 2022 18:35:46 +0400
Subject: [PATCH 679/755] refactor imports and stuff

---
 src/attr.rs         |   4 +-
 src/bot_commands.rs | 148 +++++++++++++++++++++++++++++++++++++++
 src/error.rs        |   4 +-
 src/fields_parse.rs |   2 -
 src/lib.rs          | 164 +++-----------------------------------------
 src/rename_rules.rs |   4 +-
 6 files changed, 164 insertions(+), 162 deletions(-)
 create mode 100644 src/bot_commands.rs

diff --git a/src/attr.rs b/src/attr.rs
index 765cff7c..8f1945f1 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -1,10 +1,10 @@
+use crate::Result;
+
 use syn::{
     parse::{Parse, ParseBuffer, ParseStream},
     Attribute, LitStr, Token,
 };
 
-use crate::Result;
-
 pub(crate) enum CommandAttrName {
     Prefix,
     Description,
diff --git a/src/bot_commands.rs b/src/bot_commands.rs
new file mode 100644
index 00000000..e8d552c9
--- /dev/null
+++ b/src/bot_commands.rs
@@ -0,0 +1,148 @@
+use crate::{
+    attr::CommandAttrs, command::Command, command_enum::CommandEnum,
+    compile_error, fields_parse::impl_parse_args, unzip::Unzip, Result,
+};
+
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::DeriveInput;
+
+pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
+    let data_enum = get_enum_data(&input)?;
+    let enum_attrs = CommandAttrs::from_attributes(&input.attrs)?;
+    let command_enum = CommandEnum::try_from(enum_attrs)?;
+
+    let Unzip(var_init, var_info) = data_enum
+        .variants
+        .iter()
+        .map(|variant| {
+            let attrs = CommandAttrs::from_attributes(&variant.attrs)?;
+            let command = Command::try_from(attrs, &variant.ident.to_string())?;
+
+            let variant_name = &variant.ident;
+            let self_variant = quote! { Self::#variant_name };
+
+            let parser =
+                command.parser.as_ref().unwrap_or(&command_enum.parser_type);
+            let parse = impl_parse_args(&variant.fields, self_variant, parser);
+
+            Ok((parse, command))
+        })
+        .collect::<Result<Unzip<Vec<_>, Vec<_>>>>()?;
+
+    let type_name = &input.ident;
+    let fn_descriptions = impl_descriptions(&var_info, &command_enum);
+    let fn_parse = impl_parse(&var_info, &command_enum, &var_init);
+    let fn_commands = impl_commands(&var_info, &command_enum);
+
+    let trait_impl = quote! {
+        impl BotCommands for #type_name {
+            #fn_descriptions
+            #fn_parse
+            #fn_commands
+        }
+    };
+
+    Ok(TokenStream::from(trait_impl))
+}
+
+fn impl_commands(
+    infos: &[Command],
+    global: &CommandEnum,
+) -> proc_macro2::TokenStream {
+    let commands = infos
+        .iter()
+        .filter(|command| command.description_is_enabled())
+        .map(|command| {
+            let c = command.get_matched_value(global);
+            let d = command.description.as_deref().unwrap_or_default();
+            quote! { BotCommand::new(#c,#d) }
+        });
+
+    quote! {
+        fn bot_commands() -> Vec<teloxide::types::BotCommand> {
+            use teloxide::types::BotCommand;
+            vec![#(#commands),*]
+        }
+    }
+}
+
+fn impl_descriptions(
+    infos: &[Command],
+    global: &CommandEnum,
+) -> proc_macro2::TokenStream {
+    let command_descriptions = infos
+        .iter()
+        .filter(|command| command.description_is_enabled())
+        .map(|c| {
+            let (prefix, command) = c.get_matched_value2(global);
+            let description = c.description.clone().unwrap_or_default();
+            quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } }
+        });
+
+    let global_description = match global.description.as_deref() {
+        Some(gd) => quote! { .global_description(#gd) },
+        None => quote! {},
+    };
+
+    quote! {
+        fn descriptions() -> teloxide::utils::command::CommandDescriptions<'static> {
+            use teloxide::utils::command::{CommandDescriptions, CommandDescription};
+            use std::borrow::Cow;
+
+            CommandDescriptions::new(&[
+                #(#command_descriptions),*
+            ])
+            #global_description
+        }
+    }
+}
+
+fn impl_parse(
+    infos: &[Command],
+    global: &CommandEnum,
+    variants_initialization: &[proc_macro2::TokenStream],
+) -> proc_macro2::TokenStream {
+    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
+
+    quote! {
+         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::command::ParseError>
+         where
+              N: Into<String>
+         {
+              // FIXME: we should probably just call a helper function from `teloxide`, instead of parsing command syntax ourselves
+              use std::str::FromStr;
+              use teloxide::utils::command::ParseError;
+
+              // 2 is used to only split once (=> in two parts),
+              // we only need to split the command and the rest of arguments.
+              let mut words = s.splitn(2, ' ');
+
+              // Unwrap: split iterators always have at least one item
+              let mut full_command = words.next().unwrap().split('@');
+              let command = full_command.next().unwrap();
+
+              let bot_username = full_command.next();
+              match bot_username {
+                  None => {}
+                  Some(username) if username.eq_ignore_ascii_case(&bot_name.into()) => {}
+                  Some(n) => return Err(ParseError::WrongBotName(n.to_owned())),
+              }
+
+              let args = words.next().unwrap_or("").to_owned();
+              match command {
+                   #(
+                        #matching_values => Ok(#variants_initialization),
+                   )*
+                   _ => Err(ParseError::UnknownCommand(command.to_owned())),
+              }
+         }
+    }
+}
+
+fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
+    match &input.data {
+        syn::Data::Enum(data) => Ok(data),
+        _ => Err(compile_error("`BotCommands` is only allowed for enums")),
+    }
+}
diff --git a/src/error.rs b/src/error.rs
index 96d0c694..db737a1d 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -13,9 +13,9 @@ where
     Error(TokenStream::from(quote! { compile_error! { #data } }))
 }
 
-impl From<Error> for proc_macro::TokenStream {
+impl From<Error> for proc_macro2::TokenStream {
     fn from(Error(e): Error) -> Self {
-        e.into()
+        e
     }
 }
 
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index af33a490..d3a4ab34 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,5 +1,3 @@
-extern crate quote;
-
 use quote::quote;
 use syn::{Fields, FieldsNamed, FieldsUnnamed, Type};
 
diff --git a/src/lib.rs b/src/lib.rs
index f6397f26..e590ead3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,9 @@
 // TODO: refactor this shit.
 
+extern crate proc_macro;
+
 mod attr;
+mod bot_commands;
 mod command;
 mod command_enum;
 mod error;
@@ -8,162 +11,15 @@ mod fields_parse;
 mod rename_rules;
 mod unzip;
 
-extern crate proc_macro;
-extern crate quote;
-extern crate syn;
-use crate::{
-    attr::CommandAttrs, command::Command, command_enum::CommandEnum,
-    fields_parse::impl_parse_args, unzip::Unzip,
-};
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::DeriveInput;
+pub(crate) use error::{compile_error, Result};
+use syn::{parse_macro_input, DeriveInput};
 
-pub(crate) use error::{compile_error, Error, Result};
+use crate::bot_commands::bot_commands_impl;
+use proc_macro::TokenStream;
 
 #[proc_macro_derive(BotCommands, attributes(command))]
 pub fn bot_commands_derive(tokens: TokenStream) -> TokenStream {
-    bot_commands_impl(tokens).unwrap_or_else(Error::into)
-}
-
-fn bot_commands_impl(tokens: TokenStream) -> Result<TokenStream, Error> {
-    let input = syn::parse_macro_input::parse::<DeriveInput>(tokens)?;
-
-    let data_enum = get_enum_data(&input)?;
-    let enum_attrs = CommandAttrs::from_attributes(&input.attrs)?;
-    let command_enum = CommandEnum::try_from(enum_attrs)?;
-
-    let Unzip(var_init, var_info) = data_enum
-        .variants
-        .iter()
-        .map(|variant| {
-            let attrs = CommandAttrs::from_attributes(&variant.attrs)?;
-            let command = Command::try_from(attrs, &variant.ident.to_string())?;
-
-            let variant_name = &variant.ident;
-            let self_variant = quote! { Self::#variant_name };
-
-            let parser =
-                command.parser.as_ref().unwrap_or(&command_enum.parser_type);
-            let parse = impl_parse_args(&variant.fields, self_variant, parser);
-
-            Ok((parse, command))
-        })
-        .collect::<Result<Unzip<Vec<_>, Vec<_>>, Error>>()?;
-
-    let type_name = &input.ident;
-    let fn_descriptions = impl_descriptions(&var_info, &command_enum);
-    let fn_parse = impl_parse(&var_info, &command_enum, &var_init);
-    let fn_commands = impl_commands(&var_info, &command_enum);
-
-    let trait_impl = quote! {
-        impl BotCommands for #type_name {
-            #fn_descriptions
-            #fn_parse
-            #fn_commands
-        }
-    };
-
-    Ok(TokenStream::from(trait_impl))
-}
-
-fn impl_commands(
-    infos: &[Command],
-    global: &CommandEnum,
-) -> proc_macro2::TokenStream {
-    let commands = infos
-        .iter()
-        .filter(|command| command.description_is_enabled())
-        .map(|command| {
-            let c = command.get_matched_value(global);
-            let d = command.description.as_deref().unwrap_or_default();
-            quote! { BotCommand::new(#c,#d) }
-        });
-
-    quote! {
-        fn bot_commands() -> Vec<teloxide::types::BotCommand> {
-            use teloxide::types::BotCommand;
-            vec![#(#commands),*]
-        }
-    }
-}
-
-fn impl_descriptions(
-    infos: &[Command],
-    global: &CommandEnum,
-) -> proc_macro2::TokenStream {
-    let command_descriptions = infos
-        .iter()
-        .filter(|command| command.description_is_enabled())
-        .map(|c| {
-            let (prefix, command) = c.get_matched_value2(global);
-            let description = c.description.clone().unwrap_or_default();
-            quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } }
-        });
-
-    let global_description = match global.description.as_deref() {
-        Some(gd) => quote! { .global_description(#gd) },
-        None => quote! {},
-    };
-
-    quote! {
-        fn descriptions() -> teloxide::utils::command::CommandDescriptions<'static> {
-            use teloxide::utils::command::{CommandDescriptions, CommandDescription};
-            use std::borrow::Cow;
-
-            CommandDescriptions::new(&[
-                #(#command_descriptions),*
-            ])
-            #global_description
-        }
-    }
-}
-
-fn impl_parse(
-    infos: &[Command],
-    global: &CommandEnum,
-    variants_initialization: &[proc_macro2::TokenStream],
-) -> proc_macro2::TokenStream {
-    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
-
-    quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::command::ParseError>
-         where
-              N: Into<String>
-         {
-              // FIXME: we should probably just call a helper function from `teloxide`, instead of parsing command syntax ourselves
-              use std::str::FromStr;
-              use teloxide::utils::command::ParseError;
-
-              // 2 is used to only split once (=> in two parts),
-              // we only need to split the command and the rest of arguments.
-              let mut words = s.splitn(2, ' ');
-
-              // Unwrap: split iterators always have at least one item
-              let mut full_command = words.next().unwrap().split('@');
-              let command = full_command.next().unwrap();
-
-              let bot_username = full_command.next();
-              match bot_username {
-                  None => {}
-                  Some(username) if username.eq_ignore_ascii_case(&bot_name.into()) => {}
-                  Some(n) => return Err(ParseError::WrongBotName(n.to_owned())),
-              }
-
-              let args = words.next().unwrap_or("").to_owned();
-              match command {
-                   #(
-                        #matching_values => Ok(#variants_initialization),
-                   )*
-                   _ => Err(ParseError::UnknownCommand(command.to_owned())),
-              }
-         }
-    }
-}
-
-fn get_enum_data(input: &DeriveInput) -> Result<&syn::DataEnum> {
-    match &input.data {
-        syn::Data::Enum(data) => Ok(data),
-        _ => Err(compile_error("`BotCommands` is only allowed for enums")),
-    }
+    let input = parse_macro_input!(tokens as DeriveInput);
+
+    bot_commands_impl(input).unwrap_or_else(<_>::into).into()
 }
diff --git a/src/rename_rules.rs b/src/rename_rules.rs
index 159724a1..55280617 100644
--- a/src/rename_rules.rs
+++ b/src/rename_rules.rs
@@ -1,12 +1,12 @@
 // Some concepts are from Serde.
 
+use crate::error::{compile_error, Result};
+
 use heck::{
     ToKebabCase, ToLowerCamelCase, ToPascalCase, ToShoutyKebabCase,
     ToShoutySnakeCase, ToSnakeCase,
 };
 
-use crate::error::{compile_error, Result};
-
 #[derive(Copy, Clone, Debug)]
 pub(crate) enum RenameRule {
     /// -> `lowercase`

From 25f9bff97addb66b3c4f6dca791002a000c2e70a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 26 Aug 2022 20:26:21 +0400
Subject: [PATCH 680/755] Remove useless identity conversions

---
 src/bot_commands.rs | 2 +-
 src/error.rs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bot_commands.rs b/src/bot_commands.rs
index e8d552c9..85ea4a09 100644
--- a/src/bot_commands.rs
+++ b/src/bot_commands.rs
@@ -43,7 +43,7 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
         }
     };
 
-    Ok(TokenStream::from(trait_impl))
+    Ok(trait_impl)
 }
 
 fn impl_commands(
diff --git a/src/error.rs b/src/error.rs
index db737a1d..e2f98e98 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -10,7 +10,7 @@ pub(crate) fn compile_error<T>(data: T) -> Error
 where
     T: ToTokens,
 {
-    Error(TokenStream::from(quote! { compile_error! { #data } }))
+    Error(quote! { compile_error! { #data } })
 }
 
 impl From<Error> for proc_macro2::TokenStream {

From c8514823d7818c31afd410959d0cd10090203520 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Aug 2022 15:07:19 +0400
Subject: [PATCH 681/755] refactor attributes once again

---
 src/attr.rs         | 217 ++++++++++++++++++++++++++++----------------
 src/bot_commands.rs |   2 +-
 src/command.rs      |  42 +--------
 src/command_attr.rs | 115 +++++++++++++++++++++++
 src/command_enum.rs |  21 +++--
 src/error.rs        |  32 ++++++-
 src/fields_parse.rs |   1 +
 src/lib.rs          |   1 +
 8 files changed, 302 insertions(+), 129 deletions(-)
 create mode 100644 src/command_attr.rs

diff --git a/src/attr.rs b/src/attr.rs
index 8f1945f1..1c02d748 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -1,96 +1,153 @@
-use crate::Result;
+use crate::{error::compile_error_at, Result};
 
+use proc_macro2::Span;
 use syn::{
     parse::{Parse, ParseBuffer, ParseStream},
-    Attribute, LitStr, Token,
+    spanned::Spanned,
+    Attribute, Ident, Lit, Path, Token,
 };
 
-pub(crate) enum CommandAttrName {
-    Prefix,
-    Description,
-    Rename,
-    ParseWith,
-    Separator,
+pub(crate) fn fold_attrs<A, R>(
+    attrs: &[Attribute],
+    filter: fn(&Attribute) -> bool,
+    parse: impl Fn(Attr) -> Result<R>,
+    init: A,
+    f: impl Fn(A, R) -> Result<A>,
+) -> Result<A> {
+    attrs
+        .iter()
+        .filter(|&a| filter(a))
+        .flat_map(|attribute| {
+            // FIXME: don't allocate here
+            let attrs =
+                match attribute.parse_args_with(|input: &ParseBuffer| {
+                    input.parse_terminated::<_, Token![,]>(Attr::parse)
+                }) {
+                    Ok(ok) => ok,
+                    Err(err) => return vec![Err(err.into())],
+                };
+
+            attrs.into_iter().map(&parse).collect()
+        })
+        .try_fold(init, |acc, r| r.and_then(|r| f(acc, r)))
 }
 
-impl Parse for CommandAttrName {
-    fn parse(input: ParseStream) -> syn::Result<Self> {
-        let name_arg: syn::Ident = input.parse()?;
+/// An attribute key-value pair.
+///
+/// For example:
+/// ```text
+///   #[blahblah(key = "puff", value = 12, nope)]
+///              ^^^^^^^^^^^^  ^^^^^^^^^^  ^^^^
+/// ```
+pub(crate) struct Attr {
+    pub key: Ident,
+    pub value: AttrValue,
+}
 
-        match name_arg.to_string().as_str() {
-            "prefix" => Ok(CommandAttrName::Prefix),
-            "description" => Ok(CommandAttrName::Description),
-            "rename" => Ok(CommandAttrName::Rename),
-            "parse_with" => Ok(CommandAttrName::ParseWith),
-            "separator" => Ok(CommandAttrName::Separator),
-            _ => Err(syn::Error::new(
-                name_arg.span(),
-                "unexpected attribute name (expected one of `prefix`, \
-                 `description`, `rename`, `parse_with`, `separator`",
-            )),
+/// Value of an attribute.
+///
+/// For example:
+/// ```text
+///   #[blahblah(key = "puff", value = 12, nope)]
+///                    ^^^^^^          ^^     ^-- (None pseudo-value)
+/// ```
+pub(crate) enum AttrValue {
+    Path(Path),
+    Lit(Lit),
+    None(Span),
+}
+
+impl Parse for Attr {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let key = input.parse::<Ident>()?;
+
+        let value = match input.peek(Token![=]) {
+            true => {
+                input.parse::<Token![=]>()?;
+                input.parse::<AttrValue>()?
+            }
+            false => AttrValue::None(input.span()),
+        };
+
+        Ok(Self { key, value })
+    }
+}
+
+impl Attr {
+    pub(crate) fn span(&self) -> Span {
+        self.key.span().join(self.value.span()).unwrap_or(self.key.span())
+    }
+}
+
+impl AttrValue {
+    /// Unwraps this value if it's a string literal.
+    pub fn expect_string(self) -> Result<String> {
+        self.expect("a string", |this| match this {
+            AttrValue::Lit(Lit::Str(s)) => Ok(s.value()),
+            _ => Err(this),
+        })
+    }
+
+    // /// Unwraps this value if it's a path.
+    // pub fn expect_path(self) -> Result<Path> {
+    //     self.expect("a path", |this| match this {
+    //         AttrValue::Path(p) => Ok(p),
+    //         _ => Err(this),
+    //     })
+    // }
+
+    fn expect<T>(
+        self,
+        expected: &str,
+        f: impl FnOnce(Self) -> Result<T, Self>,
+    ) -> Result<T> {
+        f(self).map_err(|this| {
+            compile_error_at(
+                &format!("expected {expected}, found {}", this.descr()),
+                this.span(),
+            )
+        })
+    }
+
+    fn descr(&self) -> &'static str {
+        use Lit::*;
+
+        match self {
+            Self::None(_) => "nothing",
+            Self::Lit(l) => match l {
+                Str(_) | ByteStr(_) => "a string",
+                Char(_) => "a character",
+                Byte(_) | Int(_) => "an integer",
+                Float(_) => "a floating point integer",
+                Bool(_) => "a boolean",
+                Verbatim(_) => ":shrug:",
+            },
+            Self::Path(_) => "a path",
+        }
+    }
+
+    /// Returns span of the value
+    ///
+    /// ```text
+    ///   #[blahblah(key = "puff", value = 12, nope )]
+    ///                    ^^^^^^          ^^      ^
+    /// ```
+    fn span(&self) -> Span {
+        match self {
+            Self::Path(p) => p.span(),
+            Self::Lit(l) => l.span(),
+            Self::None(sp) => *sp,
         }
     }
 }
 
-pub(crate) struct CommandAttr {
-    pub name: CommandAttrName,
-    pub value: String,
-}
-
-impl Parse for CommandAttr {
+impl Parse for AttrValue {
     fn parse(input: ParseStream) -> syn::Result<Self> {
-        let name = input.parse::<CommandAttrName>()?;
+        let this = match input.peek(Lit) {
+            true => Self::Lit(input.parse()?),
+            false => Self::Path(input.parse()?),
+        };
 
-        // FIXME: this should support value-less attrs, as well as
-        //        non-string-literal values
-        input.parse::<Token![=]>()?;
-        let value = input.parse::<LitStr>()?.value();
-
-        Ok(Self { name, value })
-    }
-}
-
-pub(crate) struct CommandAttrs(Vec<CommandAttr>);
-
-impl CommandAttrs {
-    pub fn from_attributes(attributes: &[Attribute]) -> Result<Self> {
-        let mut attrs = Vec::new();
-
-        for attribute in attributes.iter().filter(is_command_attribute) {
-            let attrs_ = attribute.parse_args_with(|input: &ParseBuffer| {
-                input.parse_terminated::<_, Token![,]>(CommandAttr::parse)
-            })?;
-
-            attrs.extend(attrs_);
-        }
-
-        Ok(Self(attrs))
-    }
-}
-
-impl<'a> IntoIterator for &'a CommandAttrs {
-    type Item = &'a CommandAttr;
-
-    type IntoIter = std::slice::Iter<'a, CommandAttr>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.iter()
-    }
-}
-
-impl IntoIterator for CommandAttrs {
-    type Item = CommandAttr;
-
-    type IntoIter = std::vec::IntoIter<CommandAttr>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-fn is_command_attribute(a: &&Attribute) -> bool {
-    match a.path.get_ident() {
-        Some(ident) => ident == "command",
-        _ => false,
+        Ok(this)
     }
 }
diff --git a/src/bot_commands.rs b/src/bot_commands.rs
index 85ea4a09..02b64e63 100644
--- a/src/bot_commands.rs
+++ b/src/bot_commands.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr::CommandAttrs, command::Command, command_enum::CommandEnum,
+    command::Command, command_attr::CommandAttrs, command_enum::CommandEnum,
     compile_error, fields_parse::impl_parse_args, unzip::Unzip, Result,
 };
 
diff --git a/src/command.rs b/src/command.rs
index b06038f1..769c83cc 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,9 +1,6 @@
 use crate::{
-    attr::{self, CommandAttr, CommandAttrName},
-    command_enum::CommandEnum,
-    fields_parse::ParserType,
-    rename_rules::RenameRule,
-    Result,
+    command_attr::CommandAttrs, command_enum::CommandEnum,
+    fields_parse::ParserType, rename_rules::RenameRule, Result,
 };
 
 pub(crate) struct Command {
@@ -14,8 +11,7 @@ pub(crate) struct Command {
 }
 
 impl Command {
-    pub fn try_from(attrs: attr::CommandAttrs, name: &str) -> Result<Self> {
-        let attrs = parse_attrs(attrs)?;
+    pub fn try_from(attrs: CommandAttrs, name: &str) -> Result<Self> {
         let CommandAttrs {
             prefix,
             description,
@@ -24,7 +20,7 @@ impl Command {
             separator: _,
         } = attrs;
 
-        let name = rename_rule.apply(name);
+        let name = rename_rule.unwrap_or(RenameRule::Identity).apply(name);
 
         Ok(Self { prefix, description, parser, name })
     }
@@ -60,33 +56,3 @@ impl Command {
         self.description != Some("off".to_owned())
     }
 }
-
-pub(crate) struct CommandAttrs {
-    pub prefix: Option<String>,
-    pub description: Option<String>,
-    pub rename_rule: RenameRule,
-    pub parser: Option<ParserType>,
-    pub separator: Option<String>,
-}
-
-pub(crate) fn parse_attrs(attrs: attr::CommandAttrs) -> Result<CommandAttrs> {
-    let mut prefix = None;
-    let mut description = None;
-    let mut rename_rule = RenameRule::Identity;
-    let mut parser = None;
-    let mut separator = None;
-
-    for CommandAttr { name, value } in attrs {
-        match name {
-            CommandAttrName::Prefix => prefix = Some(value),
-            CommandAttrName::Description => description = Some(value),
-            CommandAttrName::Rename => rename_rule = RenameRule::parse(&value)?,
-            CommandAttrName::ParseWith => {
-                parser = Some(ParserType::parse(&value))
-            }
-            CommandAttrName::Separator => separator = Some(value),
-        }
-    }
-
-    Ok(CommandAttrs { prefix, description, rename_rule, parser, separator })
-}
diff --git a/src/command_attr.rs b/src/command_attr.rs
new file mode 100644
index 00000000..4550f679
--- /dev/null
+++ b/src/command_attr.rs
@@ -0,0 +1,115 @@
+use crate::{
+    attr::{fold_attrs, Attr},
+    error::compile_error_at,
+    fields_parse::ParserType,
+    rename_rules::RenameRule,
+    Result,
+};
+
+use proc_macro2::Span;
+use syn::Attribute;
+
+/// Attributes for `BotCommands` derive macro.
+pub(crate) struct CommandAttrs {
+    pub prefix: Option<String>,
+    pub description: Option<String>,
+    pub rename_rule: Option<RenameRule>,
+    pub parser: Option<ParserType>,
+    pub separator: Option<String>,
+}
+
+/// An attribute for `BotCommands` derive macro.
+pub(crate) struct CommandAttr {
+    kind: CommandAttrKind,
+    sp: Span,
+}
+
+pub(crate) enum CommandAttrKind {
+    Prefix(String),
+    Description(String),
+    Rename(RenameRule),
+    ParseWith(ParserType),
+    Separator(String),
+}
+
+impl CommandAttrs {
+    pub fn from_attributes(attributes: &[Attribute]) -> Result<Self> {
+        use CommandAttrKind::*;
+
+        fold_attrs(
+            attributes,
+            is_command_attribute,
+            CommandAttr::parse,
+            Self {
+                prefix: None,
+                description: None,
+                rename_rule: None,
+                parser: None,
+                separator: None,
+            },
+            |mut this, attr| {
+                fn insert<T>(
+                    opt: &mut Option<T>,
+                    x: T,
+                    sp: Span,
+                ) -> Result<()> {
+                    match opt {
+                        slot @ None => {
+                            *slot = Some(x);
+                            Ok(())
+                        }
+                        Some(_) => {
+                            Err(compile_error_at("duplicate attribute", sp))
+                        }
+                    }
+                }
+
+                match attr.kind {
+                    Prefix(p) => insert(&mut this.prefix, p, attr.sp),
+                    Description(d) => insert(&mut this.description, d, attr.sp),
+                    Rename(r) => insert(&mut this.rename_rule, r, attr.sp),
+                    ParseWith(p) => insert(&mut this.parser, p, attr.sp),
+                    Separator(s) => insert(&mut this.separator, s, attr.sp),
+                }?;
+
+                Ok(this)
+            },
+        )
+    }
+}
+
+impl CommandAttr {
+    fn parse(attr: Attr) -> Result<Self> {
+        use CommandAttrKind::*;
+
+        let sp = attr.span();
+        let Attr { key, value } = attr;
+        let kind = match &*key.to_string() {
+            "prefix" => Prefix(value.expect_string()?),
+            "description" => Description(value.expect_string()?),
+            "rename" => Rename(
+                value.expect_string().and_then(|r| RenameRule::parse(&r))?,
+            ),
+            "parse_with" => {
+                ParseWith(value.expect_string().map(|p| ParserType::parse(&p))?)
+            }
+            "separator" => Separator(value.expect_string()?),
+            _ => {
+                return Err(compile_error_at(
+                    "unexpected attribute name (expected one of `prefix`, \
+                     `description`, `rename`, `parse_with` and `separator`",
+                    key.span(),
+                ))
+            }
+        };
+
+        Ok(Self { kind, sp })
+    }
+}
+
+fn is_command_attribute(a: &Attribute) -> bool {
+    match a.path.get_ident() {
+        Some(ident) => ident == "command",
+        _ => false,
+    }
+}
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 14aa0381..ad3959a0 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,5 +1,5 @@
 use crate::{
-    attr, command::parse_attrs, fields_parse::ParserType,
+    command_attr::CommandAttrs, fields_parse::ParserType,
     rename_rules::RenameRule, Result,
 };
 
@@ -12,14 +12,17 @@ pub(crate) struct CommandEnum {
 }
 
 impl CommandEnum {
-    pub fn try_from(attrs: attr::CommandAttrs) -> Result<Self> {
-        let attrs = parse_attrs(attrs)?;
+    pub fn try_from(attrs: CommandAttrs) -> Result<Self> {
+        let CommandAttrs {
+            prefix,
+            description,
+            rename_rule,
+            parser,
+            separator,
+        } = attrs;
+        let mut parser = parser.unwrap_or(ParserType::Default);
 
-        let prefix = attrs.prefix;
-        let description = attrs.description;
-        let rename = attrs.rename_rule;
-        let separator = attrs.separator;
-        let mut parser = attrs.parser.unwrap_or(ParserType::Default);
+        // FIXME: Error on unused separator
         if let (ParserType::Split { separator }, Some(s)) =
             (&mut parser, &separator)
         {
@@ -28,7 +31,7 @@ impl CommandEnum {
         Ok(Self {
             prefix,
             description,
-            rename_rule: rename,
+            rename_rule: rename_rule.unwrap_or(RenameRule::Identity),
             parser_type: parser,
         })
     }
diff --git a/src/error.rs b/src/error.rs
index e2f98e98..3f1603bf 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,4 @@
-use proc_macro2::TokenStream;
+use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
 
 pub(crate) type Result<T, E = Error> = std::result::Result<T, E>;
@@ -13,6 +13,36 @@ where
     Error(quote! { compile_error! { #data } })
 }
 
+pub(crate) fn compile_error_at(msg: &str, sp: Span) -> Error {
+    use proc_macro2::{
+        Delimiter, Group, Ident, Literal, Punct, Spacing, TokenTree,
+    };
+    use std::iter::FromIterator;
+
+    // compile_error! { $msg }
+    let ts = TokenStream::from_iter(vec![
+        TokenTree::Ident(Ident::new("compile_error", sp)),
+        TokenTree::Punct({
+            let mut punct = Punct::new('!', Spacing::Alone);
+            punct.set_span(sp);
+            punct
+        }),
+        TokenTree::Group({
+            let mut group = Group::new(Delimiter::Brace, {
+                TokenStream::from_iter(vec![TokenTree::Literal({
+                    let mut string = Literal::string(msg);
+                    string.set_span(sp);
+                    string
+                })])
+            });
+            group.set_span(sp);
+            group
+        }),
+    ]);
+
+    Error(ts)
+}
+
 impl From<Error> for proc_macro2::TokenStream {
     fn from(Error(e): Error) -> Self {
         e
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index d3a4ab34..a9a2d0b2 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -9,6 +9,7 @@ pub(crate) enum ParserType {
 }
 
 impl ParserType {
+    // FIXME: use path for custom
     pub fn parse(data: &str) -> Self {
         match data {
             "default" => ParserType::Default,
diff --git a/src/lib.rs b/src/lib.rs
index e590ead3..bb0e0c04 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,6 +5,7 @@ extern crate proc_macro;
 mod attr;
 mod bot_commands;
 mod command;
+mod command_attr;
 mod command_enum;
 mod error;
 mod fields_parse;

From 7ad17c41ba16c79f4bfa22364597d21ee99b02ef Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Aug 2022 15:15:07 +0400
Subject: [PATCH 682/755] clippy >:(

---
 src/attr.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/attr.rs b/src/attr.rs
index 1c02d748..dd4b9493 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -75,7 +75,10 @@ impl Parse for Attr {
 
 impl Attr {
     pub(crate) fn span(&self) -> Span {
-        self.key.span().join(self.value.span()).unwrap_or(self.key.span())
+        self.key
+            .span()
+            .join(self.value.span())
+            .unwrap_or_else(|| self.key.span())
     }
 }
 

From e1b64c0c2adfdc2d2d20a25e316dc763e49fea60 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 28 Aug 2022 15:25:57 +0400
Subject: [PATCH 683/755] =?UTF-8?q?Mark=20code=20as=20refactored=20?=
 =?UTF-8?q?=E2=9C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index bb0e0c04..4d886239 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,3 @@
-// TODO: refactor this shit.
-
 extern crate proc_macro;
 
 mod attr;

From 0e79c372acc6e32251557d0ceda26f8aa5fd60a6 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 4 Sep 2022 16:15:25 +0400
Subject: [PATCH 684/755] Update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02c6215d..47defc6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Removed
+
+- Remove `derive(DialogueState)` macro
+
+### Changed
+
+- `#[command(rename = "a_name_that_is_not_a_case_name")]` doesn't work anymore
+- A lot of internal refactoring
+
 ## 0.6.3 - 2022-07-19
 
 ### Fixed

From d5a5c44db4fa1797306ac4836835ed80997f0588 Mon Sep 17 00:00:00 2001
From: Waffle Maybe <waffle.lapkin@gmail.com>
Date: Mon, 5 Sep 2022 05:46:15 +0400
Subject: [PATCH 685/755] Update CHANGELOG.md

Co-authored-by: Hirrolot <hirrolot@gmail.com>
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47defc6c..a0916ad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `#[command(rename = "a_name_that_is_not_a_case_name")]` doesn't work anymore
-- A lot of internal refactoring
 
 ## 0.6.3 - 2022-07-19
 

From 9131ccd6e533c30d1f40109d4e90fa9a5186bbf2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 12 Sep 2022 16:57:19 +0400
Subject: [PATCH 686/755] Remove methods for creating `InlineQuery`

---
 CHANGELOG.md              |  6 +++++
 src/types/inline_query.rs | 55 ---------------------------------------
 2 files changed, 6 insertions(+), 55 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c7844c7..58f99914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Removed
+
+- Methods for creating `InlineQuery` ([#246][pr244])
+
+[pr244]: https://github.com/teloxide/teloxide-core/pull/246
+
 ## 0.7.1 - 2022-08-19
 
 ### Fixed
diff --git a/src/types/inline_query.rs b/src/types/inline_query.rs
index 41f687c7..9fbf6c54 100644
--- a/src/types/inline_query.rs
+++ b/src/types/inline_query.rs
@@ -33,58 +33,3 @@ pub struct InlineQuery {
     /// from a secret chat.
     pub chat_type: Option<ChatType>,
 }
-
-// TODO(waffle): remove
-impl InlineQuery {
-    pub fn new<S1, S2, S3>(id: S1, from: User, query: S2, offset: S3) -> Self
-    where
-        S1: Into<String>,
-        S2: Into<String>,
-        S3: Into<String>,
-    {
-        Self {
-            id: id.into(),
-            from,
-            location: None,
-            query: query.into(),
-            offset: offset.into(),
-            chat_type: None,
-        }
-    }
-
-    pub fn id<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.id = val.into();
-        self
-    }
-
-    #[must_use]
-    pub fn from(mut self, val: User) -> Self {
-        self.from = val;
-        self
-    }
-
-    #[must_use]
-    pub fn location(mut self, val: Location) -> Self {
-        self.location = Some(val);
-        self
-    }
-
-    pub fn query<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.query = val.into();
-        self
-    }
-
-    pub fn offset<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.offset = val.into();
-        self
-    }
-}

From 353d7d6b066a62e9ce00d32adbb600433078abd7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 12 Sep 2022 17:22:05 +0400
Subject: [PATCH 687/755] Write documentation for `ButtonRequest`

---
 src/types/keyboard_button.rs | 53 ++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/types/keyboard_button.rs b/src/types/keyboard_button.rs
index d4e041c0..ab450cfe 100644
--- a/src/types/keyboard_button.rs
+++ b/src/types/keyboard_button.rs
@@ -17,26 +17,8 @@ pub struct KeyboardButton {
 
     /// Request something from user. This is available in private chats only.
     ///
-    /// - If `Some(Contact)`, the user's phone number will be sent as a contact
-    ///   when the button is pressed.
-    /// - If `Some(Location)`, the user's current location will be sent when the
-    ///   button is pressed.
-    /// - If `Some(Poll(_))`, the user will be asked to create a poll and send
-    ///   it to the bot when the button is pressed.
-    /// - If `Some(WebApp(_))`, the described Web App will be launched when the
-    ///   button is pressed. The Web App will be able to send a “web_app_data”
-    ///   service message.
-    ///
-    /// **Note:** `Contact` and `Location` options will only work in Telegram
-    /// versions released after 9 April, 2016. Older clients will display
-    /// unsupported message.
-    ///
-    /// **Note:** `Poll(_)` option will only work in Telegram versions released
-    /// after 23 January, 2020. Older clients will display unsupported message.
-    ///
-    /// **Note:** `WebApp(_)` option will only work in Telegram versions
-    /// released after 16 April, 2022. Older clients will display unsupported
-    /// message.
+    /// See [`ButtonRequest`] documentation for options on what can be
+    /// requested.
     #[serde(flatten)]
     pub request: Option<ButtonRequest>,
 }
@@ -61,13 +43,38 @@ impl KeyboardButton {
     }
 }
 
-// Serialize + Deserialize are implemented by hand
-// FIXME: add documentation
-#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+/// Request something from user, when a button is pressed.
+///
+/// See individual variants documentation for more info.
+#[derive(Clone, Debug, Eq, Hash, PartialEq /*, Serialize, Deserialize */)]
 pub enum ButtonRequest {
+    /// If this variant is used, the user's current location will be sent when
+    /// the button is pressed.
+    ///
+    /// **Note:** this option will only work in Telegram versions released after
+    /// 9 April, 2016. Older clients will display unsupported message.
     Location,
+
+    /// If this variant is used, the user's phone number will be sent as a
+    /// contact when the button is pressed.
+    ///
+    /// **Note:** this option will only work in Telegram versions released after
+    /// 9 April, 2016. Older clients will display unsupported message.
     Contact,
+
+    /// If this variant is used, the user will be asked to create a poll and
+    /// send it to the bot when the button is pressed.
+    ///
+    /// **Note:** this option will only work in Telegram versions released after
+    /// 23 January, 2020. Older clients will display unsupported message.
     Poll(KeyboardButtonPollType),
+
+    /// If this variant is used, the described Web App will be launched when the
+    /// button is pressed. The Web App will be able to send a “web_app_data”
+    /// service message.
+    ///
+    /// **Note:** this option will only work in Telegram versions released after
+    /// 16 April, 2022. Older clients will display unsupported message.
     WebApp(WebAppInfo),
 }
 

From b8dc2c7b3124b60707a4af613c5563af047f3953 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 9 Aug 2022 21:07:18 +0400
Subject: [PATCH 688/755] Implement in-tree codegen

---
 .github/workflows/ci.yml                      |    2 +
 Cargo.toml                                    |    8 +-
 schema.ron                                    | 3849 +++++++++++++++++
 src/codegen.rs                                |  193 +
 src/codegen/convert.rs                        |   32 +
 src/codegen/patch.rs                          |  347 ++
 src/codegen/schema.rs                         |  107 +
 src/lib.rs                                    |    3 +
 src/local_macros.rs                           |  156 +-
 src/payloads.rs                               |   72 +-
 src/payloads/add_sticker_to_set.rs            |   10 +-
 src/payloads/answer_callback_query.rs         |   10 +-
 src/payloads/answer_inline_query.rs           |   10 +-
 src/payloads/answer_pre_checkout_query.rs     |   10 +-
 src/payloads/answer_shipping_query.rs         |   10 +-
 src/payloads/answer_web_app_query.rs          |   10 +-
 src/payloads/approve_chat_join_request.rs     |   10 +-
 src/payloads/ban_chat_member.rs               |   10 +-
 src/payloads/ban_chat_sender_chat.rs          |   10 +-
 src/payloads/close.rs                         |   10 +-
 src/payloads/codegen.rs                       |  269 ++
 src/payloads/copy_message.rs                  |   10 +-
 src/payloads/create_chat_invite_link.rs       |   10 +-
 src/payloads/create_invoice_link.rs           |   10 +-
 src/payloads/create_new_sticker_set.rs        |   10 +-
 src/payloads/decline_chat_join_request.rs     |   10 +-
 src/payloads/delete_chat_photo.rs             |   10 +-
 src/payloads/delete_chat_sticker_set.rs       |   10 +-
 src/payloads/delete_message.rs                |   10 +-
 src/payloads/delete_my_commands.rs            |   11 +-
 src/payloads/delete_sticker_from_set.rs       |   10 +-
 src/payloads/delete_webhook.rs                |   11 +-
 src/payloads/edit_chat_invite_link.rs         |   10 +-
 src/payloads/edit_message_caption.rs          |   10 +-
 src/payloads/edit_message_caption_inline.rs   |   10 +-
 src/payloads/edit_message_live_location.rs    |   10 +-
 .../edit_message_live_location_inline.rs      |   10 +-
 src/payloads/edit_message_media.rs            |   10 +-
 src/payloads/edit_message_media_inline.rs     |   10 +-
 src/payloads/edit_message_reply_markup.rs     |   10 +-
 .../edit_message_reply_markup_inline.rs       |   10 +-
 src/payloads/edit_message_text.rs             |   10 +-
 src/payloads/edit_message_text_inline.rs      |   10 +-
 src/payloads/export_chat_invite_link.rs       |   10 +-
 src/payloads/forward_message.rs               |   10 +-
 src/payloads/get_chat.rs                      |   10 +-
 src/payloads/get_chat_administrators.rs       |   10 +-
 src/payloads/get_chat_member.rs               |   10 +-
 src/payloads/get_chat_member_count.rs         |   10 +-
 src/payloads/get_chat_members_count.rs        |   10 +-
 src/payloads/get_chat_menu_button.rs          |   11 +-
 src/payloads/get_file.rs                      |   10 +-
 src/payloads/get_game_high_scores.rs          |   10 +-
 src/payloads/get_me.rs                        |   10 +-
 src/payloads/get_my_commands.rs               |   11 +-
 .../get_my_default_administrator_rights.rs    |   11 +-
 src/payloads/get_sticker_set.rs               |   10 +-
 src/payloads/get_updates.rs                   |   11 +-
 src/payloads/get_user_profile_photos.rs       |   10 +-
 src/payloads/get_webhook_info.rs              |   10 +-
 src/payloads/kick_chat_member.rs              |   10 +-
 src/payloads/leave_chat.rs                    |   10 +-
 src/payloads/log_out.rs                       |   10 +-
 src/payloads/pin_chat_message.rs              |   10 +-
 src/payloads/promote_chat_member.rs           |   10 +-
 src/payloads/restrict_chat_member.rs          |   10 +-
 src/payloads/revoke_chat_invite_link.rs       |   10 +-
 src/payloads/send_animation.rs                |   10 +-
 src/payloads/send_audio.rs                    |   10 +-
 src/payloads/send_chat_action.rs              |   10 +-
 src/payloads/send_contact.rs                  |   10 +-
 src/payloads/send_dice.rs                     |   10 +-
 src/payloads/send_document.rs                 |   10 +-
 src/payloads/send_game.rs                     |   10 +-
 src/payloads/send_invoice.rs                  |   10 +-
 src/payloads/send_location.rs                 |   10 +-
 src/payloads/send_media_group.rs              |   10 +-
 src/payloads/send_message.rs                  |   10 +-
 src/payloads/send_photo.rs                    |   10 +-
 src/payloads/send_poll.rs                     |   10 +-
 src/payloads/send_sticker.rs                  |   10 +-
 src/payloads/send_venue.rs                    |   10 +-
 src/payloads/send_video.rs                    |   10 +-
 src/payloads/send_video_note.rs               |   10 +-
 src/payloads/send_voice.rs                    |   10 +-
 .../set_chat_administrator_custom_title.rs    |   10 +-
 src/payloads/set_chat_description.rs          |   10 +-
 src/payloads/set_chat_menu_button.rs          |   11 +-
 src/payloads/set_chat_permissions.rs          |   10 +-
 src/payloads/set_chat_photo.rs                |   10 +-
 src/payloads/set_chat_sticker_set.rs          |   10 +-
 src/payloads/set_chat_title.rs                |   10 +-
 src/payloads/set_game_score.rs                |   10 +-
 src/payloads/set_game_score_inline.rs         |   10 +-
 src/payloads/set_my_commands.rs               |   10 +-
 .../set_my_default_administrator_rights.rs    |   11 +-
 src/payloads/set_passport_data_errors.rs      |   10 +-
 src/payloads/set_sticker_position_in_set.rs   |   10 +-
 src/payloads/set_sticker_set_thumb.rs         |   10 +-
 src/payloads/set_webhook.rs                   |   10 +-
 src/payloads/setters.rs                       |   10 +-
 src/payloads/stop_message_live_location.rs    |   10 +-
 .../stop_message_live_location_inline.rs      |   10 +-
 src/payloads/stop_poll.rs                     |   10 +-
 src/payloads/unban_chat_member.rs             |   10 +-
 src/payloads/unban_chat_sender_chat.rs        |   10 +-
 src/payloads/unpin_all_chat_messages.rs       |   10 +-
 src/payloads/unpin_chat_message.rs            |   10 +-
 src/payloads/upload_sticker_file.rs           |   10 +-
 src/requests/requester.rs                     |  128 +-
 110 files changed, 5318 insertions(+), 836 deletions(-)
 create mode 100644 schema.ron
 create mode 100644 src/codegen.rs
 create mode 100644 src/codegen/convert.rs
 create mode 100644 src/codegen/patch.rs
 create mode 100644 src/codegen/schema.rs
 create mode 100644 src/payloads/codegen.rs

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac784ce3..d9aebf38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ env:
   # - down below in a matrix
   rust_msrv: 1.58.0
 
+  CI: 1
+
 jobs:
   # Depends on all action that are required for a "successful" CI run.
   ci-pass:
diff --git a/Cargo.toml b/Cargo.toml
index 0395ae15..86dba265 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
 version = "0.7.1"
-edition = "2018"
+edition = "2021"
 
 license = "MIT"
 repository = "https://github.com/teloxide/teloxide-core/"
@@ -54,6 +54,12 @@ pretty_env_logger = "0.4"
 tokio = { version = "1.8.0", features = ["fs", "macros", "macros", "rt-multi-thread"] }
 cool_asserts = "2.0.3"
 
+xshell = "0.2"
+ron = "0.7"
+indexmap = { version = "1.9", features = ["serde-1"] }
+aho-corasick = "0.7"
+itertools = "0.10"
+
 [features]
 default = ["native-tls"]
 
diff --git a/schema.ron b/schema.ron
new file mode 100644
index 00000000..bd79cb18
--- /dev/null
+++ b/schema.ron
@@ -0,0 +1,3849 @@
+//! This file is written in [RON] (Rusty Object Notation).
+//! 
+//! This "schema" is a formalized version of the 
+//! [telegram bot api documentation][tbadoc] which is not machine readable.
+//! (note: this schema currently covers only API methods and **not** types).
+//! 
+//! Also, note that this file is **hand written** and may contain typos,
+//! deviations from original doc, and other kinds of typical human errors.
+//! If you found an error please open an issue (or make a PR) on [github].
+//! 
+//! This schema is targeting code generation for API wrappers in a statically 
+//! typed language, though you may use it whatever you want.
+//!
+//! This scheme also has some intentional differences from original doc:
+//! * New types:
+//!   + `ChatId` - type of `chat_id` parameter, in the original documentation
+//!     written as `Integer or String
+//!   + `UserId` - type of `user_id` parameters
+//!   + `ChatAction` - type of `action` param in `sendChatAction` method
+//!   + `AllowedUpdate` inner type of `allowed_updates` in `getUpdates` and
+//!     `setWebhook` (so type is `ArrayOf(AllowedUpdate)`)
+//!   + `ReplyMarkup` - type of `reply_markup` parameter, in the original
+//!     documentation written as `InlineKeyboardMarkup or ReplyKeyboardMarkup or 
+//!     ReplyKeyboardRemove or ForceReply`
+//!   + `ParseMode` type of `parse_mode` params
+//!   + `PollType` type of poll, either “quiz” or “regular”
+//!   + `DiceEmoji` emoji that can be used in `sendDice` one of “🎲”, “🎯”, or “🏀”
+//!   + `TargetMessage` either `inline_message_id: String` or `chat_id: ChatId` and `message_id: i64`
+//!   + `InputSticker`
+//! * Integers represented with more strict (when possible) types, e.g.:
+//!   `u8` (unsigned, 8-bit integer), `u32` (unsigned, 32-bit), 
+//!   `i64` (signed, 64-bit), etc
+//! * Instead of optional parameters `Option(Ty)` is used
+//! * Instead of `InputFile or String` just `InputFile` is used (assuming that
+//!   `InputFile` is a sum-type or something and it can contain `String`s)
+//! * `f64` ~= `Float number`
+//! 
+//! [tbadoc]: https://core.telegram.org/bots/api
+//! [RON]: https://github.com/ron-rs/ron
+//! [github]: https://github.com/WaffleLapkin/tg-methods-schema
+
+Schema(
+    api_version: ApiVersion(ver: "6.1", date: "June 20, 2022"),
+    methods: [
+        Method(
+            names: ("getUpdates", "GetUpdates", "get_updates"),
+            return_ty: ArrayOf(RawTy("Update")),
+            doc: Doc(
+                md: "Use this method to receive incoming updates using long polling ([wiki]). An Array of [Update] objects is returned.",
+                md_links: {
+                    "wiki": "https://en.wikipedia.org/wiki/Push_technology#Long_polling",
+                    "Update": "https://core.telegram.org/bots/api#update",
+                },    
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getupdates",
+            tg_category: "Getting updates",
+            params: [
+                Param(
+                    name: "offset",
+                    ty: Option(i32),
+                    descr: Doc(
+                        md: "Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as [getUpdates] is called with an offset higher than its update_id. The negative offset can be specified to retrieve updates starting from -offset update from the end of the updates queue. All previous updates will forgotten.",
+                        md_links: {
+                            "getUpdates": "https://core.telegram.org/bots/api#getupdates",
+                        }
+                    )
+                ),
+                Param(
+                    name: "limit",
+                    ty: Option(u8),
+                    descr: Doc(md: "Limits the number of updates to be retrieved. Values between 1-100 are accepted. Defaults to 100."),
+                ),
+                Param(
+                    name: "timeout",
+                    ty: Option(u32),
+                    descr: Doc(md: "Timeout in seconds for long polling. Defaults to 0, i.e. usual short polling. Should be positive, short polling should be used for testing purposes only."),
+                ),
+                Param(
+                    name: "allowed_updates",
+                    ty: Option(ArrayOf(RawTy("AllowedUpdate"))),
+                    descr: Doc(
+                        md: "A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [Update] for a complete list of available update types. Specify an empty list to receive all update types except chat_member (default). If not specified, the previous setting will be used.\n\nPlease note that this parameter doesn't affect updates created before the call to the getUpdates, so unwanted updates may be received for a short period of time.",
+                        md_links: {"Update":"https://core.telegram.org/bots/api#update"},
+                    ),
+                )
+            ],
+            notes: [
+                (md: "This method will not work if an outgoing webhook is set up."),
+                (md: "In order to avoid getting duplicate updates, recalculate _offset_ after each server response.")
+            ],
+        ),
+        Method(
+            names: ("setWebhook", "SetWebhook", "set_webhook"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized [Update]. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.\n\nIf you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. `https://www.example.com/<token>`. Since nobody else knows your bot's token, you can be pretty sure it's us.",
+                md_links: {"Update":"https://core.telegram.org/bots/api#update"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#setwebhook",
+            tg_category: "Getting updates",
+            params: [
+                Param(
+                    name: "url",
+                    ty: String,
+                    descr: Doc(md: "HTTPS url to send updates to. Use an empty string to remove webhook integration"),
+                ),
+                Param(
+                    name: "certificate",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Upload your public key certificate so that the root certificate in use can be checked. See our [self-signed guide] for details.",
+                        md_links: {"self-signed guide":"https://core.telegram.org/bots/self-signed"},
+                    )
+                ),
+                Param(
+                    name: "ip_address",
+                    ty: Option(String),
+                    descr: Doc(md: "The fixed IP address which will be used to send webhook requests instead of the IP address resolved through DNS"),
+                ),
+                Param(
+                    name: "max_connections",
+                    ty: Option(u8),
+                    descr: Doc(md: "Maximum allowed number of simultaneous HTTPS connections to the webhook for update delivery, 1-100. Defaults to 40. Use lower values to limit the load on your bot's server, and higher values to increase your bot's throughput.")
+                ),
+                Param(
+                    name: "allowed_updates",
+                    ty: Option(ArrayOf(RawTy("AllowedUpdate"))),
+                    descr: Doc(
+                        md: "A JSON-serialized list of the update types you want your bot to receive. For example, specify [“message”, “edited_channel_post”, “callback_query”] to only receive updates of these types. See [Update] for a complete list of available update types. Specify an empty list to receive all updates regardless of type (default). If not specified, the previous setting will be used.\n\nPlease note that this parameter doesn't affect updates created before the call to the setWebhook, so unwanted updates may be received for a short period of time.",
+                        md_links: {"Update":"https://core.telegram.org/bots/api#update"},
+                    ),
+                ),
+                Param(
+                    name: "drop_pending_updates",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_ to drop all pending updates")
+                ),
+                Param(
+                    name: "secret_token",
+                    ty: Option(String),
+                    descr: Doc(md: "A secret token to be sent in a header “X-Telegram-Bot-Api-Secret-Token” in every webhook request, 1-256 characters. Only characters `A-Z`, `a-z`, `0-9`, `_` and `-` are allowed. The header is useful to ensure that the request comes from a webhook set by you."),
+                ),
+            ],
+            notes: [
+                (
+                    md: "You will not be able to receive updates using [getUpdates] for as long as an outgoing webhook is set up.",
+                    md_links: {"getUpdates": "https://core.telegram.org/bots/api#getupdates"},
+                ),
+                (
+                    md: "To use a self-signed certificate, you need to upload your [public key certificate] using certificate parameter. Please upload as InputFile, sending a String will not work.",
+                    md_links: {"public key certificate":"https://core.telegram.org/bots/self-signed"}
+                ),
+                (md: "Ports currently supported for Webhooks: **443**, **80**, **88**, **8443**."),
+                (
+                    md: "If you're having any trouble setting up webhooks, please check out this [amazing guide to Webhooks].",
+                    md_links: {"amazing guide to Webhooks": "https://core.telegram.org/bots/webhooks"}
+                )
+            ]
+        ),        
+        Method(
+            names: ("deleteWebhook", "DeleteWebhook", "delete_webhook"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to remove webhook integration if you decide to switch back to [getUpdates]. Returns True on success. Requires no parameters.",
+                md_links: {"getUpdates":"https://core.telegram.org/bots/api#getupdates"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#deletewebhook",
+            tg_category: "Getting updates",
+            params: [
+                Param(
+                    name: "drop_pending_updates",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_ to drop all pending updates"),
+                )
+            ],
+        ),
+        Method(
+            names: ("getWebhookInfo", "GetWebhookInfo", "get_webhook_info"),
+            return_ty: RawTy("WebhookInfo"),
+            doc: Doc(
+                md: "Use this method to get current webhook status. Requires no parameters. On success, returns a [WebhookInfo] object. If the bot is using [getUpdates], will return an object with the _url_ field empty.",
+                md_links: {
+                    "WebhookInfo": "https://core.telegram.org/bots/api#webhookinfo",
+                    "getUpdates": "https://core.telegram.org/bots/api#getupdates",
+                }
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getwebhookinfo",
+            tg_category: "Getting updates",
+            params: [],
+        ),
+        Method(
+            names: ("getMe", "GetMe", "get_me"),
+            return_ty: RawTy("Me"),
+            doc: Doc(
+                md: "A simple method for testing your bot's auth token. Requires no parameters. Returns basic information about the bot in form of a [User] object.",
+                md_links: {"User": "https://core.telegram.org/bots/api#user"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getme",
+            tg_category: "Available methods",
+            params: [],
+        ),
+        Method(
+            names: ("logOut", "LogOut", "log_out"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to log out from the cloud Bot API server before launching the bot locally. You **must** log out the bot before running it locally, otherwise there is no guarantee that the bot will receive updates. After a successful call, you can immediately log in on a local server, but will not be able to log in back to the cloud Bot API server for 10 minutes. Returns _True_ on success. Requires no parameters."),
+            tg_doc: "https://core.telegram.org/bots/api#logout",
+            tg_category: "Available methods",
+            params: [],
+        ),        
+        Method(
+            names: ("close", "Close", "close"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to close the bot instance before moving it from one local server to another. You need to delete the webhook before calling this method to ensure that the bot isn't launched again after server restart. The method will return error 429 in the first 10 minutes after the bot is launched. Returns _True_ on success. Requires no parameters."),
+            tg_doc: "https://core.telegram.org/bots/api#close",
+            tg_category: "Available methods",
+            params: [],
+        ),
+        Method(
+            names: ("sendMessage", "SendMessage", "send_message"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send text messages. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendmessage",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "text",
+                    ty: String,
+                    descr: Doc(md: "Text of the message to be sent, 1-4096 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the message text, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_web_page_preview",
+                    ty: Option(bool),
+                    descr: Doc(md: "Disables link previews for links in this message")
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("forwardMessage", "ForwardMessage", "forward_message"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to forward messages of any kind. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#forwardmessage",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "from_chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32, 
+                    descr: Doc(md: "Message identifier in the chat specified in _from\\_chat\\_id_")
+                ),
+            ],
+        ),
+        Method(
+            names: ("copyMessage", "CopyMessage", "copy_message"),
+            return_ty: RawTy("MessageId"),
+            doc: Doc(
+                md: "Use this method to copy messages of any kind. The method is analogous to the method forwardMessage, but the copied message doesn't have a link to the original message. Returns the [MessageId] of the sent message on success.",
+                md_links: {"MessageId": "https://core.telegram.org/bots/api#messageid"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#copymessage",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "from_chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32, 
+                    descr: Doc(md: "Message identifier in the chat specified in _from\\_chat\\_id_")
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "New caption for media, 0-1024 characters after entities parsing. If not specified, the original caption is kept"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the photo caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the new caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        },
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendPhoto", "SendPhoto", "send_photo"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send photos. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendphoto",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "photo",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Photo to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    )
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo caption (may also be used when resending photos by _file\\_id_), 0-1024 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the photo caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the photo caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        },
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendAudio", "SendAudio", "send_audio"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send audio files, if you want Telegram clients to display them in the music player. Your audio must be in the .MP3 or .M4A format. On success, the sent [Message] is returned. Bots can currently send audio files of up to 50 MB in size, this limit may be changed in the future.\n\nFor sending voice messages, use the [sendVoice] method instead.",
+                md_links: {
+                    "Message": "https://core.telegram.org/bots/api#message",
+                    "sendVoice": "https://core.telegram.org/bots/api#sendvoice",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendaudio",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "audio",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Audio caption, 0-1024 characters after entities parsing"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the audio caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"},
+                    ),
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the photo caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "duration",
+                    ty: Option(u32),
+                    descr: Doc(md: "Duration of the audio in seconds"),
+                ),
+                Param(
+                    name: "performer",
+                    ty: Option(String),
+                    descr: Doc(md: "Performer"),
+                ),
+                Param(
+                    name: "title",
+                    ty: Option(String),
+                    descr: Doc(md: "Track name"),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendDocument", "SendDocument", "send_document"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send general files. On success, the sent [Message] is returned. Bots can currently send files of any type of up to 50 MB in size, this limit may be changed in the future.",
+                md_links: { "Message": "https://core.telegram.org/bots/api#message" },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#senddocument",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "document",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "File to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Document caption (may also be used when resending documents by _file\\_id_), 0-1024 characters after entities parsing"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the audio caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"},
+                    ),
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the photo caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_content_type_detection",
+                    ty: Option(bool),
+                    descr: Doc(md: "Disables automatic server-side content type detection for files uploaded using multipart/form-data."),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendVideo", "SendVideo", "send_video"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send video files, Telegram clients support mp4 videos (other formats may be sent as [Document]). On success, the sent [Message] is returned. Bots can currently send video files of up to 50 MB in size, this limit may be changed in the future.",
+                md_links: {
+                    "Document": "https://core.telegram.org/bots/api#document",
+                    "Message": "https://core.telegram.org/bots/api#message",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendvideo",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "video",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Video to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "duration",
+                    ty: Option(u32),
+                    descr: Doc(md: "Duration of the video in seconds"),
+                ),
+                Param(
+                    name: "width",
+                    ty: Option(u32),
+                    descr: Doc(md: "Video width"),
+                ),
+                Param(
+                    name: "height",
+                    ty: Option(u32),
+                    descr: Doc(md: "Video height"),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Video caption (may also be used when resending videos by _file\\_id_), 0-1024 characters after entities parsing"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the video caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"},
+                    ),
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "supports_streaming",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the uploaded video is suitable for streaming"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                    
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendAnimation", "SendAnimation", "send_animation"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send animation files (GIF or H.264/MPEG-4 AVC video without sound). On success, the sent [Message] is returned. Bots can currently send animation files of up to 50 MB in size, this limit may be changed in the future.",
+                md_links: { "Message": "https://core.telegram.org/bots/api#message" },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendanimation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "animation",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Animation to send. Pass a file_id as String to send a video that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a video from the Internet, or upload a new video using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "duration",
+                    ty: Option(u32),
+                    descr: Doc(md: "Duration of the animation in seconds"),
+                ),
+                Param(
+                    name: "width",
+                    ty: Option(u32),
+                    descr: Doc(md: "Animation width"),
+                ),
+                Param(
+                    name: "height",
+                    ty: Option(u32),
+                    descr: Doc(md: "Animation height"),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Animation caption (may also be used when resending videos by _file\\_id_), 0-1024 characters after entities parsing"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the animation caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"},
+                    ),
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the photo caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendVoice", "SendVoice", "send_voice"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send audio files, if you want Telegram clients to display the file as a playable voice message. For this to work, your audio must be in an .OGG file encoded with OPUS (other formats may be sent as [Audio] or [Document]). On success, the sent [Message] is returned. Bots can currently send voice messages of up to 50 MB in size, this limit may be changed in the future.",
+                md_links: {
+                    "Audio": "https://core.telegram.org/bots/api#audio",
+                    "Document": "https://core.telegram.org/bots/api#document",
+                    "Message": "https://core.telegram.org/bots/api#message",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendaudio",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "voice",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Audio file to send. Pass a file_id as String to send an audio file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get an audio file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "Voice message caption, 0-1024 characters after entities parsing"),
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the voice message caption. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"},
+                    ),
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the photo caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "duration",
+                    ty: Option(u32),
+                    descr: Doc(md: "Duration of the voice message in seconds"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }  
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendVideoNote", "SendVideoNote", "send_video_note"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "As of [v.4.0], Telegram clients support rounded square mp4 videos of up to 1 minute long. Use this method to send video messages. On success, the sent [Message] is returned.",
+                md_links: {
+                    "v.4.0": "https://core.telegram.org/bots/api#document",
+                    "Message": "https://core.telegram.org/bots/api#message",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendvideonote",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "video_note",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Video note to send. Pass a file_id as String to send a video note that exists on the Telegram servers (recommended) or upload a new video using multipart/form-data. [More info on Sending Files »]. Sending video notes by a URL is currently unsupported",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "duration",
+                    ty: Option(u32),
+                    descr: Doc(md: "Duration of the video in seconds"),
+                ),
+                Param(
+                    name: "length",
+                    ty: Option(u32),
+                    descr: Doc(md: "Video width and height, i.e. diameter of the video message"),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "Thumbnail of the file sent; can be ignored if thumbnail generation for the file is supported server-side. The thumbnail should be in JPEG format and less than 200 kB in size. A thumbnail's width and height should not exceed 320. Ignored if the file is not uploaded using multipart/form-data. Thumbnails can't be reused and can be only uploaded as a new file, so you can pass “attach://<file_attach_name>” if the thumbnail was uploaded using multipart/form-data under <file_attach_name>. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"},
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }    
+                    ),
+                    
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendMediaGroup", "SendMediaGroup", "send_media_group"),
+            return_ty: ArrayOf(RawTy("Message")),
+            doc: Doc(
+                md: "Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [Message]s that were sent is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendmediagroup",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "media",
+                    ty: ArrayOf(RawTy("InputMedia")),
+                    descr: Doc(md: "A JSON-serialized array describing messages to be sent, must include 2-10 items")
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendLocation", "SendLocation", "send_location"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send point on the map. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendlocation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)"),
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of the location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of the location"),
+                ),
+                Param(
+                    name: "horizontal_accuracy",
+                    ty: Option(f64),
+                    descr: Doc(md: "The radius of uncertainty for the location, measured in meters; 0-1500"),
+                ),
+                Param(
+                    name: "live_period",
+                    ty: Option(u32),
+                    descr: Doc(
+                        md: "Period in seconds for which the location will be updated (see [Live Locations], should be between 60 and 86400.",
+                        md_links: {"Live Locations": "https://telegram.org/blog/live-locations"}
+                    )
+                ),
+                Param(
+                    name: "heading",
+                    ty: Option(u16), 
+                    descr: Doc(md: "For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.")
+                ),
+                Param(
+                    name: "proximity_alert_radius",
+                    ty: Option(u32), 
+                    descr: Doc(md: "For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.")
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageLiveLocation", "EditMessageLiveLocation", "edit_message_live_location"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [stopMessageLiveLocation]. On success, the edited Message is returned.",
+                md_links: {"stopMessageLiveLocation": "https://core.telegram.org/bots/api#stopmessagelivelocation"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagelivelocation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32, 
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of new location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of new location"),
+                ),
+                Param(
+                    name: "horizontal_accuracy",
+                    ty: Option(f64),
+                    descr: Doc(md: "The radius of uncertainty for the location, measured in meters; 0-1500"),
+                ),
+                Param(
+                    name: "heading",
+                    ty: Option(u16), 
+                    descr: Doc(md: "For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.")
+                ),
+                Param(
+                    name: "proximity_alert_radius",
+                    ty: Option(u32), 
+                    descr: Doc(md: "For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+            sibling: Some("editMessageLiveLocationInline"),
+        ),
+        Method(
+            names: ("editMessageLiveLocationInline", "EditMessageLiveLocationInline", "edit_message_live_location_inline"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [stopMessageLiveLocation]. On success, True is returned.",
+                md_links: {"stopMessageLiveLocation": "https://core.telegram.org/bots/api#stopmessagelivelocation"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagelivelocation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message"),
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of new location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of new location"),
+                ),
+                Param(
+                    name: "horizontal_accuracy",
+                    ty: Option(f64),
+                    descr: Doc(md: "The radius of uncertainty for the location, measured in meters; 0-1500"),
+                ),
+                Param(
+                    name: "heading",
+                    ty: Option(u16), 
+                    descr: Doc(md: "For live locations, a direction in which the user is moving, in degrees. Must be between 1 and 360 if specified.")
+                ),
+                Param(
+                    name: "proximity_alert_radius",
+                    ty: Option(u32), 
+                    descr: Doc(md: "For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified.")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+            sibling: Some("editMessageLiveLocation"),
+        ),
+        Method(
+            names: ("stopMessageLiveLocation", "StopMessageLiveLocation", "stop_message_live_location"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [stopMessageLiveLocation]. On success, the edited Message is returned.",
+                md_links: {
+                    "Message": "https://core.telegram.org/bots/api#message",
+                    "stopMessageLiveLocation": "https://core.telegram.org/bots/api#stopmessagelivelocation",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagelivelocation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32, 
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of new location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of new location"),
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }    
+                    ),
+                ),
+            ],
+            sibling: Some("stopMessageLiveLocationInline"),
+        ),
+        Method(
+            names: ("stopMessageLiveLocationInline", "StopMessageLiveLocationInline", "stop_message_live_location_inline"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [stopMessageLiveLocation]. On success, True is returned.",
+                md_links: {"stopMessageLiveLocation": "https://core.telegram.org/bots/api#stopmessagelivelocation"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagelivelocation",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message"),
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of new location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of new location"),
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+            sibling: Some("stopMessageLiveLocation"),
+        ),
+        Method(
+            names: ("sendVenue", "SendVenue", "send_venue"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send information about a venue. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendvenue",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "latitude",
+                    ty: f64,
+                    descr: Doc(md: "Latitude of new location"),
+                ),
+                Param(
+                    name: "longitude",
+                    ty: f64,
+                    descr: Doc(md: "Longitude of new location"),
+                ),
+                Param(
+                    name: "title",
+                    ty: String,
+                    descr: Doc(md: "Name of the venue")
+                ),
+                Param(
+                    name: "address",
+                    ty: String,
+                    descr: Doc(md: "Address of the venue")
+                ),
+                Param(
+                    name: "foursquare_id",
+                    ty: Option(String),
+                    descr: Doc(md: "Foursquare identifier of the venue")
+                ),
+                Param(
+                    name: "foursquare_type",
+                    ty: Option(String),
+                    descr: Doc(md: "Foursquare type of the venue, if known. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)")
+                ),
+                Param(
+                    name: "google_place_id",
+                    ty: Option(String),
+                    descr: Doc(md: "Google Places identifier of the venue")
+                ),
+                Param(
+                    name: "google_place_type",
+                    ty: Option(String),
+                    descr: Doc(
+                        md: "Google Places type of the venue. (See [supported types].)",
+                        md_links: {"supported types":"https://developers.google.com/places/web-service/supported_types"},
+                    ),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }  
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendContact", "SendContact", "send_contact"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send phone contacts. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendcontact",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "phone_number",
+                    ty: String,
+                    descr: Doc(md: "Contact's phone number"),
+                ),
+                Param(
+                    name: "first_name",
+                    ty: String,
+                    descr: Doc(md: "Contact's first name"),
+                ),
+                Param(
+                    name: "last_name",
+                    ty: Option(String),
+                    descr: Doc(md: "Contact's last name")
+                ),
+                Param(
+                    name: "vcard",
+                    ty: Option(String),
+                    descr: Doc(
+                        md: "Additional data about the contact in the form of a [vCard], 0-2048 bytes",
+                        md_links: {"vCard": "https://en.wikipedia.org/wiki/VCard"}
+                    )
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendPoll", "SendPoll", "send_poll"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send phone contacts. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendpoll",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "question",
+                    ty: String,
+                    descr: Doc(md: "Poll question, 1-300 characters"),
+                ),
+                Param(
+                    name: "options",
+                    ty: ArrayOf(String),
+                    descr: Doc(md: "A JSON-serialized list of answer options, 2-10 strings 1-100 characters each"),
+                ),
+                Param(
+                    name: "is_anonymous",
+                    ty: Option(bool),
+                    descr: Doc(md: "True, if the poll needs to be anonymous, defaults to True")
+                ),
+                Param(
+                    name: "type",
+                    ty: Option(RawTy("PollType")),
+                    descr: Doc(md: "Poll type, “quiz” or “regular”, defaults to “regular”")
+                ),
+                Param(
+                    name: "allows_multiple_answers",
+                    ty: Option(bool),
+                    descr: Doc(md: "True, if the poll allows multiple answers, ignored for polls in quiz mode, defaults to False")
+                ),
+                Param(
+                    name: "correct_option_id",
+                    ty: Option(u8),
+                    descr: Doc(md: "0-based identifier of the correct answer option, required for polls in quiz mode")
+                ),
+                Param(
+                    name: "explanation",
+                    ty: Option(String),
+                    descr: Doc(md: "Text that is shown when a user chooses an incorrect answer or taps on the lamp icon in a quiz-style poll, 0-200 characters with at most 2 line feeds after entities parsing")
+                ),
+                Param(
+                    name: "explanation_parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "explanation_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the poll explanation, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "open_period",
+                    ty: Option(u16),
+                    descr: Doc(md: "Amount of time in seconds the poll will be active after creation, 5-600. Can't be used together with close_date.")
+                ),
+                Param(
+                    name: "close_date",
+                    ty: Option(u64),
+                    descr: Doc(md: "Point in time (Unix timestamp) when the poll will be automatically closed. Must be at least 5 and no more than 600 seconds in the future. Can't be used together with open_period.")
+                ),
+                Param(
+                    name: "is_closed",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the poll needs to be immediately closed. This can be useful for poll preview.")
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }    
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendDice", "SendDice", "send_dice"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send an animated emoji that will display a random value. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#senddice",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "emoji",
+                    ty: Option(RawTy("DiceEmoji")),
+                    descr: Doc(md: "Emoji on which the dice throw animation is based. Currently, must be one of “🎲”, “🎯”, “🏀”, “⚽”, “🎳”, or “🎰”. Dice can have values 1-6 for “🎲”, “🎯” and “🎳”, values 1-5 for “🏀” and “⚽”, and values 1-64 for “🎰”. Defaults to “🎲”"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendChatAction", "SendChatAction", "send_chat_action"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method when you need to tell the user that something is happening on the bot's side. The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status). Returns True on success.\n\n> Example: The [ImageBot] needs some time to process a request and upload the image. Instead of sending a text message along the lines of “Retrieving image, please wait…”, the bot may use sendChatAction with action = upload_photo. The user will see a “sending photo” status for the bot.\n\nWe only recommend using this method when a response from the bot will take a **noticeable** amount of time to arrive.",
+                md_links: {"ImageBot": "https://t.me/imagebot"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendchataction",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "action",
+                    ty: RawTy("ChatAction"),
+                    descr: Doc(
+                        md: "Type of action to broadcast. Choose one, depending on what the user is about to receive: typing for [text messages], upload_photo for [photos], record_video or upload_video for [videos], record_audio or upload_audio for [audio files], upload_document for [general files], choose_sticker for [stickers], find_location for [location data], record_video_note or upload_video_note for [video notes].",
+                        md_links: {
+                            "text messages": "https://core.telegram.org/bots/api#sendmessage",
+                            "photos": "https://core.telegram.org/bots/api#sendphoto",
+                            "videos": "https://core.telegram.org/bots/api#sendvideo",
+                            "audio files": "https://core.telegram.org/bots/api#sendaudio",
+                            "general files": "https://core.telegram.org/bots/api#senddocument",
+                            "stickers": "https://core.telegram.org/bots/api#sendsticker",
+                            "location data": "https://core.telegram.org/bots/api#sendlocation",
+                            "video notes": "https://core.telegram.org/bots/api#sendvideonote",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("getUserProfilePhotos", "GetUserProfilePhotos", "get_user_profile_photos"),
+            return_ty: RawTy("UserProfilePhotos"),
+            doc: Doc(
+                md: "Use this method to get a list of profile pictures for a user. Returns a [UserProfilePhotos] object.",
+                md_links: {"UserProfilePhotos": "https://core.telegram.org/bots/api#userprofilephotos"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getuserprofilephotos",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "offset",
+                    ty: Option(u32),
+                    descr: Doc(md: "Sequential number of the first photo to be returned. By default, all photos are returned.")
+                ),
+                Param(
+                    name: "limit",
+                    ty: Option(u8),
+                    descr: Doc(md: "Limits the number of photos to be retrieved. Values between 1-100 are accepted. Defaults to 100.")
+                ),
+            ],
+        ),
+        Method(
+            names: ("getFile", "GetFile", "get_file"),
+            return_ty: RawTy("File"),
+            doc: Doc(
+                md: "Use this method to get basic info about a file and prepare it for downloading. For the moment, bots can download files of up to 20MB in size. On success, a [File] object is returned. The file can then be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>` is taken from the response. It is guaranteed that the link will be valid for at least 1 hour. When the link expires, a new one can be requested by calling [getFile] again.",
+                md_links: {
+                    "File": "https://core.telegram.org/bots/api#file",
+                    "getFile": "https://core.telegram.org/bots/api#getfile",
+                },
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getuserprofilephotos",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "file_id",
+                    ty: String,
+                    descr: Doc(md: "File identifier to get info about")
+                ),
+            ],
+        ),
+        Method(
+            names: ("banChatMember", "BanChatMember", "ban_chat_member"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to ban a user in a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the chat on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.",
+                md_links: {"unbanned": "https://core.telegram.org/bots/api#unbanchatmember"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#kickchatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "until_date",
+                    ty: Option(u64),
+                    descr: Doc(md: "Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever")
+                ),
+                Param(
+                    name: "revoke_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.")
+                ),
+            ],
+        ),
+        // deprecated
+        Method(
+            names: ("kickChatMember", "KickChatMember", "kick_chat_member"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to kick a user from a group, a supergroup or a channel. In the case of supergroups and channels, the user will not be able to return to the group on their own using invite links, etc., unless [unbanned] first. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success.",
+                md_links: {"unbanned": "https://core.telegram.org/bots/api#unbanchatmember"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#kickchatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "until_date",
+                    ty: Option(u64),
+                    descr: Doc(md: "Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever")
+                ),
+                Param(
+                    name: "revoke_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True to delete all messages from the chat for the user that is being removed. If False, the user will be able to see messages in the group that were sent before the user was removed. Always True for supergroups and channels.")
+                ),
+            ],
+        ),
+
+        Method(
+            names: ("unbanChatMember", "UnbanChatMember", "unban_chat_member"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to unban a previously kicked user in a supergroup or channel. The user will **not** return to the group or channel automatically, but will be able to join via link, etc. The bot must be an administrator for this to work. By default, this method guarantees that after the call the user is not a member of the chat, but will be able to join it. So if the user is a member of the chat they will also be **removed** from the chat. If you don't want this, use the parameter _only\\_if\\_banned_. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#unbanchatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "only_if_banned",
+                    ty: Option(bool),
+                    descr: Doc(md: "Do nothing if the user is not banned"),
+                )
+            ],
+        ),
+        Method(
+            names: ("restrictChatMember", "RestrictChatMember", "restrict_chat_member"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to restrict a user in a supergroup. The bot must be an administrator in the supergroup for this to work and must have the appropriate admin rights. Pass _True_ for all permissions to lift restrictions from a user. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#restrictchatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "permissions",
+                    ty: RawTy("ChatPermissions"),
+                    descr: Doc(md: "A JSON-serialized object for new user permissions")
+                ),
+                Param(
+                    name: "until_date",
+                    ty: Option(u64),
+                    descr: Doc(md: "Date when the user will be unbanned, unix time. If user is banned for more than 366 days or less than 30 seconds from the current time they are considered to be banned forever")
+                ),
+            ],
+        ),
+        Method(
+            names: ("promoteChatMember", "PromoteChatMember", "promote_chat_member"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to promote or demote a user in a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Pass _False_ for all boolean parameters to demote a user. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#promotechatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "is_anonymous",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator's presence in the chat is hidden")
+                ),
+                Param(
+                    name: "can_manage_chat",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can access the chat event log, chat statistics, message statistics in channels, see channel members, see anonymous administrators in supergroups and ignore slow mode. Implied by any other administrator privilege"),
+                ),
+                Param(
+                    name: "can_change_info",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can change chat title, photo and other settings")
+                ),
+                Param(
+                    name: "can_post_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can create channel posts, channels only")
+                ),
+                Param(
+                    name: "can_edit_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can edit messages of other users and can pin messages, channels only")
+                ),
+                Param(
+                    name: "can_delete_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can delete messages of other users")
+                ),
+                Param(
+                    name: "can_manage_video_chats",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can manage video chats, supergroups only")
+                ),
+                Param(
+                    name: "can_invite_users",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can invite new users to the chat")
+                ),
+                Param(
+                    name: "can_restrict_members",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can restrict, ban or unban chat members")
+                ),
+                 Param(
+                    name: "can_pin_messages",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can pin messages, supergroups only")
+                ),
+                Param(
+                    name: "can_promote_members",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the administrator can add new administrators with a subset of their own privileges or demote administrators that he has promoted, directly or indirectly (promoted by administrators that were appointed by him)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatAdministratorCustomTitle", "SetChatAdministratorCustomTitle", "set_chat_administrator_custom_title"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to set a custom title for an administrator in a supergroup promoted by the bot. Returns _True_on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setchatadministratorcustomtitle",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+                Param(
+                    name: "custom_title",
+                    ty: String,
+                    descr: Doc(md: "New custom title for the administrator; 0-16 characters, emoji are not allowed")
+                ),
+            ],
+        ),
+        Method(
+            names: ("banChatSenderChat", "BanChatSenderChat", "ban_chat_sender_chat"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to ban a channel chat in a supergroup or a channel. The owner of the chat will not be able to send messages and join live streams on behalf of the chat, unless it is unbanned first. The bot must be an administrator in the supergroup or channel for this to work and must have the appropriate administrator rights."),
+            tg_doc: "https://core.telegram.org/bots/api#banchatsenderchat",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "sender_chat_id",
+                    ty: RawTy("ChatId"),
+                    descr: Doc(md: "Unique identifier of the target sender chat")
+                ),
+            ],
+        ),        
+        Method(
+            names: ("unbanChatSenderChat", "UnbanChatSenderChat", "unban_chat_sender_chat"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to unban a previously banned channel chat in a supergroup or channel. The bot must be an administrator for this to work and must have the appropriate administrator rights."),
+            tg_doc: "https://core.telegram.org/bots/api#unbanchatsenderchat",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "sender_chat_id",
+                    ty: RawTy("ChatId"),
+                    descr: Doc(md: "Unique identifier of the target sender chat")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatPermissions", "SetChatPermissions", "set_chat_permissions"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to set default chat permissions for all members. The bot must be an administrator in the group or a supergroup for this to work and must have the _can_restrict_members_ admin rights. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setchatpermissions",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "permissions",
+                    ty: RawTy("ChatPermissions"),
+                    descr: Doc(md: "New default chat permissions")
+                ),
+            ],
+        ),
+        Method(
+            names: ("exportChatInviteLink", "ExportChatInviteLink", "export_chat_invite_link"),
+            return_ty: String,
+            doc: Doc(md: "Use this method to generate a new invite link for a chat; any previously generated link is revoked. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the new invite link as String on success.\n\n> Note: Each administrator in a chat generates their own invite links. Bots can't use invite links generated by other administrators. If you want your bot to work with invite links, it will need to generate its own link using exportChatInviteLink — after this the link will become available to the bot via the getChat method. If your bot needs to generate a new invite link replacing its previous one, use exportChatInviteLink again."),
+            tg_doc: "https://core.telegram.org/bots/api#exportchatinvitelink",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),        
+        Method(
+            names: ("createChatInviteLink", "CreateChatInviteLink", "create_chat_invite_link"),
+            return_ty: RawTy("ChatInviteLink"),
+            doc: Doc(
+                md: "Use this method to create an additional invite link for a chat. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. The link can be revoked using the method [revokeChatInviteLink]. Returns the new invite link as [ChatInviteLink] object.",
+                md_links: {
+                    "revokeChatInviteLink": "https://core.telegram.org/bots/api#revokechatinvitelink",
+                    "ChatInviteLink": "https://core.telegram.org/bots/api#chatinvitelink",
+                }
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#createchatinvitelink",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "name",
+                    ty: Option(String),
+                    descr: Doc(md: "Invite link name; 0-32 characters")
+                ),
+                Param(
+                    name: "expire_date",
+                    ty: Option(i64),
+                    descr: Doc(md: "Point in time (Unix timestamp) when the link will expire")
+                ),
+                Param(
+                    name: "member_limit",
+                    ty: Option(u32),
+                    descr: Doc(md: "Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999")
+                ),
+                Param(
+                    name: "creates_join_request",
+                    ty: Option(bool)    ,
+                    descr: Doc(md: "True, if users joining the chat via the link need to be approved by chat administrators. If True, member_limit can't be specified")
+                ),
+            ],
+        ),        
+        Method(
+            names: ("editChatInviteLink", "EditChatInviteLink", "edit_chat_invite_link"),
+            return_ty: String,
+            doc: Doc(
+                md: "Use this method to edit a non-primary invite link created by the bot. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the edited invite link as a [ChatInviteLink] object.",
+                md_links: {"ChatInviteLink": "https://core.telegram.org/bots/api#chatinvitelink"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editchatinvitelink",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "invite_link",
+                    ty: String,
+                    descr: Doc(md: "The invite link to edit")
+                ),
+                Param(
+                    name: "name",
+                    ty: Option(String),
+                    descr: Doc(md: "Invite link name; 0-32 characters")
+                ),
+                Param(
+                    name: "expire_date",
+                    ty: Option(i64),
+                    descr: Doc(md: "Point in time (Unix timestamp) when the link will expire")
+                ),
+                Param(
+                    name: "member_limit",
+                    ty: Option(u32),
+                    descr: Doc(md: "Maximum number of users that can be members of the chat simultaneously after joining the chat via this invite link; 1-99999")
+                ),
+                Param(
+                    name: "creates_join_request",
+                    ty: Option(bool)    ,
+                    descr: Doc(md: "True, if users joining the chat via the link need to be approved by chat administrators. If True, member_limit can't be specified")
+                ),
+            ],
+        ),        
+        Method(
+            names: ("revokeChatInviteLink", "RevokeChatInviteLink", "revoke_chat_invite_link"),
+            return_ty: String,
+            doc: Doc(
+                md: "Use this method to revoke an invite link created by the bot. If the primary link is revoked, a new link is automatically generated. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns the revoked invite link as [ChatInviteLink] object.",
+                md_links: {"ChatInviteLink": "https://core.telegram.org/bots/api#chatinvitelink"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editchatinvitelink",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "invite_link",
+                    ty: String,
+                    descr: Doc(md: "The invite link to revoke")
+                ),
+            ],
+        ),
+        Method(
+            names: ("approveChatJoinRequest", "ApproveChatJoinRequest", "approve_chat_join_request"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to approve a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#approvechatjoinrequest",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+            ],
+        ),
+        Method(
+            names: ("declineChatJoinRequest", "DeclineChatJoinRequest", "decline_chat_join_request"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to decline a chat join request. The bot must be an administrator in the chat for this to work and must have the _can_invite_users_ administrator right. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#declinechatjoinrequest",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatPhoto", "SetChatPhoto", "set_chat_photo"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to set a new profile photo for the chat. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setchatphoto",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "photo",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(md: "New chat photo, uploaded using multipart/form-data")
+                ),
+            ],
+        ),
+        Method(
+            names: ("deleteChatPhoto", "DeleteChatPhoto", "delete_chat_photo"),
+            return_ty: String,
+            doc: Doc(md: "Use this method to delete a chat photo. Photos can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns True on success."),
+            tg_doc: "https://core.telegram.org/bots/api#deletechatphoto",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatTitle", "SetChatTitle", "set_chat_title"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to change the title of a chat. Titles can't be changed for private chats. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setchattitle",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "title",
+                    ty: String,
+                    descr: Doc(md: "New chat title, 1-255 characters")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatDescription", "SetChatDescription", "set_chat_description"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to change the description of a group, a supergroup or a channel. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setchatdescription",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "description",
+                    ty: Option(String),
+                    descr: Doc(md: "New chat description, 0-255 characters")
+                ),
+            ],
+        ),
+        Method(
+            names: ("pinChatMessage", "PinChatMessage", "pin_chat_message"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to pin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#pinchatmessage",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of a message to pin"),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(md: "Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels.")
+                ),
+            ],
+        ),
+        Method(
+            names: ("unpinChatMessage", "UnpinChatMessage", "unpin_chat_message"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to remove a message from the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#unpinchatmessage",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "Identifier of a message to unpin. If not specified, the most recent pinned message (by sending date) will be unpinned.")
+                ),
+            ],
+        ),
+        Method(
+            names: ("unpinAllChatMessages", "UnpinAllChatMessages", "unpin_all_chat_messages"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to clear the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#unpinallchatmessages",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("leaveChat", "LeaveChat", "leave_chat"),
+            return_ty: True,
+            doc: Doc(md: "Use this method for your bot to leave a group, supergroup or channel. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#leavechat",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("getChat", "GetChat", "get_chat"),
+            return_ty: RawTy("Chat"),
+            doc: Doc(
+                md: "Use this method to get up to date information about the chat (current name of the user for one-on-one conversations, current username of a user, group or channel, etc.). Returns a [Chat] object on success.",
+                md_links: {"Chat": "https://core.telegram.org/bots/api#chat"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getchat",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("getChatAdministrators", "GetChatAdministrators", "get_chat_administrators"),
+            return_ty: ArrayOf(RawTy("ChatMember")),
+            doc: Doc(
+                md: "Use this method to get a list of administrators in a chat. On success, returns an Array of [ChatMember] objects that contains information about all chat administrators except other bots. If the chat is a group or a supergroup and no administrators were appointed, only the creator will be returned.",
+                md_links: {"ChatMember": "https://core.telegram.org/bots/api#chatmember"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getchatadministrators",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("getChatMemberCount", "GetChatMemberCount", "get_chat_member_count"),
+            return_ty: u32,
+            doc: Doc(md: "Use this method to get the number of members in a chat. Returns _Int_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#getchatmemberscount",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        // deprecated
+        Method(
+            names: ("getChatMembersCount", "GetChatMembersCount", "get_chat_members_count"),
+            return_ty: u32,
+            doc: Doc(md: "Use this method to get the number of members in a chat. Returns _Int_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#getchatmemberscount",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("getChatMember", "GetChatMember", "get_chat_member"),
+            return_ty: RawTy("ChatMember"),
+            doc: Doc(
+                md: "Use this method to get information about a member of a chat. Returns a [ChatMember] object on success.",
+                md_links: {"ChatMember": "https://core.telegram.org/bots/api#chatmember"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getchatmember",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "Unique identifier of the target user")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatStickerSet", "SetChatStickerSet", "set_chat_sticker_set"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to set a new group sticker set for a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field _can\\_set\\_sticker\\_set_ optionally returned in getChat requests to check if the bot can use this method. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#set_chat_sticker_set",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+                Param(
+                    name: "sticker_set_name",
+                    ty: String,
+                    descr: Doc(md: "Name of the sticker set to be set as the group sticker set")
+                ),
+            ],
+        ),
+        Method(
+            names: ("deleteChatStickerSet", "DeleteChatStickerSet", "delete_chat_sticker_set"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to delete a group sticker set from a supergroup. The bot must be an administrator in the chat for this to work and must have the appropriate admin rights. Use the field `can_set_sticker_set` optionally returned in [getChat] requests to check if the bot can use this method. Returns _True_ on success.",
+                md_links: {"getChat": "https://core.telegram.org/bots/api#getchat"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#deletechatstickerset",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)")
+                ),
+            ],
+        ),
+        Method(
+            names: ("answerCallbackQuery", "AnswerCallbackQuery", "answer_callback_query"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to send answers to callback queries sent from [inline keyboards]. The answer will be displayed to the user as a notification at the top of the chat screen or as an alert. On success, True is returned.\n\n>Alternatively, the user can be redirected to the specified Game URL. For this option to work, you must first create a game for your bot via [@Botfather] and accept the terms. Otherwise, you may use links like `t.me/your_bot?start=XXXX` that open your bot with a parameter.",
+                md_links: {
+                    "inline keyboards": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                    "@Botfather": "https://t.me/botfather",
+                }
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#answercallbackquery",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "callback_query_id",
+                    ty: String,
+                    descr: Doc(md: "Unique identifier for the query to be answered"),
+                ),
+                Param(
+                    name: "text",
+                    ty: Option(String),
+                    descr: Doc(md: "Text of the notification. If not specified, nothing will be shown to the user, 0-200 characters"),
+                ),
+                Param(
+                    name: "show_alert",
+                    ty: Option(bool),
+                    descr: Doc(md: "If true, an alert will be shown by the client instead of a notification at the top of the chat screen. Defaults to false."),
+                ),
+                Param(
+                    name: "url",
+                    ty: Option(String),
+                    descr: Doc(
+                        md: "URL that will be opened by the user's client. If you have created a [Game] and accepted the conditions via [@Botfather], specify the URL that opens your game — note that this will only work if the query comes from a _[callback\\_game]_ button.\n\nOtherwise, you may use links like `t.me/your\\_bot?start=XXXX` that open your bot with a parameter.",
+                        md_links: {
+                            "Game": "https://core.telegram.org/bots/api#game",
+                            "@Botfather": "https://t.me/botfather",
+                            "callback_game": "https://core.telegram.org/bots/api#inlinekeyboardbutton",
+                        },
+                    ),
+                ),
+                Param(
+                    name: "cache_time",
+                    ty: Option(u32),
+                    descr: Doc(md: "The maximum amount of time in seconds that the result of the callback query may be cached client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0."),
+                ),
+            ],
+        ),
+        Method(
+            names: ("setMyCommands", "SetMyCommands", "set_my_commands"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to change the list of the bot's commands. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setmycommands",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "commands",
+                    ty: ArrayOf(RawTy("BotCommand")),
+                    descr: Doc(md: "A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most 100 commands can be specified.")
+                ),
+                Param(
+                    name: "scope",
+                    ty: Option(RawTy("BotCommandScope")),
+                    descr: Doc(md: "A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.")
+                ),
+                Param(
+                    name: "language_code",
+                    ty: Option(String),
+                    descr: Doc(md: "A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands")
+                ),
+            ],
+        ),        
+        Method(
+            names: ("getMyCommands", "GetMyCommands", "get_my_commands"),
+            return_ty: ArrayOf(RawTy("BotCommand")),
+            doc: Doc(
+                md: "Use this method to get the current list of the bot's commands. Requires no parameters. Returns Array of [BotCommand] on success.",
+                md_links: {"BotCommand": "https://core.telegram.org/bots/api#botcommand"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getmycommands",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "scope",
+                    ty: Option(RawTy("BotCommandScope")),
+                    descr: Doc(md: "A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.")
+                ),
+                Param(
+                    name: "language_code",
+                    ty: Option(String),
+                    descr: Doc(md: "A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands")
+                ),
+            ],
+        ),
+        Method(
+            names: ("setChatMenuButton", "SetChatMenuButton", "set_chat_menu_button"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to change the bot's menu button in a private chat, or the default menu button."),
+            tg_doc: "https://core.telegram.org/bots/api#setchatmenubutton",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: Option(RawTy("ChatId")),
+                    descr: Doc(md: "Unique identifier for the target private chat. If not specified, default bot's menu button will be changed."),
+                ),
+                Param(
+                    name: "menu_button",
+                    ty: Option(RawTy("MenuButton")),
+                    descr: Doc(md: "An object for the new bot's menu button. Defaults to MenuButtonDefault"),
+                )
+            ]
+        ),
+        Method(
+            names: ("getChatMenuButton", "GetChatMenuButton", "get_chat_menu_button"),
+            return_ty: RawTy("MenuButton"),
+            doc: Doc(md: "Use this method to get the current value of the bot's menu button in a private chat, or the default menu button."),
+            tg_doc: "https://core.telegram.org/bots/api#getchatmenubutton",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: Option(RawTy("ChatId")),
+                    descr: Doc(md: "Unique identifier for the target private chat. If not specified, default bot's menu button will be returned"),
+                ),
+            ]
+        ),
+        Method(
+            names: ("setMyDefaultAdministratorRights", "SetMyDefaultAdministratorRights", "set_my_default_administrator_rights"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to change the default administrator rights requested by the bot when it's added as an administrator to groups or channels. These rights will be suggested to users, but they are are free to modify the list before adding the bot."),
+            tg_doc: "https://core.telegram.org/bots/api#setmydefaultadministratorrights",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "rights",
+                    ty: Option(RawTy("ChatAdministratorRights")),
+                    descr: Doc(md: "A JSON-serialized object describing new default administrator rights. If not specified, the default administrator rights will be cleared."),
+                ),
+                Param(
+                    name: "for_channels",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_ to change the default administrator rights of the bot in channels. Otherwise, the default administrator rights of the bot for groups and supergroups will be changed."),
+                )
+            ]
+        ),
+        Method(
+            names: ("getMyDefaultAdministratorRights", "GetMyDefaultAdministratorRights", "get_my_default_administrator_rights"),
+            return_ty: RawTy("ChatAdministratorRights"),
+            doc: Doc(md: "Use this method to get the current value of the bot's menu button in a private chat, or the default menu button."),
+            tg_doc: "https://core.telegram.org/bots/api#setmydefaultadministratorrights",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "for_channels",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_ to get default administrator rights of the bot in channels. Otherwise, default administrator rights of the bot for groups and supergroups will be returned."),
+                )
+            ]
+        ),
+        Method(
+            names: ("deleteMyCommands", "DeleteMyCommands", "delete_my_commands"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to delete the list of the bot's commands for the given scope and user language. After deletion, [higher level commands] will be shown to affected users. Returns _True_ on success.",
+                md_links: {"higher level commands":"https://core.telegram.org/bots/api#determining-list-of-commands"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#deletemycommands",
+            tg_category: "Available methods",
+            params: [
+                Param(
+                    name: "scope",
+                    ty: Option(RawTy("BotCommandScope")),
+                    descr: Doc(md: "A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.")
+                ),
+                Param(
+                    name: "language_code",
+                    ty: Option(String),
+                    descr: Doc(md: "A two-letter ISO 639-1 language code. If empty, commands will be applied to all users from the given scope, for whose language there are no dedicated commands")
+                ),
+            ],
+        ),
+        Method(
+            names: ("answerInlineQuery", "AnswerInlineQuery", "answer_inline_query"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to send answers to an inline query. On success, _True_ is returned. No more than **50** results per query are allowed."),
+            tg_doc: "https://core.telegram.org/bots/api#answerinlinequery",
+            tg_category: "Inline Mode",
+            params: [
+                Param(
+                    name: "inline_query_id",
+                    ty: String,
+                    descr: Doc(md: "Unique identifier for the answered query")
+                ),
+                Param(
+                    name: "results",
+                    ty: ArrayOf(RawTy("InlineQueryResult")),
+                    descr: Doc(md: "A JSON-serialized array of results for the inline query")
+                ),
+                Param(
+                    name: "cache_time",
+                    ty: Option(u32),
+                    descr: Doc(md: "The maximum amount of time in seconds that the result of the inline query may be cached on the server. Defaults to 300.")
+                ),
+                Param(
+                    name: "is_personal",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if results may be cached on the server side only for the user that sent the query. By default, results may be returned to any user who sends the same query")
+                ),
+                Param(
+                    name: "next_offset",
+                    ty: Option(String),
+                    descr: Doc(md: "Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don't support pagination. Offset length can't exceed 64 bytes.")
+                ),
+                Param(
+                    name: "switch_pm_text",
+                    ty: Option(String),
+                    descr: Doc(md: "If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter switch_pm_parameter")
+                ),
+                Param(
+                    name: "switch_pm_parameter",
+                    ty: Option(String),
+                    descr: Doc(
+                        md: "[Deep-linking] parameter for the /start message sent to the bot when user presses the switch button. 1-64 characters, only `A-Z`, `a-z`, `0-9`, `_` and `-` are allowed.\n\n_Example_: An inline bot that sends YouTube videos can ask the user to connect the bot to their YouTube account to adapt search results accordingly. To do this, it displays a 'Connect your YouTube account' button above the results, or even before showing any. The user presses the button, switches to a private chat with the bot and, in doing so, passes a start parameter that instructs the bot to return an oauth link. Once done, the bot can offer a [switch_inline] button so that the user can easily return to the chat where they wanted to use the bot's inline capabilities.",
+                        md_links: {
+                            "Deep-linking": "https://core.telegram.org/bots#deep-linking",
+                            "switch_inline": "https://core.telegram.org/bots/api#inlinekeyboardmarkup",
+                        },
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("answerWebAppQuery", "AnswerWebAppQuery", "answer_web_app_query"),
+            return_ty: RawTy("SentWebAppMessage"),
+            doc: Doc(
+                md: "Use this method to set the result of an interaction with a [Web App] and send a corresponding message on behalf of the user to the chat from which the query originated.", 
+                md_links: {"Web App": "https://core.telegram.org/bots/webapps"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#answerwebappquery",
+            tg_category: "Inline Mode",
+            params: [
+                Param(
+                    name: "web_app_query_id",
+                    ty: String,
+                    descr: Doc(md: "Unique identifier for the query to be answered")
+                ),
+                Param(
+                    name :"result",
+                    ty: RawTy("InlineQueryResult"),
+                    descr: Doc(md: "A JSON-serialized object describing the message to be sent"),
+                ),
+            ]
+        ),
+        Method(
+            names: ("editMessageText", "EditMessageText", "edit_message_text"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to edit text and [games] messages. On success, the edited Message is returned.",
+                md_links: {"games": "https://core.telegram.org/bots/api#games"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagetext",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageTextInline"),
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "text",
+                    ty: String,
+                    descr: Doc(md: "New text of the message, 1-4096 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in message text, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_web_page_preview",
+                    ty: Option(bool),
+                    descr: Doc(md: "Disables link previews for links in this message")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"},  
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageTextInline", "EditMessageTextInline", "edit_message_text_inline"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to edit text and [games] messages. On success, _True_ is returned.",
+                md_links: {"games": "https://core.telegram.org/bots/api#games"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagetext",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageText"),
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message")
+                ),
+                Param(
+                    name: "text",
+                    ty: String,
+                    descr: Doc(md: "New text of the message, 1-4096 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in message text, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "disable_web_page_preview",
+                    ty: Option(bool),
+                    descr: Doc(md: "Disables link previews for links in this message")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageCaption", "EditMessageCaption", "edit_message_caption"),
+            return_ty: RawTy("Message"),
+            doc: Doc(md: "Use this method to edit captions of messages. On success, the edited Message is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagecaption",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageCaptionInline"),
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "New caption of the message, 0-1024 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the caption, which can be specified instead of _parse\\_mode_"),
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",    
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageCaptionInline", "EditMessageCaptionInline", "edit_message_caption_inline"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to edit captions of messages. On success, _True_ is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagetext",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageCaption"),
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message")
+                ),
+                Param(
+                    name: "caption",
+                    ty: Option(String),
+                    descr: Doc(md: "New caption of the message, 0-1024 characters after entities parsing")
+                ),
+                Param(
+                    name: "parse_mode",
+                    ty: Option(RawTy("ParseMode")),
+                    descr: Doc(
+                        md: "Mode for parsing entities in the message text. See [formatting options] for more details.",
+                        md_links: {"formatting options": "https://core.telegram.org/bots/api#formatting-options"}
+                    )
+                ),
+                Param(
+                    name: "caption_entities",
+                    ty: Option(ArrayOf(RawTy("MessageEntity"))),
+                    descr: Doc(md: "List of special entities that appear in the caption, which can be specified instead of _parse\\_mode_"),
+                ),
+
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"}    
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageMedia", "EditMessageMedia", "edit_message_media"),
+            return_ty: RawTy("Message"),
+            doc: Doc(md: "Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, the edited Message is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagemedia",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageMediaInline"),
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "media",
+                    ty: RawTy("InputMedia"),
+                    descr: Doc(md: "A JSON-serialized object for a new media content of the message")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageMediaInline", "EditMessageMediaInline", "edit_message_media_inline"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, _True_ is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagemediainline",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageMedia"),
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message")
+                ),
+                Param(
+                    name: "media",
+                    ty: RawTy("InputMedia"),
+                    descr: Doc(md: "A JSON-serialized object for a new media content of the message")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageReplyMarkup", "EditMessageReplyMarkup", "edit_message_reply_markup"),
+            return_ty: RawTy("Message"),
+            doc: Doc(md: "Use this method to edit only the reply markup of messages. On success, the edited Message is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagereplymarkup",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageMediaInline"),
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("editMessageReplyMarkupInline", "EditMessageReplyMarkupInline", "edit_message_reply_markup_inline"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to edit only the reply markup of messages. On success, _True_ is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#editmessagereplymarkup",
+            tg_category: "Updating messages",
+            sibling: Some("editMessageReplyMarkup"),
+            params: [
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("stopPoll", "StopPoll", "stop_poll"),
+            return_ty: RawTy("Poll"),
+            doc: Doc(md: "Use this method to stop a poll which was sent by the bot. On success, the stopped Poll with the final results is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#stoppoll",
+            tg_category: "Updating messages",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard].",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("deleteMessage", "DeleteMessage", "delete_message"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to delete a message, including service messages, with the following limitations:\n- A message can only be deleted if it was sent less than 48 hours ago.\n- A dice message in a private chat can only be deleted if it was sent more than 24 hours ago.\n- Bots can delete outgoing messages in private chats, groups, and supergroups.\n- Bots can delete incoming messages in private chats.\n- Bots granted can_post_messages permissions can delete outgoing messages in channels.\n- If the bot is an administrator of a group, it can delete any message there.\n- If the bot has can_delete_messages permission in a supergroup or a channel, it can delete any message there.\n\nReturns True on success."),
+            tg_doc: "https://core.telegram.org/bots/api#delete_message",
+            tg_category: "Updating messages",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i32,
+                    descr: Doc(md: "Identifier of the message to delete")
+                ),  
+            ],
+        ),
+        Method(
+            names: ("sendSticker", "SendSticker", "send_sticker"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send static .WEBP or [animated] .TGS stickers. On success, the sent Message is returned.", 
+                md_links: {"animated": "https://telegram.org/blog/animated-stickers"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendsticker",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).")
+                ),
+                Param(
+                    name: "sticker",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "Sticker to send. Pass a file_id as String to send a photo that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a photo from the Internet, or upload a new photo using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    )
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.",
+                        md_links: {
+                            "inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating",
+                            "custom reply keyboard": "https://core.telegram.org/bots#keyboards",
+                        }
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("getStickerSet", "GetStickerSet", "get_sticker_set"),
+            return_ty: RawTy("StickerSet"),
+            doc: Doc(md: "Use this method to get a sticker set. On success, a StickerSet object is returned."),
+            tg_doc: "https://core.telegram.org/bots/api#getstickerset",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "name",
+                    ty: String,
+                    descr: Doc(md: "Name of the sticker set"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("uploadStickerFile", "UploadStickerFile", "upload_sticker_file"),
+            return_ty: RawTy("FileMeta"),
+            doc: Doc(md: "Use this method to upload a .PNG file with a sticker for later use in _createNewStickerSet_ and _addStickerToSet_ methods (can be used multiple times). Returns the uploaded File on success."),
+            tg_doc: "https://core.telegram.org/bots/api#uploadstickerfile",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier of sticker file owner"),
+                ),
+                Param(
+                    name: "png_sticker",
+                    ty: RawTy("InputFile"),
+                    descr: Doc(
+                        md: "PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("createNewStickerSet", "CreateNewStickerSet", "create_new_sticker_set"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields _png\\_sticker_ or _tgs\\_sticker_. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#createstickerset",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier of sticker file owner"),
+                ),
+                Param(
+                    name: "name",
+                    ty: String,
+                    descr: Doc(md: "Short name of sticker set, to be used in `t.me/addstickers/` URLs (e.g., _animals_). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in _“\\_by\\_<bot username>”. <bot\\_username>_ is case insensitive. 1-64 characters."),
+                ),
+                Param(
+                    name: "title",
+                    ty: String,
+                    descr: Doc(md: "Sticker set title, 1-64 characters"),
+                ),
+                Param(
+                    name: "sticker",
+                    ty: RawTy("InputSticker"),
+                    descr: Doc(
+                        md: "**PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "emojis",
+                    ty: String,
+                    descr: Doc(md: "One or more emoji corresponding to the sticker"),
+                ),
+                Param(
+                    name: "contains_masks",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if a set of mask stickers should be created"),
+                ),
+                Param(
+                    name: "mask_position",
+                    ty: Option(RawTy("MaskPosition")),
+                    descr: Doc(md: "A JSON-serialized object for position where the mask should be placed on faces"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("addStickerToSet", "AddStickerToSet", "add_sticker_to_set"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to add a new sticker to a set created by the bot. You **must** use exactly one of the fields _png\\_sticker_ or _tgs\\_sticker_. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#addstickertoset",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier of sticker file owner"),
+                ),
+                Param(
+                    name: "name",
+                    ty: String,
+                    descr: Doc(md: "Sticker set name"),
+                ),
+                Param(
+                    name: "sticker",
+                    ty: RawTy("InputSticker"),
+                    descr: Doc(
+                        md: "**PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+                Param(
+                    name: "emojis",
+                    ty: String,
+                    descr: Doc(md: "One or more emoji corresponding to the sticker"),
+                ),
+                Param(
+                    name: "mask_position",
+                    ty: Option(RawTy("MaskPosition")),
+                    descr: Doc(md: "A JSON-serialized object for position where the mask should be placed on faces"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("setStickerPositionInSet", "SetStickerPositionInSet", "set_sticker_position_in_set"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to move a sticker in a set created by the bot to a specific position. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setstickerpositioninset",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "sticker",
+                    ty: String,
+                    descr: Doc(md: "File identifier of the sticker"),
+                ),
+                Param(
+                    name: "position",
+                    ty: u32,
+                    descr: Doc(md: "New sticker position in the set, zero-based"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("deleteStickerFromSet", "DeleteStickerFromSet", "delete_sticker_from_set"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to delete a sticker from a set created by the bot. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#deletestickerfromset",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "sticker",
+                    ty: String,
+                    descr: Doc(md: "File identifier of the sticker"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("setStickerSetThumb", "SetStickerSetThumb", "set_sticker_set_thumb"),
+            return_ty: True,
+            doc: Doc(md: "Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns _True_ on success."),
+            tg_doc: "https://core.telegram.org/bots/api#setstickersetthumb",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "name",
+                    ty: String,
+                    descr: Doc(md: "Name of the sticker set"),
+                ),
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier of sticker file owner"),
+                ),
+                Param(
+                    name: "thumb",
+                    ty: Option(RawTy("InputFile")),
+                    descr: Doc(
+                        md: "A **PNG** image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a **TGS** animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a _file\\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]. Animated sticker set thumbnail can't be uploaded via HTTP URL.",
+                        md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendInvoice", "SendInvoice", "send_invoice"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send invoices. On success, the sent [Message] is returned.",
+                md_links: {"Message":"https://core.telegram.org/bots/api#message"}
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendinvoice",
+            tg_category: "Payments",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: RawTy("Recipient"),
+                    descr: Doc(md: "Unique identifier for the target private chat"),
+                ),
+                Param(
+                    name: "title",
+                    ty: String,
+                    descr: Doc(md: "Product name, 1-32 characters"),
+                ),
+                Param(
+                    name: "description",
+                    ty: String,
+                    descr: Doc(md: "Product description, 1-255 characters"),
+                ),
+                Param(
+                    name: "payload",
+                    ty: String,
+                    descr: Doc(md: "Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes."),
+                ),
+                Param(
+                    name: "provider_token",
+                    ty: String,
+                    descr: Doc(
+                        md: "Payments provider token, obtained via [Botfather]",
+                        md_links: {"Botfather":"https://t.me/botfather"}    
+                    ),
+                ),
+                Param(
+                    name: "currency",
+                    ty: String,
+                    descr: Doc(md: "Three-letter ISO 4217 currency code, see more on currencies"),
+                ),
+                Param(
+                    name: "prices",
+                    ty: ArrayOf(RawTy("LabeledPrice")),
+                    descr: Doc(md: "Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)"),
+                ),
+                Param(
+                    name: "max_tip_amount",
+                    ty: Option(u32),
+                    descr: Doc(
+                        md: "The maximum accepted amount for tips in the smallest units of the currency (integer, **not** float/double). For example, for a maximum tip of `US$ 1.45` pass `max_tip_amount = 145`. See the exp parameter in [`currencies.json`], it shows the number of digits past the decimal point for each currency (2 for the majority of currencies). Defaults to 0",
+                        md_links: {"`currencies.json`":"https://core.telegram.org/bots/payments/currencies.json"}
+                    ),
+                ),
+                Param(
+                    name: "suggested_tip_amounts",
+                    ty: Option(ArrayOf(u32)),
+                    descr: Doc(md: "A JSON-serialized array of suggested amounts of tips in the smallest units of the currency (integer, **not** float/double). At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed _max_tip_amount_."),
+                ),
+                Param(
+                    name: "start_parameter",
+                    ty: Option(String),
+                    descr: Doc(md: "Unique deep-linking parameter. If left empty, **forwarded copies** of the sent message will have a Pay button, allowing multiple users to pay directly from the forwarded message, using the same invoice. If non-empty, forwarded copies of the sent message will have a URL button with a deep link to the bot (instead of a Pay button), with the value used as the start parameter"),
+                ),
+                Param(
+                    name: "provider_data",
+                    ty: Option(String),
+                    descr: Doc(md: "A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.")
+                ),
+                Param(
+                    name: "photo_url",
+                    ty: Option(String),
+                    descr: Doc(md: "URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.")
+                ),
+                Param(
+                    name: "photo_size",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo size in bytes")
+                ),
+                Param(
+                    name: "photo_width",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo width")
+                ),
+                Param(
+                    name: "photo_height",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo height")
+                ),
+                Param(
+                    name: "need_name",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's full name to complete the order")
+                ),
+                Param(
+                    name: "need_phone_number",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's phone number to complete the order")
+                ),
+                Param(
+                    name: "need_email",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's email address to complete the order")
+                ),
+                Param(
+                    name: "need_shipping_address",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's shipping address to complete the order")
+                ),
+                Param(
+                    name: "send_phone_number_to_provider",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if user's phone number should be sent to provider")
+                ),
+                Param(
+                    name: "send_email_to_provider",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if user's email address should be sent to provider")
+                ),
+                Param(
+                    name: "is_flexible",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the final price depends on the shipping method")
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("InlineKeyboardMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard]. If empty, one 'Pay `total price`' button will be shown. If not empty, the first button must be a Pay button.",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"}
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("createInvoiceLink", "CreateInvoiceLink", "create_invoice_link"),
+            return_ty: String,
+            doc: Doc(md: "Use this method to create a link for an invoice. Returns the created invoice link as String on success."),
+            tg_doc: "https://core.telegram.org/bots/api#createinvoicelink",
+            tg_category: "Payments",
+            params: [
+                Param(
+                    name: "title",
+                    ty: String,
+                    descr: Doc(md: "Product name, 1-32 characters"),
+                ),
+                Param(
+                    name: "description",
+                    ty: String,
+                    descr: Doc(md: "Product description, 1-255 characters"),
+                ),
+                Param(
+                    name: "payload",
+                    ty: String,
+                    descr: Doc(md: "Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes."),
+                ),
+                Param(
+                    name: "provider_token",
+                    ty: String,
+                    descr: Doc(
+                        md: "Payments provider token, obtained via [Botfather]",
+                        md_links: {"Botfather":"https://t.me/botfather"}    
+                    ),
+                ),
+                Param(
+                    name: "currency",
+                    ty: String,
+                    descr: Doc(md: "Three-letter ISO 4217 currency code, see more on currencies"),
+                ),
+                Param(
+                    name: "prices",
+                    ty: ArrayOf(RawTy("LabeledPrice")),
+                    descr: Doc(md: "Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)"),
+                ),
+                Param(
+                    name: "max_tip_amount",
+                    ty: Option(u32),
+                    descr: Doc(
+                        md: "The maximum accepted amount for tips in the smallest units of the currency (integer, **not** float/double). For example, for a maximum tip of `US$ 1.45` pass `max_tip_amount = 145`. See the exp parameter in [`currencies.json`], it shows the number of digits past the decimal point for each currency (2 for the majority of currencies). Defaults to 0",
+                        md_links: {"`currencies.json`":"https://core.telegram.org/bots/payments/currencies.json"}
+                    ),
+                ),
+                Param(
+                    name: "suggested_tip_amounts",
+                    ty: Option(ArrayOf(u32)),
+                    descr: Doc(md: "A JSON-serialized array of suggested amounts of tips in the smallest units of the currency (integer, **not** float/double). At most 4 suggested tip amounts can be specified. The suggested tip amounts must be positive, passed in a strictly increased order and must not exceed _max_tip_amount_."),
+                ),
+                Param(
+                    name: "provider_data",
+                    ty: Option(String),
+                    descr: Doc(md: "A JSON-serialized data about the invoice, which will be shared with the payment provider. A detailed description of required fields should be provided by the payment provider.")
+                ),
+                Param(
+                    name: "photo_url",
+                    ty: Option(String),
+                    descr: Doc(md: "URL of the product photo for the invoice. Can be a photo of the goods or a marketing image for a service. People like it better when they see what they are paying for.")
+                ),
+                Param(
+                    name: "photo_size",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo size in bytes")
+                ),
+                Param(
+                    name: "photo_width",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo width")
+                ),
+                Param(
+                    name: "photo_height",
+                    ty: Option(String),
+                    descr: Doc(md: "Photo height")
+                ),
+                Param(
+                    name: "need_name",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's full name to complete the order")
+                ),
+                Param(
+                    name: "need_phone_number",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's phone number to complete the order")
+                ),
+                Param(
+                    name: "need_email",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's email address to complete the order")
+                ),
+                Param(
+                    name: "need_shipping_address",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if you require the user's shipping address to complete the order")
+                ),
+                Param(
+                    name: "send_phone_number_to_provider",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if user's phone number should be sent to provider")
+                ),
+                Param(
+                    name: "send_email_to_provider",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if user's email address should be sent to provider")
+                ),
+                Param(
+                    name: "is_flexible",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the final price depends on the shipping method")
+                ),
+            ],
+        ),
+        Method(
+            names: ("answerShippingQuery", "AnswerShippingQuery", "answer_shipping_query"),
+            return_ty: True,
+            doc: Doc(
+                md: "If you sent an invoice requesting a shipping address and the parameter _is\\_flexible_ was specified, the Bot API will send an [Update] with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is returned.",
+                md_links: {"Update":"https://core.telegram.org/bots/api#update"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#answershippingquery",
+            tg_category: "Payments",
+            params: [
+                Param(
+                    name: "shipping_query_id",
+                    ty: String,
+                    descr: Doc(md: "Unique identifier for the query to be answered"),
+                ),
+                Param(
+                    name: "ok",
+                    ty: bool,
+                    descr: Doc(md: "Specify True if delivery to the specified address is possible and False if there are any problems (for example, if delivery to the specified address is not possible)"),
+                ),
+                Param(
+                    name: "shipping_options",
+                    ty: Option(ArrayOf(RawTy("ShippingOption"))),
+                    descr: Doc(md: "Required if ok is True. A JSON-serialized array of available shipping options."),
+                ),
+                Param(
+                    name: "error_message",
+                    ty: Option(String),
+                    descr: Doc(md: "Required if ok is False. Error message in human readable form that explains why it is impossible to complete the order (e.g. 'Sorry, delivery to your desired address is unavailable'). Telegram will display this message to the user."),
+                ),
+            ],
+        ),
+        Method(
+            names: ("answerPreCheckoutQuery", "AnswerPreCheckoutQuery", "answer_pre_checkout_query"),
+            return_ty: True,
+            doc: Doc(
+                md: "Once the user has confirmed their payment and shipping details, the Bot API sends the final confirmation in the form of an [Update] with the field pre\\_checkout\\_query. Use this method to respond to such pre-checkout queries. On success, True is returned. **Note:** The Bot API must receive an answer within 10 seconds after the pre-checkout query was sent.",
+                md_links: {"Update":"https://core.telegram.org/bots/api#update"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#answershippingquery",
+            tg_category: "Payments",
+            params: [
+                Param(
+                    name: "pre_checkout_query_id",
+                    ty: String,
+                    descr: Doc(md: "Unique identifier for the query to be answered"),
+                ),
+                Param(
+                    name: "ok",
+                    ty: bool,
+                    descr: Doc(md: "Specify True if everything is alright (goods are available, etc.) and the bot is ready to proceed with the order. Use False if there are any problems."),
+                ),
+                Param(
+                    name: "error_message",
+                    ty: Option(String),
+                    descr: Doc(md: "Required if ok is False. Error message in human readable form that explains the reason for failure to proceed with the checkout (e.g. \"Sorry, somebody just bought the last of our amazing black T-shirts while you were busy filling out your payment details. Please choose a different color or garment!\"). Telegram will display this message to the user."),
+                ),
+            ],
+        ),
+        Method(
+            names: ("setPassportDataErrors", "SetPassportDataErrors", "set_passport_data_errors"),
+            return_ty: True,
+            doc: Doc(md: "Informs a user that some of the Telegram Passport elements they provided contains errors. The user will not be able to re-submit their Passport to you until the errors are fixed (the contents of the field for which you returned the error must change). Returns _True_ on success.\n\nUse this if the data submitted by the user doesn't satisfy the standards your service requires for any reason. For example, if a birthday date seems invalid, a submitted document is blurry, a scan shows evidence of tampering, etc. Supply some details in the error message to make sure the user knows how to correct the issues."),
+            tg_doc: "https://core.telegram.org/bots/api#setpassportdataerrors",
+            tg_category: "Telegram Passport",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier"),
+                ),
+                Param(
+                    name: "errors",
+                    ty: ArrayOf(RawTy("PassportElementError")),
+                    descr: Doc(md: "A JSON-serialized array describing the errors"),
+                ),
+            ],
+        ),
+        Method(
+            names: ("sendGame", "SendGame", "send_game"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to send a game. On success, the sent [Message] is returned.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"}    
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#sendgame",
+            tg_category: "Games",
+            params: [
+                Param(
+                    name: "chat_id",
+                    ty: u32,
+                    descr: Doc(md: "Unique identifier for the target chat"),
+                ),
+                Param(
+                    name: "game_short_name",
+                    ty: String,
+                    descr: Doc(md: "Short name of the game, serves as the unique identifier for the game. Set up your games via Botfather."),
+                ),
+                Param(
+                    name: "disable_notification",
+                    ty: Option(bool), 
+                    descr: Doc(
+                        md: "Sends the message [silently]. Users will receive a notification with no sound.",
+                        md_links: {"silently": "https://telegram.org/blog/channels-2-0#silent-messages"}
+                    )
+                ),
+                Param(
+                    name: "protect_content",
+                    ty: Option(bool),
+                    descr: Doc(md: "Protects the contents of sent messages from forwarding and saving"),
+                ),
+                Param(
+                    name: "reply_to_message_id",
+                    ty: Option(i32),
+                    descr: Doc(md: "If the message is a reply, ID of the original message")
+                ),
+                Param(
+                    name: "allow_sending_without_reply",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass _True_, if the message should be sent even if the specified replied-to message is not found")
+                ),
+                Param(
+                    name: "reply_markup",
+                    ty: Option(RawTy("ReplyMarkup")),
+                    descr: Doc(
+                        md: "A JSON-serialized object for an [inline keyboard]. If empty, one 'Play game_title' button will be shown. If not empty, the first button must launch the game.",
+                        md_links: {"inline keyboard": "https://core.telegram.org/bots#inline-keyboards-and-on-the-fly-updating"},
+                    ),
+                ),
+            ],
+        ),
+        Method(
+            names: ("setGameScore", "SetGameScore", "set_game_score"),
+            return_ty: RawTy("Message"),
+            doc: Doc(
+                md: "Use this method to set the score of the specified user in a game. On success, returns the edited [Message]. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.",
+                md_links: {"Message": "https://core.telegram.org/bots/api#message"}         
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#setgamescore",
+            tg_category: "Games",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier"),
+                ),
+                Param(
+                    name: "score",
+                    ty: u64,
+                    descr: Doc(md: "New score"),
+                ),
+                Param(
+                    name: "force",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters"),
+                ),
+                Param(
+                    name: "disable_edit_message",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the game message should not be automatically edited to include the current scoreboard"),
+                ),
+                Param(
+                    name: "chat_id",
+                    ty: u32,
+                    descr: Doc(md: "Unique identifier for the target chat")
+                ),
+                Param(
+                    name: "message_id",
+                    ty: i64, 
+                    descr: Doc(md: "Identifier of the message to edit")
+                ),
+            ],
+            sibling: Some("setGameScoreInline"),
+        ),
+        Method(
+            names: ("setGameScoreInline", "SetGameScoreInline", "set_game_score_inline"),
+            return_ty: RawTy("Message"),
+            doc: Doc(md: "Use this method to set the score of the specified user in a game. On success, returns _True_. Returns an error, if the new score is not greater than the user's current score in the chat and force is False."),
+            tg_doc: "https://core.telegram.org/bots/api#setgamescore",
+            tg_category: "Games",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier"),
+                ),
+                Param(
+                    name: "score",
+                    ty: u64,
+                    descr: Doc(md: "New score"),
+                ),
+                Param(
+                    name: "force",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters"),
+                ),
+                Param(
+                    name: "disable_edit_message",
+                    ty: Option(bool),
+                    descr: Doc(md: "Pass True, if the game message should not be automatically edited to include the current scoreboard"),
+                ),
+                Param(
+                    name: "inline_message_id",
+                    ty: String,
+                    descr: Doc(md: "Identifier of the inline message"),
+                ),
+            ],
+            sibling: Some("setGameScore"),
+        ),
+        Method(
+            names: ("getGameHighScores", "GetGameHighScores", "get_game_high_scores"),
+            return_ty: True,
+            doc: Doc(
+                md: "Use this method to get data for high score tables. Will return the score of the specified user and several of their neighbors in a game. On success, returns an Array of [GameHighScore] objects.\n\n> This method will currently return scores for the target user, plus two of their closest neighbors on each side. Will also return the top three users if the user and his neighbors are not among them. Please note that this behavior is subject to change.",
+                md_links: {"GameHighScore": "https://core.telegram.org/bots/api#gamehighscore"},
+            ),
+            tg_doc: "https://core.telegram.org/bots/api#getgamehighscores",
+            tg_category: "Games",
+            params: [
+                Param(
+                    name: "user_id",
+                    ty: RawTy("UserId"),
+                    descr: Doc(md: "User identifier"),
+                ),
+                Param(
+                    name: "target",
+                    ty: RawTy("TargetMessage"),
+                    descr: Doc(md: "Target message")
+                )
+            ],
+        ),
+    ],
+    tg_categories: {
+        "Getting updates": "https://core.telegram.org/bots/api#getting-updates",
+        "Available methods": "https://core.telegram.org/bots/api#available-methods",
+        "Inline Mode": "https://core.telegram.org/bots/api#inline-mode",
+        "Updating messages": "https://core.telegram.org/bots/api#updating-messages",
+        "Stickers": "https://core.telegram.org/bots/api#stickers",
+        "Payments": "https://core.telegram.org/bots/api#payments",
+        "Telegram Passport": "https://core.telegram.org/bots/api#telegram-passport",    
+        "Games": "https://core.telegram.org/bots/api#games",
+    }
+)
diff --git a/src/codegen.rs b/src/codegen.rs
new file mode 100644
index 00000000..5f80912b
--- /dev/null
+++ b/src/codegen.rs
@@ -0,0 +1,193 @@
+//! `teloxide-core` uses codegen in order to implement request payloads and
+//! `Requester` trait.
+//!
+//! These are utilities for doing codegen inspired by/stolen from r-a's
+//! [sourcegen].
+//!
+//! [sourcegen]: https://github.com/rust-lang/rust-analyzer/blob/master/crates/sourcegen
+
+// TODO(waffle): does it make sense to extract these utilities (at least project
+//               agnostic ones) in a standalone crate?
+
+pub(crate) mod convert;
+mod patch;
+pub(crate) mod schema;
+
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
+
+use aho_corasick::AhoCorasick;
+use xshell::{cmd, Shell};
+
+fn ensure_rustfmt(sh: &Shell) {
+    // FIXME(waffle): find a better way to set toolchain
+    let toolchain = "nightly-2022-01-17";
+
+    let version = cmd!(sh, "rustup run {toolchain} rustfmt --version")
+        .read()
+        .unwrap_or_default();
+
+    if !version.contains("nightly") {
+        panic!(
+            "Failed to run rustfmt from toolchain '{toolchain}'. Please run `rustup component add \
+             rustfmt --toolchain {toolchain}` to install it.",
+        );
+    }
+}
+
+pub fn reformat(text: String) -> String {
+    let toolchain = "nightly-2022-01-17";
+
+    let sh = Shell::new().unwrap();
+    ensure_rustfmt(&sh);
+    let rustfmt_toml = project_root().join("rustfmt.toml");
+    let mut stdout = cmd!(
+        sh,
+        "rustup run {toolchain} rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"
+    )
+    .stdin(text)
+    .read()
+    .unwrap();
+    if !stdout.ends_with('\n') {
+        stdout.push('\n');
+    }
+    stdout
+}
+
+pub fn add_hidden_preamble(generator: &'static str, mut text: String) -> String {
+    let preamble = format!("// Generated by `{generator}`, do not edit by hand.\n\n");
+    text.insert_str(0, &preamble);
+    text
+}
+
+pub fn add_preamble(generator: &'static str, mut text: String) -> String {
+    let preamble = format!("//! Generated by `{generator}`, do not edit by hand.\n\n");
+    text.insert_str(0, &preamble);
+    text
+}
+
+/// Checks that the `file` has the specified `contents`. If that is not the
+/// case, updates the file and then fails the test.
+pub fn ensure_file_contents(file: &Path, contents: &str) {
+    ensure_files_contents([(file, contents)])
+}
+
+pub fn ensure_files_contents<'a>(
+    files_and_contents: impl IntoIterator<Item = (&'a Path, &'a str)>,
+) {
+    let mut err_count = 0;
+
+    for (file, contents) in files_and_contents {
+        if let Ok(old_contents) = fs::read_to_string(file) {
+            if normalize_newlines(&old_contents) == normalize_newlines(contents) {
+                // File is already up to date.
+                continue;
+            }
+
+            err_count += 1;
+
+            let display_path = file.strip_prefix(&project_root()).unwrap_or(file);
+            eprintln!(
+                "\n\x1b[31;1merror\x1b[0m: {} was not up-to-date, updating\n",
+                display_path.display()
+            );
+            if let Some(parent) = file.parent() {
+                let _ = fs::create_dir_all(parent);
+            }
+            fs::write(file, contents).unwrap();
+        }
+    }
+
+    let (s, were) = match err_count {
+        // No erros, everything is up to date
+        0 => return,
+        // Singular
+        1 => ("", "was"),
+        // Plural
+        _ => ("s", "were"),
+    };
+
+    if std::env::var("CI").is_ok() {
+        eprintln!("    NOTE: run `cargo test` locally and commit the updated files\n");
+    }
+
+    panic!("some file{s} {were} not up to date and has been updated, simply re-run the tests");
+}
+
+pub fn replace_block(path: &Path, title: &str, new: &str) -> String {
+    let file = fs::read_to_string(path).unwrap();
+
+    let start = format!("// START BLOCK {title}\n");
+    let end = format!("// END BLOCK {title}\n");
+
+    let mut starts = vec![];
+    let mut ends = vec![];
+
+    let searcher = AhoCorasick::new_auto_configured(&[start, end]);
+
+    for finding in searcher.find_iter(&file) {
+        match finding.pattern() {
+            // start
+            0 => starts.push(finding.start()..finding.end()),
+            // end
+            1 => ends.push(finding.start()..finding.end()),
+            n => panic!("{n}"),
+        }
+    }
+
+    let start_offset = match &*starts {
+        [] => panic!(
+            "Coulnd't find start of block {title} in {p}",
+            p = path.display()
+        ),
+        [offset] => offset.end,
+        [..] => panic!(),
+    };
+
+    let end_offset = match &*ends {
+        [] => panic!(
+            "Coulnd't find end of block {title} in {p}",
+            p = path.display()
+        ),
+        [offset] => offset.start,
+        [..] => panic!(),
+    };
+
+    if end_offset < start_offset {
+        panic!(
+            "End of the {title} block is located before the start in {p}",
+            p = path.display()
+        );
+    }
+
+    format!("{}{}{}", &file[..start_offset], new, &file[end_offset..])
+}
+
+fn normalize_newlines(s: &str) -> String {
+    s.replace("\r\n", "\n")
+}
+
+/// Changes the first character in a string to uppercase.
+pub fn to_uppercase(s: &str) -> String {
+    let mut chars = s.chars();
+    format!("{}{}", chars.next().unwrap().to_uppercase(), chars.as_str())
+}
+
+pub fn project_root() -> PathBuf {
+    let dir = env!("CARGO_MANIFEST_DIR");
+    let res = PathBuf::from(dir);
+    assert!(res.join("CHANGELOG.md").exists());
+    res
+}
+
+/// Returns minimal prefix of `l` such that `r` doesn't start with the prefix.
+#[track_caller]
+pub fn min_prefix<'a>(l: &'a str, r: &str) -> &'a str {
+    l.char_indices()
+        .zip(r.chars())
+        .find(|((_, l), r)| l != r)
+        .map(|((i, _), _)| &l[..=i])
+        .unwrap_or_else(|| panic!("there is no different prefix for {l} and {r}"))
+}
diff --git a/src/codegen/convert.rs b/src/codegen/convert.rs
new file mode 100644
index 00000000..a31b3e88
--- /dev/null
+++ b/src/codegen/convert.rs
@@ -0,0 +1,32 @@
+use crate::codegen::schema::Type;
+
+pub enum Convert {
+    Id(Type),
+    Into(Type),
+    Collect(Type),
+}
+
+pub fn convert_for(ty: &Type) -> Convert {
+    match ty {
+        ty @ Type::True
+        | ty @ Type::u8
+        | ty @ Type::u16
+        | ty @ Type::u32
+        | ty @ Type::i32
+        | ty @ Type::u64
+        | ty @ Type::i64
+        | ty @ Type::f64
+        | ty @ Type::bool => Convert::Id(ty.clone()),
+        ty @ Type::String => Convert::Into(ty.clone()),
+        Type::Option(inner) => convert_for(inner),
+        Type::ArrayOf(ty) => Convert::Collect((**ty).clone()),
+        Type::RawTy(s) => match s.as_str() {
+            raw @ "Recipient" | raw @ "ChatId" | raw @ "TargetMessage" | raw @ "ReplyMarkup" => {
+                Convert::Into(Type::RawTy(raw.to_owned()))
+            }
+            raw => Convert::Id(Type::RawTy(raw.to_owned())),
+        },
+        ty @ Type::Url => Convert::Id(ty.clone()),
+        ty @ Type::DateTime => Convert::Into(ty.clone()),
+    }
+}
diff --git a/src/codegen/patch.rs b/src/codegen/patch.rs
new file mode 100644
index 00000000..666ecf99
--- /dev/null
+++ b/src/codegen/patch.rs
@@ -0,0 +1,347 @@
+use crate::codegen::schema::{Doc, Schema, Type};
+
+pub fn patch_schema(mut schema: Schema) -> Schema {
+    fn check(l: &Option<&str>, r: &str) -> bool {
+        l.map(|m| r == m).unwrap_or(true)
+    }
+
+    schema.methods.iter_mut().for_each(|method| {
+        method
+            .params
+            .iter_mut()
+            .map(|p| &mut p.name)
+            .for_each(escape_kw);
+
+        DOC_PATCHES.iter().for_each(|(key, patch)| match key {
+            Target::Method(m) => {
+                if check(m, &method.names.0) {
+                    method.doc.patch(patch, *key);
+                }
+            }
+            Target::Field {
+                method_name: m,
+                field_name: f,
+            } => {
+                if check(m, &method.names.0) {
+                    method
+                        .params
+                        .iter_mut()
+                        .filter(|p| check(f, &p.name))
+                        .for_each(|p| p.descr.patch(patch, *key))
+                }
+            }
+            Target::Any { method_name: m } => {
+                if check(m, &method.names.0) {
+                    method.doc.patch(patch, *key);
+
+                    method
+                        .params
+                        .iter_mut()
+                        .for_each(|p| p.descr.patch(patch, *key))
+                }
+            }
+        });
+    });
+
+    schema
+}
+
+static DOC_PATCHES: &[(Target, Patch)] = &[
+    (
+        Target::Any { method_name: None },
+        Patch::ReplaceLink {
+            name: "More info on Sending Files »",
+            value: "crate::types::InputFile",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "text messages",
+            value: "crate::payloads::SendMessage",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "photos",
+            value: "crate::payloads::SendPhoto",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "videos",
+            value: "crate::payloads::SendVideo",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "audio files",
+            value: "crate::payloads::SendAudio",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "general files",
+            value: "crate::payloads::SendDocument",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "location data",
+            value: "crate::payloads::SendLocation",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "video notes",
+            value: "crate::payloads::SendVideoNote",
+        },
+    ),
+    (
+        Target::Field {
+            method_name: Some("sendChatAction"),
+            field_name: Some("action"),
+        },
+        Patch::ReplaceLink {
+            name: "stickers",
+            value: "crate::payloads::SendSticker",
+        },
+    ),
+    (
+        Target::Any { method_name: None },
+        Patch::Custom(intra_links),
+    ),
+    (
+        Target::Method(Some("addStickerToSet")),
+        Patch::Replace {
+            text: "You **must** use exactly one of the fields _png\\_sticker_ or _tgs\\_sticker_. ",
+            with: "",
+        },
+    ),
+    (
+        Target::Method(Some("GetFile")),
+        Patch::Replace {
+            text: "The file can then be downloaded via the link `https://api.telegram.org/file/bot<token>/<file_path>`, where `<file_path>` is taken from the response. It is guaranteed that the link will be valid for at least 1 hour. When the link expires, a new one can be requested by calling [`GetFile`] again.",
+            with: "The file can then be downloaded via the method [`Bot::download_file(file_path, dst)`], where `file_path` is taken from the response. It is guaranteed that the path from [`GetFile`] will be valid for at least 1 hour. When the path expires, a new one can be requested by calling [`GetFile`].",
+        },
+    ),
+    (
+        Target::Method(Some("GetFile")),
+        Patch::AddLink {
+            name: "`Bot::download_file(file_path, dst)`",
+            value: "crate::net::Download::download_file",
+        },
+    ),
+    // FIXME RETUNRS
+];
+
+#[derive(Debug, Clone, Copy)]
+enum Target<'a> {
+    Any {
+        method_name: Option<&'a str>,
+    },
+    Method(Option<&'a str>),
+    Field {
+        method_name: Option<&'a str>,
+        field_name: Option<&'a str>,
+    },
+}
+
+impl<'a> Target<'a> {
+    fn is_exact(&self) -> bool {
+        match self {
+            Target::Method(m) => m.is_some(),
+            Target::Field {
+                method_name,
+                field_name,
+            } => method_name.is_some() && field_name.is_some(),
+            Target::Any { method_name: _ } => false,
+        }
+    }
+}
+
+enum Patch<'a> {
+    ReplaceLink { name: &'a str, value: &'a str },
+    AddLink { name: &'a str, value: &'a str },
+    // RemoveLink { name: &'a str },
+    // FullReplace { text: &'a str, with: &'a str },
+    Replace { text: &'a str, with: &'a str },
+    Custom(fn(&mut Doc)),
+}
+
+impl Doc {
+    fn patch(&mut self, patch: &Patch, key: Target) {
+        match patch {
+            Patch::ReplaceLink { name, value } => {
+                if let Some(link) = self.md_links.get_mut(*name) {
+                    link.clear();
+                    *link += *value;
+                } else if key.is_exact() {
+                    panic!("Patch error: {:?} doesn't have link {}", key, name);
+                }
+            }
+            Patch::AddLink { name, value } => {
+                self.md_links
+                    .insert((*name).to_owned(), (*value).to_owned());
+            }
+            // Patch::RemoveLink { name } => drop(self.md_links.remove(*name)),
+            // Patch::FullReplace { text, with } => {
+            //     assert_eq!(self.md.as_str(), *text);
+
+            //     self.md.clear();
+            //     self.md += with;
+            // }
+            Patch::Replace { text, with } => self.md = self.md.replace(*text, with),
+            Patch::Custom(f) => f(self),
+        }
+    }
+}
+
+fn intra_links(doc: &mut Doc) {
+    let mut repls_t = Vec::new();
+    let mut repls_m = Vec::new();
+
+    doc.md_links
+        .iter_mut()
+        .filter(|(k, v)| {
+            v.starts_with("https://core.telegram.org/bots/api#")
+                && !k.contains(&['-', '_', '.', ' '][..])
+        })
+        .for_each(|(k, v)| {
+            if let Some(c) = k.chars().next() {
+                match () {
+                    _ if k == "games" => {}
+                    _ if k == "unbanned" => *v = String::from("crate::payloads::UnbanChatMember"),
+                    _ if c.is_lowercase() && !["update"].contains(&&&**k) => {
+                        repls_m.push(k.clone());
+                        *v = format!("crate::payloads::{}", to_uppercase(k));
+                    }
+                    _ => {
+                        repls_t.push(k.clone());
+                        *v = format!("crate::types::{}", k);
+                    }
+                }
+            }
+        });
+
+    for repl in repls_t {
+        if let Some(value) = doc.md_links.remove(repl.as_str()) {
+            doc.md = doc
+                .md
+                .replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repl));
+            doc.md_links.insert(format!("`{}`", repl), value);
+        }
+    }
+
+    for repl in repls_m {
+        if let Some(value) = doc.md_links.remove(repl.as_str()) {
+            let repln = to_uppercase(&repl);
+            doc.md = doc
+                .md
+                .replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repln));
+            doc.md_links.insert(format!("`{}`", repln), value);
+        }
+    }
+}
+
+fn escape_kw(s: &mut String) {
+    if ["type"].contains(&s.as_str()) {
+        *s = format!("{}_", s);
+    }
+}
+
+fn to_uppercase(s: &str) -> String {
+    let mut chars = s.chars();
+    format!("{}{}", chars.next().unwrap().to_uppercase(), chars.as_str())
+}
+
+pub(crate) fn patch_ty(mut schema: Schema) -> Schema {
+    // URLs
+    patch_types(
+        &mut schema,
+        Type::String,
+        Type::Url,
+        &[("set_webhook", "url")],
+    );
+
+    patch_types(
+        &mut schema,
+        Type::Option(Box::new(Type::String)),
+        Type::Option(Box::new(Type::Url)),
+        &[
+            ("answer_callback_query", "url"),
+            ("send_invoice", "photo_url"),
+        ],
+    );
+
+    // Dates
+    patch_types(
+        &mut schema,
+        Type::Option(Box::new(Type::u64)),
+        Type::Option(Box::new(Type::DateTime)),
+        &[
+            ("send_poll", "close_date"),
+            ("ban_chat_member", "until_date"),
+            ("kick_chat_member", "until_date"),
+            ("restrict_chat_member", "until_date"),
+        ],
+    );
+    patch_types(
+        &mut schema,
+        Type::Option(Box::new(Type::i64)),
+        Type::Option(Box::new(Type::DateTime)),
+        &[
+            ("create_chat_invite_link", "expire_date"),
+            ("edit_chat_invite_link", "expire_date"),
+        ],
+    );
+
+    schema
+}
+
+fn patch_types(schema: &mut Schema, from: Type, to: Type, list: &[(&str, &str)]) {
+    // URLs
+    for &(method, param) in list {
+        let m = schema
+            .methods
+            .iter_mut()
+            .find(|m| m.names.2 == method)
+            .expect("Couldn't find method for patching");
+
+        let p = m
+            .params
+            .iter_mut()
+            .find(|p| p.name == param)
+            .expect("Couldn't find parameter for patching");
+
+        assert_eq!(p.ty, from, "{}::{}", method, param);
+        p.ty = to.clone();
+    }
+}
diff --git a/src/codegen/schema.rs b/src/codegen/schema.rs
new file mode 100644
index 00000000..6f3eaa14
--- /dev/null
+++ b/src/codegen/schema.rs
@@ -0,0 +1,107 @@
+use std::fs;
+
+use indexmap::IndexMap as HashMap;
+use serde::{Deserialize, Serialize};
+
+use crate::codegen::project_root;
+
+pub fn get() -> Schema {
+    let path = project_root().join("schema.ron");
+    let text = fs::read_to_string(path).unwrap();
+    let schema = ron::from_str::<Schema>(&text).unwrap();
+
+    let schema = super::patch::patch_schema(schema);
+    let schema = super::patch::patch_ty(schema);
+
+    schema
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct Schema {
+    pub api_version: ApiVersion,
+    pub methods: Vec<Method>,
+    pub tg_categories: HashMap<String, String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct ApiVersion {
+    pub ver: String,
+    pub date: String,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct Method {
+    pub names: (String, String, String),
+    pub return_ty: Type,
+    pub doc: Doc,
+    pub tg_doc: String,
+    pub tg_category: String,
+    #[serde(default)]
+    pub notes: Vec<Doc>,
+    pub params: Vec<Param>,
+    #[serde(default)]
+    pub sibling: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct Doc {
+    pub md: String,
+    #[serde(default)]
+    pub md_links: HashMap<String, String>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct Param {
+    pub name: String,
+    pub ty: Type,
+    pub descr: Doc,
+}
+
+#[allow(non_camel_case_types)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub enum Type {
+    True,
+    u8,
+    u16,
+    u32,
+    i32,
+    u64,
+    i64,
+    f64,
+    bool,
+    String,
+    Option(Box<Type>),
+    ArrayOf(Box<Type>),
+    RawTy(String),
+
+    Url,
+    DateTime,
+}
+
+impl std::fmt::Display for Type {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Type::True => write!(f, "True"),
+            Type::u8 => write!(f, "u8"),
+            Type::u16 => write!(f, "u16"),
+            Type::u32 => write!(f, "u32"),
+            Type::i32 => write!(f, "i32"),
+            Type::u64 => write!(f, "u64"),
+            Type::i64 => write!(f, "i64"),
+            Type::f64 => write!(f, "f64"),
+            Type::bool => write!(f, "bool"),
+            Type::String => write!(f, "String"),
+            Type::Option(inner) => write!(f, "Option<{}>", inner),
+            Type::ArrayOf(inner) => write!(f, "Vec<{}>", inner),
+            Type::RawTy(raw) => f.write_str(raw),
+            Type::Url => write!(f, "Url"),
+            Type::DateTime => write!(f, "DateTime<Utc>"),
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 111df60c..20080d1d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -115,3 +115,6 @@ mod bot;
 
 // implementation details
 mod serde_multipart;
+
+#[cfg(test)]
+mod codegen;
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 13333232..18ab5103 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -399,14 +399,6 @@ macro_rules! download_forward {
     };
 }
 
-// This macro is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS MACRO**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
 macro_rules! requester_forward {
     ($i:ident $(, $rest:ident )* $(,)? => $body:ident, $ty:ident ) => {
         requester_forward!(@method $i $body $ty);
@@ -415,10 +407,14 @@ macro_rules! requester_forward {
         )*
     };
 
+// START BLOCK requester_forward_at_method
+// Generated by `codegen_requester_forward`, do not edit by hand.
+
+
     (@method get_updates $body:ident $ty:ident) => {
         type GetUpdates = $ty![GetUpdates];
 
-        fn get_updates(&self) -> Self::GetUpdates {
+        fn get_updates(&self, ) -> Self::GetUpdates {
             let this = self;
             $body!(get_updates this ())
         }
@@ -434,7 +430,7 @@ macro_rules! requester_forward {
     (@method delete_webhook $body:ident $ty:ident) => {
         type DeleteWebhook = $ty![DeleteWebhook];
 
-        fn delete_webhook(&self) -> Self::DeleteWebhook {
+        fn delete_webhook(&self, ) -> Self::DeleteWebhook {
             let this = self;
             $body!(delete_webhook this ())
         }
@@ -442,7 +438,7 @@ macro_rules! requester_forward {
     (@method get_webhook_info $body:ident $ty:ident) => {
         type GetWebhookInfo = $ty![GetWebhookInfo];
 
-        fn get_webhook_info(&self) -> Self::GetWebhookInfo {
+        fn get_webhook_info(&self, ) -> Self::GetWebhookInfo {
             let this = self;
             $body!(get_webhook_info this ())
         }
@@ -450,7 +446,7 @@ macro_rules! requester_forward {
     (@method get_me $body:ident $ty:ident) => {
         type GetMe = $ty![GetMe];
 
-        fn get_me(&self) -> Self::GetMe {
+        fn get_me(&self, ) -> Self::GetMe {
             let this = self;
             $body!(get_me this ())
         }
@@ -458,7 +454,7 @@ macro_rules! requester_forward {
     (@method log_out $body:ident $ty:ident) => {
         type LogOut = $ty![LogOut];
 
-        fn log_out(&self) -> Self::LogOut {
+        fn log_out(&self, ) -> Self::LogOut {
             let this = self;
             $body!(log_out this ())
         }
@@ -466,7 +462,7 @@ macro_rules! requester_forward {
     (@method close $body:ident $ty:ident) => {
         type Close = $ty![Close];
 
-        fn close(&self) -> Self::Close {
+        fn close(&self, ) -> Self::Close {
             let this = self;
             $body!(close this ())
         }
@@ -708,10 +704,10 @@ macro_rules! requester_forward {
     (@method set_chat_administrator_custom_title $body:ident $ty:ident) => {
         type SetChatAdministratorCustomTitle = $ty![SetChatAdministratorCustomTitle];
 
-        fn set_chat_administrator_custom_title<Ch, Cu>(&self, chat_id: Ch, user_id: UserId, custom_title: Cu) -> Self::SetChatAdministratorCustomTitle where Ch: Into<Recipient>,
-        Cu: Into<String> {
+        fn set_chat_administrator_custom_title<Ch, C>(&self, chat_id: Ch, user_id: UserId, custom_title: C) -> Self::SetChatAdministratorCustomTitle where Ch: Into<Recipient>,
+        C: Into<String> {
             let this = self;
-            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: UserId, custom_title: Cu))
+            $body!(set_chat_administrator_custom_title this (chat_id: Ch, user_id: UserId, custom_title: C))
         }
     };
     (@method ban_chat_sender_chat $body:ident $ty:ident) => {
@@ -931,7 +927,7 @@ macro_rules! requester_forward {
     (@method get_my_commands $body:ident $ty:ident) => {
         type GetMyCommands = $ty![GetMyCommands];
 
-        fn get_my_commands(&self) -> Self::GetMyCommands {
+        fn get_my_commands(&self, ) -> Self::GetMyCommands {
             let this = self;
             $body!(get_my_commands this ())
         }
@@ -939,7 +935,7 @@ macro_rules! requester_forward {
     (@method set_chat_menu_button $body:ident $ty:ident) => {
         type SetChatMenuButton = $ty![SetChatMenuButton];
 
-        fn set_chat_menu_button(&self) -> Self::SetChatMenuButton {
+        fn set_chat_menu_button(&self, ) -> Self::SetChatMenuButton {
             let this = self;
             $body!(set_chat_menu_button this ())
         }
@@ -947,7 +943,7 @@ macro_rules! requester_forward {
     (@method get_chat_menu_button $body:ident $ty:ident) => {
         type GetChatMenuButton = $ty![GetChatMenuButton];
 
-        fn get_chat_menu_button(&self) -> Self::GetChatMenuButton {
+        fn get_chat_menu_button(&self, ) -> Self::GetChatMenuButton {
             let this = self;
             $body!(get_chat_menu_button this ())
         }
@@ -955,7 +951,7 @@ macro_rules! requester_forward {
     (@method set_my_default_administrator_rights $body:ident $ty:ident) => {
         type SetMyDefaultAdministratorRights = $ty![SetMyDefaultAdministratorRights];
 
-        fn set_my_default_administrator_rights(&self) -> Self::SetMyDefaultAdministratorRights {
+        fn set_my_default_administrator_rights(&self, ) -> Self::SetMyDefaultAdministratorRights {
             let this = self;
             $body!(set_my_default_administrator_rights this ())
         }
@@ -963,7 +959,7 @@ macro_rules! requester_forward {
     (@method get_my_default_administrator_rights $body:ident $ty:ident) => {
         type GetMyDefaultAdministratorRights = $ty![GetMyDefaultAdministratorRights];
 
-        fn get_my_default_administrator_rights(&self) -> Self::GetMyDefaultAdministratorRights {
+        fn get_my_default_administrator_rights(&self, ) -> Self::GetMyDefaultAdministratorRights {
             let this = self;
             $body!(get_my_default_administrator_rights this ())
         }
@@ -971,7 +967,7 @@ macro_rules! requester_forward {
     (@method delete_my_commands $body:ident $ty:ident) => {
         type DeleteMyCommands = $ty![DeleteMyCommands];
 
-        fn delete_my_commands(&self) -> Self::DeleteMyCommands {
+        fn delete_my_commands(&self, ) -> Self::DeleteMyCommands {
             let this = self;
             $body!(delete_my_commands this ())
         }
@@ -1224,5 +1220,117 @@ macro_rules! requester_forward {
             let this = self;
             $body!(get_game_high_scores this (user_id: UserId, target: T))
         }
-    };
+    };// END BLOCK requester_forward_at_method
+}
+
+#[test]
+fn codegen_requester_forward() {
+    use crate::codegen::{
+        add_hidden_preamble,
+        convert::{convert_for, Convert},
+        ensure_file_contents, min_prefix, project_root, reformat, replace_block,
+        schema::{self, Type},
+        to_uppercase,
+    };
+    use indexmap::IndexMap;
+    use itertools::Itertools;
+
+    let path = project_root().join("src/local_macros.rs");
+    let schema = schema::get();
+
+    let contents = schema
+        .methods
+        .iter()
+        .map(|m| {
+            let mut convert_params = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, Type::Option(_)))
+                .map(|p| (&p.name, convert_for(&p.ty)))
+                .filter(|(_, c)| !matches!(c, Convert::Id(_)))
+                .map(|(name, _)| &**name)
+                .collect::<Vec<_>>();
+
+            convert_params.sort();
+
+            let prefixes: IndexMap<_, _> = convert_params
+                .iter()
+                .copied()
+                // Workaround to output the last type as the first letter
+                .chain(["\0"])
+                .tuple_windows()
+                .map(|(l, r)| (l, min_prefix(&l, &r)))
+                .collect();
+
+            let args = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, Type::Option(_)))
+                .map(|p| match prefixes.get(&*p.name) {
+                    Some(prefix) => format!("{}: {}", p.name, to_uppercase(prefix)),
+                    None => format!("{}: {}", p.name, p.ty),
+                })
+                .join(", ");
+
+            let generics = m
+                .params
+                .iter()
+                .flat_map(|p| prefixes.get(&*p.name))
+                .copied()
+                .map(to_uppercase)
+                .join(", ");
+            let where_clause = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, Type::Option(_)))
+                .flat_map(|p| match convert_for(&p.ty) {
+                    Convert::Id(_) => None,
+                    Convert::Into(ty) => Some(format!(
+                        "{}: Into<{}>",
+                        &to_uppercase(&prefixes[&*p.name]),
+                        ty
+                    )),
+                    Convert::Collect(ty) => Some(format!(
+                        "{}: IntoIterator<Item = {}>",
+                        &to_uppercase(&prefixes[&*p.name]),
+                        ty
+                    )),
+                })
+                .join(",\n        ");
+
+            let generics = if generics.is_empty() {
+                String::from("")
+            } else {
+                format!("<{}>", generics)
+            };
+
+            let where_clause = if where_clause.is_empty() {
+                String::from("")
+            } else {
+                format!(" where {}", where_clause)
+            };
+
+            format!(
+                "
+    (@method {method} $body:ident $ty:ident) => {{
+        type {Method} = $ty![{Method}];
+
+        fn {method}{generics}(&self, {args}) -> Self::{Method}{where_clause} {{
+            let this = self;
+            $body!({method} this ({args}))
+        }}
+    }};",
+                Method = m.names.1,
+                method = m.names.2,
+            )
+        })
+        .collect();
+
+    let contents = reformat(replace_block(
+        &path,
+        "requester_forward_at_method",
+        &add_hidden_preamble("codegen_requester_forward", contents),
+    ));
+
+    ensure_file_contents(&path, &contents);
 }
diff --git a/src/payloads.rs b/src/payloads.rs
index 2a4d2419..5989336f 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -12,14 +12,9 @@
 /// namespace.
 pub mod setters;
 
-// This block is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS BLOCK**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+// START BLOCK payload_modules
+// Generated by `codegen_payload_mods_and_reexports`, do not edit by hand.
+
 mod add_sticker_to_set;
 mod answer_callback_query;
 mod answer_inline_query;
@@ -227,3 +222,64 @@ pub use unban_chat_sender_chat::{UnbanChatSenderChat, UnbanChatSenderChatSetters
 pub use unpin_all_chat_messages::{UnpinAllChatMessages, UnpinAllChatMessagesSetters};
 pub use unpin_chat_message::{UnpinChatMessage, UnpinChatMessageSetters};
 pub use upload_sticker_file::{UploadStickerFile, UploadStickerFileSetters};
+// END BLOCK payload_modules
+
+/// Generates `mod`s and `pub use`s above.
+#[test]
+fn codegen_payload_mods_and_reexports() {
+    use crate::codegen::{
+        add_hidden_preamble, ensure_file_contents, project_root, reformat, replace_block, schema,
+    };
+
+    let path = project_root().join("src/payloads.rs");
+    let schema = schema::get();
+    let mut block = String::new();
+
+    schema
+        .methods
+        .iter()
+        .for_each(|m| block.push_str(&format!("mod {};\n", m.names.2)));
+
+    block.push('\n');
+
+    schema.methods.iter().for_each(|m| {
+        block.push_str(&format!(
+            "pub use {m}::{{{M}, {M}Setters}};\n",
+            m = m.names.2,
+            M = m.names.1
+        ))
+    });
+
+    let contents = reformat(replace_block(
+        &path,
+        "payload_modules",
+        &add_hidden_preamble("codegen_payload_mods_and_reexports", block),
+    ));
+
+    ensure_file_contents(&path, &contents);
+}
+
+/// Generates contents of [`setters`] module.
+#[test]
+fn codegen_setters_reexports() {
+    use crate::codegen::{
+        add_hidden_preamble, ensure_file_contents, project_root, reformat, schema,
+    };
+
+    let path = project_root().join("src/payloads/setters.rs");
+    let schema = schema::get();
+    let mut contents = String::new();
+
+    contents.push_str("#[doc(no_inline)] pub use crate::payloads::{");
+    schema
+        .methods
+        .iter()
+        .for_each(|m| contents.push_str(&format!("{M}Setters as _,", M = m.names.1)));
+    contents.push_str("};\n");
+
+    let contents = reformat(add_hidden_preamble("codegen_setters_reexports", contents));
+    ensure_file_contents(&path, &contents);
+}
+
+#[cfg(test)]
+mod codegen;
diff --git a/src/payloads/add_sticker_to_set.rs b/src/payloads/add_sticker_to_set.rs
index a231d9e3..3ef0900f 100644
--- a/src/payloads/add_sticker_to_set.rs
+++ b/src/payloads/add_sticker_to_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputSticker, MaskPosition, True, UserId};
diff --git a/src/payloads/answer_callback_query.rs b/src/payloads/answer_callback_query.rs
index 17381fe9..7dbb2a82 100644
--- a/src/payloads/answer_callback_query.rs
+++ b/src/payloads/answer_callback_query.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 use url::Url;
 
diff --git a/src/payloads/answer_inline_query.rs b/src/payloads/answer_inline_query.rs
index 1225600c..55420240 100644
--- a/src/payloads/answer_inline_query.rs
+++ b/src/payloads/answer_inline_query.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineQueryResult, True};
diff --git a/src/payloads/answer_pre_checkout_query.rs b/src/payloads/answer_pre_checkout_query.rs
index d185dbdc..c30f826d 100644
--- a/src/payloads/answer_pre_checkout_query.rs
+++ b/src/payloads/answer_pre_checkout_query.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/answer_shipping_query.rs b/src/payloads/answer_shipping_query.rs
index da97b5d0..349ccab5 100644
--- a/src/payloads/answer_shipping_query.rs
+++ b/src/payloads/answer_shipping_query.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ShippingOption, True};
diff --git a/src/payloads/answer_web_app_query.rs b/src/payloads/answer_web_app_query.rs
index feeeed3f..79d3e9fa 100644
--- a/src/payloads/answer_web_app_query.rs
+++ b/src/payloads/answer_web_app_query.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineQueryResult, SentWebAppMessage};
diff --git a/src/payloads/approve_chat_join_request.rs b/src/payloads/approve_chat_join_request.rs
index eac96cf3..54618be9 100644
--- a/src/payloads/approve_chat_join_request.rs
+++ b/src/payloads/approve_chat_join_request.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True, UserId};
diff --git a/src/payloads/ban_chat_member.rs b/src/payloads/ban_chat_member.rs
index c9262bfd..81fe5090 100644
--- a/src/payloads/ban_chat_member.rs
+++ b/src/payloads/ban_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/ban_chat_sender_chat.rs b/src/payloads/ban_chat_sender_chat.rs
index 2416fbd6..4722a600 100644
--- a/src/payloads/ban_chat_sender_chat.rs
+++ b/src/payloads/ban_chat_sender_chat.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatId, Recipient, True};
diff --git a/src/payloads/close.rs b/src/payloads/close.rs
index 406b0054..749dc22a 100644
--- a/src/payloads/close.rs
+++ b/src/payloads/close.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/codegen.rs b/src/payloads/codegen.rs
new file mode 100644
index 00000000..b1c6a86c
--- /dev/null
+++ b/src/payloads/codegen.rs
@@ -0,0 +1,269 @@
+use std::{borrow::Borrow, collections::HashSet, ops::Deref};
+
+use itertools::Itertools;
+
+use crate::codegen::{
+    add_preamble,
+    convert::{convert_for, Convert},
+    ensure_files_contents, project_root, reformat,
+    schema::{self, Doc, Method, Param, Type},
+    to_uppercase,
+};
+
+#[test]
+fn codegen_payloads() {
+    let base_path = project_root().join("src/payloads/");
+    let schema = schema::get();
+
+    let mut files = Vec::new();
+
+    for method in schema.methods {
+        let file_name = format!("{}.rs", method.names.2);
+        let path = base_path.join(&*file_name);
+
+        let uses = uses(&method);
+
+        let method_doc = render_doc(&method.doc, method.sibling.as_deref());
+        let eq_hash_derive = eq_hash_suitable(&method)
+            .then(|| " Eq, Hash,")
+            .unwrap_or("");
+        let default_derive = default_needed(&method).then(|| " Default,").unwrap_or("");
+
+        let return_ty = method.return_ty.to_string();
+
+        let required = params(
+            method
+                .params
+                .iter()
+                .filter(|p| !matches!(&p.ty, Type::Option(_))),
+        );
+        let required = match &*required {
+            "" => "".to_owned(),
+            _ => format!("        required {{\n{required}\n        }}"),
+        };
+
+        let optional = params(method.params.iter().filter_map(|p| match &p.ty {
+            Type::Option(inner) => Some(Param {
+                name: p.name.clone(),
+                ty: inner.deref().clone(),
+                descr: p.descr.clone(),
+            }),
+            _ => None,
+        }));
+        let optional = match &*optional {
+            "" => "".to_owned(),
+            _ if required.is_empty() => format!("        optional {{\n{optional}\n        }}"),
+            _ => format!("\n        optional {{\n{optional}\n        }}"),
+        };
+
+        let multipart = multipart_input_file_fields(&method)
+            .map(|field| format!("    @[multipart = {}]\n", field.join(", ")))
+            .unwrap_or(String::new());
+
+        let derive = if !multipart.is_empty()
+            || matches!(
+                &*method.names.1,
+                "SendMediaGroup" | "EditMessageMedia" | "EditMessageMediaInline"
+            ) {
+            format!("#[derive(Debug, Clone, Serialize)]")
+        } else {
+            format!("#[derive(Debug, PartialEq,{eq_hash_derive}{default_derive} Clone, Serialize)]")
+        };
+
+        let timeout_secs = match &*method.names.2 {
+            "get_updates" => "    @[timeout_secs = timeout]\n",
+            _ => "",
+        };
+
+        let contents = format!(
+            "\
+{uses}
+
+impl_payload! {{
+{multipart}{timeout_secs}{method_doc}
+    {derive}
+    pub {Method} ({Method}Setters) => {return_ty} {{
+{required}{optional}
+    }}
+}}
+",
+            Method = method.names.1,
+        );
+
+        files.push((path, reformat(add_preamble("codegen_payloads", contents))));
+    }
+
+    ensure_files_contents(files.iter().map(|(p, c)| (&**p, &**c)))
+}
+
+fn uses(method: &Method) -> String {
+    enum Use {
+        Prelude,
+        Crate(String),
+        External(String),
+    }
+
+    fn ty_use(ty: &Type) -> Use {
+        match ty {
+            Type::True => Use::Crate(String::from("use crate::types::True;")),
+            Type::u8
+            | Type::u16
+            | Type::u32
+            | Type::i32
+            | Type::u64
+            | Type::i64
+            | Type::f64
+            | Type::bool
+            | Type::String => Use::Prelude,
+            Type::Option(inner) | Type::ArrayOf(inner) => ty_use(inner),
+            Type::RawTy(raw) => Use::Crate(["use crate::types::", &raw, ";"].concat()),
+            Type::Url => Use::External(String::from("use url::Url;")),
+            Type::DateTime => Use::External(String::from("use chrono::{DateTime, Utc};")),
+        }
+    }
+
+    let mut crate_uses = HashSet::new();
+    let mut external_uses = HashSet::new();
+
+    external_uses.insert(String::from("use serde::Serialize;"));
+
+    core::iter::once(&method.return_ty)
+        .chain(method.params.iter().map(|p| &p.ty))
+        .map(ty_use)
+        .for_each(|u| match u {
+            Use::Prelude => {}
+            Use::Crate(u) => {
+                crate_uses.insert(u);
+            }
+            Use::External(u) => {
+                external_uses.insert(u);
+            }
+        });
+
+    let external_uses = external_uses.into_iter().join("\n");
+
+    if crate_uses.is_empty() {
+        external_uses
+    } else {
+        let crate_uses = crate_uses.into_iter().join("");
+
+        format!("{external_uses}\n\n{crate_uses}",)
+    }
+}
+
+fn render_doc(doc: &Doc, sibling: Option<&str>) -> String {
+    let links = match &doc.md_links {
+        links if links.is_empty() => String::new(),
+        links => {
+            let l: String = links
+                .iter()
+                .map(|(name, link)| format!("\n    /// [{name}]: {link}"))
+                .collect();
+
+            format!("\n    ///{l}")
+        }
+    };
+
+    let sibling_note = sibling
+        .map(|s| {
+            format!(
+                "\n    /// \n    /// See also: [`{s}`](crate::payloads::{s})",
+                s = to_uppercase(s)
+            )
+        })
+        .unwrap_or_default();
+
+    [
+        "    /// ",
+        &doc.md.replace("\n", "\n    /// "),
+        &sibling_note,
+        &links,
+    ]
+    .concat()
+}
+
+fn eq_hash_suitable(method: &Method) -> bool {
+    fn ty_eq_hash_suitable(ty: &Type) -> bool {
+        match ty {
+            Type::f64 => false,
+            Type::Option(inner) | Type::ArrayOf(inner) => ty_eq_hash_suitable(&*inner),
+
+            Type::True
+            | Type::u8
+            | Type::u16
+            | Type::u32
+            | Type::i32
+            | Type::u64
+            | Type::i64
+            | Type::bool
+            | Type::String => true,
+
+            Type::Url | Type::DateTime => true,
+
+            Type::RawTy(raw) => raw != "MaskPosition" && raw != "InlineQueryResult",
+        }
+    }
+
+    method.params.iter().all(|p| ty_eq_hash_suitable(&p.ty))
+}
+
+fn default_needed(method: &Method) -> bool {
+    method
+        .params
+        .iter()
+        .all(|p| matches!(p.ty, Type::Option(_)))
+}
+
+fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
+    params
+        .map(|param| {
+            let param = param.borrow();
+            let doc = render_doc(&param.descr, None).replace("\n", "\n        ");
+            let field = &param.name;
+            let ty = &param.ty;
+            let flatten = match ty {
+                Type::RawTy(s) if s == "InputSticker" || s == "TargetMessage" => {
+                    "\n            #[serde(flatten)]"
+                }
+                _ => "",
+            };
+            let with = match ty {
+                Type::DateTime => {
+                    "\n            #[serde(with = \
+                     \"crate::types::serde_opt_date_from_unix_timestamp\")]"
+                }
+                _ => "",
+            };
+            let rename = match field.strip_suffix('_') {
+                Some(field) => format!("\n            #[serde(rename = \"{field}\")]"),
+                None => "".to_owned(),
+            };
+            let convert = match convert_for(ty) {
+                Convert::Id(_) => "",
+                Convert::Into(_) => " [into]",
+                Convert::Collect(_) => " [collect]",
+            };
+            format!("        {doc}{flatten}{with}{rename}\n            pub {field}: {ty}{convert},")
+        })
+        .join("\n")
+}
+
+fn multipart_input_file_fields(m: &Method) -> Option<Vec<&str>> {
+    let fields: Vec<_> = m
+        .params
+        .iter()
+        .filter(|&p| ty_is_multiparty(&p.ty))
+        .map(|p| &*p.name)
+        .collect();
+
+    if fields.is_empty() {
+        None
+    } else {
+        Some(fields)
+    }
+}
+
+fn ty_is_multiparty(ty: &Type) -> bool {
+    matches!(ty, Type::RawTy(x) if x == "InputFile" || x == "InputSticker")
+        || matches!(ty, Type::Option(inner) if ty_is_multiparty(inner))
+}
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index f0a56fbd..39f1688c 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/create_chat_invite_link.rs b/src/payloads/create_chat_invite_link.rs
index ddb054c3..6e18a577 100644
--- a/src/payloads/create_chat_invite_link.rs
+++ b/src/payloads/create_chat_invite_link.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/create_invoice_link.rs b/src/payloads/create_invoice_link.rs
index 6b39fb68..72748157 100644
--- a/src/payloads/create_invoice_link.rs
+++ b/src/payloads/create_invoice_link.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::LabeledPrice;
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 1ba21044..cf4c4453 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputSticker, MaskPosition, True, UserId};
diff --git a/src/payloads/decline_chat_join_request.rs b/src/payloads/decline_chat_join_request.rs
index 6524b027..3626f452 100644
--- a/src/payloads/decline_chat_join_request.rs
+++ b/src/payloads/decline_chat_join_request.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True, UserId};
diff --git a/src/payloads/delete_chat_photo.rs b/src/payloads/delete_chat_photo.rs
index 0e5f63af..53ab7ce1 100644
--- a/src/payloads/delete_chat_photo.rs
+++ b/src/payloads/delete_chat_photo.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Recipient;
diff --git a/src/payloads/delete_chat_sticker_set.rs b/src/payloads/delete_chat_sticker_set.rs
index 78151eef..222ae9ff 100644
--- a/src/payloads/delete_chat_sticker_set.rs
+++ b/src/payloads/delete_chat_sticker_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 35dfbcc1..4214ad7b 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/delete_my_commands.rs b/src/payloads/delete_my_commands.rs
index b82f12d2..6b91c126 100644
--- a/src/payloads/delete_my_commands.rs
+++ b/src/payloads/delete_my_commands.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{BotCommandScope, True};
@@ -16,7 +10,6 @@ impl_payload! {
     /// [higher level commands]: https://core.telegram.org/bots/api#determining-list-of-commands
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub DeleteMyCommands (DeleteMyCommandsSetters) => True {
-
         optional {
             /// A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.
             pub scope: BotCommandScope,
diff --git a/src/payloads/delete_sticker_from_set.rs b/src/payloads/delete_sticker_from_set.rs
index 680a2452..020b9616 100644
--- a/src/payloads/delete_sticker_from_set.rs
+++ b/src/payloads/delete_sticker_from_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/delete_webhook.rs b/src/payloads/delete_webhook.rs
index 843643de..49ad8872 100644
--- a/src/payloads/delete_webhook.rs
+++ b/src/payloads/delete_webhook.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
@@ -16,7 +10,6 @@ impl_payload! {
     /// [`GetUpdates`]: crate::payloads::GetUpdates
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub DeleteWebhook (DeleteWebhookSetters) => True {
-
         optional {
             /// Pass _True_ to drop all pending updates
             pub drop_pending_updates: bool,
diff --git a/src/payloads/edit_chat_invite_link.rs b/src/payloads/edit_chat_invite_link.rs
index 4b1439b0..7ff80f19 100644
--- a/src/payloads/edit_chat_invite_link.rs
+++ b/src/payloads/edit_chat_invite_link.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index 50092449..f31cce35 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
diff --git a/src/payloads/edit_message_caption_inline.rs b/src/payloads/edit_message_caption_inline.rs
index f5a65e03..f044f0de 100644
--- a/src/payloads/edit_message_caption_inline.rs
+++ b/src/payloads/edit_message_caption_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index ff8000e9..c9400abd 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/edit_message_live_location_inline.rs b/src/payloads/edit_message_live_location_inline.rs
index 5a6238d6..83883889 100644
--- a/src/payloads/edit_message_live_location_inline.rs
+++ b/src/payloads/edit_message_live_location_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 2ab6b094..9cbba6aa 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, InputMedia, Message, Recipient};
diff --git a/src/payloads/edit_message_media_inline.rs b/src/payloads/edit_message_media_inline.rs
index fd50e50f..1daf67f8 100644
--- a/src/payloads/edit_message_media_inline.rs
+++ b/src/payloads/edit_message_media_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, InputMedia, True};
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index 31717940..a6402bd3 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, Message, Recipient};
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/src/payloads/edit_message_reply_markup_inline.rs
index 20f2a178..c478ebb6 100644
--- a/src/payloads/edit_message_reply_markup_inline.rs
+++ b/src/payloads/edit_message_reply_markup_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, True};
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index b57670e8..18adde6f 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
diff --git a/src/payloads/edit_message_text_inline.rs b/src/payloads/edit_message_text_inline.rs
index 38fdb60a..4dea6cd4 100644
--- a/src/payloads/edit_message_text_inline.rs
+++ b/src/payloads/edit_message_text_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, MessageEntity, ParseMode, True};
diff --git a/src/payloads/export_chat_invite_link.rs b/src/payloads/export_chat_invite_link.rs
index affbb254..357eb829 100644
--- a/src/payloads/export_chat_invite_link.rs
+++ b/src/payloads/export_chat_invite_link.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Recipient;
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 299b5de4..762ff542 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient};
diff --git a/src/payloads/get_chat.rs b/src/payloads/get_chat.rs
index 1174c2c1..1d42f1f9 100644
--- a/src/payloads/get_chat.rs
+++ b/src/payloads/get_chat.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Chat, Recipient};
diff --git a/src/payloads/get_chat_administrators.rs b/src/payloads/get_chat_administrators.rs
index aabf98d4..1ad2f5ea 100644
--- a/src/payloads/get_chat_administrators.rs
+++ b/src/payloads/get_chat_administrators.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatMember, Recipient};
diff --git a/src/payloads/get_chat_member.rs b/src/payloads/get_chat_member.rs
index eee95f01..ff469de9 100644
--- a/src/payloads/get_chat_member.rs
+++ b/src/payloads/get_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatMember, Recipient, UserId};
diff --git a/src/payloads/get_chat_member_count.rs b/src/payloads/get_chat_member_count.rs
index ef135206..f481fe84 100644
--- a/src/payloads/get_chat_member_count.rs
+++ b/src/payloads/get_chat_member_count.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Recipient;
diff --git a/src/payloads/get_chat_members_count.rs b/src/payloads/get_chat_members_count.rs
index 7a86721a..ed598b2d 100644
--- a/src/payloads/get_chat_members_count.rs
+++ b/src/payloads/get_chat_members_count.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Recipient;
diff --git a/src/payloads/get_chat_menu_button.rs b/src/payloads/get_chat_menu_button.rs
index c2097e3a..32a34821 100644
--- a/src/payloads/get_chat_menu_button.rs
+++ b/src/payloads/get_chat_menu_button.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatId, MenuButton};
@@ -14,7 +8,6 @@ impl_payload! {
     /// Use this method to get the current value of the bot's menu button in a private chat, or the default menu button.
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetChatMenuButton (GetChatMenuButtonSetters) => MenuButton {
-
         optional {
             /// Unique identifier for the target private chat. If not specified, default bot's menu button will be returned
             pub chat_id: ChatId [into],
diff --git a/src/payloads/get_file.rs b/src/payloads/get_file.rs
index 2c2c0b08..20a4b53e 100644
--- a/src/payloads/get_file.rs
+++ b/src/payloads/get_file.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::File;
diff --git a/src/payloads/get_game_high_scores.rs b/src/payloads/get_game_high_scores.rs
index d38a3468..017104ab 100644
--- a/src/payloads/get_game_high_scores.rs
+++ b/src/payloads/get_game_high_scores.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{TargetMessage, True, UserId};
diff --git a/src/payloads/get_me.rs b/src/payloads/get_me.rs
index 4c2f85ff..07323fba 100644
--- a/src/payloads/get_me.rs
+++ b/src/payloads/get_me.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Me;
diff --git a/src/payloads/get_my_commands.rs b/src/payloads/get_my_commands.rs
index 085cbe82..387da9a5 100644
--- a/src/payloads/get_my_commands.rs
+++ b/src/payloads/get_my_commands.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{BotCommand, BotCommandScope};
@@ -16,7 +10,6 @@ impl_payload! {
     /// [`BotCommand`]: crate::types::BotCommand
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetMyCommands (GetMyCommandsSetters) => Vec<BotCommand> {
-
         optional {
             /// A JSON-serialized object, describing scope of users for which the commands are relevant. Defaults to BotCommandScopeDefault.
             pub scope: BotCommandScope,
diff --git a/src/payloads/get_my_default_administrator_rights.rs b/src/payloads/get_my_default_administrator_rights.rs
index d45e708b..867d145f 100644
--- a/src/payloads/get_my_default_administrator_rights.rs
+++ b/src/payloads/get_my_default_administrator_rights.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::ChatAdministratorRights;
@@ -14,7 +8,6 @@ impl_payload! {
     /// Use this method to get the current value of the bot's menu button in a private chat, or the default menu button.
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetMyDefaultAdministratorRights (GetMyDefaultAdministratorRightsSetters) => ChatAdministratorRights {
-
         optional {
             /// Pass _True_ to get default administrator rights of the bot in channels. Otherwise, default administrator rights of the bot for groups and supergroups will be returned.
             pub for_channels: bool,
diff --git a/src/payloads/get_sticker_set.rs b/src/payloads/get_sticker_set.rs
index c3dbc0db..a750a58e 100644
--- a/src/payloads/get_sticker_set.rs
+++ b/src/payloads/get_sticker_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::StickerSet;
diff --git a/src/payloads/get_updates.rs b/src/payloads/get_updates.rs
index 667ffcdd..43340c9b 100644
--- a/src/payloads/get_updates.rs
+++ b/src/payloads/get_updates.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{AllowedUpdate, Update};
@@ -18,7 +12,6 @@ impl_payload! {
     /// [`Update`]: crate::types::Update
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub GetUpdates (GetUpdatesSetters) => Vec<Update> {
-
         optional {
             /// Identifier of the first update to be returned. Must be greater by one than the highest among the identifiers of previously received updates. By default, updates starting with the earliest unconfirmed update are returned. An update is considered confirmed as soon as [`GetUpdates`] is called with an offset higher than its update_id. The negative offset can be specified to retrieve updates starting from -offset update from the end of the updates queue. All previous updates will forgotten.
             ///
diff --git a/src/payloads/get_user_profile_photos.rs b/src/payloads/get_user_profile_photos.rs
index 193e8438..272eb71a 100644
--- a/src/payloads/get_user_profile_photos.rs
+++ b/src/payloads/get_user_profile_photos.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{UserId, UserProfilePhotos};
diff --git a/src/payloads/get_webhook_info.rs b/src/payloads/get_webhook_info.rs
index 0ea91a87..bd8ace2e 100644
--- a/src/payloads/get_webhook_info.rs
+++ b/src/payloads/get_webhook_info.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::WebhookInfo;
diff --git a/src/payloads/kick_chat_member.rs b/src/payloads/kick_chat_member.rs
index 9b45538d..87193da5 100644
--- a/src/payloads/kick_chat_member.rs
+++ b/src/payloads/kick_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/leave_chat.rs b/src/payloads/leave_chat.rs
index 212cc901..cafd0af3 100644
--- a/src/payloads/leave_chat.rs
+++ b/src/payloads/leave_chat.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/log_out.rs b/src/payloads/log_out.rs
index 82c362eb..a138f45a 100644
--- a/src/payloads/log_out.rs
+++ b/src/payloads/log_out.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index b6a0552d..960ea24c 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/promote_chat_member.rs b/src/payloads/promote_chat_member.rs
index 84e56bb6..ece800f6 100644
--- a/src/payloads/promote_chat_member.rs
+++ b/src/payloads/promote_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True, UserId};
diff --git a/src/payloads/restrict_chat_member.rs b/src/payloads/restrict_chat_member.rs
index a390cbef..282af1dd 100644
--- a/src/payloads/restrict_chat_member.rs
+++ b/src/payloads/restrict_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/revoke_chat_invite_link.rs b/src/payloads/revoke_chat_invite_link.rs
index 7321413c..9d1b5085 100644
--- a/src/payloads/revoke_chat_invite_link.rs
+++ b/src/payloads/revoke_chat_invite_link.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::Recipient;
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 49e2fa36..4082b046 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 13906cc4..7f5e4adb 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_chat_action.rs b/src/payloads/send_chat_action.rs
index 45cd89de..a3acd43e 100644
--- a/src/payloads/send_chat_action.rs
+++ b/src/payloads/send_chat_action.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatAction, Recipient, True};
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 1af036cd..06632a21 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index 70dd0339..a7b74fe3 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{DiceEmoji, Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 6bfc8330..1ee434f2 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_game.rs b/src/payloads/send_game.rs
index 8d30f29c..b348bfb3 100644
--- a/src/payloads/send_game.rs
+++ b/src/payloads/send_game.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/send_invoice.rs b/src/payloads/send_invoice.rs
index 6ac80104..85322d96 100644
--- a/src/payloads/send_invoice.rs
+++ b/src/payloads/send_invoice.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 use url::Url;
 
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 99037b0d..556105b9 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index 108004cf..db762c50 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputMedia, Message, Recipient};
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index 7563f7c1..fa0c2bbf 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 8ab5d344..782d7d27 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 7409cbc0..920ddad0 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
diff --git a/src/payloads/send_sticker.rs b/src/payloads/send_sticker.rs
index 65513e8d..2ebf8bdd 100644
--- a/src/payloads/send_sticker.rs
+++ b/src/payloads/send_sticker.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index 33a99a72..bb6da175 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index ebf14dff..1510cbf1 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 828ca1a3..78892cee 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index bfbbd5fb..8b3865b2 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/src/payloads/set_chat_administrator_custom_title.rs
index fe82a6c7..fbdc85d7 100644
--- a/src/payloads/set_chat_administrator_custom_title.rs
+++ b/src/payloads/set_chat_administrator_custom_title.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True, UserId};
diff --git a/src/payloads/set_chat_description.rs b/src/payloads/set_chat_description.rs
index a9d08495..89976ecd 100644
--- a/src/payloads/set_chat_description.rs
+++ b/src/payloads/set_chat_description.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/set_chat_menu_button.rs b/src/payloads/set_chat_menu_button.rs
index 88cfea43..b87b6393 100644
--- a/src/payloads/set_chat_menu_button.rs
+++ b/src/payloads/set_chat_menu_button.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatId, MenuButton, True};
@@ -14,7 +8,6 @@ impl_payload! {
     /// Use this method to change the bot's menu button in a private chat, or the default menu button.
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub SetChatMenuButton (SetChatMenuButtonSetters) => True {
-
         optional {
             /// Unique identifier for the target private chat. If not specified, default bot's menu button will be changed.
             pub chat_id: ChatId [into],
diff --git a/src/payloads/set_chat_permissions.rs b/src/payloads/set_chat_permissions.rs
index da9b5334..debfc9a9 100644
--- a/src/payloads/set_chat_permissions.rs
+++ b/src/payloads/set_chat_permissions.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatPermissions, Recipient, True};
diff --git a/src/payloads/set_chat_photo.rs b/src/payloads/set_chat_photo.rs
index 316f2292..7aa7ec7b 100644
--- a/src/payloads/set_chat_photo.rs
+++ b/src/payloads/set_chat_photo.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, Recipient, True};
diff --git a/src/payloads/set_chat_sticker_set.rs b/src/payloads/set_chat_sticker_set.rs
index f63faa5d..a865a008 100644
--- a/src/payloads/set_chat_sticker_set.rs
+++ b/src/payloads/set_chat_sticker_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/set_chat_title.rs b/src/payloads/set_chat_title.rs
index 8cdba296..b78ef9cc 100644
--- a/src/payloads/set_chat_title.rs
+++ b/src/payloads/set_chat_title.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 540a7323..65e7412e 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, UserId};
diff --git a/src/payloads/set_game_score_inline.rs b/src/payloads/set_game_score_inline.rs
index 90f6269b..513e4f57 100644
--- a/src/payloads/set_game_score_inline.rs
+++ b/src/payloads/set_game_score_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, UserId};
diff --git a/src/payloads/set_my_commands.rs b/src/payloads/set_my_commands.rs
index 2c08f2e9..7dd6f276 100644
--- a/src/payloads/set_my_commands.rs
+++ b/src/payloads/set_my_commands.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{BotCommand, BotCommandScope, True};
diff --git a/src/payloads/set_my_default_administrator_rights.rs b/src/payloads/set_my_default_administrator_rights.rs
index 547e45f3..25f64f38 100644
--- a/src/payloads/set_my_default_administrator_rights.rs
+++ b/src/payloads/set_my_default_administrator_rights.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatAdministratorRights, True};
@@ -14,7 +8,6 @@ impl_payload! {
     /// Use this method to change the default administrator rights requested by the bot when it's added as an administrator to groups or channels. These rights will be suggested to users, but they are are free to modify the list before adding the bot.
     #[derive(Debug, PartialEq, Eq, Hash, Default, Clone, Serialize)]
     pub SetMyDefaultAdministratorRights (SetMyDefaultAdministratorRightsSetters) => True {
-
         optional {
             /// A JSON-serialized object describing new default administrator rights. If not specified, the default administrator rights will be cleared.
             pub rights: ChatAdministratorRights,
diff --git a/src/payloads/set_passport_data_errors.rs b/src/payloads/set_passport_data_errors.rs
index d906071f..64f43fbe 100644
--- a/src/payloads/set_passport_data_errors.rs
+++ b/src/payloads/set_passport_data_errors.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{PassportElementError, True, UserId};
diff --git a/src/payloads/set_sticker_position_in_set.rs b/src/payloads/set_sticker_position_in_set.rs
index 965c0e69..281593ea 100644
--- a/src/payloads/set_sticker_position_in_set.rs
+++ b/src/payloads/set_sticker_position_in_set.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::True;
diff --git a/src/payloads/set_sticker_set_thumb.rs b/src/payloads/set_sticker_set_thumb.rs
index 1aaecab3..4fc93547 100644
--- a/src/payloads/set_sticker_set_thumb.rs
+++ b/src/payloads/set_sticker_set_thumb.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InputFile, True, UserId};
diff --git a/src/payloads/set_webhook.rs b/src/payloads/set_webhook.rs
index f282696a..4171b8f2 100644
--- a/src/payloads/set_webhook.rs
+++ b/src/payloads/set_webhook.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 use url::Url;
 
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index 17bdddf6..a25e3026 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+// Generated by `codegen_setters_reexports`, do not edit by hand.
+
 #[doc(no_inline)]
 pub use crate::payloads::{
     AddStickerToSetSetters as _, AnswerCallbackQuerySetters as _, AnswerInlineQuerySetters as _,
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index 1ee26b5a..8f454fb1 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, Recipient, ReplyMarkup};
diff --git a/src/payloads/stop_message_live_location_inline.rs b/src/payloads/stop_message_live_location_inline.rs
index 0aeb7650..2191c774 100644
--- a/src/payloads/stop_message_live_location_inline.rs
+++ b/src/payloads/stop_message_live_location_inline.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Message, ReplyMarkup};
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index c4e0ca24..ba884397 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{InlineKeyboardMarkup, Poll, Recipient};
diff --git a/src/payloads/unban_chat_member.rs b/src/payloads/unban_chat_member.rs
index d58f35c8..fb20e0e0 100644
--- a/src/payloads/unban_chat_member.rs
+++ b/src/payloads/unban_chat_member.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True, UserId};
diff --git a/src/payloads/unban_chat_sender_chat.rs b/src/payloads/unban_chat_sender_chat.rs
index 54d4d4ea..7287e099 100644
--- a/src/payloads/unban_chat_sender_chat.rs
+++ b/src/payloads/unban_chat_sender_chat.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{ChatId, Recipient, True};
diff --git a/src/payloads/unpin_all_chat_messages.rs b/src/payloads/unpin_all_chat_messages.rs
index 25c8486a..a1d8fa0a 100644
--- a/src/payloads/unpin_all_chat_messages.rs
+++ b/src/payloads/unpin_all_chat_messages.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index 0a05a594..f5576134 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{Recipient, True};
diff --git a/src/payloads/upload_sticker_file.rs b/src/payloads/upload_sticker_file.rs
index ba2f6660..d856dc1d 100644
--- a/src/payloads/upload_sticker_file.rs
+++ b/src/payloads/upload_sticker_file.rs
@@ -1,11 +1,5 @@
-// This file is auto generated by [`cg`] from [`schema`].
-//
-// **DO NOT EDIT THIS FILE**,
-//
-// Edit `cg` or `schema` instead.
-//
-// [cg]: https://github.com/teloxide/cg
-// [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+//! Generated by `codegen_payloads`, do not edit by hand.
+
 use serde::Serialize;
 
 use crate::types::{FileMeta, InputFile, UserId};
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 6bc4fffc..2d611b65 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -59,14 +59,8 @@ pub trait Requester {
     /// Error type returned by all requests.
     type Err: std::error::Error + Send;
 
-    // This block is auto generated by [`cg`] from [`schema`].
-    //
-    // **DO NOT EDIT THIS BLOCK**,
-    //
-    // Edit `cg` or `schema` instead.
-    //
-    // [cg]: https://github.com/teloxide/cg
-    // [`schema`]: https://github.com/WaffleLapkin/tg-methods-schema
+    // START BLOCK requester_methods
+    // Generated by `codegen_requester_methods`, do not edit by hand.
 
     type GetUpdates: Request<Payload = GetUpdates, Err = Self::Err>;
 
@@ -363,15 +357,15 @@ pub trait Requester {
     >;
 
     /// For Telegram documentation see [`SetChatAdministratorCustomTitle`].
-    fn set_chat_administrator_custom_title<Ch, Cu>(
+    fn set_chat_administrator_custom_title<Ch, C>(
         &self,
         chat_id: Ch,
         user_id: UserId,
-        custom_title: Cu,
+        custom_title: C,
     ) -> Self::SetChatAdministratorCustomTitle
     where
         Ch: Into<Recipient>,
-        Cu: Into<String>;
+        C: Into<String>;
 
     type BanChatSenderChat: Request<Payload = BanChatSenderChat, Err = Self::Err>;
 
@@ -928,6 +922,7 @@ pub trait Requester {
     fn get_game_high_scores<T>(&self, user_id: UserId, target: T) -> Self::GetGameHighScores
     where
         T: Into<TargetMessage>;
+    // END BLOCK requester_methods
 }
 
 macro_rules! fty {
@@ -1119,3 +1114,114 @@ where
 
     forward_all! { fwd_either, fty_either }
 }
+
+#[test]
+fn codegen_requester_methods() {
+    use crate::codegen::{
+        add_hidden_preamble,
+        convert::{convert_for, Convert},
+        ensure_file_contents, min_prefix, project_root, reformat, replace_block,
+        schema::{self, Type},
+        to_uppercase,
+    };
+    use indexmap::IndexMap;
+    use itertools::Itertools;
+
+    let schema = schema::get();
+
+    let methods = schema
+        .methods
+        .iter()
+        .map(|m| {
+            let mut convert_params = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, Type::Option(_)))
+                .map(|p| (&p.name, convert_for(&p.ty)))
+                .filter(|(_, c)| !matches!(c, Convert::Id(_)))
+                .map(|(name, _)| &**name)
+                .collect::<Vec<_>>();
+
+            convert_params.sort();
+
+            let prefixes: IndexMap<_, _> = convert_params
+                .iter()
+                .copied()
+                // Workaround to output the last type as the first letter
+                .chain(["\0"])
+                .tuple_windows()
+                .map(|(l, r)| (l, min_prefix(&l, &r)))
+                .collect();
+
+            let args = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, schema::Type::Option(_)))
+                .map(|p| match prefixes.get(&*p.name) {
+                    Some(prefix) => format!("{}: {}", p.name, to_uppercase(prefix)),
+                    None => format!("{}: {}", p.name, p.ty),
+                })
+                .join(", ");
+
+            let generics = m
+                .params
+                .iter()
+                .flat_map(|p| prefixes.get(&*p.name))
+                .copied()
+                .map(to_uppercase)
+                .join(", ");
+            let where_clause = m
+                .params
+                .iter()
+                .filter(|p| !matches!(p.ty, Type::Option(_)))
+                .flat_map(|p| match convert_for(&p.ty) {
+                    Convert::Id(_) => None,
+                    Convert::Into(ty) => Some(format!(
+                        "{}: Into<{}>",
+                        &to_uppercase(&prefixes[&*p.name]),
+                        ty
+                    )),
+                    Convert::Collect(ty) => Some(format!(
+                        "{}: IntoIterator<Item = {}>",
+                        &to_uppercase(&prefixes[&*p.name]),
+                        ty
+                    )),
+                })
+                .join(",\n        ");
+
+            let generics = if generics.is_empty() {
+                String::from("")
+            } else {
+                format!("<{}>", generics)
+            };
+
+            let where_clause = if where_clause.is_empty() {
+                String::from("")
+            } else {
+                format!(" where {}", where_clause)
+            };
+
+            format!(
+                "
+type {Method}: Request<Payload = {Method}, Err = Self::Err>;
+
+/// For Telegram documentation see [`{Method}`].
+fn {method} {generics} (&self, {args}) -> Self::{Method}{where_clause};
+            ",
+                Method = m.names.1,
+                method = m.names.2,
+            )
+        })
+        .collect::<String>();
+
+    let path = project_root().join("src/requests/requester.rs");
+
+    ensure_file_contents(
+        &path,
+        &reformat(replace_block(
+            &path,
+            "requester_methods",
+            &add_hidden_preamble("codegen_requester_methods", methods),
+        )),
+    );
+}

From c854081dceabdc530228041d87cb0d212e1fc7c8 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 14 Aug 2022 23:03:56 +0400
Subject: [PATCH 689/755] make clippy happy

/I wish someone made *me* happy/
---
 src/codegen/patch.rs      |  2 +-
 src/lib.rs                |  1 +
 src/local_macros.rs       |  8 ++++----
 src/payloads/codegen.rs   | 10 +++++-----
 src/requests/requester.rs |  8 ++++----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/codegen/patch.rs b/src/codegen/patch.rs
index 666ecf99..a235fcd2 100644
--- a/src/codegen/patch.rs
+++ b/src/codegen/patch.rs
@@ -239,7 +239,7 @@ fn intra_links(doc: &mut Doc) {
                 match () {
                     _ if k == "games" => {}
                     _ if k == "unbanned" => *v = String::from("crate::payloads::UnbanChatMember"),
-                    _ if c.is_lowercase() && !["update"].contains(&&&**k) => {
+                    _ if c.is_lowercase() && !["update"].contains(&&**k) => {
                         repls_m.push(k.clone());
                         *v = format!("crate::payloads::{}", to_uppercase(k));
                     }
diff --git a/src/lib.rs b/src/lib.rs
index 20080d1d..4b65f9c9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -88,6 +88,7 @@
 #![cfg_attr(all(feature = "full", docsrs), deny(rustdoc::broken_intra_doc_links))]
 //#![deny(missing_docs)]
 #![warn(clippy::print_stdout, clippy::dbg_macro)]
+#![allow(clippy::let_and_return)]
 // Unless this becomes machine applicable, I'm not adding 334 #[must_use]s (waffle)
 #![allow(clippy::return_self_not_must_use)]
 // Workaround for CI
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 18ab5103..a1d668cb 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1251,7 +1251,7 @@ fn codegen_requester_forward() {
                 .map(|(name, _)| &**name)
                 .collect::<Vec<_>>();
 
-            convert_params.sort();
+            convert_params.sort_unstable();
 
             let prefixes: IndexMap<_, _> = convert_params
                 .iter()
@@ -1259,7 +1259,7 @@ fn codegen_requester_forward() {
                 // Workaround to output the last type as the first letter
                 .chain(["\0"])
                 .tuple_windows()
-                .map(|(l, r)| (l, min_prefix(&l, &r)))
+                .map(|(l, r)| (l, min_prefix(l, r)))
                 .collect();
 
             let args = m
@@ -1287,12 +1287,12 @@ fn codegen_requester_forward() {
                     Convert::Id(_) => None,
                     Convert::Into(ty) => Some(format!(
                         "{}: Into<{}>",
-                        &to_uppercase(&prefixes[&*p.name]),
+                        &to_uppercase(prefixes[&*p.name]),
                         ty
                     )),
                     Convert::Collect(ty) => Some(format!(
                         "{}: IntoIterator<Item = {}>",
-                        &to_uppercase(&prefixes[&*p.name]),
+                        &to_uppercase(prefixes[&*p.name]),
                         ty
                     )),
                 })
diff --git a/src/payloads/codegen.rs b/src/payloads/codegen.rs
index b1c6a86c..c4e266d1 100644
--- a/src/payloads/codegen.rs
+++ b/src/payloads/codegen.rs
@@ -58,14 +58,14 @@ fn codegen_payloads() {
 
         let multipart = multipart_input_file_fields(&method)
             .map(|field| format!("    @[multipart = {}]\n", field.join(", ")))
-            .unwrap_or(String::new());
+            .unwrap_or_else(String::new);
 
         let derive = if !multipart.is_empty()
             || matches!(
                 &*method.names.1,
                 "SendMediaGroup" | "EditMessageMedia" | "EditMessageMediaInline"
             ) {
-            format!("#[derive(Debug, Clone, Serialize)]")
+            "#[derive(Debug, Clone, Serialize)]".to_owned()
         } else {
             format!("#[derive(Debug, PartialEq,{eq_hash_derive}{default_derive} Clone, Serialize)]")
         };
@@ -116,7 +116,7 @@ fn uses(method: &Method) -> String {
             | Type::bool
             | Type::String => Use::Prelude,
             Type::Option(inner) | Type::ArrayOf(inner) => ty_use(inner),
-            Type::RawTy(raw) => Use::Crate(["use crate::types::", &raw, ";"].concat()),
+            Type::RawTy(raw) => Use::Crate(["use crate::types::", raw, ";"].concat()),
             Type::Url => Use::External(String::from("use url::Url;")),
             Type::DateTime => Use::External(String::from("use chrono::{DateTime, Utc};")),
         }
@@ -175,7 +175,7 @@ fn render_doc(doc: &Doc, sibling: Option<&str>) -> String {
 
     [
         "    /// ",
-        &doc.md.replace("\n", "\n    /// "),
+        &doc.md.replace('\n', "\n    /// "),
         &sibling_note,
         &links,
     ]
@@ -218,7 +218,7 @@ fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
     params
         .map(|param| {
             let param = param.borrow();
-            let doc = render_doc(&param.descr, None).replace("\n", "\n        ");
+            let doc = render_doc(&param.descr, None).replace('\n', "\n        ");
             let field = &param.name;
             let ty = &param.ty;
             let flatten = match ty {
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 2d611b65..bafb7b01 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1142,7 +1142,7 @@ fn codegen_requester_methods() {
                 .map(|(name, _)| &**name)
                 .collect::<Vec<_>>();
 
-            convert_params.sort();
+            convert_params.sort_unstable();
 
             let prefixes: IndexMap<_, _> = convert_params
                 .iter()
@@ -1150,7 +1150,7 @@ fn codegen_requester_methods() {
                 // Workaround to output the last type as the first letter
                 .chain(["\0"])
                 .tuple_windows()
-                .map(|(l, r)| (l, min_prefix(&l, &r)))
+                .map(|(l, r)| (l, min_prefix(l, r)))
                 .collect();
 
             let args = m
@@ -1178,12 +1178,12 @@ fn codegen_requester_methods() {
                     Convert::Id(_) => None,
                     Convert::Into(ty) => Some(format!(
                         "{}: Into<{}>",
-                        &to_uppercase(&prefixes[&*p.name]),
+                        &to_uppercase(prefixes[&*p.name]),
                         ty
                     )),
                     Convert::Collect(ty) => Some(format!(
                         "{}: IntoIterator<Item = {}>",
-                        &to_uppercase(&prefixes[&*p.name]),
+                        &to_uppercase(prefixes[&*p.name]),
                         ty
                     )),
                 })

From d4ababf99f3635472f9bec68dee2f5bcfe44a019 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 15 Sep 2022 22:13:58 +0400
Subject: [PATCH 690/755] fix CI

---
 .github/workflows/ci.yml | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9aebf38..589bb662 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,13 @@ env:
   # When updating this, also update:
   # - README.md
   # - src/lib.rs
-  # - down below in a matrix
+  # - down below in a matrix  
   rust_msrv: 1.58.0
+  # When updating this, also update:
+  # - down below in a matrix
+  #
+  # This is needed because some of our tests can't run on MSRV.
+  rust_msrv_dev: 1.59.0
 
   CI: 1
 
@@ -38,6 +43,7 @@ jobs:
       - check-examples
       - clippy
       - doc
+      - msrv
 
     steps:
       - run: exit 0
@@ -76,7 +82,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - msrv
+          - msrv_dev
     
         include:
           - rust: stable
@@ -88,8 +94,8 @@ jobs:
           - rust: nightly
             toolchain: nightly-2022-01-17
             features: "--all-features"
-          - rust: msrv
-            toolchain: 1.58.0
+          - rust: msrv_dev
+            toolchain: 1.59.0
             features: "--features full"
 
     steps:      
@@ -188,3 +194,27 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: docs # from .cargo/config.toml
+
+  msrv:
+    name: minimal supported rust version
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Rust ${{ env.rust_msrv }}
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ env.rust_msrv }}
+          override: true
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1
+
+      - name: Check 
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --verbose --features full

From 2df66b62b786c038b930a57213a8545642df4a74 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 14:20:57 +0400
Subject: [PATCH 691/755] Update MSRV/toolchain versions

---
 .github/workflows/ci.yml | 42 ++++++----------------------------------
 rust-toolchain.toml      |  2 +-
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 589bb662..5143bb29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,17 +17,12 @@ env:
   CARGO_NET_RETRY: 10
   RUSTUP_MAX_RETRIES: 10
 
-  rust_nightly: nightly-2022-01-17
+  rust_nightly: nightly-2022-09-23
   # When updating this, also update:
   # - README.md
   # - src/lib.rs
   # - down below in a matrix  
-  rust_msrv: 1.58.0
-  # When updating this, also update:
-  # - down below in a matrix
-  #
-  # This is needed because some of our tests can't run on MSRV.
-  rust_msrv_dev: 1.59.0
+  rust_msrv: 1.64.0
 
   CI: 1
 
@@ -43,7 +38,6 @@ jobs:
       - check-examples
       - clippy
       - doc
-      - msrv
 
     steps:
       - run: exit 0
@@ -82,7 +76,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - msrv_dev
+          - msrv
     
         include:
           - rust: stable
@@ -92,10 +86,10 @@ jobs:
             toolchain: beta
             features: "--features full"
           - rust: nightly
-            toolchain: nightly-2022-01-17
+            toolchain: nightly-2022-09-23
             features: "--all-features"
-          - rust: msrv_dev
-            toolchain: 1.59.0
+          - rust: msrv
+            toolchain: 1.64.0
             features: "--features full"
 
     steps:      
@@ -194,27 +188,3 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: docs # from .cargo/config.toml
-
-  msrv:
-    name: minimal supported rust version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ env.rust_msrv }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_msrv }}
-          override: true
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: Check 
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --verbose --features full
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 66a1979e..b4990f3d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-01-17"
+channel = "nightly-2022-09-23"
 components = ["rustfmt", "clippy"]
 profile = "minimal"

From fe88ba29494b183d3b2d60bbbba5b181abee1486 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 17:33:22 +0400
Subject: [PATCH 692/755] Use `IntoFuture` for requests

---
 src/adaptors/auto_send.rs        | 117 +++++--------------------------
 src/adaptors/cache_me.rs         |  10 +++
 src/adaptors/erased.rs           |  18 ++++-
 src/adaptors/throttle/request.rs |  21 +++++-
 src/adaptors/trace.rs            |  17 ++++-
 src/requests/json.rs             |  16 +++++
 src/requests/multipart.rs        |  16 +++++
 src/requests/request.rs          |  59 ++++++++--------
 src/requests/requester.rs        |  42 +++++------
 9 files changed, 161 insertions(+), 155 deletions(-)

diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index e10f763f..5c01f081 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -1,10 +1,5 @@
-use std::{
-    future::Future,
-    pin::Pin,
-    task::{Context, Poll},
-};
+use std::future::IntoFuture;
 
-use futures::future::FusedFuture;
 use url::Url;
 
 use crate::{
@@ -192,33 +187,17 @@ download_forward! {
 }
 
 #[must_use = "Futures are lazy and do nothing unless polled or awaited"]
-#[pin_project::pin_project]
-pub struct AutoRequest<R: Request>(#[pin] Inner<R>);
+pub struct AutoRequest<R>(R);
 
 impl<R> AutoRequest<R>
 where
     R: Request,
 {
     pub fn new(inner: R) -> Self {
-        Self(Inner::Request(inner))
+        Self(inner)
     }
 }
 
-/// Data of the `AutoRequest` used to not expose variants (I wish there were
-/// private enum variants).
-#[pin_project::pin_project(project = InnerProj, project_replace = InnerRepl)]
-enum Inner<R: Request> {
-    /// An unsent modifiable request.
-    Request(R),
-    /// A sent request.
-    Future(#[pin] R::Send),
-    /// Done state. Set after `R::Send::poll` returned `Ready(_)`.
-    ///
-    /// Also used as a temporary replacement to turn pinned `Request(req)`
-    /// into `Future(req.send())` in `AutoRequest::poll`.
-    Done,
-}
-
 impl<R> Request for AutoRequest<R>
 where
     R: Request,
@@ -228,19 +207,20 @@ where
     type SendRef = R::SendRef;
 
     fn send(self) -> Self::Send {
-        match self.0 {
-            Inner::Request(req) => req.send(),
-            Inner::Future(fut) => fut,
-            Inner::Done => done_unreachable(),
-        }
+        self.0.send()
     }
 
     fn send_ref(&self) -> Self::SendRef {
-        match &self.0 {
-            Inner::Request(req) => req.send_ref(),
-            Inner::Future(_) => already_polled(),
-            Inner::Done => done_unreachable(),
-        }
+        self.0.send_ref()
+    }
+}
+
+impl<R: Request> IntoFuture for AutoRequest<R> {
+    type Output = Result<Output<Self>, <Self as Request>::Err>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
     }
 }
 
@@ -248,75 +228,10 @@ impl<R: Request> HasPayload for AutoRequest<R> {
     type Payload = R::Payload;
 
     fn payload_mut(&mut self) -> &mut Self::Payload {
-        match &mut self.0 {
-            Inner::Request(req) => req.payload_mut(),
-            Inner::Future(_) => already_polled(),
-            Inner::Done => done_unreachable(),
-        }
+        self.0.payload_mut()
     }
 
     fn payload_ref(&self) -> &Self::Payload {
-        match &self.0 {
-            Inner::Request(req) => req.payload_ref(),
-            Inner::Future(_) => already_polled(),
-            Inner::Done => done_unreachable(),
-        }
+        self.0.payload_ref()
     }
 }
-
-impl<R: Request> Future for AutoRequest<R> {
-    type Output = Result<Output<R>, R::Err>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut this: Pin<&mut Inner<_>> = self.as_mut().project().0;
-
-        match this.as_mut().project() {
-            // Poll the underling future.
-            InnerProj::Future(fut) => {
-                let res = futures::ready!(fut.poll(cx));
-                // We've got the result, so we set the state to done.
-                this.set(Inner::Done);
-                Poll::Ready(res)
-            }
-
-            // This future is fused.
-            InnerProj::Done => Poll::Pending,
-            // The `AutoRequest` future was polled for the first time after
-            // creation. We need to transform it into sent form by calling
-            // `R::send` and doing some magic around Pin.
-            InnerProj::Request(_) => {
-                // Replace `Request(_)` by `Done(_)` to obtain ownership over
-                // the former.
-                let inner = this.as_mut().project_replace(Inner::Done);
-                // Map Request(req) to `Future(req.send())`.
-                let inner = match inner {
-                    InnerRepl::Request(req) => Inner::Future(req.send()),
-                    // Practically this is unreachable, because we've just checked for
-                    // both `Future(_)` and `Done` variants.
-                    InnerRepl::Future(_) | InnerRepl::Done => done_unreachable(),
-                };
-                // Set the resulting `Future(_)` back to pin.
-                this.set(inner);
-
-                // Poll `self`. This time another brunch will be executed, returning `Poll`.
-                self.poll(cx)
-            }
-        }
-    }
-}
-
-impl<R: Request> FusedFuture for AutoRequest<R> {
-    fn is_terminated(&self) -> bool {
-        matches!(&self.0, Inner::Done)
-    }
-}
-
-#[inline(never)]
-fn done_unreachable() -> ! {
-    unreachable!("future is completed and as such doesn't provide any functionality")
-}
-
-#[inline(never)]
-fn already_polled() -> ! {
-    panic!("AutoRequest was already polled once")
-}
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index b1918ab8..9d75deaf 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -1,4 +1,5 @@
 use std::{pin::Pin, sync::Arc};
+use std::future::IntoFuture;
 
 use futures::{
     future,
@@ -244,6 +245,15 @@ impl<R: Request<Payload = GetMe>> HasPayload for CachedMeRequest<R> {
     }
 }
 
+impl<R: Request<Payload = GetMe>> IntoFuture for CachedMeRequest<R> {
+    type Output = Result<Me, R::Err>;
+    type IntoFuture = Send<R>;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 type ReadyMe<Err> = Ready<Result<Me, Err>>;
 
 #[pin_project::pin_project]
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index 98dd2c95..fc12d8ac 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{future::IntoFuture, sync::Arc};
 
 use futures::{future::BoxFuture, FutureExt};
 use reqwest::Url;
@@ -51,7 +51,8 @@ pub struct ErasedRequest<'a, T, E> {
     inner: Box<dyn ErasableRequest<'a, Payload = T, Err = E> + 'a>,
 }
 
-impl<'a, T, E> ErasedRequest<'a, T, E> {
+// `T: Payload` required b/c of <https://github.com/rust-lang/rust/issues/102185>
+impl<'a, T: Payload, E> ErasedRequest<'a, T, E> {
     pub(crate) fn erase(request: impl Request<Payload = T, Err = E> + 'a) -> Self {
         Self {
             inner: Box::new(request),
@@ -94,6 +95,19 @@ where
     }
 }
 
+impl<'a, T, E> IntoFuture for ErasedRequest<'a, T, E>
+where
+    T: Payload,
+    E: std::error::Error + Send,
+{
+    type Output = Result<Output<Self>, <Self as Request>::Err>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 /// Object safe version of [`Request`].
 ///
 /// TODO(waffle): make [`Request`] object safe and remove this trait (this is a
diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index bf431ebb..29e3a2e5 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -1,4 +1,9 @@
-use std::{future::Future, pin::Pin, sync::Arc, time::Instant};
+use std::{
+    future::{Future, IntoFuture},
+    pin::Pin,
+    sync::Arc,
+    time::Instant,
+};
 
 use futures::{
     future::BoxFuture,
@@ -74,6 +79,20 @@ where
     }
 }
 
+impl<R> IntoFuture for ThrottlingRequest<R>
+where
+    R: Request + Clone + Send + Sync + 'static,
+    R::Err: AsResponseParameters + Send,
+    Output<R>: Send,
+{
+    type Output = Result<Output<Self>, <Self as Request>::Err>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 impl<R: Request> Future for ThrottlingSend<R>
 where
     R::Err: AsResponseParameters,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index a3b3fcfa..7e0e9a78 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -1,6 +1,6 @@
 use std::{
     fmt::Debug,
-    future::Future,
+    future::{Future, IntoFuture},
     pin::Pin,
     task::{self, Poll},
 };
@@ -309,6 +309,21 @@ where
     }
 }
 
+impl<R> IntoFuture for TraceRequest<R>
+where
+    R: Request,
+    Output<R>: Debug,
+    R::Err: Debug,
+    R::Payload: Debug,
+{
+    type Output = Result<Output<Self>, <Self as Request>::Err>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 #[pin_project::pin_project]
 pub struct Send<F>
 where
diff --git a/src/requests/json.rs b/src/requests/json.rs
index fc9e068b..5898cfa2 100644
--- a/src/requests/json.rs
+++ b/src/requests/json.rs
@@ -1,3 +1,5 @@
+use std::future::IntoFuture;
+
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
@@ -49,6 +51,20 @@ where
     }
 }
 
+impl<P> IntoFuture for JsonRequest<P>
+where
+    P: 'static,
+    P: Payload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    type Output = Result<P::Output, RequestError>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 impl<P> HasPayload for JsonRequest<P>
 where
     P: Payload,
diff --git a/src/requests/multipart.rs b/src/requests/multipart.rs
index 6aa36dda..6578acd9 100644
--- a/src/requests/multipart.rs
+++ b/src/requests/multipart.rs
@@ -1,3 +1,5 @@
+use std::future::IntoFuture;
+
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
@@ -50,6 +52,20 @@ where
     }
 }
 
+impl<P> IntoFuture for MultipartRequest<P>
+where
+    P: 'static,
+    P: Payload + MultipartPayload + Serialize,
+    P::Output: DeserializeOwned,
+{
+    type Output = Result<P::Output, RequestError>;
+    type IntoFuture = <Self as Request>::Send;
+
+    fn into_future(self) -> Self::IntoFuture {
+        self.send()
+    }
+}
+
 impl<P> HasPayload for MultipartRequest<P>
 where
     P: Payload,
diff --git a/src/requests/request.rs b/src/requests/request.rs
index ee91232b..393e15c4 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -1,7 +1,7 @@
-use std::future::Future;
+use std::future::{Future, IntoFuture};
 
-use either::Either;
-use futures::future;
+// use either::Either;
+// use futures::future;
 
 use crate::requests::{HasPayload, Output};
 
@@ -20,12 +20,11 @@ use crate::requests::{HasPayload, Output};
 ///
 /// [`Throttle<B>`]: crate::adaptors::Throttle
 #[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]
-pub trait Request: HasPayload {
-    /*
-     * Could be mostly `core::future::IntoFuture` though there is no reason to
-     * use it before it's integrated in async/await
-     */
-
+pub trait Request
+where
+    Self: HasPayload,
+    Self: IntoFuture<Output = Result<Output<Self>, Self::Err>, IntoFuture = Self::Send>,
+{
     /// The type of an error that may happen while sending a request to
     /// Telegram.
     type Err: std::error::Error + Send;
@@ -99,27 +98,29 @@ pub trait Request: HasPayload {
     }
 }
 
-impl<L, R> Request for Either<L, R>
-where
-    L: Request,
-    R: Request<Payload = L::Payload, Err = L::Err>,
-{
-    type Err = L::Err;
+// FIXME: re-introduce `Either` impls once `Either: IntoFuture` (or make out own `Either`) (same for `Requester`)
 
-    type Send = future::Either<L::Send, R::Send>;
+// impl<L, R> Request for Either<L, R>
+// where
+//     L: Request,
+//     R: Request<Payload = L::Payload, Err = L::Err>,
+// {
+//     type Err = L::Err;
 
-    type SendRef = future::Either<L::SendRef, R::SendRef>;
+//     type Send = future::Either<L::Send, R::Send>;
 
-    fn send(self) -> Self::Send {
-        self.map_left(<_>::send)
-            .map_right(<_>::send)
-            .either(future::Either::Left, future::Either::Right)
-    }
+//     type SendRef = future::Either<L::SendRef, R::SendRef>;
 
-    fn send_ref(&self) -> Self::SendRef {
-        self.as_ref()
-            .map_left(<_>::send_ref)
-            .map_right(<_>::send_ref)
-            .either(future::Either::Left, future::Either::Right)
-    }
-}
+//     fn send(self) -> Self::Send {
+//         self.map_left(<_>::send)
+//             .map_right(<_>::send)
+//             .either(future::Either::Left, future::Either::Right)
+//     }
+
+//     fn send_ref(&self) -> Self::SendRef {
+//         self.as_ref()
+//             .map_left(<_>::send_ref)
+//             .map_right(<_>::send_ref)
+//             .either(future::Either::Left, future::Either::Right)
+//     }
+// }
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index bafb7b01..5f65a6cb 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -1090,30 +1090,30 @@ where
     forward_all! {}
 }
 
-macro_rules! fty_either {
-    ($T:ident) => {
-        either::Either<LR::$T, RR::$T>
-    };
-}
+// macro_rules! fty_either {
+//     ($T:ident) => {
+//         either::Either<LR::$T, RR::$T>
+//     };
+// }
 
-macro_rules! fwd_either {
-    ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
-        match ($this) {
-            either::Either::Left(l) => either::Either::Left(l.$m($($arg),*)),
-            either::Either::Right(r) => either::Either::Right(r.$m($($arg),*)),
-        }
-    };
-}
+// macro_rules! fwd_either {
+//     ($m:ident $this:ident ($($arg:ident : $T:ty),*)) => {
+//         match ($this) {
+//             either::Either::Left(l) => either::Either::Left(l.$m($($arg),*)),
+//             either::Either::Right(r) =>
+// either::Either::Right(r.$m($($arg),*)),         }
+//     };
+// }
 
-impl<LR, RR> Requester for either::Either<LR, RR>
-where
-    LR: Requester,
-    RR: Requester<Err = LR::Err>,
-{
-    type Err = LR::Err;
+// impl<LR, RR> Requester for either::Either<LR, RR>
+// where
+//     LR: Requester,
+//     RR: Requester<Err = LR::Err>,
+// {
+//     type Err = LR::Err;
 
-    forward_all! { fwd_either, fty_either }
-}
+//     forward_all! { fwd_either, fty_either }
+// }
 
 #[test]
 fn codegen_requester_methods() {

From d541faa6213f6c92d6574b033777862a9f6a1bef Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 17:48:26 +0400
Subject: [PATCH 693/755] Deprecate `AutoSend`

---
 Cargo.toml                    | 4 ++--
 examples/erased.rs            | 4 ++--
 examples/self_info.rs         | 3 +--
 src/adaptors.rs               | 2 ++
 src/requests/requester_ext.rs | 3 +++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 86dba265..2dda612a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,8 +99,8 @@ cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples=examples"]
 
 [[example]]
 name = "self_info"
-required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send"]
+required-features = ["tokio/macros", "tokio/rt-multi-thread"]
 
 [[example]]
 name = "erased"
-required-features = ["tokio/macros", "tokio/rt-multi-thread", "auto_send", "erased"]
+required-features = ["tokio/macros", "tokio/rt-multi-thread", "erased", "trace_adaptor"]
diff --git a/examples/erased.rs b/examples/erased.rs
index d980ddc3..2c54123c 100644
--- a/examples/erased.rs
+++ b/examples/erased.rs
@@ -32,9 +32,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     log::info!("Trace settings: {:?}", trace_settings);
 
     let bot = if trace_settings.is_empty() {
-        Bot::from_env().erase().auto_send()
+        Bot::from_env().erase()
     } else {
-        Bot::from_env().trace(trace_settings).erase().auto_send()
+        Bot::from_env().trace(trace_settings).erase()
     };
 
     bot.send_chat_action(chat_id, ChatAction::Typing).await?;
diff --git a/examples/self_info.rs b/examples/self_info.rs
index b56271c8..6349b76a 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -14,8 +14,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     let bot = Bot::from_env()
-        .parse_mode(ParseMode::MarkdownV2)
-        .auto_send();
+        .parse_mode(ParseMode::MarkdownV2);
 
     let Me { user: me, .. } = bot.get_me().await?;
 
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 4f1b7406..8fa3aafd 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -14,6 +14,7 @@
 /// [`AutoSend`]: auto_send::AutoSend
 /// [`send`]: crate::requests::Request::send
 #[cfg(feature = "auto_send")]
+#[deprecated(since = "0.8.0", note = "`AutoSend` is no longer required to `.await` requests and is now noop")]
 pub mod auto_send;
 
 /// [`CacheMe`] bot adaptor which caches [`GetMe`] requests.
@@ -47,6 +48,7 @@ pub mod throttle;
 mod parse_mode;
 
 #[cfg(feature = "auto_send")]
+#[allow(deprecated)]
 pub use auto_send::AutoSend;
 #[cfg(feature = "cache_me")]
 pub use cache_me::CacheMe;
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 0bcf438e..0af1faae 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -4,6 +4,7 @@ use crate::{adaptors::DefaultParseMode, requests::Requester, types::ParseMode};
 use crate::adaptors::CacheMe;
 
 #[cfg(feature = "auto_send")]
+#[allow(deprecated)]
 use crate::adaptors::AutoSend;
 
 #[cfg(feature = "erased")]
@@ -28,6 +29,8 @@ pub trait RequesterExt: Requester {
 
     /// Send requests automatically, see [`AutoSend`] for more.
     #[cfg(feature = "auto_send")]
+    #[deprecated(since = "0.8.0", note = "`AutoSend` is no longer required to `.await` requests and is now noop")]
+    #[allow(deprecated)]
     fn auto_send(self) -> AutoSend<Self>
     where
         Self: Sized,

From 6d79d78c8cb41be8b7feccdad823d7ff8505d5b7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:14:58 +0400
Subject: [PATCH 694/755] Update `pin-project`

(this fixes a `dead_code` warning in generated code)
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2dda612a..a3e25291 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ exclude = [
 futures = "0.3.5"
 tokio = { version = "1.12.0", features = ["fs"] }
 tokio-util = { version = "0.7.0", features = ["codec"] }
-pin-project = "1.0.3"
+pin-project = "1.0.12"
 bytes = "1.0.0"
 reqwest = { version = "0.11.10", features = ["json", "stream", "multipart"], default-features = false }
 url = { version = "2", features = ["serde"] }

From 69adf7ef1096fbca3979f9290d37abc94c7a1c6b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:20:32 +0400
Subject: [PATCH 695/755] Update changelog

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f99914..9f9aa9eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Changed
+
+- **You can now `.await` any `Request`!** ([#249][pr249])
+  - `Request` now requires `Self: IntoFuture`
+  - There is no need for `AutoSend` anymore
+- MSRV (Minimal Supported Rust Version) was bumped from `1.58.0` to `1.64.0`
+
 ### Removed
 
 - Methods for creating `InlineQuery` ([#246][pr244])
 
 [pr244]: https://github.com/teloxide/teloxide-core/pull/246
 
+### Deprecated
+
+- `AutoSend` adaptor ([#249][pr249])
+
+[pr249]: https://github.com/teloxide/teloxide-core/pull/249
+
 ## 0.7.1 - 2022-08-19
 
 ### Fixed

From 0dc459ffcce351efbb05ba1fbea16028695ec025 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:40:07 +0400
Subject: [PATCH 696/755] Doc fixes

---
 src/adaptors.rs                  |  5 +----
 src/adaptors/auto_send.rs        | 34 +++++++++-----------------------
 src/adaptors/throttle/request.rs |  4 ++--
 src/adaptors/throttle/worker.rs  |  4 ++--
 src/bot.rs                       |  4 ++--
 src/lib.rs                       |  4 +---
 src/net/download.rs              |  2 +-
 src/requests/request.rs          |  7 +++++++
 src/requests/requester.rs        |  5 ++---
 9 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/src/adaptors.rs b/src/adaptors.rs
index 8fa3aafd..142bc4e9 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -3,12 +3,9 @@
 //! Bot adaptors are very similar to the [`Iterator`] adaptors: they are bots
 //! wrapping other bots to alter existing or add new functionality.
 //!
-//! E.g. [`AutoSend`] allows `await`ing requests directly, no need to use
-//! `.send()`.
-//!
 //! [`Requester`]: crate::requests::Requester
 
-/// [`AutoSend`] bot adaptor which allows sending a request without calling
+/// [`AutoSend`] bot adaptor which used to allow sending a request without calling
 /// [`send`].
 ///
 /// [`AutoSend`]: auto_send::AutoSend
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 5c01f081..878e64ff 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -7,32 +7,16 @@ use crate::{
     types::*,
 };
 
-/// Send requests automatically.
+/// Previously was used to send requests automatically.
 ///
-/// Requests returned by `<AutoSend<_> as `[`Requester`]`>` are [`Future`]s
-/// which means that you can simply `.await` them instead of using
-/// `.send().await`.
-///
-/// Notes:
-/// 1. This wrapper should be the most outer i.e.: `AutoSend<CacheMe<Bot>>`
-///    will automatically send requests, while `CacheMe<AutoSend<Bot>>` - won't.
-/// 2. After first call to `poll` on a request you will be unable to access
-///    payload nor could you use [`send_ref`](Request::send_ref).
-///
-/// ## Examples
-///
-/// ```rust
-/// use teloxide_core::{
-///     requests::{Requester, RequesterExt},
-///     types::Me,
-///     Bot,
-/// };
-///
-/// # async {
-/// let bot = Bot::new("TOKEN").auto_send();
-/// let myself: Me = bot.get_me().await?; // No .send()!
-/// # Ok::<_, teloxide_core::RequestError>(()) };
-/// ```
+/// Before addition of [`IntoFuture`] you could only `.await` [`Future`]s.
+/// This adaptor turned requests into futures, allowing to `.await` them,
+/// without calling `.send()`.
+/// 
+/// Now, however, all requests are required to implement `IntoFuture`, allowing
+/// you to `.await` them directly. This adaptor is noop, and shouldn't be used.
+/// 
+/// [`Future`]: std::future::Future
 #[derive(Clone, Debug)]
 pub struct AutoSend<B> {
     bot: B,
diff --git a/src/adaptors/throttle/request.rs b/src/adaptors/throttle/request.rs
index 29e3a2e5..46235fce 100644
--- a/src/adaptors/throttle/request.rs
+++ b/src/adaptors/throttle/request.rs
@@ -178,7 +178,7 @@ where
 
             let res = match &mut request {
                 ShareableRequest::Shared(shared) => shared.send_ref().await,
-                ShareableRequest::Owned(owned) => owned.take().unwrap().send().await,
+                ShareableRequest::Owned(owned) => owned.take().unwrap().await,
             };
 
             return res;
@@ -197,7 +197,7 @@ where
                 request.send_ref().await
             }
             (false, ShareableRequest::Shared(shared)) => shared.send_ref().await,
-            (false, ShareableRequest::Owned(owned)) => owned.take().unwrap().send().await,
+            (false, ShareableRequest::Owned(owned)) => owned.take().unwrap().await,
         };
 
         let retry_after = res.as_ref().err().and_then(<_>::retry_after);
diff --git a/src/adaptors/throttle/worker.rs b/src/adaptors/throttle/worker.rs
index a3202f4c..62438013 100644
--- a/src/adaptors/throttle/worker.rs
+++ b/src/adaptors/throttle/worker.rs
@@ -9,7 +9,7 @@ use vecrem::VecExt;
 use crate::{
     adaptors::throttle::{request_lock::RequestLock, ChatIdHash, Limits, Settings},
     errors::AsResponseParameters,
-    requests::{Request, Requester},
+    requests::Requester,
 };
 
 const MINUTE: Duration = Duration::from_secs(60);
@@ -321,7 +321,7 @@ async fn freeze(
                 // TODO: maybe not call `get_chat` every time?
 
                 // At this point there isn't much we can do with the error besides ignoring
-                if let Ok(chat) = bot.get_chat(id).send().await {
+                if let Ok(chat) = bot.get_chat(id).await {
                     match chat.slow_mode_delay() {
                         Some(delay) => {
                             let now = Instant::now();
diff --git a/src/bot.rs b/src/bot.rs
index 2b3f6893..19bb00d5 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -29,7 +29,7 @@ const TELOXIDE_TOKEN: &str = "TELOXIDE_TOKEN";
 /// use teloxide_core::prelude::*;
 ///
 /// let bot = Bot::new("TOKEN");
-/// dbg!(bot.get_me().send().await?);
+/// dbg!(bot.get_me().await?);
 /// # Ok::<_, teloxide_core::RequestError>(()) };
 /// ```
 ///
@@ -158,7 +158,7 @@ impl Bot {
     /// let url = reqwest::Url::parse("https://localhost/tbas").unwrap();
     /// let bot = Bot::new("TOKEN").set_api_url(url);
     /// // From now all methods will use "https://localhost/tbas" as an API URL.
-    /// bot.get_me().send().await
+    /// bot.get_me().await
     /// # };
     /// ```
     ///
diff --git a/src/lib.rs b/src/lib.rs
index 4b65f9c9..3a14fc0b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,7 +10,6 @@
 //! _Compiler support: requires rustc 1.58+_.
 //!
 //! ```
-//! # #[cfg(feature = "auto_send")]
 //! # async {
 //! # let chat_id = teloxide_core::types::ChatId(-1);
 //! use teloxide_core::{
@@ -20,7 +19,6 @@
 //!
 //! let bot = Bot::from_env()
 //!     .parse_mode(ParseMode::MarkdownV2)
-//!     .auto_send();
 //!
 //! let me = bot.get_me().await?;
 //!
@@ -46,7 +44,6 @@
 //! - `native-tls` = use [`native-tls`] tls implementation (**enabled by
 //!   default**)
 //! - `rustls` — use [`rustls`] tls implementation
-//! - `auto_send` — enables [`AutoSend`] bot adaptor
 //! - `trace_adaptor` — enables [`Trace`] bot adaptor
 //! - `erased` — enables [`ErasedRequester`] bot adaptor
 //! - `throttle` — enables [`Throttle`] bot adaptor
@@ -55,6 +52,7 @@
 //! - `nightly` — enables nightly-only features, currently:
 //!   - Removes some future boxing using `#![feature(type_alias_impl_trait)]`
 //!   - Used to built docs (`#![feature(doc_cfg, doc_notable_trait)]`)
+//! - `auto_send` — enables [`AutoSend`] bot adaptor (deprecated)
 //!
 //! [`AutoSend`]: adaptors::AutoSend
 //! [`Trace`]: adaptors::Trace
diff --git a/src/net/download.rs b/src/net/download.rs
index da05352d..dcef724f 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -42,7 +42,7 @@ pub trait Download<'w>
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
     ///
-    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").send().await?;
+    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").await?;
     /// let mut file = File::create("/tmp/test.png").await?;
     /// bot.download_file(&file_path, &mut file).await?;
     /// # Ok(()) }
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 393e15c4..578a050c 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -41,6 +41,7 @@ where
     /// Send this request.
     ///
     /// ## Examples
+    /// 
     /// ```
     /// # async {
     /// use teloxide_core::{
@@ -56,6 +57,11 @@ where
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
     /// let _: Me = request.send().await.unwrap();
+    /// 
+    /// // You can also just await requests, without calling `send`:
+    /// let method = GetMe::new();
+    /// let request = JsonRequest::new(bot, method);
+    /// let _: Me = request.await.unwrap();
     /// # };
     /// ```
     #[must_use = "Futures are lazy and do nothing unless polled or awaited"]
@@ -72,6 +78,7 @@ where
     /// and then serializing it, this method should just serialize the data.)
     ///
     /// ## Examples
+    /// 
     /// ```
     /// # async {
     /// use teloxide_core::{prelude::*, requests::Request, types::ChatId, Bot};
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 5f65a6cb..874517bf 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -32,8 +32,7 @@ use crate::{
 /// bot.send_message(chat_id, "<b>Text</b>")
 ///     // Optional parameters can be supplied by calling setters
 ///     .parse_mode(ParseMode::Html)
-///     // To send request to telegram you need to call `.send()` and await the resulting future
-///     .send()
+///     // To send request to telegram you need to `.await` the request
 ///     .await?;
 /// # Ok::<_, teloxide_core::RequestError>(())
 /// # };
@@ -51,7 +50,7 @@ use crate::{
 /// where
 ///     R: Requester,
 /// {
-///     bot.send_message(chat, "hi").send().await.expect("error")
+///     bot.send_message(chat, "hi").await.expect("error")
 /// }
 /// ```
 #[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]

From c96e46dc6cc84ec1dc1a75c692af72068eea2208 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:40:54 +0400
Subject: [PATCH 697/755] fmt

I'm too lazy to amend commits...
---
 examples/self_info.rs         | 3 +--
 src/adaptors.rs               | 9 ++++++---
 src/adaptors/auto_send.rs     | 4 ++--
 src/adaptors/cache_me.rs      | 3 +--
 src/requests/request.rs       | 9 +++++----
 src/requests/requester_ext.rs | 5 ++++-
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/examples/self_info.rs b/examples/self_info.rs
index 6349b76a..e3747671 100644
--- a/examples/self_info.rs
+++ b/examples/self_info.rs
@@ -13,8 +13,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             .parse::<i64>()?,
     );
 
-    let bot = Bot::from_env()
-        .parse_mode(ParseMode::MarkdownV2);
+    let bot = Bot::from_env().parse_mode(ParseMode::MarkdownV2);
 
     let Me { user: me, .. } = bot.get_me().await?;
 
diff --git a/src/adaptors.rs b/src/adaptors.rs
index 142bc4e9..c54a65ec 100644
--- a/src/adaptors.rs
+++ b/src/adaptors.rs
@@ -5,13 +5,16 @@
 //!
 //! [`Requester`]: crate::requests::Requester
 
-/// [`AutoSend`] bot adaptor which used to allow sending a request without calling
-/// [`send`].
+/// [`AutoSend`] bot adaptor which used to allow sending a request without
+/// calling [`send`].
 ///
 /// [`AutoSend`]: auto_send::AutoSend
 /// [`send`]: crate::requests::Request::send
 #[cfg(feature = "auto_send")]
-#[deprecated(since = "0.8.0", note = "`AutoSend` is no longer required to `.await` requests and is now noop")]
+#[deprecated(
+    since = "0.8.0",
+    note = "`AutoSend` is no longer required to `.await` requests and is now noop"
+)]
 pub mod auto_send;
 
 /// [`CacheMe`] bot adaptor which caches [`GetMe`] requests.
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index 878e64ff..dfd4a4c8 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -12,10 +12,10 @@ use crate::{
 /// Before addition of [`IntoFuture`] you could only `.await` [`Future`]s.
 /// This adaptor turned requests into futures, allowing to `.await` them,
 /// without calling `.send()`.
-/// 
+///
 /// Now, however, all requests are required to implement `IntoFuture`, allowing
 /// you to `.await` them directly. This adaptor is noop, and shouldn't be used.
-/// 
+///
 /// [`Future`]: std::future::Future
 #[derive(Clone, Debug)]
 pub struct AutoSend<B> {
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 9d75deaf..5ae8669a 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -1,5 +1,4 @@
-use std::{pin::Pin, sync::Arc};
-use std::future::IntoFuture;
+use std::{future::IntoFuture, pin::Pin, sync::Arc};
 
 use futures::{
     future,
diff --git a/src/requests/request.rs b/src/requests/request.rs
index 578a050c..d39c9d64 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -41,7 +41,7 @@ where
     /// Send this request.
     ///
     /// ## Examples
-    /// 
+    ///
     /// ```
     /// # async {
     /// use teloxide_core::{
@@ -57,7 +57,7 @@ where
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
     /// let _: Me = request.send().await.unwrap();
-    /// 
+    ///
     /// // You can also just await requests, without calling `send`:
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
@@ -78,7 +78,7 @@ where
     /// and then serializing it, this method should just serialize the data.)
     ///
     /// ## Examples
-    /// 
+    ///
     /// ```
     /// # async {
     /// use teloxide_core::{prelude::*, requests::Request, types::ChatId, Bot};
@@ -105,7 +105,8 @@ where
     }
 }
 
-// FIXME: re-introduce `Either` impls once `Either: IntoFuture` (or make out own `Either`) (same for `Requester`)
+// FIXME: re-introduce `Either` impls once `Either: IntoFuture` (or make out own
+// `Either`) (same for `Requester`)
 
 // impl<L, R> Request for Either<L, R>
 // where
diff --git a/src/requests/requester_ext.rs b/src/requests/requester_ext.rs
index 0af1faae..35509409 100644
--- a/src/requests/requester_ext.rs
+++ b/src/requests/requester_ext.rs
@@ -29,7 +29,10 @@ pub trait RequesterExt: Requester {
 
     /// Send requests automatically, see [`AutoSend`] for more.
     #[cfg(feature = "auto_send")]
-    #[deprecated(since = "0.8.0", note = "`AutoSend` is no longer required to `.await` requests and is now noop")]
+    #[deprecated(
+        since = "0.8.0",
+        note = "`AutoSend` is no longer required to `.await` requests and is now noop"
+    )]
     #[allow(deprecated)]
     fn auto_send(self) -> AutoSend<Self>
     where

From bd522b70f1a6854d25d48d969d659942150ff9ff Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:56:58 +0400
Subject: [PATCH 698/755] fix CI

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5143bb29..f05f9948 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,6 +102,7 @@ jobs:
           profile: minimal
           toolchain: ${{ matrix.toolchain }}
           override: true
+          components: rustfmt # required by codegen
 
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v1

From 02e34bc77afee5b9e0af92bfcd44ad010cfed959 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 18:58:02 +0400
Subject: [PATCH 699/755] fix MSRV in docs

---
 README.md  | 2 +-
 src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e3aedce7..25e08273 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
 ```toml
 teloxide-core = "0.7"
 ```
-_Compiler support: requires rustc 1.58+_.
+_Compiler support: requires rustc 1.64+_.
 
 [`teloxide`]: https://docs.rs/teloxide
 [Telegram Bot API]: https://core.telegram.org/bots/api
diff --git a/src/lib.rs b/src/lib.rs
index 3a14fc0b..e904f6a5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@
 //!```toml
 //! teloxide_core = "0.7"
 //! ```
-//! _Compiler support: requires rustc 1.58+_.
+//! _Compiler support: requires rustc 1.64+_.
 //!
 //! ```
 //! # async {

From 5d65c119229df3d0c8f750c4b4fbd51315a0972f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 19:00:22 +0400
Subject: [PATCH 700/755] Fix `SetWebhook` request: make it multipart

---
 CHANGELOG.md   | 6 ++++++
 src/bot/api.rs | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f99914..e9d75899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [pr244]: https://github.com/teloxide/teloxide-core/pull/246
 
+### Fixed 
+
+- `SetWebhook` request can now properly send certificate ([#250][pr250])
+
+[pr250]: https://github.com/teloxide/teloxide-core/pull/250
+
 ## 0.7.1 - 2022-08-19
 
 ### Fixed
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 4ea83ae3..96c6239a 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -20,7 +20,7 @@ impl Requester for Bot {
         Self::GetUpdates::new(self.clone(), payloads::GetUpdates::new())
     }
 
-    type SetWebhook = JsonRequest<payloads::SetWebhook>;
+    type SetWebhook = MultipartRequest<payloads::SetWebhook>;
 
     fn set_webhook(&self, url: Url) -> Self::SetWebhook {
         Self::SetWebhook::new(self.clone(), payloads::SetWebhook::new(url))

From 86cac381e73ae89af9adcc3539f03083e6982d1c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 19:06:11 +0400
Subject: [PATCH 701/755] Use correct toolchain for codegen

---
 src/codegen.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/codegen.rs b/src/codegen.rs
index 5f80912b..c26575f1 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -23,7 +23,7 @@ use xshell::{cmd, Shell};
 
 fn ensure_rustfmt(sh: &Shell) {
     // FIXME(waffle): find a better way to set toolchain
-    let toolchain = "nightly-2022-01-17";
+    let toolchain = "nightly-2022-09-23";
 
     let version = cmd!(sh, "rustup run {toolchain} rustfmt --version")
         .read()
@@ -38,7 +38,7 @@ fn ensure_rustfmt(sh: &Shell) {
 }
 
 pub fn reformat(text: String) -> String {
-    let toolchain = "nightly-2022-01-17";
+    let toolchain = "nightly-2022-09-23";
 
     let sh = Shell::new().unwrap();
     ensure_rustfmt(&sh);

From 2a20fdd1c05cea0b981ae6b2c2a5a62e88cecbc7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 22:42:53 +0400
Subject: [PATCH 702/755] fix doc tests

---
 src/lib.rs              | 2 +-
 src/requests/request.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index e904f6a5..8d343f72 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,7 @@
 //! };
 //!
 //! let bot = Bot::from_env()
-//!     .parse_mode(ParseMode::MarkdownV2)
+//!     .parse_mode(ParseMode::MarkdownV2);
 //!
 //! let me = bot.get_me().await?;
 //!
diff --git a/src/requests/request.rs b/src/requests/request.rs
index d39c9d64..bd5113af 100644
--- a/src/requests/request.rs
+++ b/src/requests/request.rs
@@ -56,12 +56,11 @@ where
     /// // Note: it's recommended to `Requester` instead of creating requests directly
     /// let method = GetMe::new();
     /// let request = JsonRequest::new(bot, method);
+    /// let request_clone = request.clone();
     /// let _: Me = request.send().await.unwrap();
     ///
     /// // You can also just await requests, without calling `send`:
-    /// let method = GetMe::new();
-    /// let request = JsonRequest::new(bot, method);
-    /// let _: Me = request.await.unwrap();
+    /// let _: Me = request_clone.await.unwrap();
     /// # };
     /// ```
     #[must_use = "Futures are lazy and do nothing unless polled or awaited"]

From 28deda130eeea29f43e39d97e9e683021e3ec703 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 22:48:24 +0400
Subject: [PATCH 703/755] fmt (I am a joke)

---
 src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8d343f72..46fd908b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,8 +17,7 @@
 //!     types::{DiceEmoji, ParseMode},
 //! };
 //!
-//! let bot = Bot::from_env()
-//!     .parse_mode(ParseMode::MarkdownV2);
+//! let bot = Bot::from_env().parse_mode(ParseMode::MarkdownV2);
 //!
 //! let me = bot.get_me().await?;
 //!

From 995a482f8130a785c898a737facbe478d9751734 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Fri, 23 Sep 2022 22:59:04 +0400
Subject: [PATCH 704/755] silence clippy

---
 src/lib.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 46fd908b..5e92048c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,6 +90,13 @@
 #![allow(clippy::return_self_not_must_use)]
 // Workaround for CI
 #![allow(rustdoc::bare_urls)]
+// FIXME: deal with these lints
+#![allow(
+    clippy::collapsible_str_replace,
+    clippy::borrow_deref_ref,
+    clippy::unnecessary_lazy_evaluations,
+    clippy::derive_partial_eq_without_eq
+)]
 
 // The internal helper macros.
 #[macro_use]

From 9126c7db3a5fc67ae8046ccc4ba8dfb249e41360 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 21:13:50 +0400
Subject: [PATCH 705/755] Fix serialization of video stickers

---
 CHANGELOG.md               | 2 ++
 src/types/input_sticker.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343b3bfc..f51030ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,8 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed 
 
 - `SetWebhook` request can now properly send certificate ([#250][pr250])
+- Serialization of `InputSticker::Webm` ([#252][pr252])
 
 [pr250]: https://github.com/teloxide/teloxide-core/pull/250
+[pr252]: https://github.com/teloxide/teloxide-core/pull/252
 
 ### Deprecated
 
diff --git a/src/types/input_sticker.rs b/src/types/input_sticker.rs
index 827194ec..f938106c 100644
--- a/src/types/input_sticker.rs
+++ b/src/types/input_sticker.rs
@@ -34,5 +34,6 @@ pub enum InputSticker {
     /// WEBM video with the sticker, uploaded using multipart/form-data.
     ///
     /// See <https://core.telegram.org/stickers#video-sticker-requirements> for technical requirements.
+    #[serde(rename = "webm_sticker")]
     Webm(InputFile),
 }

From c544dae94c20cc517df157f6e8b33632ce3c07b3 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 20:00:14 +0400
Subject: [PATCH 706/755] TBA 6.2: `Chat` and `MessageEntity` changes

---
 src/types/chat.rs           | 14 ++++++++++++++
 src/types/message_entity.rs | 19 +++++++++++++++----
 src/types/update.rs         |  1 +
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/types/chat.rs b/src/types/chat.rs
index 6131b87d..6500dfcb 100644
--- a/src/types/chat.rs
+++ b/src/types/chat.rs
@@ -99,6 +99,13 @@ pub struct ChatPrivate {
     ///
     /// [`GetChat`]: crate::payloads::GetChat
     pub has_private_forwards: Option<True>,
+
+    /// `True`, if the privacy settings of the other party restrict sending
+    /// voice and video note messages in the private chat. Returned only in
+    /// [`GetChat`].
+    ///
+    /// [`GetChat`]: crate::payloads::GetChat
+    pub has_restricted_voice_and_video_messages: Option<True>,
 }
 
 #[serde_with_macros::skip_serializing_none]
@@ -492,6 +499,7 @@ mod serde_helper {
         last_name: Option<String>,
         bio: Option<String>,
         has_private_forwards: Option<True>,
+        has_restricted_voice_and_video_messages: Option<True>,
     }
 
     impl From<ChatPrivate> for super::ChatPrivate {
@@ -503,6 +511,7 @@ mod serde_helper {
                 last_name,
                 bio,
                 has_private_forwards,
+                has_restricted_voice_and_video_messages,
             }: ChatPrivate,
         ) -> Self {
             Self {
@@ -511,6 +520,7 @@ mod serde_helper {
                 last_name,
                 bio,
                 has_private_forwards,
+                has_restricted_voice_and_video_messages,
             }
         }
     }
@@ -523,6 +533,7 @@ mod serde_helper {
                 last_name,
                 bio,
                 has_private_forwards,
+                has_restricted_voice_and_video_messages,
             }: super::ChatPrivate,
         ) -> Self {
             Self {
@@ -532,6 +543,7 @@ mod serde_helper {
                 last_name,
                 bio,
                 has_private_forwards,
+                has_restricted_voice_and_video_messages,
             }
         }
     }
@@ -576,6 +588,7 @@ mod tests {
                     last_name: None,
                     bio: None,
                     has_private_forwards: None,
+                    has_restricted_voice_and_video_messages: None,
                 }),
                 photo: None,
                 pinned_message: None,
@@ -596,6 +609,7 @@ mod tests {
                 last_name: None,
                 bio: None,
                 has_private_forwards: None,
+                has_restricted_voice_and_video_messages: None,
             }),
             photo: None,
             pinned_message: None,
diff --git a/src/types/message_entity.rs b/src/types/message_entity.rs
index 4ac72484..f417d442 100644
--- a/src/types/message_entity.rs
+++ b/src/types/message_entity.rs
@@ -139,7 +139,7 @@ impl MessageEntity {
     /// If you don't have a complete [`User`] value, please use
     /// [`MessageEntity::text_mention_id`] instead.
     #[must_use]
-    pub fn text_mention(user: User, offset: usize, length: usize) -> Self {
+    pub const fn text_mention(user: User, offset: usize, length: usize) -> Self {
         Self {
             kind: MessageEntityKind::TextMention { user },
             offset,
@@ -158,6 +158,16 @@ impl MessageEntity {
         }
     }
 
+    /// Create a message entity representing a custom emoji.
+    #[must_use]
+    pub const fn custom_emoji(custom_emoji_id: String, offset: usize, length: usize) -> Self {
+        Self {
+            kind: MessageEntityKind::CustomEmoji { custom_emoji_id },
+            offset,
+            length,
+        }
+    }
+
     #[must_use]
     pub fn kind(mut self, val: MessageEntityKind) -> Self {
         self.kind = val;
@@ -300,13 +310,14 @@ pub enum MessageEntityKind {
     PhoneNumber,
     Bold,
     Italic,
+    Underline,
+    Strikethrough,
+    Spoiler,
     Code,
     Pre { language: Option<String> },
     TextLink { url: reqwest::Url },
     TextMention { user: User },
-    Underline,
-    Strikethrough,
-    Spoiler,
+    CustomEmoji { custom_emoji_id: String }, // FIXME(waffle): newtype this
 }
 
 #[cfg(test)]
diff --git a/src/types/update.rs b/src/types/update.rs
index 05b55133..0ca68c3e 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -344,6 +344,7 @@ mod test {
                         last_name: None,
                         bio: None,
                         has_private_forwards: None,
+                        has_restricted_voice_and_video_messages: None,
                     }),
                     photo: None,
                     pinned_message: None,

From 26ec8b0c7b70af719b1bf434f8c6040bb4b490ab Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 20:02:08 +0400
Subject: [PATCH 707/755] Refactor stickers

---
 src/types/mask_position.rs |  34 ++--
 src/types/sticker.rs       | 386 ++++++++++++++++++++++++++++++++-----
 src/types/sticker_set.rs   | 121 +++++++++++-
 3 files changed, 472 insertions(+), 69 deletions(-)

diff --git a/src/types/mask_position.rs b/src/types/mask_position.rs
index f6fd809a..4f42c675 100644
--- a/src/types/mask_position.rs
+++ b/src/types/mask_position.rs
@@ -4,11 +4,11 @@ use serde::{Deserialize, Serialize};
 /// default.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#maskposition).
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct MaskPosition {
     /// The part of the face relative to which the mask should be placed. One
     /// of `forehead`, `eyes`, `mouth`, or `chin`.
-    pub point: String,
+    pub point: MaskPoint,
 
     /// Shift by X-axis measured in widths of the mask scaled to the face size,
     /// from left to right. For example, choosing `-1.0` will place mask just
@@ -24,41 +24,45 @@ pub struct MaskPosition {
     pub scale: f64,
 }
 
+/// The part of the face relative to which the mask should be placed.
+#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum MaskPoint {
+    Forehead,
+    Eyes,
+    Mouth,
+    Chin,
+}
+
 impl MaskPosition {
-    pub fn new<S>(point: S, x_shift: f64, y_shift: f64, scale: f64) -> Self
-    where
-        S: Into<String>,
-    {
+    pub const fn new(point: MaskPoint, x_shift: f64, y_shift: f64, scale: f64) -> Self {
         Self {
-            point: point.into(),
+            point,
             x_shift,
             y_shift,
             scale,
         }
     }
 
-    pub fn point<S>(mut self, val: S) -> Self
-    where
-        S: Into<String>,
-    {
-        self.point = val.into();
+    pub const fn point(mut self, val: MaskPoint) -> Self {
+        self.point = val;
         self
     }
 
     #[must_use]
-    pub fn x_shift(mut self, val: f64) -> Self {
+    pub const fn x_shift(mut self, val: f64) -> Self {
         self.x_shift = val;
         self
     }
 
     #[must_use]
-    pub fn y_shift(mut self, val: f64) -> Self {
+    pub const fn y_shift(mut self, val: f64) -> Self {
         self.y_shift = val;
         self
     }
 
     #[must_use]
-    pub fn scale(mut self, val: f64) -> Self {
+    pub const fn scale(mut self, val: f64) -> Self {
         self.scale = val;
         self
     }
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 3d96af32..dd8d22da 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -10,25 +10,40 @@ use crate::types::{FileMeta, MaskPosition, PhotoSize};
 #[serde_with_macros::skip_serializing_none]
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Sticker {
-    /// Identifier for this file.
-    pub file_id: String,
+    /// Metadata of the sticker file.
+    #[serde(flatten)]
+    pub file: FileMeta,
 
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
-
-    /// Sticker width.
+    /// Sticker width, in pixels.
+    ///
+    /// You can assume that `max(width, height) = 512`, `min(width, height) <=
+    /// 512`. In other words one dimension is exactly 512 pixels and the other
+    /// is at most 512 pixels.
     pub width: u16,
 
-    /// Sticker height.
+    /// Sticker height, in pixels.
+    ///
+    /// You can assume that `max(width, height) = 512`, `min(width, height) <=
+    /// 512`. In other words one dimension is exactly 512 pixels and the other
+    /// is at most 512 pixels.
     pub height: u16,
 
-    /// Kind of this sticker - webp, animated or video.
+    /// Kind of this sticker - regular, mask or custom emoji.
+    ///
+    /// In other words this represent how the sticker is presented, as a big
+    /// picture/video, as a mask while editing pictures or as a custom emoji in
+    /// messages.
     #[serde(flatten)]
     pub kind: StickerKind,
 
-    /// Sticker thumbnail in the .webp or .jpg format.
+    /// Format of this sticker - raster/`.webp`, animated/`.tgs` or
+    /// video/`.webm`.
+    ///
+    /// In other words this represents how the sticker is encoded.
+    #[serde(flatten)]
+    pub format: StickerFormat,
+
+    /// Sticker thumbnail in the `.webp` or `.jpg` format.
     pub thumb: Option<PhotoSize>,
 
     /// Emoji associated with the sticker.
@@ -36,29 +51,59 @@ pub struct Sticker {
 
     /// Name of the sticker set to which the sticker belongs.
     pub set_name: Option<String>,
-
-    /// Premium animation for the sticker, if the sticker is premium.
-    pub premium_animation: Option<FileMeta>,
-
-    /// For mask stickers, the position where the mask should be placed.
-    pub mask_position: Option<MaskPosition>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
 
-/// Kind of a sticker - webp, animated or video.
+/// Kind of a [`Sticker`] - regular, mask or custom emoji.
+///
+/// Dataful version of [`StickerType`].
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(try_from = "StickerKindRaw", into = "StickerKindRaw")]
+#[serde(tag = "type")]
+#[serde(rename_all = "snake_case")]
 pub enum StickerKind {
-    /// "Normal", raster sticker.
-    Webp,
-    /// [Animated] sticker.
+    /// "Normal", raster, animated or video sticker.
+    Regular {
+        /// Premium animation for the sticker, if the sticker is premium.
+        premium_animation: Option<FileMeta>,
+    },
+    /// Mask sticker.
+    Mask {
+        /// For mask stickers, the position where the mask should be placed.
+        mask_position: MaskPosition,
+    },
+    /// Custom emoji sticker.
+    CustomEmoji {
+        /// A unique identifier of the custom emoji.
+        // FIXME(waffle): newtype
+        custom_emoji_id: String,
+    },
+}
+
+/// Type of a [`Sticker`] - regular, mask or custom emoji.
+///
+/// Dataless version of [`StickerType`].
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "sticker_type")]
+#[serde(rename_all = "snake_case")]
+pub enum StickerType {
+    /// "Normal", raster, animated or video sticker.
+    Regular,
+    /// Mask sticker.
+    Mask,
+    /// Custom emoji sticker.
+    CustomEmoji,
+}
+
+/// Format of a [`Sticker`] - regular/webp, animated/tgs or video/webm.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(try_from = "StickerFormatRaw", into = "StickerFormatRaw")]
+pub enum StickerFormat {
+    /// "Normal", raster, `.webp` sticker.
+    Raster,
+    /// [Animated], `.tgs` sticker.
     ///
     /// [Animated]: https://telegram.org/blog/animated-stickers
     Animated,
-    /// [Video] sticker.
+    /// [Video], `.webm` sticker.
     ///
     /// [Video]: https://telegram.org/blog/video-stickers-better-reactions
     Video,
@@ -71,8 +116,11 @@ pub enum StickerKind {
 ///
 /// let sticker: Sticker = todo!();
 ///
-/// let _ = sticker.is_video();
-/// let _ = sticker.kind.is_video();
+/// let _ = sticker.is_regular();
+/// let _ = sticker.kind.is_regular();
+///
+/// let _ sticker.mask_position();
+/// let _ sticker.kind.mask_position();
 /// ```
 impl Deref for Sticker {
     type Target = StickerKind;
@@ -82,24 +130,149 @@ impl Deref for Sticker {
     }
 }
 
-impl StickerKind {
+impl Sticker {
     /// Returns `true` is this is a "normal" raster sticker.
+    ///
+    /// Alias to [`self.format.is_raster()`].
+    ///
+    /// [`self.format.is_raster()`]: StickerFormat::is_raster
     #[must_use]
-    pub fn is_webp(&self) -> bool {
-        matches!(self, Self::Webp)
+    pub fn is_raster(&self) -> bool {
+        self.format.is_raster()
     }
 
     /// Returns `true` is this is an [animated] sticker.
     ///
+    /// Alias to [`self.format.is_animated()`].
+    ///
+    /// [`self.format.is_animated()`]: StickerFormat::is_animated
     /// [animated]: https://telegram.org/blog/animated-stickers
     #[must_use]
+    pub fn is_animated(&self) -> bool {
+        self.format.is_animated()
+    }
+
+    /// Returns `true` is this is a [video] sticker.
+    ///
+    /// Alias to [`self.format.is_video()`].
+    ///
+    /// [`self.format.is_video()`]: StickerFormat::is_video
+    /// [video]: https://telegram.org/blog/video-stickers-better-reactions
+    #[must_use]
+    pub fn is_video(&self) -> bool {
+        self.format.is_video()
+    }
+}
+
+impl StickerKind {
+    /// Converts [`StickerKind`] to [`StickerType`]
+    #[must_use]
+    pub fn type_(&self) -> StickerType {
+        match self {
+            StickerKind::Regular { .. } => StickerType::Regular,
+            StickerKind::Mask { .. } => StickerType::Mask,
+            StickerKind::CustomEmoji { .. } => StickerType::CustomEmoji,
+        }
+    }
+
+    /// Returns `true` if the sticker kind is [`Regular`].
+    ///
+    /// [`Regular`]: StickerKind::Regular
+    #[must_use]
+    pub fn is_regular(&self) -> bool {
+        self.type_().is_regular()
+    }
+
+    /// Returns `true` if the sticker kind is [`Mask`].
+    ///
+    /// [`Mask`]: StickerKind::Mask
+    #[must_use]
+    pub fn is_mask(&self) -> bool {
+        self.type_().is_mask()
+    }
+
+    /// Returns `true` if the sticker kind is [`CustomEmoji`].
+    ///
+    /// [`CustomEmoji`]: StickerKind::CustomEmoji
+    #[must_use]
+    pub fn is_custom_emoji(&self) -> bool {
+        self.type_().is_custom_emoji()
+    }
+
+    /// Getter for [`StickerKind::Regular::premium_animation`].
+    pub fn premium_animation(&self) -> Option<&FileMeta> {
+        if let Self::Regular { premium_animation } = self {
+            premium_animation.as_ref()
+        } else {
+            None
+        }
+    }
+
+    /// Getter for [`StickerKind::Mask::mask_position`].
+    pub fn mask_position(&self) -> Option<MaskPosition> {
+        if let Self::Mask { mask_position } = self {
+            Some(*mask_position)
+        } else {
+            None
+        }
+    }
+
+    /// Getter for [`StickerKind::CustomEmoji::custom_emoji_id`].
+    pub fn custom_emoji_id(&self) -> Option<&str> {
+        if let Self::CustomEmoji { custom_emoji_id } = self {
+            Some(custom_emoji_id)
+        } else {
+            None
+        }
+    }
+}
+
+impl StickerType {
+    /// Returns `true` if the sticker type is [`Regular`].
+    ///
+    /// [`Regular`]: StickerType::Regular
+    #[must_use]
+    pub fn is_regular(&self) -> bool {
+        matches!(self, Self::Regular)
+    }
+
+    /// Returns `true` if the sticker type is [`Mask`].
+    ///
+    /// [`Mask`]: StickerType::Mask
+    #[must_use]
+    pub fn is_mask(&self) -> bool {
+        matches!(self, Self::Mask)
+    }
+
+    /// Returns `true` if the sticker type is [`CustomEmoji`].
+    ///
+    /// [`CustomEmoji`]: StickerType::CustomEmoji
+    #[must_use]
+    pub fn is_custom_emoji(&self) -> bool {
+        matches!(self, Self::CustomEmoji)
+    }
+}
+
+impl StickerFormat {
+    /// Returns `true` if the sticker format is [`Raster`].
+    ///
+    /// [`Raster`]: StickerFormat::Raster
+    #[must_use]
+    pub fn is_raster(&self) -> bool {
+        matches!(self, Self::Raster)
+    }
+
+    /// Returns `true` if the sticker format is [`Animated`].
+    ///
+    /// [`Animated`]: StickerFormat::Animated
+    #[must_use]
     pub fn is_animated(&self) -> bool {
         matches!(self, Self::Animated)
     }
 
-    /// Returns `true` is this is a [video] sticker.
+    /// Returns `true` if the sticker format is [`Video`].
     ///
-    /// [video]: https://telegram.org/blog/video-stickers-better-reactions
+    /// [`Video`]: StickerFormat::Video
     #[must_use]
     pub fn is_video(&self) -> bool {
         matches!(self, Self::Video)
@@ -107,22 +280,22 @@ impl StickerKind {
 }
 
 #[derive(Serialize, Deserialize)]
-struct StickerKindRaw {
+struct StickerFormatRaw {
     is_animated: bool,
     is_video: bool,
 }
 
-impl TryFrom<StickerKindRaw> for StickerKind {
+impl TryFrom<StickerFormatRaw> for StickerFormat {
     type Error = &'static str;
 
     fn try_from(
-        StickerKindRaw {
+        StickerFormatRaw {
             is_animated,
             is_video,
-        }: StickerKindRaw,
+        }: StickerFormatRaw,
     ) -> Result<Self, Self::Error> {
         let ret = match (is_animated, is_video) {
-            (false, false) => Self::Webp,
+            (false, false) => Self::Raster,
             (true, false) => Self::Animated,
             (false, true) => Self::Video,
             (true, true) => return Err("`is_animated` and `is_video` present at the same time"),
@@ -132,21 +305,146 @@ impl TryFrom<StickerKindRaw> for StickerKind {
     }
 }
 
-impl From<StickerKind> for StickerKindRaw {
-    fn from(kind: StickerKind) -> Self {
+impl From<StickerFormat> for StickerFormatRaw {
+    fn from(kind: StickerFormat) -> Self {
         match kind {
-            StickerKind::Webp => Self {
+            StickerFormat::Raster => Self {
                 is_animated: false,
                 is_video: false,
             },
-            StickerKind::Animated => Self {
+            StickerFormat::Animated => Self {
                 is_animated: true,
                 is_video: false,
             },
-            StickerKind::Video => Self {
+            StickerFormat::Video => Self {
                 is_animated: false,
                 is_video: true,
             },
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::types::{MaskPoint, Sticker, StickerFormat, StickerType};
+
+    #[test]
+    fn mask_serde() {
+        // Taken from a real (mask) sticker set
+        let json = r#"{
+            "width": 512,
+            "height": 512,
+            "emoji": "🎭",
+            "set_name": "Coronamask",
+            "is_animated": false,
+            "is_video": false,
+            "type": "mask",
+            "mask_position": {
+                "point": "forehead",
+                "x_shift": -0.0125,
+                "y_shift": 0.5525,
+                "scale": 1.94
+            },
+            "thumb": {
+                "file_id": "AAMCAQADFQABYzA0qlYHijpjMzMwBFKnEVE5XdkAAjIKAAK_jJAE1TRw7D936M8BAAdtAAMpBA",
+                "file_unique_id": "AQADMgoAAr-MkARy",
+                "file_size": 11028,
+                "width": 320,
+                "height": 320
+            },
+            "file_id": "CAACAgEAAxUAAWMwNKpWB4o6YzMzMARSpxFROV3ZAAIyCgACv4yQBNU0cOw_d-jPKQQ",
+            "file_unique_id": "AgADMgoAAr-MkAQ",
+            "file_size": 18290
+        }"#;
+
+        let sticker: Sticker = serde_json::from_str(json).unwrap();
+
+        // Assert some basic properties are correctly deserialized
+        assert_eq!(sticker.type_(), StickerType::Mask);
+        assert_eq!(sticker.mask_position().unwrap().point, MaskPoint::Forehead);
+        assert_eq!(sticker.is_animated(), false);
+        assert_eq!(sticker.is_video(), false);
+        assert_eq!(sticker.thumb.clone().unwrap().file_size, 11028);
+        assert_eq!(sticker.file.file_size, 18290);
+        assert_eq!(sticker.width, 512);
+        assert_eq!(sticker.height, 512);
+
+        let json2 = serde_json::to_string(&sticker).unwrap();
+        let sticker2: Sticker = serde_json::from_str(&json2).unwrap();
+        assert_eq!(sticker, sticker2);
+    }
+
+    #[test]
+    fn regular_serde() {
+        // Taken from a real sticker set
+        let json = r#"{
+            "width": 463,
+            "height": 512,
+            "emoji": "🍿",
+            "set_name": "menhera2",
+            "is_animated": false,
+            "is_video": false,
+            "type": "regular",
+            "thumb": {
+                "file_id": "AAMCAgADFQABYzBxOJ1GWrttqL7FSRwdAtrq-AkAAtkHAALBGJ4LUUUh5CUew90BAAdtAAMpBA",
+                "file_unique_id": "AQAD2QcAAsEYngty",
+                "file_size": 4558,
+                "width": 116,
+                "height": 128
+            },
+            "file_id": "CAACAgIAAxUAAWMwcTidRlq7bai-xUkcHQLa6vgJAALZBwACwRieC1FFIeQlHsPdKQQ",
+            "file_unique_id": "AgAD2QcAAsEYngs",
+            "file_size": 25734
+        }"#;
+
+        let sticker: Sticker = serde_json::from_str(json).unwrap();
+
+        // Assert some basic properties are correctly deserialized
+        assert_eq!(sticker.type_(), StickerType::Regular);
+        assert_eq!(sticker.premium_animation(), None);
+        assert_eq!(sticker.is_animated(), false);
+        assert_eq!(sticker.is_video(), false);
+        assert_eq!(sticker.thumb.clone().unwrap().file_size, 4558);
+        assert_eq!(sticker.file.file_size, 25734);
+        assert_eq!(sticker.width, 463);
+        assert_eq!(sticker.height, 512);
+        assert_eq!(sticker.set_name.as_deref(), Some("menhera2"));
+
+        let json2 = serde_json::to_string(&sticker).unwrap();
+        let sticker2: Sticker = serde_json::from_str(&json2).unwrap();
+        assert_eq!(sticker, sticker2);
+    }
+
+    #[test]
+    fn sticker_format_serde() {
+        {
+            let json = r#"{"is_animation":false,"is_video":false}"#;
+            let fmt: StickerFormat = serde_json::from_str(json).unwrap();
+            assert_eq!(fmt, StickerFormat::Raster);
+
+            let json2 = serde_json::to_string(&fmt).unwrap();
+            assert_eq!(json, json2);
+        }
+        {
+            let json = r#"{"is_animation":true,"is_video":false}"#;
+            let fmt: StickerFormat = serde_json::from_str(json).unwrap();
+            assert_eq!(fmt, StickerFormat::Animated);
+
+            let json2 = serde_json::to_string(&fmt).unwrap();
+            assert_eq!(json, json2);
+        }
+        {
+            let json = r#"{"is_animation":false,"is_video":true}"#;
+            let fmt: StickerFormat = serde_json::from_str(json).unwrap();
+            assert_eq!(fmt, StickerFormat::Video);
+
+            let json2 = serde_json::to_string(&fmt).unwrap();
+            assert_eq!(json, json2);
+        }
+        {
+            let json = r#"{"is_animation":true,"is_video":true}"#;
+            let fmt: Result<StickerFormat, _> = serde_json::from_str(json);
+            assert!(fmt.is_err());
+        }
+    }
+}
diff --git a/src/types/sticker_set.rs b/src/types/sticker_set.rs
index e666c1c8..d7adaf29 100644
--- a/src/types/sticker_set.rs
+++ b/src/types/sticker_set.rs
@@ -2,7 +2,7 @@ use std::ops::Deref;
 
 use serde::{Deserialize, Serialize};
 
-use crate::types::{PhotoSize, Sticker, StickerKind};
+use crate::types::{PhotoSize, Sticker, StickerFormat, StickerType};
 
 /// This object represents a sticker set.
 ///
@@ -15,33 +15,134 @@ pub struct StickerSet {
     /// Sticker set title.
     pub title: String,
 
-    /// Sticker kind shared by all stickers in this set.
-    pub kind: StickerKind,
+    /// Sticker type shared by all stickers in this set.
+    #[serde(flatten)]
+    pub kind: StickerType,
 
-    /// `true`, if the sticker set contains masks.
-    pub contains_masks: bool,
+    /// Sticker format shared by all stickers in this set.
+    #[serde(flatten)]
+    pub format: StickerFormat,
 
     /// List of all set stickers.
     pub stickers: Vec<Sticker>,
 
-    /// Sticker set thumbnail in the .WEBP or .TGS format.
+    /// Sticker set thumbnail in the `.webp`, `.tgs` or `.webm` format.
     pub thumb: Option<PhotoSize>,
 }
 
-/// This allows calling [`StickerKind`]'s methods directly on [`StickerSet`].
+/// This allows calling [`StickerType`]'s methods directly on [`StickerSet`].
 ///
 /// ```no_run
 /// use teloxide_core::types::StickerSet;
 ///
 /// let sticker: StickerSet = todo!();
 ///
-/// let _ = sticker.is_video();
-/// let _ = sticker.kind.is_video();
+/// let _ = sticker.is_mask();
+/// let _ = sticker.kind.is_mask();
 /// ```
 impl Deref for StickerSet {
-    type Target = StickerKind;
+    type Target = StickerType;
 
     fn deref(&self) -> &Self::Target {
         &self.kind
     }
 }
+
+impl StickerSet {
+    /// Returns `true` is this is a "normal" raster sticker.
+    ///
+    /// Alias to [`self.format.is_raster()`].
+    ///
+    /// [`self.format.is_raster()`]: StickerFormat::is_raster
+    #[must_use]
+    pub fn is_raster(&self) -> bool {
+        self.format.is_raster()
+    }
+
+    /// Returns `true` is this is an [animated] sticker.
+    ///
+    /// Alias to [`self.format.is_animated()`].
+    ///
+    /// [`self.format.is_animated()`]: StickerFormat::is_animated
+    /// [animated]: https://telegram.org/blog/animated-stickers
+    #[must_use]
+    pub fn is_animated(&self) -> bool {
+        self.format.is_animated()
+    }
+
+    /// Returns `true` is this is a [video] sticker.
+    ///
+    /// Alias to [`self.format.is_video()`].
+    ///
+    /// [`self.format.is_video()`]: StickerFormat::is_video
+    /// [video]: https://telegram.org/blog/video-stickers-better-reactions
+    #[must_use]
+    pub fn is_video(&self) -> bool {
+        self.format.is_video()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::types::StickerSet;
+
+    #[test]
+    fn smoke_serde() {
+        // https://t.me/addstickers/teloxide_test
+        let json = r#"{
+            "name": "teloxide_test",
+            "title": "teloxide-test",
+            "is_animated": false,
+            "is_video": false,
+            "sticker_type": "regular",
+            "contains_masks": false,
+            "stickers": [
+                {
+                    "width": 512,
+                    "height": 512,
+                    "emoji": "⚙️",
+                    "set_name": "teloxide_test",
+                    "is_animated": false,
+                    "is_video": false,
+                    "type": "regular",
+                    "thumb": {
+                        "file_id": "AAMCAQADFQABYzB4ATH0sqXx351gZ5GpY1Z3Tl8AAlgCAAJ1t4hFbxNCoAg1-akBAAdtAAMpBA",
+                        "file_unique_id": "AQADWAIAAnW3iEVy",
+                        "file_size": 7698,
+                        "width": 320,
+                        "height": 320
+                    },
+                    "file_id": "CAACAgEAAxUAAWMweAEx9LKl8d-dYGeRqWNWd05fAAJYAgACdbeIRW8TQqAINfmpKQQ",
+                    "file_unique_id": "AgADWAIAAnW3iEU",
+                    "file_size": 12266
+                },
+                {
+                    "width": 512,
+                    "height": 512,
+                    "emoji": "⚙️",
+                    "set_name": "teloxide_test",
+                    "is_animated": false,
+                    "is_video": false,
+                    "type": "regular",
+                    "thumb": {
+                        "file_id": "AAMCAQADFQABYzB4AcABR8-MuvGagis9Pk6liSAAAs8DAAL2YYBFNbvduoN1p7oBAAdtAAMpBA",
+                        "file_unique_id": "AQADzwMAAvZhgEVy",
+                        "file_size": 7780,
+                        "width": 320,
+                        "height": 320
+                    },
+                    "file_id": "CAACAgEAAxUAAWMweAHAAUfPjLrxmoIrPT5OpYkgAALPAwAC9mGARTW73bqDdae6KQQ",
+                    "file_unique_id": "AgADzwMAAvZhgEU",
+                    "file_size": 12158
+                }
+            ]
+        }"#;
+
+        let set: StickerSet = serde_json::from_str(json).unwrap();
+
+        assert!(set.is_raster());
+        assert!(set.is_regular());
+        assert!(set.thumb.is_none());
+        assert_eq!(set.stickers.len(), 2);
+    }
+}

From a75c645c68ec5feca823601cea21ccf54db451aa Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 20:16:00 +0400
Subject: [PATCH 708/755] Allow codegen to create new files

---
 src/codegen.rs | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/codegen.rs b/src/codegen.rs
index c26575f1..fa165066 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -15,6 +15,7 @@ pub(crate) mod schema;
 
 use std::{
     fs,
+    io::{Read, Write},
     path::{Path, PathBuf},
 };
 
@@ -79,25 +80,32 @@ pub fn ensure_files_contents<'a>(
 ) {
     let mut err_count = 0;
 
-    for (file, contents) in files_and_contents {
-        if let Ok(old_contents) = fs::read_to_string(file) {
-            if normalize_newlines(&old_contents) == normalize_newlines(contents) {
-                // File is already up to date.
-                continue;
-            }
+    for (path, contents) in files_and_contents {
+        let mut file = fs::File::options()
+            .read(true)
+            .write(true)
+            .create(true)
+            .open(path)
+            .unwrap();
+        let mut old_contents = String::with_capacity(contents.len());
+        file.read_to_string(&mut old_contents).unwrap();
 
-            err_count += 1;
-
-            let display_path = file.strip_prefix(&project_root()).unwrap_or(file);
-            eprintln!(
-                "\n\x1b[31;1merror\x1b[0m: {} was not up-to-date, updating\n",
-                display_path.display()
-            );
-            if let Some(parent) = file.parent() {
-                let _ = fs::create_dir_all(parent);
-            }
-            fs::write(file, contents).unwrap();
+        if normalize_newlines(&old_contents) == normalize_newlines(contents) {
+            // File is already up to date.
+            continue;
         }
+
+        err_count += 1;
+
+        let display_path = path.strip_prefix(&project_root()).unwrap_or(path);
+        eprintln!(
+            "\n\x1b[31;1merror\x1b[0m: {} was not up-to-date, updating\n",
+            display_path.display()
+        );
+        if let Some(parent) = path.parent() {
+            let _ = fs::create_dir_all(parent);
+        }
+        file.write_all(contents.as_bytes()).unwrap();
     }
 
     let (s, were) = match err_count {

From 967da8fd9ed8df967fbdaca444148a9021985206 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 20:43:24 +0400
Subject: [PATCH 709/755] TBA 6.2 methods

---
 schema.ron                                | 22 ++++++++++++++++++----
 src/adaptors/auto_send.rs                 |  1 +
 src/adaptors/cache_me.rs                  |  1 +
 src/adaptors/erased.rs                    | 16 ++++++++++++++++
 src/adaptors/parse_mode.rs                |  1 +
 src/adaptors/throttle/requester_impl.rs   |  1 +
 src/adaptors/trace.rs                     |  1 +
 src/bot/api.rs                            | 12 ++++++++++++
 src/local_macros.rs                       |  8 ++++++++
 src/payloads.rs                           |  2 ++
 src/payloads/create_new_sticker_set.rs    |  8 ++++----
 src/payloads/get_custom_emoji_stickers.rs | 16 ++++++++++++++++
 src/payloads/setters.rs                   |  4 ++--
 src/requests/requester.rs                 |  8 ++++++++
 14 files changed, 91 insertions(+), 10 deletions(-)
 create mode 100644 src/payloads/get_custom_emoji_stickers.rs

diff --git a/schema.ron b/schema.ron
index bd79cb18..b5d6d0c2 100644
--- a/schema.ron
+++ b/schema.ron
@@ -3164,6 +3164,20 @@ Schema(
                 ),
             ],
         ),
+        Method(
+            names: ("getCustomEmojiStickers", "GetCustomEmojiStickers", "get_custom_emoji_stickers"),
+            return_ty: ArrayOf(RawTy("Sticker")),
+            doc: Doc(md: "Use this method to get information about custom emoji stickers by their identifiers. Returns an Array of Sticker objects."),
+            tg_doc: "https://core.telegram.org/bots/api#getcustomemojistickers",
+            tg_category: "Stickers",
+            params: [
+                Param(
+                    name: "custom_emoji_ids",
+                    ty: ArrayOf(String),
+                    descr: Doc(md: "List of custom emoji identifiers. At most 200 custom emoji identifiers can be specified."),
+                ),
+            ],
+        ),
         Method(
             names: ("uploadStickerFile", "UploadStickerFile", "upload_sticker_file"),
             return_ty: RawTy("FileMeta"),
@@ -3212,7 +3226,7 @@ Schema(
                     name: "sticker",
                     ty: RawTy("InputSticker"),
                     descr: Doc(
-                        md: "**PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
+                        md: "**PNG** image, **TGS** animation or **WEBM** video with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]",
                         md_links: {"More info on Sending Files »": "https://core.telegram.org/bots/api#sending-files"},
                     ),
                 ),
@@ -3222,9 +3236,9 @@ Schema(
                     descr: Doc(md: "One or more emoji corresponding to the sticker"),
                 ),
                 Param(
-                    name: "contains_masks",
-                    ty: Option(bool),
-                    descr: Doc(md: "Pass _True_, if a set of mask stickers should be created"),
+                    name: "sticker_type",
+                    ty: Option(RawTy("StickerType")),
+                    descr: Doc(md: "Type of stickers in the set, pass “regular” or “mask”. Custom emoji sticker sets can't be created via the Bot API at the moment. By default, a regular sticker set is created."),
                 ),
                 Param(
                     name: "mask_position",
diff --git a/src/adaptors/auto_send.rs b/src/adaptors/auto_send.rs
index dfd4a4c8..607d69c0 100644
--- a/src/adaptors/auto_send.rs
+++ b/src/adaptors/auto_send.rs
@@ -142,6 +142,7 @@ where
         delete_message,
         send_sticker,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
diff --git a/src/adaptors/cache_me.rs b/src/adaptors/cache_me.rs
index 5ae8669a..30365693 100644
--- a/src/adaptors/cache_me.rs
+++ b/src/adaptors/cache_me.rs
@@ -169,6 +169,7 @@ where
         delete_message,
         send_sticker,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index fc12d8ac..aee6c21c 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -166,6 +166,9 @@ macro_rules! fwd_erased {
     (@convert $m:ident, $arg:ident, errors : $T:ty) => {
         $arg.into_iter().collect()
     };
+    (@convert $m:ident, $arg:ident, custom_emoji_ids : $T:ty) => {
+        $arg.into_iter().collect()
+    };
     (@convert $m:ident, $arg:ident, $arg_:ident : $T:ty) => {
         $arg.into()
     };
@@ -258,6 +261,7 @@ where
         delete_message,
         send_sticker,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
@@ -713,6 +717,11 @@ trait ErasableRequester<'a> {
 
     fn get_sticker_set(&self, name: String) -> ErasedRequest<'a, GetStickerSet, Self::Err>;
 
+    fn get_custom_emoji_stickers(
+        &self,
+        custom_emoji_ids: Vec<String>,
+    ) -> ErasedRequest<'a, GetCustomEmojiStickers, Self::Err>;
+
     fn upload_sticker_file(
         &self,
         user_id: UserId,
@@ -1426,6 +1435,13 @@ where
         Requester::get_sticker_set(self, name).erase()
     }
 
+    fn get_custom_emoji_stickers(
+        &self,
+        custom_emoji_ids: Vec<String>,
+    ) -> ErasedRequest<'a, GetCustomEmojiStickers, Self::Err> {
+        Requester::get_custom_emoji_stickers(self, custom_emoji_ids).erase()
+    }
+
     fn upload_sticker_file(
         &self,
         user_id: UserId,
diff --git a/src/adaptors/parse_mode.rs b/src/adaptors/parse_mode.rs
index ca53a67e..04516105 100644
--- a/src/adaptors/parse_mode.rs
+++ b/src/adaptors/parse_mode.rs
@@ -164,6 +164,7 @@ impl<B: Requester> Requester for DefaultParseMode<B> {
         delete_message,
         send_sticker,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
diff --git a/src/adaptors/throttle/requester_impl.rs b/src/adaptors/throttle/requester_impl.rs
index 50cbccf6..e7817f50 100644
--- a/src/adaptors/throttle/requester_impl.rs
+++ b/src/adaptors/throttle/requester_impl.rs
@@ -148,6 +148,7 @@ where
         stop_poll,
         delete_message,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
diff --git a/src/adaptors/trace.rs b/src/adaptors/trace.rs
index 7e0e9a78..fef86e76 100644
--- a/src/adaptors/trace.rs
+++ b/src/adaptors/trace.rs
@@ -195,6 +195,7 @@ where
         delete_message,
         send_sticker,
         get_sticker_set,
+        get_custom_emoji_stickers,
         upload_sticker_file,
         create_new_sticker_set,
         add_sticker_to_set,
diff --git a/src/bot/api.rs b/src/bot/api.rs
index 96c6239a..d78cad73 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -911,6 +911,18 @@ impl Requester for Bot {
         Self::GetStickerSet::new(self.clone(), payloads::GetStickerSet::new(name))
     }
 
+    type GetCustomEmojiStickers = JsonRequest<payloads::GetCustomEmojiStickers>;
+
+    fn get_custom_emoji_stickers<C>(&self, custom_emoji_ids: C) -> Self::GetCustomEmojiStickers
+    where
+        C: IntoIterator<Item = String>,
+    {
+        Self::GetCustomEmojiStickers::new(
+            self.clone(),
+            payloads::GetCustomEmojiStickers::new(custom_emoji_ids),
+        )
+    }
+
     type UploadStickerFile = MultipartRequest<payloads::UploadStickerFile>;
 
     fn upload_sticker_file(
diff --git a/src/local_macros.rs b/src/local_macros.rs
index a1d668cb..56659c5e 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -1087,6 +1087,14 @@ macro_rules! requester_forward {
             $body!(get_sticker_set this (name: N))
         }
     };
+    (@method get_custom_emoji_stickers $body:ident $ty:ident) => {
+        type GetCustomEmojiStickers = $ty![GetCustomEmojiStickers];
+
+        fn get_custom_emoji_stickers<C>(&self, custom_emoji_ids: C) -> Self::GetCustomEmojiStickers where C: IntoIterator<Item = String> {
+            let this = self;
+            $body!(get_custom_emoji_stickers this (custom_emoji_ids: C))
+        }
+    };
     (@method upload_sticker_file $body:ident $ty:ident) => {
         type UploadStickerFile = $ty![UploadStickerFile];
 
diff --git a/src/payloads.rs b/src/payloads.rs
index 5989336f..168c257a 100644
--- a/src/payloads.rs
+++ b/src/payloads.rs
@@ -55,6 +55,7 @@ mod get_chat_member;
 mod get_chat_member_count;
 mod get_chat_members_count;
 mod get_chat_menu_button;
+mod get_custom_emoji_stickers;
 mod get_file;
 mod get_game_high_scores;
 mod get_me;
@@ -157,6 +158,7 @@ pub use get_chat_member::{GetChatMember, GetChatMemberSetters};
 pub use get_chat_member_count::{GetChatMemberCount, GetChatMemberCountSetters};
 pub use get_chat_members_count::{GetChatMembersCount, GetChatMembersCountSetters};
 pub use get_chat_menu_button::{GetChatMenuButton, GetChatMenuButtonSetters};
+pub use get_custom_emoji_stickers::{GetCustomEmojiStickers, GetCustomEmojiStickersSetters};
 pub use get_file::{GetFile, GetFileSetters};
 pub use get_game_high_scores::{GetGameHighScores, GetGameHighScoresSetters};
 pub use get_me::{GetMe, GetMeSetters};
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index cf4c4453..0c92056e 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InputSticker, MaskPosition, True, UserId};
+use crate::types::{InputSticker, MaskPosition, StickerType, True, UserId};
 
 impl_payload! {
     @[multipart = sticker]
@@ -16,7 +16,7 @@ impl_payload! {
             pub name: String [into],
             /// Sticker set title, 1-64 characters
             pub title: String [into],
-            /// **PNG** or **TGS** image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
+            /// **PNG** image, **TGS** animation or **WEBM** video with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed 512px, and either width or height must be exactly 512px. Pass a _file\_id_ as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. [More info on Sending Files »]
             ///
             /// [More info on Sending Files »]: crate::types::InputFile
             #[serde(flatten)]
@@ -25,8 +25,8 @@ impl_payload! {
             pub emojis: String [into],
         }
         optional {
-            /// Pass _True_, if a set of mask stickers should be created
-            pub contains_masks: bool,
+            /// Type of stickers in the set, pass “regular” or “mask”. Custom emoji sticker sets can't be created via the Bot API at the moment. By default, a regular sticker set is created.
+            pub sticker_type: StickerType,
             /// A JSON-serialized object for position where the mask should be placed on faces
             pub mask_position: MaskPosition,
         }
diff --git a/src/payloads/get_custom_emoji_stickers.rs b/src/payloads/get_custom_emoji_stickers.rs
new file mode 100644
index 00000000..68cedfff
--- /dev/null
+++ b/src/payloads/get_custom_emoji_stickers.rs
@@ -0,0 +1,16 @@
+//! Generated by `codegen_payloads`, do not edit by hand.
+
+use serde::Serialize;
+
+use crate::types::Sticker;
+
+impl_payload! {
+    /// Use this method to get information about custom emoji stickers by their identifiers. Returns an Array of Sticker objects.
+    #[derive(Debug, PartialEq, Eq, Hash, Clone, Serialize)]
+    pub GetCustomEmojiStickers (GetCustomEmojiStickersSetters) => Vec<Sticker> {
+        required {
+            /// List of custom emoji identifiers. At most 200 custom emoji identifiers can be specified.
+            pub custom_emoji_ids: Vec<String> [collect],
+        }
+    }
+}
diff --git a/src/payloads/setters.rs b/src/payloads/setters.rs
index a25e3026..d9e68c24 100644
--- a/src/payloads/setters.rs
+++ b/src/payloads/setters.rs
@@ -18,8 +18,8 @@ pub use crate::payloads::{
     EditMessageTextSetters as _, ExportChatInviteLinkSetters as _, ForwardMessageSetters as _,
     GetChatAdministratorsSetters as _, GetChatMemberCountSetters as _, GetChatMemberSetters as _,
     GetChatMembersCountSetters as _, GetChatMenuButtonSetters as _, GetChatSetters as _,
-    GetFileSetters as _, GetGameHighScoresSetters as _, GetMeSetters as _,
-    GetMyCommandsSetters as _, GetMyDefaultAdministratorRightsSetters as _,
+    GetCustomEmojiStickersSetters as _, GetFileSetters as _, GetGameHighScoresSetters as _,
+    GetMeSetters as _, GetMyCommandsSetters as _, GetMyDefaultAdministratorRightsSetters as _,
     GetStickerSetSetters as _, GetUpdatesSetters as _, GetUserProfilePhotosSetters as _,
     GetWebhookInfoSetters as _, KickChatMemberSetters as _, LeaveChatSetters as _,
     LogOutSetters as _, PinChatMessageSetters as _, PromoteChatMemberSetters as _,
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index 874517bf..b18a825c 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -750,6 +750,13 @@ pub trait Requester {
     where
         N: Into<String>;
 
+    type GetCustomEmojiStickers: Request<Payload = GetCustomEmojiStickers, Err = Self::Err>;
+
+    /// For Telegram documentation see [`GetCustomEmojiStickers`].
+    fn get_custom_emoji_stickers<C>(&self, custom_emoji_ids: C) -> Self::GetCustomEmojiStickers
+    where
+        C: IntoIterator<Item = String>;
+
     type UploadStickerFile: Request<Payload = UploadStickerFile, Err = Self::Err>;
 
     /// For Telegram documentation see [`UploadStickerFile`].
@@ -1019,6 +1026,7 @@ macro_rules! forward_all {
             delete_message,
             send_sticker,
             get_sticker_set,
+            get_custom_emoji_stickers,
             upload_sticker_file,
             create_new_sticker_set,
             add_sticker_to_set,

From 7550af9a25a5dc6ff44f55b6b93939043af0f95d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 20:59:05 +0400
Subject: [PATCH 710/755] Fix `sticker_type` param serialization

---
 src/payloads/codegen.rs                | 4 +++-
 src/payloads/create_new_sticker_set.rs | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/payloads/codegen.rs b/src/payloads/codegen.rs
index c4e266d1..6cc60bad 100644
--- a/src/payloads/codegen.rs
+++ b/src/payloads/codegen.rs
@@ -222,7 +222,9 @@ fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
             let field = &param.name;
             let ty = &param.ty;
             let flatten = match ty {
-                Type::RawTy(s) if s == "InputSticker" || s == "TargetMessage" => {
+                Type::RawTy(s)
+                    if s == "InputSticker" || s == "TargetMessage" || s == "StickerType" =>
+                {
                     "\n            #[serde(flatten)]"
                 }
                 _ => "",
diff --git a/src/payloads/create_new_sticker_set.rs b/src/payloads/create_new_sticker_set.rs
index 0c92056e..2fa6b2b7 100644
--- a/src/payloads/create_new_sticker_set.rs
+++ b/src/payloads/create_new_sticker_set.rs
@@ -26,6 +26,7 @@ impl_payload! {
         }
         optional {
             /// Type of stickers in the set, pass “regular” or “mask”. Custom emoji sticker sets can't be created via the Bot API at the moment. By default, a regular sticker set is created.
+            #[serde(flatten)]
             pub sticker_type: StickerType,
             /// A JSON-serialized object for position where the mask should be placed on faces
             pub mask_position: MaskPosition,

From 8cad09498c2743b5d2a44b41e16ebddd4afac47d Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 21:07:37 +0400
Subject: [PATCH 711/755] Fix sticker tests

---
 src/types/message.rs | 73 ++++++++++++++++++++++----------------------
 src/types/sticker.rs | 12 ++++----
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index 54cc09af..d42835ae 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1435,42 +1435,43 @@ mod tests {
     #[test]
     fn de_sticker() {
         let json = r#"{
-          "message_id": 199787,
-          "from": {
-           "id": 250918540,
-           "is_bot": false,
-           "first_name": "Андрей",
-           "last_name": "Власов",
-           "username": "aka_dude",
-           "language_code": "en"
-          },
-          "chat": {
-           "id": 250918540,
-           "first_name": "Андрей",
-           "last_name": "Власов",
-           "username": "aka_dude",
-           "type": "private"
-          },
-          "date": 1568290188,
-          "sticker": {
-           "width": 512,
-           "height": 512,
-           "emoji": "😡",
-           "set_name": "AdvenTimeAnim",
-           "is_animated": true,
-           "is_video": false,
-           "thumb": {
-            "file_id": "AAQCAAMjAAOw0PgMaabKAcaXKCBLubkPAAQBAAdtAAPGKwACFgQ",
-            "file_unique_id":"",
-            "file_size": 4118,
-            "width": 128,
-            "height": 128
-           },
-           "file_id": "CAADAgADIwADsND4DGmmygHGlyggFgQ",
-           "file_unique_id":"",
-           "file_size": 16639
-          }
-         }"#;
+            "message_id": 199787,
+            "from": {
+                "id": 250918540,
+                "is_bot": false,
+                "first_name": "Андрей",
+                "last_name": "Власов",
+                "username": "aka_dude",
+                "language_code": "en"
+            },
+            "chat": {
+                "id": 250918540,
+                "first_name": "Андрей",
+                "last_name": "Власов",
+                "username": "aka_dude",
+                "type": "private"
+            },
+            "date": 1568290188,
+            "sticker": {
+                "width": 512,
+                "height": 512,
+                "emoji": "😡",
+                "set_name": "AdvenTimeAnim",
+                "is_animated": true,
+                "is_video": false,
+                "type": "regular",
+                "thumb": {
+                    "file_id": "AAMCAgADGQEAARIt0GMwiZ6n4nRbxdpM3pL8vPX6PVAhAAIjAAOw0PgMaabKAcaXKCABAAdtAAMpBA",
+                    "file_unique_id": "AQADIwADsND4DHI",
+                    "file_size": 4118,
+                    "width": 128,
+                    "height": 128
+                },
+                "file_id": "CAACAgIAAxkBAAESLdBjMImep-J0W8XaTN6S_Lz1-j1QIQACIwADsND4DGmmygHGlyggKQQ",
+                "file_unique_id": "AgADIwADsND4DA",
+                "file_size": 16639
+            }
+        }"#;
         from_str::<Message>(json).unwrap();
     }
 
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index dd8d22da..4ee875fd 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -119,8 +119,8 @@ pub enum StickerFormat {
 /// let _ = sticker.is_regular();
 /// let _ = sticker.kind.is_regular();
 ///
-/// let _ sticker.mask_position();
-/// let _ sticker.kind.mask_position();
+/// let _ = sticker.mask_position();
+/// let _ = sticker.kind.mask_position();
 /// ```
 impl Deref for Sticker {
     type Target = StickerKind;
@@ -418,7 +418,7 @@ mod tests {
     #[test]
     fn sticker_format_serde() {
         {
-            let json = r#"{"is_animation":false,"is_video":false}"#;
+            let json = r#"{"is_animated":false,"is_video":false}"#;
             let fmt: StickerFormat = serde_json::from_str(json).unwrap();
             assert_eq!(fmt, StickerFormat::Raster);
 
@@ -426,7 +426,7 @@ mod tests {
             assert_eq!(json, json2);
         }
         {
-            let json = r#"{"is_animation":true,"is_video":false}"#;
+            let json = r#"{"is_animated":true,"is_video":false}"#;
             let fmt: StickerFormat = serde_json::from_str(json).unwrap();
             assert_eq!(fmt, StickerFormat::Animated);
 
@@ -434,7 +434,7 @@ mod tests {
             assert_eq!(json, json2);
         }
         {
-            let json = r#"{"is_animation":false,"is_video":true}"#;
+            let json = r#"{"is_animated":false,"is_video":true}"#;
             let fmt: StickerFormat = serde_json::from_str(json).unwrap();
             assert_eq!(fmt, StickerFormat::Video);
 
@@ -442,7 +442,7 @@ mod tests {
             assert_eq!(json, json2);
         }
         {
-            let json = r#"{"is_animation":true,"is_video":true}"#;
+            let json = r#"{"is_animated":true,"is_video":true}"#;
             let fmt: Result<StickerFormat, _> = serde_json::from_str(json);
             assert!(fmt.is_err());
         }

From a5f2e5984c037779b03cbb6014ce7871bf112126 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 21:12:07 +0400
Subject: [PATCH 712/755] update changelog and docs

---
 CHANGELOG.md | 7 +++++++
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343b3bfc..2d507d7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+### Added 
+
+- Support for Telegram Bot API [version 6.2](https://core.telegram.org/bots/api#august-12-2022) ([#251][pr251])
+
+[pr251]: https://github.com/teloxide/teloxide-core/pull/251
+
 ### Changed
 
 - **You can now `.await` any `Request`!** ([#249][pr249])
   - `Request` now requires `Self: IntoFuture`
   - There is no need for `AutoSend` anymore
 - MSRV (Minimal Supported Rust Version) was bumped from `1.58.0` to `1.64.0`
+- Refactored `Sticker` and related types ([#251][pr251])
 
 ### Removed
 
diff --git a/README.md b/README.md
index 25e08273..1fc5fc94 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
     <img src="https://img.shields.io/badge/license-MIT-blue.svg">
   </a>
   <a href="https://core.telegram.org/bots/api">
-    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.1%20(inclusively)-green.svg">
+    <img src="https://img.shields.io/badge/API%20coverage-Up%20to%206.2%20(inclusively)-green.svg">
   </a>
   <a href="https://crates.io/crates/teloxide_core">
     <img src="https://img.shields.io/crates/v/teloxide_core.svg">
diff --git a/src/lib.rs b/src/lib.rs
index 5e92048c..9be7e01b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 //! Core part of the [`teloxide`] library.
 //!
 //! This library provides tools for making requests to the [Telegram Bot API]
-//! (Currently, version `6.1` is supported) with ease. The library is fully
+//! (Currently, version `6.2` is supported) with ease. The library is fully
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml

From c640177c20d2fa245fbfc86e9c90a18b128400b2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 29 Sep 2022 13:15:01 +0400
Subject: [PATCH 713/755] supress clippy

---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 9be7e01b..e7c945f3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -86,6 +86,7 @@
 //#![deny(missing_docs)]
 #![warn(clippy::print_stdout, clippy::dbg_macro)]
 #![allow(clippy::let_and_return)]
+#![allow(clippy::bool_assert_comparison)]
 // Unless this becomes machine applicable, I'm not adding 334 #[must_use]s (waffle)
 #![allow(clippy::return_self_not_must_use)]
 // Workaround for CI

From cd10ef00d43f1961ec8f816d57964336e50b874b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 21:18:06 +0400
Subject: [PATCH 714/755] Replace `file_{[unique_]id,size}` fields with
 `FileMeta`

---
 CHANGELOG.md               |  4 ++++
 src/types/animation.rs     | 38 +++++++++++++++++++-------------------
 src/types/audio.rs         | 38 +++++++++++++++++++-------------------
 src/types/document.rs      | 20 +++++++-------------
 src/types/passport_file.rs | 19 ++++++++-----------
 src/types/photo_size.rs    | 28 +++++++++++++---------------
 src/types/video.rs         | 20 +++++++-------------
 src/types/video_note.rs    | 20 +++++++-------------
 src/types/voice.rs         | 20 ++++++++------------
 9 files changed, 92 insertions(+), 115 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343b3bfc..ecf2bbfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- `Animation`, `Audio`, `Document`, `PassportFile`, `PhotoSize`, `Video`, `VideoNote` and `Voice` now contain `FileMeta` instead of its fields ([#253][pr253])
+  - Field access should still work via `Deref` impls
 - **You can now `.await` any `Request`!** ([#249][pr249])
   - `Request` now requires `Self: IntoFuture`
   - There is no need for `AutoSend` anymore
 - MSRV (Minimal Supported Rust Version) was bumped from `1.58.0` to `1.64.0`
 
+[pr253]: https://github.com/teloxide/teloxide-core/pull/253
+
 ### Removed
 
 - Methods for creating `InlineQuery` ([#246][pr244])
diff --git a/src/types/animation.rs b/src/types/animation.rs
index 1d33d5ff..beb032db 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -1,22 +1,20 @@
+use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::PhotoSize;
+use crate::types::{FileMeta, PhotoSize};
 
 /// This object represents an animation file (GIF or H.264/MPEG-4 AVC video
 /// without sound).
 ///
 /// [The official docs](https://core.telegram.org/bots/api#animation).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct Animation {
-    /// An identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the animation file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// A video width as defined by a sender.
     pub width: u32,
@@ -36,14 +34,12 @@ pub struct Animation {
     /// A MIME type of the file as defined by a sender.
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
 
 #[cfg(test)]
 mod tests {
+    use crate::types::FileMeta;
+
     use super::*;
 
     #[test]
@@ -65,21 +61,25 @@ mod tests {
         "mime_type":"video/gif",
         "file_size":6500}"#;
         let expected = Animation {
-            file_id: "id".to_string(),
-            file_unique_id: "".to_string(),
+            file: FileMeta {
+                file_id: "id".to_string(),
+                file_unique_id: "".to_string(),
+                file_size: 6500,
+            },
             width: 320,
             height: 320,
             duration: 59,
             thumb: Some(PhotoSize {
-                file_id: "id".to_string(),
-                file_unique_id: "".to_string(),
+                file: FileMeta {
+                    file_id: "id".to_owned(),
+                    file_unique_id: "".to_owned(),
+                    file_size: 3452,
+                },
                 width: 320,
                 height: 320,
-                file_size: 3452,
             }),
             file_name: Some("some".to_string()),
             mime_type: Some("video/gif".parse().unwrap()),
-            file_size: 6500,
         };
         let actual = serde_json::from_str::<Animation>(json).unwrap();
         assert_eq!(actual, expected)
diff --git a/src/types/audio.rs b/src/types/audio.rs
index cfbfa888..1f17690a 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -1,22 +1,20 @@
+use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::PhotoSize;
+use crate::types::{FileMeta, PhotoSize};
 
 /// This object represents an audio file to be treated as music by the Telegram
 /// clients.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#audio).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct Audio {
-    /// An identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the audio file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// A duration of the audio in seconds as defined by a sender.
     pub duration: u32,
@@ -34,16 +32,14 @@ pub struct Audio {
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
 
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
-
     /// A thumbnail of the album cover to which the music file belongs.
     pub thumb: Option<PhotoSize>,
 }
 
 #[cfg(test)]
 mod tests {
+    use crate::types::FileMeta;
+
     use super::*;
 
     #[test]
@@ -65,19 +61,23 @@ mod tests {
             }
         }"#;
         let expected = Audio {
-            file_id: "id".to_string(),
-            file_unique_id: "".to_string(),
+            file: FileMeta {
+                file_id: "id".to_string(),
+                file_unique_id: "".to_string(),
+                file_size: 123_456,
+            },
             duration: 60,
             performer: Some("Performer".to_string()),
             title: Some("Title".to_string()),
             mime_type: Some("application/zip".parse().unwrap()),
-            file_size: 123_456,
             thumb: Some(PhotoSize {
-                file_id: "id".to_string(),
-                file_unique_id: "".to_string(),
+                file: FileMeta {
+                    file_id: "id".to_owned(),
+                    file_unique_id: "".to_owned(),
+                    file_size: 3452,
+                },
                 width: 320,
                 height: 320,
-                file_size: 3452,
             }),
             file_name: None,
         };
diff --git a/src/types/document.rs b/src/types/document.rs
index d391dee4..035cdd41 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,7 +1,8 @@
+use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::PhotoSize;
+use crate::types::{FileMeta, PhotoSize};
 
 /// This object represents a general file (as opposed to [photos], [voice
 /// messages] and [audio files]).
@@ -12,15 +13,12 @@ use crate::types::PhotoSize;
 /// [voice messages]: https://core.telegram.org/bots/api#voice
 /// [audio files]: https://core.telegram.org/bots/api#audio
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct Document {
-    /// An identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the document file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// A document thumbnail as defined by a sender.
     pub thumb: Option<PhotoSize>,
@@ -31,8 +29,4 @@ pub struct Document {
     /// A MIME type of the file as defined by a sender.
     #[serde(default, with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index 68a62972..935b3567 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -1,24 +1,21 @@
 use chrono::{DateTime, Utc};
+use derive_more::Deref;
 use serde::{Deserialize, Serialize};
 
+use crate::types::FileMeta;
+
 /// This object represents a file uploaded to Telegram Passport.
 ///
 /// Currently all Telegram Passport files are in JPEG format when decrypted and
 /// don't exceed 10MB.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#passportfile).
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct PassportFile {
-    /// Identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
-
-    /// File size in bytes.
-    pub file_size: u32,
+    /// Metadata of the passport file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// Time when the file was uploaded.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 6efc0e0d..5e030bd1 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -1,29 +1,25 @@
+use derive_more::Deref;
 use serde::{Deserialize, Serialize};
 
+use crate::types::FileMeta;
+
 /// This object represents one size of a photo or a [file]/[sticker] thumbnail.
 ///
 /// [file]: crate::types::Document
 /// [sticker]: crate::types::Sticker
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct PhotoSize {
-    /// Identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the photo file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// Photo width.
     pub width: u32,
 
     /// Photo height.
     pub height: u32,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
 
 #[cfg(test)]
@@ -35,11 +31,13 @@ mod tests {
         let json = r#"{"file_id":"id","file_unique_id":"","width":320,"height":320,
                              "file_size":3452}"#;
         let expected = PhotoSize {
-            file_id: "id".to_string(),
-            file_unique_id: "".to_string(),
+            file: FileMeta {
+                file_id: "id".to_owned(),
+                file_unique_id: "".to_owned(),
+                file_size: 3452,
+            },
             width: 320,
             height: 320,
-            file_size: 3452,
         };
         let actual = serde_json::from_str::<PhotoSize>(json).unwrap();
         assert_eq!(actual, expected);
diff --git a/src/types/video.rs b/src/types/video.rs
index 3cb11ab1..e4bc736b 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -1,21 +1,19 @@
+use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
-use crate::types::PhotoSize;
+use crate::types::{FileMeta, PhotoSize};
 
 /// This object represents a video file.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#video).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct Video {
-    /// Identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the video file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// Video width as defined by sender.
     pub width: u32,
@@ -35,8 +33,4 @@ pub struct Video {
     /// Mime type of a file as defined by sender.
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index 980f15c9..9b82c643 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -1,6 +1,7 @@
+use derive_more::Deref;
 use serde::{Deserialize, Serialize};
 
-use crate::types::PhotoSize;
+use crate::types::{FileMeta, PhotoSize};
 
 /// This object represents a [video message] (available in Telegram apps as of
 /// [v.4.0]).
@@ -10,15 +11,12 @@ use crate::types::PhotoSize;
 /// [video message]: https://telegram.org/blog/video-messages-and-telescope
 /// [v4.0]: https://telegram.org/blog/video-messages-and-telescope
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct VideoNote {
-    /// Identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the video note file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// Video width and height (diameter of the video message) as defined by
     /// sender.
@@ -29,8 +27,4 @@ pub struct VideoNote {
 
     /// Video thumbnail.
     pub thumb: Option<PhotoSize>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }
diff --git a/src/types/voice.rs b/src/types/voice.rs
index e44cfc7c..f124e08d 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -1,19 +1,19 @@
+use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
+use crate::types::FileMeta;
+
 /// This object represents a voice note.
 ///
 /// [The official docs](https://core.telegram.org/bots/api#voice).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
 pub struct Voice {
-    /// Identifier for this file.
-    pub file_id: String,
-
-    /// Unique identifier for this file, which is supposed to be the same over
-    /// time and for different bots. Can't be used to download or reuse the
-    /// file.
-    pub file_unique_id: String,
+    /// Metadata of the voice file.
+    #[deref]
+    #[serde(flatten)]
+    pub file: FileMeta,
 
     /// Duration of the audio in seconds as defined by sender.
     pub duration: u32,
@@ -21,8 +21,4 @@ pub struct Voice {
     /// MIME type of the file as defined by sender.
     #[serde(with = "crate::types::non_telegram_types::mime::opt_deser")]
     pub mime_type: Option<Mime>,
-
-    /// File size in bytes.
-    #[serde(default = "crate::types::file::file_size_fallback")]
-    pub file_size: u32,
 }

From 534d478973cb03892c7c56cf75db7683c823ccc3 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 29 Sep 2022 14:11:51 +0400
Subject: [PATCH 715/755] Remove the `authors` field from `Cargo.toml`

---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 91213f15..83268b75 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,6 @@
 name = "teloxide-macros"
 version = "0.6.3"
 description = "The teloxide's procedural macros"
-authors = ["p0lunin <dmytro.polunin@gmail.com>"]
 license = "MIT"
 edition = "2018"
 

From 1b9092c7042e8cfdfc2734ce57c17ea85e3e2f2f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 25 Sep 2022 21:56:28 +0400
Subject: [PATCH 716/755] Start using `MessageId` in APIs

---
 src/types/message.rs        | 22 +++++++++++++---------
 src/types/message_id.rs     | 24 ++++++++++++++++++++----
 src/types/target_message.rs | 12 +++++++++---
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/types/message.rs b/src/types/message.rs
index d42835ae..54da04d9 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -7,7 +7,7 @@ use url::Url;
 use crate::types::{
     Animation, Audio, BareChatId, Chat, ChatId, Contact, Dice, Document, Game,
     InlineKeyboardMarkup, Invoice, Location, MessageAutoDeleteTimerChanged, MessageEntity,
-    MessageEntityRef, PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker,
+    MessageEntityRef, MessageId, PassportData, PhotoSize, Poll, ProximityAlertTriggered, Sticker,
     SuccessfulPayment, True, User, Venue, Video, VideoChatEnded, VideoChatParticipantsInvited,
     VideoChatScheduled, VideoChatStarted, VideoNote, Voice, WebAppData,
 };
@@ -18,8 +18,8 @@ use crate::types::{
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Message {
     /// Unique message identifier inside this chat.
-    #[serde(rename = "message_id")]
-    pub id: i32,
+    #[serde(flatten)]
+    pub id: MessageId,
 
     /// Date the message was sent in Unix time.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
@@ -1158,7 +1158,11 @@ impl Message {
     /// [`url`]: Message::url
     #[track_caller]
     #[must_use]
-    pub fn url_of(chat_id: ChatId, chat_username: Option<&str>, message_id: i32) -> Option<Url> {
+    pub fn url_of(
+        chat_id: ChatId,
+        chat_username: Option<&str>,
+        message_id: MessageId,
+    ) -> Option<Url> {
         use BareChatId::*;
 
         // Note: `t.me` links use bare chat ids
@@ -1181,10 +1185,10 @@ impl Message {
         let url = match chat_username {
             // If it's public group (i.e. not DM, not private group), we can produce
             // "normal" t.me link (accessible to everyone).
-            Some(username) => format!("https://t.me/{0}/{1}", username, message_id),
+            Some(username) => format!("https://t.me/{0}/{1}", username, message_id.0),
             // For private supergroups and channels we produce "private" t.me/c links. These are
             // only accessible to the group members.
-            None => format!("https://t.me/c/{0}/{1}", chat_id, message_id),
+            None => format!("https://t.me/c/{0}/{1}", chat_id, message_id.0),
         };
 
         // UNWRAP:
@@ -1276,11 +1280,11 @@ impl Message {
     pub fn url_in_thread_of(
         chat_id: ChatId,
         chat_username: Option<&str>,
-        thread_starter_msg_id: i32,
-        message_id: i32,
+        thread_starter_msg_id: MessageId,
+        message_id: MessageId,
     ) -> Option<Url> {
         Self::url_of(chat_id, chat_username, message_id).map(|mut url| {
-            url.set_query(Some(&format!("thread={thread_starter_msg_id}")));
+            url.set_query(Some(&format!("thread={}", thread_starter_msg_id.0)));
             url
         })
     }
diff --git a/src/types/message_id.rs b/src/types/message_id.rs
index fe3eb9ab..88a90902 100644
--- a/src/types/message_id.rs
+++ b/src/types/message_id.rs
@@ -1,8 +1,24 @@
 use serde::{Deserialize, Serialize};
 
-/// This object represents a unique message identifier.
+/// A unique message identifier.
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
-pub struct MessageId {
-    /// Unique message identifier
-    pub message_id: i32,
+pub struct MessageId(#[serde(rename = "message_id")] pub i32);
+
+#[cfg(test)]
+mod tests {
+    use crate::types::MessageId;
+
+    #[test]
+    fn smoke_deser() {
+        let json = r#"{"message_id":123}"#;
+        let mid: MessageId = serde_json::from_str(json).unwrap();
+        assert_eq!(mid, MessageId(123));
+    }
+
+    #[test]
+    fn smoke_ser() {
+        let mid: MessageId = MessageId(123);
+        let json = serde_json::to_string(&mid).unwrap();
+        assert_eq!(json, r#"{"message_id":123}"#);
+    }
 }
diff --git a/src/types/target_message.rs b/src/types/target_message.rs
index 66f2409e..e851be06 100644
--- a/src/types/target_message.rs
+++ b/src/types/target_message.rs
@@ -1,4 +1,4 @@
-use crate::types::Recipient;
+use crate::types::{MessageId, Recipient};
 
 use serde::{Deserialize, Serialize};
 
@@ -6,8 +6,14 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum TargetMessage {
-    Common { chat_id: Recipient, message_id: i32 },
-    Inline { inline_message_id: String },
+    Common {
+        chat_id: Recipient,
+        #[serde(flatten)]
+        message_id: MessageId,
+    },
+    Inline {
+        inline_message_id: String,
+    },
 }
 
 impl From<String> for TargetMessage {

From f5a3b55435f314f48019e1f7b4973739d4a114b5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 26 Sep 2022 22:59:58 +0400
Subject: [PATCH 717/755] Use typed `MessageId` in methods

---
 schema.ron                                 | 56 +++++++++++-----------
 src/adaptors/erased.rs                     | 48 +++++++++----------
 src/bot/api.rs                             | 36 +++++++++-----
 src/local_macros.rs                        | 48 +++++++++----------
 src/payloads/codegen.rs                    |  9 +++-
 src/payloads/copy_message.rs               |  6 ++-
 src/payloads/delete_message.rs             |  5 +-
 src/payloads/edit_message_caption.rs       |  5 +-
 src/payloads/edit_message_live_location.rs |  5 +-
 src/payloads/edit_message_media.rs         |  5 +-
 src/payloads/edit_message_reply_markup.rs  |  5 +-
 src/payloads/edit_message_text.rs          |  5 +-
 src/payloads/forward_message.rs            |  5 +-
 src/payloads/pin_chat_message.rs           |  5 +-
 src/payloads/send_animation.rs             |  7 ++-
 src/payloads/send_audio.rs                 |  7 ++-
 src/payloads/send_contact.rs               |  5 +-
 src/payloads/send_dice.rs                  |  5 +-
 src/payloads/send_document.rs              |  7 ++-
 src/payloads/send_location.rs              |  5 +-
 src/payloads/send_media_group.rs           |  5 +-
 src/payloads/send_message.rs               |  5 +-
 src/payloads/send_photo.rs                 |  7 ++-
 src/payloads/send_poll.rs                  |  7 ++-
 src/payloads/send_venue.rs                 |  5 +-
 src/payloads/send_video.rs                 |  7 ++-
 src/payloads/send_video_note.rs            |  5 +-
 src/payloads/send_voice.rs                 |  7 ++-
 src/payloads/set_game_score.rs             |  5 +-
 src/payloads/stop_message_live_location.rs |  5 +-
 src/payloads/stop_poll.rs                  |  5 +-
 src/payloads/unpin_chat_message.rs         |  5 +-
 src/requests/requester.rs                  | 33 ++++++++-----
 src/types.rs                               | 11 +++++
 src/types/message.rs                       | 10 ++--
 src/types/message_id.rs                    |  2 +-
 src/types/update.rs                        |  4 +-
 37 files changed, 243 insertions(+), 164 deletions(-)

diff --git a/schema.ron b/schema.ron
index b5d6d0c2..dfe1e459 100644
--- a/schema.ron
+++ b/schema.ron
@@ -268,7 +268,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -324,7 +324,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32, 
+                    ty: RawTy("MessageId"), 
                     descr: Doc(md: "Message identifier in the chat specified in _from\\_chat\\_id_")
                 ),
             ],
@@ -351,7 +351,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32, 
+                    ty: RawTy("MessageId"), 
                     descr: Doc(md: "Message identifier in the chat specified in _from\\_chat\\_id_")
                 ),
                 Param(
@@ -387,7 +387,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -464,7 +464,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -567,7 +567,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -657,7 +657,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -765,7 +765,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -866,7 +866,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -947,7 +947,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1027,7 +1027,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1084,7 +1084,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1157,7 +1157,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1195,7 +1195,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32, 
+                    ty: RawTy("MessageId"), 
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -1311,7 +1311,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32, 
+                    ty: RawTy("MessageId"), 
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -1450,7 +1450,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1524,7 +1524,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1638,7 +1638,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -1694,7 +1694,7 @@ Schema(
                 ),
                 Param(
                     name: "reply_to_message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "If the message is a reply, ID of the original message")
                 ),
                 Param(
@@ -2311,7 +2311,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of a message to pin"),
                 ),
                 Param(
@@ -2335,7 +2335,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: Option(i32),
+                    ty: Option(RawTy("MessageId")),
                     descr: Doc(md: "Identifier of a message to unpin. If not specified, the most recent pinned message (by sending date) will be unpinned.")
                 ),
             ],
@@ -2760,7 +2760,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -2860,7 +2860,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -2948,7 +2948,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -3009,7 +3009,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -3059,7 +3059,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
                 Param(
@@ -3086,7 +3086,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i32,
+                    ty: RawTy("MessageId"),
                     descr: Doc(md: "Identifier of the message to delete")
                 ),  
             ],
@@ -3786,7 +3786,7 @@ Schema(
                 ),
                 Param(
                     name: "message_id",
-                    ty: i64, 
+                    ty: RawTy("MessageId"), 
                     descr: Doc(md: "Identifier of the message to edit")
                 ),
             ],
diff --git a/src/adaptors/erased.rs b/src/adaptors/erased.rs
index aee6c21c..1cac5f5c 100644
--- a/src/adaptors/erased.rs
+++ b/src/adaptors/erased.rs
@@ -312,14 +312,14 @@ trait ErasableRequester<'a> {
         &self,
         chat_id: Recipient,
         from_chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, ForwardMessage, Self::Err>;
 
     fn copy_message(
         &self,
         chat_id: Recipient,
         from_chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, CopyMessage, Self::Err>;
 
     fn send_photo(
@@ -380,7 +380,7 @@ trait ErasableRequester<'a> {
     fn edit_message_live_location(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, EditMessageLiveLocation, Self::Err>;
@@ -395,7 +395,7 @@ trait ErasableRequester<'a> {
     fn stop_message_live_location(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, StopMessageLiveLocation, Self::Err>;
@@ -562,7 +562,7 @@ trait ErasableRequester<'a> {
     fn pin_chat_message(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, PinChatMessage, Self::Err>;
 
     fn unpin_chat_message(
@@ -652,7 +652,7 @@ trait ErasableRequester<'a> {
     fn edit_message_text(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         text: String,
     ) -> ErasedRequest<'a, EditMessageText, Self::Err>;
 
@@ -665,7 +665,7 @@ trait ErasableRequester<'a> {
     fn edit_message_caption(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, EditMessageCaption, Self::Err>;
 
     fn edit_message_caption_inline(
@@ -676,7 +676,7 @@ trait ErasableRequester<'a> {
     fn edit_message_media(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         media: InputMedia,
     ) -> ErasedRequest<'a, EditMessageMedia, Self::Err>;
 
@@ -689,7 +689,7 @@ trait ErasableRequester<'a> {
     fn edit_message_reply_markup(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err>;
 
     fn edit_message_reply_markup_inline(
@@ -700,13 +700,13 @@ trait ErasableRequester<'a> {
     fn stop_poll(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, StopPoll, Self::Err>;
 
     fn delete_message(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, DeleteMessage, Self::Err>;
 
     fn send_sticker(
@@ -815,7 +815,7 @@ trait ErasableRequester<'a> {
         user_id: UserId,
         score: u64,
         chat_id: u32,
-        message_id: i64,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, SetGameScore, Self::Err>;
 
     fn set_game_score_inline(
@@ -878,7 +878,7 @@ where
         &self,
         chat_id: Recipient,
         from_chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, ForwardMessage, Self::Err> {
         Requester::forward_message(self, chat_id, from_chat_id, message_id).erase()
     }
@@ -887,7 +887,7 @@ where
         &self,
         chat_id: Recipient,
         from_chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, CopyMessage, Self::Err> {
         Requester::copy_message(self, chat_id, from_chat_id, message_id).erase()
     }
@@ -968,7 +968,7 @@ where
     fn edit_message_live_location(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, EditMessageLiveLocation, Self::Err> {
@@ -989,7 +989,7 @@ where
     fn stop_message_live_location(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> ErasedRequest<'a, StopMessageLiveLocation, Self::Err> {
@@ -1214,7 +1214,7 @@ where
     fn pin_chat_message(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, PinChatMessage, Self::Err> {
         Requester::pin_chat_message(self, chat_id, message_id).erase()
     }
@@ -1346,7 +1346,7 @@ where
     fn edit_message_text(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         text: String,
     ) -> ErasedRequest<'a, EditMessageText, Self::Err> {
         Requester::edit_message_text(self, chat_id, message_id, text).erase()
@@ -1363,7 +1363,7 @@ where
     fn edit_message_caption(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, EditMessageCaption, Self::Err> {
         Requester::edit_message_caption(self, chat_id, message_id).erase()
     }
@@ -1378,7 +1378,7 @@ where
     fn edit_message_media(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
         media: InputMedia,
     ) -> ErasedRequest<'a, EditMessageMedia, Self::Err> {
         Requester::edit_message_media(self, chat_id, message_id, media).erase()
@@ -1395,7 +1395,7 @@ where
     fn edit_message_reply_markup(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, EditMessageReplyMarkup, Self::Err> {
         Requester::edit_message_reply_markup(self, chat_id, message_id).erase()
     }
@@ -1410,7 +1410,7 @@ where
     fn stop_poll(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, StopPoll, Self::Err> {
         Requester::stop_poll(self, chat_id, message_id).erase()
     }
@@ -1418,7 +1418,7 @@ where
     fn delete_message(
         &self,
         chat_id: Recipient,
-        message_id: i32,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, DeleteMessage, Self::Err> {
         Requester::delete_message(self, chat_id, message_id).erase()
     }
@@ -1576,7 +1576,7 @@ where
         user_id: UserId,
         score: u64,
         chat_id: u32,
-        message_id: i64,
+        message_id: MessageId,
     ) -> ErasedRequest<'a, SetGameScore, Self::Err> {
         Requester::set_game_score(self, user_id, score, chat_id, message_id).erase()
     }
diff --git a/src/bot/api.rs b/src/bot/api.rs
index d78cad73..f0fbfa78 100644
--- a/src/bot/api.rs
+++ b/src/bot/api.rs
@@ -6,7 +6,7 @@ use crate::{
     requests::{JsonRequest, MultipartRequest},
     types::{
         BotCommand, ChatId, ChatPermissions, InlineQueryResult, InputFile, InputMedia,
-        InputSticker, LabeledPrice, Recipient, UserId,
+        InputSticker, LabeledPrice, MessageId, Recipient, UserId,
     },
     Bot,
 };
@@ -60,7 +60,7 @@ impl Requester for Bot {
         &self,
         chat_id: C,
         from_chat_id: F,
-        message_id: i32,
+        message_id: MessageId,
     ) -> Self::ForwardMessage
     where
         C: Into<Recipient>,
@@ -168,7 +168,7 @@ impl Requester for Bot {
     fn edit_message_live_location<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> Self::EditMessageLiveLocation
@@ -203,7 +203,7 @@ impl Requester for Bot {
     fn stop_message_live_location<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> Self::StopMessageLiveLocation
@@ -564,7 +564,7 @@ impl Requester for Bot {
 
     type PinChatMessage = JsonRequest<payloads::PinChatMessage>;
 
-    fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
+    fn pin_chat_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::PinChatMessage
     where
         C: Into<Recipient>,
     {
@@ -756,7 +756,12 @@ impl Requester for Bot {
 
     type EditMessageText = JsonRequest<payloads::EditMessageText>;
 
-    fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText
+    fn edit_message_text<C, T>(
+        &self,
+        chat_id: C,
+        message_id: MessageId,
+        text: T,
+    ) -> Self::EditMessageText
     where
         C: Into<Recipient>,
         T: Into<String>,
@@ -786,7 +791,7 @@ impl Requester for Bot {
 
     type EditMessageCaption = JsonRequest<payloads::EditMessageCaption>;
 
-    fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
+    fn edit_message_caption<C>(&self, chat_id: C, message_id: MessageId) -> Self::EditMessageCaption
     where
         C: Into<Recipient>,
     {
@@ -813,7 +818,7 @@ impl Requester for Bot {
     fn edit_message_media<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         media: InputMedia,
     ) -> Self::EditMessageMedia
     where
@@ -846,7 +851,7 @@ impl Requester for Bot {
     fn edit_message_reply_markup<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
     ) -> Self::EditMessageReplyMarkup
     where
         C: Into<Recipient>,
@@ -874,7 +879,7 @@ impl Requester for Bot {
 
     type StopPoll = JsonRequest<payloads::StopPoll>;
 
-    fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
+    fn stop_poll<C>(&self, chat_id: C, message_id: MessageId) -> Self::StopPoll
     where
         C: Into<Recipient>,
     {
@@ -883,7 +888,7 @@ impl Requester for Bot {
 
     type DeleteMessage = JsonRequest<payloads::DeleteMessage>;
 
-    fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
+    fn delete_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::DeleteMessage
     where
         C: Into<Recipient>,
     {
@@ -1139,7 +1144,7 @@ impl Requester for Bot {
         user_id: UserId,
         score: u64,
         chat_id: u32,
-        message_id: i64,
+        message_id: MessageId,
     ) -> Self::SetGameScore {
         Self::SetGameScore::new(
             self.clone(),
@@ -1190,7 +1195,12 @@ impl Requester for Bot {
 
     type CopyMessage = JsonRequest<payloads::CopyMessage>;
 
-    fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
+    fn copy_message<C, F>(
+        &self,
+        chat_id: C,
+        from_chat_id: F,
+        message_id: MessageId,
+    ) -> Self::CopyMessage
     where
         C: Into<Recipient>,
         F: Into<Recipient>,
diff --git a/src/local_macros.rs b/src/local_macros.rs
index 56659c5e..8ab0370f 100644
--- a/src/local_macros.rs
+++ b/src/local_macros.rs
@@ -479,19 +479,19 @@ macro_rules! requester_forward {
     (@method forward_message $body:ident $ty:ident) => {
         type ForwardMessage = $ty![ForwardMessage];
 
-        fn forward_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::ForwardMessage where C: Into<Recipient>,
+        fn forward_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: MessageId) -> Self::ForwardMessage where C: Into<Recipient>,
         F: Into<Recipient> {
             let this = self;
-            $body!(forward_message this (chat_id: C, from_chat_id: F, message_id: i32))
+            $body!(forward_message this (chat_id: C, from_chat_id: F, message_id: MessageId))
         }
     };
     (@method copy_message $body:ident $ty:ident) => {
         type CopyMessage = $ty![CopyMessage];
 
-        fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage where C: Into<Recipient>,
+        fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: MessageId) -> Self::CopyMessage where C: Into<Recipient>,
         F: Into<Recipient> {
             let this = self;
-            $body!(copy_message this (chat_id: C, from_chat_id: F, message_id: i32))
+            $body!(copy_message this (chat_id: C, from_chat_id: F, message_id: MessageId))
         }
     };
     (@method send_photo $body:ident $ty:ident) => {
@@ -570,9 +570,9 @@ macro_rules! requester_forward {
     (@method edit_message_live_location $body:ident $ty:ident) => {
         type EditMessageLiveLocation = $ty![EditMessageLiveLocation];
 
-        fn edit_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocation where C: Into<Recipient> {
+        fn edit_message_live_location<C>(&self, chat_id: C, message_id: MessageId, latitude: f64, longitude: f64) -> Self::EditMessageLiveLocation where C: Into<Recipient> {
             let this = self;
-            $body!(edit_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
+            $body!(edit_message_live_location this (chat_id: C, message_id: MessageId, latitude: f64, longitude: f64))
         }
     };
     (@method edit_message_live_location_inline $body:ident $ty:ident) => {
@@ -586,9 +586,9 @@ macro_rules! requester_forward {
     (@method stop_message_live_location $body:ident $ty:ident) => {
         type StopMessageLiveLocation = $ty![StopMessageLiveLocation];
 
-        fn stop_message_live_location<C>(&self, chat_id: C, message_id: i32, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocation where C: Into<Recipient> {
+        fn stop_message_live_location<C>(&self, chat_id: C, message_id: MessageId, latitude: f64, longitude: f64) -> Self::StopMessageLiveLocation where C: Into<Recipient> {
             let this = self;
-            $body!(stop_message_live_location this (chat_id: C, message_id: i32, latitude: f64, longitude: f64))
+            $body!(stop_message_live_location this (chat_id: C, message_id: MessageId, latitude: f64, longitude: f64))
         }
     };
     (@method stop_message_live_location_inline $body:ident $ty:ident) => {
@@ -822,9 +822,9 @@ macro_rules! requester_forward {
     (@method pin_chat_message $body:ident $ty:ident) => {
         type PinChatMessage = $ty![PinChatMessage];
 
-        fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage where C: Into<Recipient> {
+        fn pin_chat_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::PinChatMessage where C: Into<Recipient> {
             let this = self;
-            $body!(pin_chat_message this (chat_id: C, message_id: i32))
+            $body!(pin_chat_message this (chat_id: C, message_id: MessageId))
         }
     };
     (@method unpin_chat_message $body:ident $ty:ident) => {
@@ -992,10 +992,10 @@ macro_rules! requester_forward {
     (@method edit_message_text $body:ident $ty:ident) => {
         type EditMessageText = $ty![EditMessageText];
 
-        fn edit_message_text<C, T>(&self, chat_id: C, message_id: i32, text: T) -> Self::EditMessageText where C: Into<Recipient>,
+        fn edit_message_text<C, T>(&self, chat_id: C, message_id: MessageId, text: T) -> Self::EditMessageText where C: Into<Recipient>,
         T: Into<String> {
             let this = self;
-            $body!(edit_message_text this (chat_id: C, message_id: i32, text: T))
+            $body!(edit_message_text this (chat_id: C, message_id: MessageId, text: T))
         }
     };
     (@method edit_message_text_inline $body:ident $ty:ident) => {
@@ -1010,9 +1010,9 @@ macro_rules! requester_forward {
     (@method edit_message_caption $body:ident $ty:ident) => {
         type EditMessageCaption = $ty![EditMessageCaption];
 
-        fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption where C: Into<Recipient> {
+        fn edit_message_caption<C>(&self, chat_id: C, message_id: MessageId) -> Self::EditMessageCaption where C: Into<Recipient> {
             let this = self;
-            $body!(edit_message_caption this (chat_id: C, message_id: i32))
+            $body!(edit_message_caption this (chat_id: C, message_id: MessageId))
         }
     };
     (@method edit_message_caption_inline $body:ident $ty:ident) => {
@@ -1026,9 +1026,9 @@ macro_rules! requester_forward {
     (@method edit_message_media $body:ident $ty:ident) => {
         type EditMessageMedia = $ty![EditMessageMedia];
 
-        fn edit_message_media<C>(&self, chat_id: C, message_id: i32, media: InputMedia) -> Self::EditMessageMedia where C: Into<Recipient> {
+        fn edit_message_media<C>(&self, chat_id: C, message_id: MessageId, media: InputMedia) -> Self::EditMessageMedia where C: Into<Recipient> {
             let this = self;
-            $body!(edit_message_media this (chat_id: C, message_id: i32, media: InputMedia))
+            $body!(edit_message_media this (chat_id: C, message_id: MessageId, media: InputMedia))
         }
     };
     (@method edit_message_media_inline $body:ident $ty:ident) => {
@@ -1042,9 +1042,9 @@ macro_rules! requester_forward {
     (@method edit_message_reply_markup $body:ident $ty:ident) => {
         type EditMessageReplyMarkup = $ty![EditMessageReplyMarkup];
 
-        fn edit_message_reply_markup<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageReplyMarkup where C: Into<Recipient> {
+        fn edit_message_reply_markup<C>(&self, chat_id: C, message_id: MessageId) -> Self::EditMessageReplyMarkup where C: Into<Recipient> {
             let this = self;
-            $body!(edit_message_reply_markup this (chat_id: C, message_id: i32))
+            $body!(edit_message_reply_markup this (chat_id: C, message_id: MessageId))
         }
     };
     (@method edit_message_reply_markup_inline $body:ident $ty:ident) => {
@@ -1058,17 +1058,17 @@ macro_rules! requester_forward {
     (@method stop_poll $body:ident $ty:ident) => {
         type StopPoll = $ty![StopPoll];
 
-        fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll where C: Into<Recipient> {
+        fn stop_poll<C>(&self, chat_id: C, message_id: MessageId) -> Self::StopPoll where C: Into<Recipient> {
             let this = self;
-            $body!(stop_poll this (chat_id: C, message_id: i32))
+            $body!(stop_poll this (chat_id: C, message_id: MessageId))
         }
     };
     (@method delete_message $body:ident $ty:ident) => {
         type DeleteMessage = $ty![DeleteMessage];
 
-        fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage where C: Into<Recipient> {
+        fn delete_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::DeleteMessage where C: Into<Recipient> {
             let this = self;
-            $body!(delete_message this (chat_id: C, message_id: i32))
+            $body!(delete_message this (chat_id: C, message_id: MessageId))
         }
     };
     (@method send_sticker $body:ident $ty:ident) => {
@@ -1208,9 +1208,9 @@ macro_rules! requester_forward {
     (@method set_game_score $body:ident $ty:ident) => {
         type SetGameScore = $ty![SetGameScore];
 
-        fn set_game_score(&self, user_id: UserId, score: u64, chat_id: u32, message_id: i64) -> Self::SetGameScore {
+        fn set_game_score(&self, user_id: UserId, score: u64, chat_id: u32, message_id: MessageId) -> Self::SetGameScore {
             let this = self;
-            $body!(set_game_score this (user_id: UserId, score: u64, chat_id: u32, message_id: i64))
+            $body!(set_game_score this (user_id: UserId, score: u64, chat_id: u32, message_id: MessageId))
         }
     };
     (@method set_game_score_inline $body:ident $ty:ident) => {
diff --git a/src/payloads/codegen.rs b/src/payloads/codegen.rs
index 6cc60bad..0032f9a5 100644
--- a/src/payloads/codegen.rs
+++ b/src/payloads/codegen.rs
@@ -222,8 +222,15 @@ fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
             let field = &param.name;
             let ty = &param.ty;
             let flatten = match ty {
+                Type::RawTy(s) if s == "MessageId" && field == "reply_to_message_id" => {
+                    "\n            #[serde(serialize_with = \
+                     \"crate::types::serialize_reply_to_message_id\")]"
+                }
                 Type::RawTy(s)
-                    if s == "InputSticker" || s == "TargetMessage" || s == "StickerType" =>
+                    if s == "MessageId"
+                        || s == "InputSticker"
+                        || s == "TargetMessage"
+                        || s == "StickerType" =>
                 {
                     "\n            #[serde(flatten)]"
                 }
diff --git a/src/payloads/copy_message.rs b/src/payloads/copy_message.rs
index 39f1688c..b614b79e 100644
--- a/src/payloads/copy_message.rs
+++ b/src/payloads/copy_message.rs
@@ -16,7 +16,8 @@ impl_payload! {
             /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
             pub from_chat_id: Recipient [into],
             /// Message identifier in the chat specified in _from\_chat\_id_
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// New caption for media, 0-1024 characters after entities parsing. If not specified, the original caption is kept
@@ -34,7 +35,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/delete_message.rs b/src/payloads/delete_message.rs
index 4214ad7b..8503c4dd 100644
--- a/src/payloads/delete_message.rs
+++ b/src/payloads/delete_message.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{MessageId, Recipient, True};
 
 impl_payload! {
     /// Use this method to delete a message, including service messages, with the following limitations:
@@ -21,7 +21,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to delete
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
     }
 }
diff --git a/src/payloads/edit_message_caption.rs b/src/payloads/edit_message_caption.rs
index f31cce35..4f993098 100644
--- a/src/payloads/edit_message_caption.rs
+++ b/src/payloads/edit_message_caption.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
+use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, MessageId, ParseMode, Recipient};
 
 impl_payload! {
     /// Use this method to edit captions of messages. On success, the edited Message is returned.
@@ -14,7 +14,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// New caption of the message, 0-1024 characters after entities parsing
diff --git a/src/payloads/edit_message_live_location.rs b/src/payloads/edit_message_live_location.rs
index c9400abd..b8df0e5a 100644
--- a/src/payloads/edit_message_live_location.rs
+++ b/src/payloads/edit_message_live_location.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
@@ -16,7 +16,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
             /// Latitude of new location
             pub latitude: f64,
             /// Longitude of new location
diff --git a/src/payloads/edit_message_media.rs b/src/payloads/edit_message_media.rs
index 9cbba6aa..917a13b7 100644
--- a/src/payloads/edit_message_media.rs
+++ b/src/payloads/edit_message_media.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, InputMedia, Message, Recipient};
+use crate::types::{InlineKeyboardMarkup, InputMedia, Message, MessageId, Recipient};
 
 impl_payload! {
     /// Use this method to edit animation, audio, document, photo, or video messages. If a message is a part of a message album, then it can be edited only to a photo or a video. Otherwise, message type can be changed arbitrarily. When inline message is edited, new file can't be uploaded. Use previously uploaded file via its file_id or specify a URL. On success, the edited Message is returned.
@@ -14,7 +14,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
             /// A JSON-serialized object for a new media content of the message
             pub media: InputMedia,
         }
diff --git a/src/payloads/edit_message_reply_markup.rs b/src/payloads/edit_message_reply_markup.rs
index a6402bd3..dd64252d 100644
--- a/src/payloads/edit_message_reply_markup.rs
+++ b/src/payloads/edit_message_reply_markup.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, Message, Recipient};
+use crate::types::{InlineKeyboardMarkup, Message, MessageId, Recipient};
 
 impl_payload! {
     /// Use this method to edit only the reply markup of messages. On success, the edited Message is returned.
@@ -14,7 +14,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// A JSON-serialized object for an [inline keyboard].
diff --git a/src/payloads/edit_message_text.rs b/src/payloads/edit_message_text.rs
index 18adde6f..ba4329c5 100644
--- a/src/payloads/edit_message_text.rs
+++ b/src/payloads/edit_message_text.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, ParseMode, Recipient};
+use crate::types::{InlineKeyboardMarkup, Message, MessageEntity, MessageId, ParseMode, Recipient};
 
 impl_payload! {
     /// Use this method to edit text and [games] messages. On success, the edited Message is returned.
@@ -16,7 +16,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
             /// New text of the message, 1-4096 characters after entities parsing
             pub text: String [into],
         }
diff --git a/src/payloads/forward_message.rs b/src/payloads/forward_message.rs
index 762ff542..1e4c079c 100644
--- a/src/payloads/forward_message.rs
+++ b/src/payloads/forward_message.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient};
+use crate::types::{Message, MessageId, Recipient};
 
 impl_payload! {
     /// Use this method to forward messages of any kind. On success, the sent [`Message`] is returned.
@@ -16,7 +16,8 @@ impl_payload! {
             /// Unique identifier for the chat where the original message was sent (or channel username in the format `@channelusername`)
             pub from_chat_id: Recipient [into],
             /// Message identifier in the chat specified in _from\_chat\_id_
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// Sends the message [silently]. Users will receive a notification with no sound.
diff --git a/src/payloads/pin_chat_message.rs b/src/payloads/pin_chat_message.rs
index 960ea24c..fd217bac 100644
--- a/src/payloads/pin_chat_message.rs
+++ b/src/payloads/pin_chat_message.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{MessageId, Recipient, True};
 
 impl_payload! {
     /// Use this method to pin a message in a group, a supergroup, or a channel. The bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in the supergroup or 'can_edit_messages' admin right in the channel. Returns _True_ on success.
@@ -12,7 +12,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Identifier of a message to pin
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// Pass True, if it is not necessary to send a notification to all chat members about the new pinned message. Notifications are always disabled in channels.
diff --git a/src/payloads/send_animation.rs b/src/payloads/send_animation.rs
index 4082b046..118e1044 100644
--- a/src/payloads/send_animation.rs
+++ b/src/payloads/send_animation.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = animation, thumb]
@@ -45,7 +47,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_audio.rs b/src/payloads/send_audio.rs
index 7f5e4adb..05b5c6ca 100644
--- a/src/payloads/send_audio.rs
+++ b/src/payloads/send_audio.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = audio, thumb]
@@ -48,7 +50,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_contact.rs b/src/payloads/send_contact.rs
index 06632a21..d96b1faa 100644
--- a/src/payloads/send_contact.rs
+++ b/src/payloads/send_contact.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
@@ -32,7 +32,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_dice.rs b/src/payloads/send_dice.rs
index a7b74fe3..5a673cb9 100644
--- a/src/payloads/send_dice.rs
+++ b/src/payloads/send_dice.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{DiceEmoji, Message, Recipient, ReplyMarkup};
+use crate::types::{DiceEmoji, Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send an animated emoji that will display a random value. On success, the sent [`Message`] is returned.
@@ -24,7 +24,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_document.rs b/src/payloads/send_document.rs
index 1ee434f2..aaa684de 100644
--- a/src/payloads/send_document.rs
+++ b/src/payloads/send_document.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = document, thumb]
@@ -41,7 +43,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_location.rs b/src/payloads/send_location.rs
index 556105b9..69a84cee 100644
--- a/src/payloads/send_location.rs
+++ b/src/payloads/send_location.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send point on the map. On success, the sent [`Message`] is returned.
@@ -36,7 +36,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_media_group.rs b/src/payloads/send_media_group.rs
index db762c50..9d2b14fa 100644
--- a/src/payloads/send_media_group.rs
+++ b/src/payloads/send_media_group.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InputMedia, Message, Recipient};
+use crate::types::{InputMedia, Message, MessageId, Recipient};
 
 impl_payload! {
     /// Use this method to send a group of photos, videos, documents or audios as an album. Documents and audio files can be only grouped in an album with messages of the same type. On success, an array of [`Message`]s that were sent is returned.
@@ -24,7 +24,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
         }
diff --git a/src/payloads/send_message.rs b/src/payloads/send_message.rs
index fa0c2bbf..20899142 100644
--- a/src/payloads/send_message.rs
+++ b/src/payloads/send_message.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send text messages. On success, the sent [`Message`] is returned.
@@ -32,7 +32,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_photo.rs b/src/payloads/send_photo.rs
index 782d7d27..50af80dd 100644
--- a/src/payloads/send_photo.rs
+++ b/src/payloads/send_photo.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = photo]
@@ -35,7 +37,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_poll.rs b/src/payloads/send_poll.rs
index 920ddad0..bdc1f7f7 100644
--- a/src/payloads/send_poll.rs
+++ b/src/payloads/send_poll.rs
@@ -3,7 +3,9 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 
-use crate::types::{Message, MessageEntity, ParseMode, PollType, Recipient, ReplyMarkup};
+use crate::types::{
+    Message, MessageEntity, MessageId, ParseMode, PollType, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     /// Use this method to send phone contacts. On success, the sent [`Message`] is returned.
@@ -51,7 +53,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_venue.rs b/src/payloads/send_venue.rs
index bb6da175..d368aede 100644
--- a/src/payloads/send_venue.rs
+++ b/src/payloads/send_venue.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to send information about a venue. On success, the sent [`Message`] is returned.
@@ -40,7 +40,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_video.rs b/src/payloads/send_video.rs
index 1510cbf1..f267cbf3 100644
--- a/src/payloads/send_video.rs
+++ b/src/payloads/send_video.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = video, thumb]
@@ -48,7 +50,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_video_note.rs b/src/payloads/send_video_note.rs
index 78892cee..2c1e4484 100644
--- a/src/payloads/send_video_note.rs
+++ b/src/payloads/send_video_note.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, Recipient, ReplyMarkup};
+use crate::types::{InputFile, Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     @[multipart = video_note, thumb]
@@ -36,7 +36,8 @@ impl_payload! {
             /// Protects the contents of sent messages from forwarding and saving
             pub protect_content: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/send_voice.rs b/src/payloads/send_voice.rs
index 8b3865b2..e1cbb888 100644
--- a/src/payloads/send_voice.rs
+++ b/src/payloads/send_voice.rs
@@ -2,7 +2,9 @@
 
 use serde::Serialize;
 
-use crate::types::{InputFile, Message, MessageEntity, ParseMode, Recipient, ReplyMarkup};
+use crate::types::{
+    InputFile, Message, MessageEntity, MessageId, ParseMode, Recipient, ReplyMarkup,
+};
 
 impl_payload! {
     @[multipart = voice]
@@ -37,7 +39,8 @@ impl_payload! {
             /// [silently]: https://telegram.org/blog/channels-2-0#silent-messages
             pub disable_notification: bool,
             /// If the message is a reply, ID of the original message
-            pub reply_to_message_id: i32,
+            #[serde(serialize_with = "crate::types::serialize_reply_to_message_id")]
+            pub reply_to_message_id: MessageId,
             /// Pass _True_, if the message should be sent even if the specified replied-to message is not found
             pub allow_sending_without_reply: bool,
             /// Additional interface options. A JSON-serialized object for an [inline keyboard], [custom reply keyboard], instructions to remove reply keyboard or to force a reply from the user.
diff --git a/src/payloads/set_game_score.rs b/src/payloads/set_game_score.rs
index 65e7412e..eb34ed04 100644
--- a/src/payloads/set_game_score.rs
+++ b/src/payloads/set_game_score.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, UserId};
+use crate::types::{Message, MessageId, UserId};
 
 impl_payload! {
     /// Use this method to set the score of the specified user in a game. On success, returns the edited [`Message`]. Returns an error, if the new score is not greater than the user's current score in the chat and force is False.
@@ -20,7 +20,8 @@ impl_payload! {
             /// Unique identifier for the target chat
             pub chat_id: u32,
             /// Identifier of the message to edit
-            pub message_id: i64,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// Pass True, if the high score is allowed to decrease. This can be useful when fixing mistakes or banning cheaters
diff --git a/src/payloads/stop_message_live_location.rs b/src/payloads/stop_message_live_location.rs
index 8f454fb1..970fc87c 100644
--- a/src/payloads/stop_message_live_location.rs
+++ b/src/payloads/stop_message_live_location.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Message, Recipient, ReplyMarkup};
+use crate::types::{Message, MessageId, Recipient, ReplyMarkup};
 
 impl_payload! {
     /// Use this method to edit live location messages. A location can be edited until its live_period expires or editing is explicitly disabled by a call to [`StopMessageLiveLocation`]. On success, the edited Message is returned.
@@ -17,7 +17,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`)
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
             /// Latitude of new location
             pub latitude: f64,
             /// Longitude of new location
diff --git a/src/payloads/stop_poll.rs b/src/payloads/stop_poll.rs
index ba884397..05ab001d 100644
--- a/src/payloads/stop_poll.rs
+++ b/src/payloads/stop_poll.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{InlineKeyboardMarkup, Poll, Recipient};
+use crate::types::{InlineKeyboardMarkup, MessageId, Poll, Recipient};
 
 impl_payload! {
     /// Use this method to stop a poll which was sent by the bot. On success, the stopped Poll with the final results is returned.
@@ -12,7 +12,8 @@ impl_payload! {
             /// Unique identifier for the target chat or username of the target channel (in the format `@channelusername`).
             pub chat_id: Recipient [into],
             /// Identifier of the message to edit
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
         optional {
             /// A JSON-serialized object for an [inline keyboard].
diff --git a/src/payloads/unpin_chat_message.rs b/src/payloads/unpin_chat_message.rs
index f5576134..94771ea0 100644
--- a/src/payloads/unpin_chat_message.rs
+++ b/src/payloads/unpin_chat_message.rs
@@ -2,7 +2,7 @@
 
 use serde::Serialize;
 
-use crate::types::{Recipient, True};
+use crate::types::{MessageId, Recipient, True};
 
 impl_payload! {
     /// Use this method to remove a message from the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' admin right in a supergroup or 'can_edit_messages' admin right in a channel. Returns _True_ on success.
@@ -14,7 +14,8 @@ impl_payload! {
         }
         optional {
             /// Identifier of a message to unpin. If not specified, the most recent pinned message (by sending date) will be unpinned.
-            pub message_id: i32,
+            #[serde(flatten)]
+            pub message_id: MessageId,
         }
     }
 }
diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index b18a825c..b863cb06 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -111,7 +111,7 @@ pub trait Requester {
         &self,
         chat_id: C,
         from_chat_id: F,
-        message_id: i32,
+        message_id: MessageId,
     ) -> Self::ForwardMessage
     where
         C: Into<Recipient>,
@@ -120,7 +120,12 @@ pub trait Requester {
     type CopyMessage: Request<Payload = CopyMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`CopyMessage`].
-    fn copy_message<C, F>(&self, chat_id: C, from_chat_id: F, message_id: i32) -> Self::CopyMessage
+    fn copy_message<C, F>(
+        &self,
+        chat_id: C,
+        from_chat_id: F,
+        message_id: MessageId,
+    ) -> Self::CopyMessage
     where
         C: Into<Recipient>,
         F: Into<Recipient>;
@@ -195,7 +200,7 @@ pub trait Requester {
     fn edit_message_live_location<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> Self::EditMessageLiveLocation
@@ -223,7 +228,7 @@ pub trait Requester {
     fn stop_message_live_location<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         latitude: f64,
         longitude: f64,
     ) -> Self::StopMessageLiveLocation
@@ -485,7 +490,7 @@ pub trait Requester {
     type PinChatMessage: Request<Payload = PinChatMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`PinChatMessage`].
-    fn pin_chat_message<C>(&self, chat_id: C, message_id: i32) -> Self::PinChatMessage
+    fn pin_chat_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::PinChatMessage
     where
         C: Into<Recipient>;
 
@@ -639,7 +644,7 @@ pub trait Requester {
     fn edit_message_text<C, T>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         text: T,
     ) -> Self::EditMessageText
     where
@@ -661,7 +666,11 @@ pub trait Requester {
     type EditMessageCaption: Request<Payload = EditMessageCaption, Err = Self::Err>;
 
     /// For Telegram documentation see [`EditMessageCaption`].
-    fn edit_message_caption<C>(&self, chat_id: C, message_id: i32) -> Self::EditMessageCaption
+    fn edit_message_caption<C>(
+        &self,
+        chat_id: C,
+        message_id: MessageId,
+    ) -> Self::EditMessageCaption
     where
         C: Into<Recipient>;
 
@@ -681,7 +690,7 @@ pub trait Requester {
     fn edit_message_media<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
         media: InputMedia,
     ) -> Self::EditMessageMedia
     where
@@ -704,7 +713,7 @@ pub trait Requester {
     fn edit_message_reply_markup<C>(
         &self,
         chat_id: C,
-        message_id: i32,
+        message_id: MessageId,
     ) -> Self::EditMessageReplyMarkup
     where
         C: Into<Recipient>;
@@ -725,14 +734,14 @@ pub trait Requester {
     type StopPoll: Request<Payload = StopPoll, Err = Self::Err>;
 
     /// For Telegram documentation see [`StopPoll`].
-    fn stop_poll<C>(&self, chat_id: C, message_id: i32) -> Self::StopPoll
+    fn stop_poll<C>(&self, chat_id: C, message_id: MessageId) -> Self::StopPoll
     where
         C: Into<Recipient>;
 
     type DeleteMessage: Request<Payload = DeleteMessage, Err = Self::Err>;
 
     /// For Telegram documentation see [`DeleteMessage`].
-    fn delete_message<C>(&self, chat_id: C, message_id: i32) -> Self::DeleteMessage
+    fn delete_message<C>(&self, chat_id: C, message_id: MessageId) -> Self::DeleteMessage
     where
         C: Into<Recipient>;
 
@@ -907,7 +916,7 @@ pub trait Requester {
         user_id: UserId,
         score: u64,
         chat_id: u32,
-        message_id: i64,
+        message_id: MessageId,
     ) -> Self::SetGameScore;
 
     type SetGameScoreInline: Request<Payload = SetGameScoreInline, Err = Self::Err>;
diff --git a/src/types.rs b/src/types.rs
index 6f35de8a..2ff4585a 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -86,6 +86,7 @@ pub use reply_keyboard_remove::*;
 pub use reply_markup::*;
 pub use response_parameters::*;
 pub use sent_web_app_message::*;
+use serde::Serialize;
 pub use shipping_address::*;
 pub use shipping_option::*;
 pub use shipping_query::*;
@@ -405,3 +406,13 @@ pub(crate) mod duration_secs {
         }
     }
 }
+
+pub(crate) fn serialize_reply_to_message_id<S>(
+    this: &Option<MessageId>,
+    serializer: S,
+) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    this.map(|MessageId(id)| id).serialize(serializer)
+}
diff --git a/src/types/message.rs b/src/types/message.rs
index 54da04d9..6edc9451 100644
--- a/src/types/message.rs
+++ b/src/types/message.rs
@@ -1206,7 +1206,7 @@ impl Message {
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
     #[must_use]
-    pub fn comment_url(&self, comment_id: i32) -> Option<Url> {
+    pub fn comment_url(&self, comment_id: MessageId) -> Option<Url> {
         Self::comment_url_of(self.chat.id, self.chat.username(), self.id, comment_id)
     }
 
@@ -1228,11 +1228,11 @@ impl Message {
     pub fn comment_url_of(
         channel_id: ChatId,
         channel_username: Option<&str>,
-        post_id: i32,
-        comment_id: i32,
+        post_id: MessageId,
+        comment_id: MessageId,
     ) -> Option<Url> {
         Self::url_of(channel_id, channel_username, post_id).map(|mut url| {
-            url.set_query(Some(&format!("comment={comment_id}")));
+            url.set_query(Some(&format!("comment={}", comment_id.0)));
             url
         })
     }
@@ -1249,7 +1249,7 @@ impl Message {
     /// Returns `None` for private chats (i.e.: DMs) and private groups (not
     /// supergroups).
     #[must_use]
-    pub fn url_in_thread(&self, thread_starter_msg_id: i32) -> Option<Url> {
+    pub fn url_in_thread(&self, thread_starter_msg_id: MessageId) -> Option<Url> {
         Self::url_in_thread_of(
             self.chat.id,
             self.chat.username(),
diff --git a/src/types/message_id.rs b/src/types/message_id.rs
index 88a90902..27e1f91c 100644
--- a/src/types/message_id.rs
+++ b/src/types/message_id.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 /// A unique message identifier.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct MessageId(#[serde(rename = "message_id")] pub i32);
 
 #[cfg(test)]
diff --git a/src/types/update.rs b/src/types/update.rs
index 0ca68c3e..2d0ac5e6 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -297,7 +297,7 @@ impl Serialize for UpdateKind {
 mod test {
     use crate::types::{
         Chat, ChatId, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon,
-        MessageKind, Update, UpdateKind, User, UserId,
+        MessageKind, Update, UpdateKind, User, UserId, MessageId
     };
 
     use chrono::{DateTime, NaiveDateTime, Utc};
@@ -334,7 +334,7 @@ mod test {
             id: 892_252_934,
             kind: UpdateKind::Message(Message {
                 via_bot: None,
-                id: 6557,
+                id: MessageId(6557),
                 date,
                 chat: Chat {
                     id: ChatId(218_485_655),

From 13e5ed8fb4ef4ddb60d662c71f0792620fd7476f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 29 Sep 2022 13:32:36 +0400
Subject: [PATCH 718/755] Fix `MessageId` deserialization

---
 src/types/message_id.rs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/types/message_id.rs b/src/types/message_id.rs
index 27e1f91c..31cbd20c 100644
--- a/src/types/message_id.rs
+++ b/src/types/message_id.rs
@@ -2,7 +2,25 @@ use serde::{Deserialize, Serialize};
 
 /// A unique message identifier.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct MessageId(#[serde(rename = "message_id")] pub i32);
+#[serde(from = "MessageIdRaw", into = "MessageIdRaw")]
+pub struct MessageId(pub i32);
+
+#[derive(Serialize, Deserialize)]
+struct MessageIdRaw {
+    message_id: i32,
+}
+
+impl From<MessageIdRaw> for MessageId {
+    fn from(MessageIdRaw { message_id }: MessageIdRaw) -> Self {
+        MessageId(message_id)
+    }
+}
+
+impl From<MessageId> for MessageIdRaw {
+    fn from(MessageId(message_id): MessageId) -> Self {
+        MessageIdRaw { message_id }
+    }
+}
 
 #[cfg(test)]
 mod tests {

From 0f08fd6cdbe50d7d63354c404e9da9bc2d6d862b Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 29 Sep 2022 13:33:11 +0400
Subject: [PATCH 719/755] fmt?

---
 src/types/update.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/update.rs b/src/types/update.rs
index 2d0ac5e6..0fb34e6e 100644
--- a/src/types/update.rs
+++ b/src/types/update.rs
@@ -297,7 +297,7 @@ impl Serialize for UpdateKind {
 mod test {
     use crate::types::{
         Chat, ChatId, ChatKind, ChatPrivate, MediaKind, MediaText, Message, MessageCommon,
-        MessageKind, Update, UpdateKind, User, UserId, MessageId
+        MessageId, MessageKind, Update, UpdateKind, User, UserId,
     };
 
     use chrono::{DateTime, NaiveDateTime, Utc};

From 57d08938e4ebf3ddf628dd1d13768158bf768005 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 1 Oct 2022 17:04:31 +0400
Subject: [PATCH 720/755] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1861a0f..7a0a335c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,9 +21,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - `Request` now requires `Self: IntoFuture`
   - There is no need for `AutoSend` anymore
 - MSRV (Minimal Supported Rust Version) was bumped from `1.58.0` to `1.64.0`
+- Message id parameters and fields now use `MessageId` type instead of `i32` ([#254][pr254])
 - Refactored `Sticker` and related types ([#251][pr251])
 
 [pr253]: https://github.com/teloxide/teloxide-core/pull/253
+[pr254]: https://github.com/teloxide/teloxide-core/pull/254
 
 ### Removed
 

From 24db0e29d3357e53b1d07c6408ca07e221ec7dcb Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 1 Oct 2022 17:28:54 +0400
Subject: [PATCH 721/755] Remove `file_` prefix from `File` fields

This also removes `Deref<Target = FileMeta>` impls from
`Animation`, `Audio`, `Document`, `PhotoSize` (?), `Video`, `VideoNote`
and `Voice` -- they are not really necessary with the `file_` prefix
removed.
---
 src/net/download.rs        | 10 ++++-----
 src/types/animation.rs     | 16 ++++++-------
 src/types/audio.rs         | 16 ++++++-------
 src/types/document.rs      |  4 +---
 src/types/file.rs          | 46 +++++++++++++++++++++-----------------
 src/types/passport_file.rs |  3 ++-
 src/types/photo_size.rs    | 10 ++++-----
 src/types/sticker.rs       |  8 +++----
 src/types/video.rs         |  4 +---
 src/types/video_note.rs    |  4 +---
 src/types/voice.rs         |  4 +---
 11 files changed, 58 insertions(+), 67 deletions(-)

diff --git a/src/net/download.rs b/src/net/download.rs
index dcef724f..685d9f57 100644
--- a/src/net/download.rs
+++ b/src/net/download.rs
@@ -34,17 +34,17 @@ pub trait Download<'w>
     /// use teloxide_core::{
     ///     net::Download,
     ///     requests::{Request, Requester},
-    ///     types::File as TgFile,
+    ///     types::File,
     ///     Bot,
     /// };
-    /// use tokio::fs::File;
+    /// use tokio::fs;
     ///
     /// # async fn run() -> Result<(), Box<dyn std::error::Error>> {
     /// let bot = Bot::new("TOKEN");
     ///
-    /// let TgFile { file_path, .. } = bot.get_file("*file_id*").await?;
-    /// let mut file = File::create("/tmp/test.png").await?;
-    /// bot.download_file(&file_path, &mut file).await?;
+    /// let file = bot.get_file("*file_id*").await?;
+    /// let mut dst = fs::File::create("/tmp/test.png").await?;
+    /// bot.download_file(&file.path, &mut dst).await?;
     /// # Ok(()) }
     /// ```
     ///
diff --git a/src/types/animation.rs b/src/types/animation.rs
index beb032db..22aa8a46 100644
--- a/src/types/animation.rs
+++ b/src/types/animation.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
@@ -9,10 +8,9 @@ use crate::types::{FileMeta, PhotoSize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#animation).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Animation {
     /// Metadata of the animation file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
@@ -62,18 +60,18 @@ mod tests {
         "file_size":6500}"#;
         let expected = Animation {
             file: FileMeta {
-                file_id: "id".to_string(),
-                file_unique_id: "".to_string(),
-                file_size: 6500,
+                id: "id".to_string(),
+                unique_id: "".to_string(),
+                size: 6500,
             },
             width: 320,
             height: 320,
             duration: 59,
             thumb: Some(PhotoSize {
                 file: FileMeta {
-                    file_id: "id".to_owned(),
-                    file_unique_id: "".to_owned(),
-                    file_size: 3452,
+                    id: "id".to_owned(),
+                    unique_id: "".to_owned(),
+                    size: 3452,
                 },
                 width: 320,
                 height: 320,
diff --git a/src/types/audio.rs b/src/types/audio.rs
index 1f17690a..ee7d7468 100644
--- a/src/types/audio.rs
+++ b/src/types/audio.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
@@ -9,10 +8,9 @@ use crate::types::{FileMeta, PhotoSize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#audio).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Audio {
     /// Metadata of the audio file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
@@ -62,9 +60,9 @@ mod tests {
         }"#;
         let expected = Audio {
             file: FileMeta {
-                file_id: "id".to_string(),
-                file_unique_id: "".to_string(),
-                file_size: 123_456,
+                id: "id".to_string(),
+                unique_id: "".to_string(),
+                size: 123_456,
             },
             duration: 60,
             performer: Some("Performer".to_string()),
@@ -72,9 +70,9 @@ mod tests {
             mime_type: Some("application/zip".parse().unwrap()),
             thumb: Some(PhotoSize {
                 file: FileMeta {
-                    file_id: "id".to_owned(),
-                    file_unique_id: "".to_owned(),
-                    file_size: 3452,
+                    id: "id".to_owned(),
+                    unique_id: "".to_owned(),
+                    size: 3452,
                 },
                 width: 320,
                 height: 320,
diff --git a/src/types/document.rs b/src/types/document.rs
index 035cdd41..4ad439ae 100644
--- a/src/types/document.rs
+++ b/src/types/document.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
@@ -13,10 +12,9 @@ use crate::types::{FileMeta, PhotoSize};
 /// [voice messages]: https://core.telegram.org/bots/api#voice
 /// [audio files]: https://core.telegram.org/bots/api#audio
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Document {
     /// Metadata of the document file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
diff --git a/src/types/file.rs b/src/types/file.rs
index 892b382c..89ae95f7 100644
--- a/src/types/file.rs
+++ b/src/types/file.rs
@@ -25,26 +25,30 @@ pub struct File {
     /// File path. Use [`Bot::download_file(file_path, dst)`] to get the file.
     ///
     /// [`Bot::download_file(file_path, dst)`]: crate::net::Download::download_file
-    pub file_path: String,
+    #[serde(rename = "file_path")]
+    pub path: String,
 }
 
-/// Metadata of the [`File`].
+/// Metadata of a [`File`].
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct FileMeta {
     /// Identifier for this file.
-    pub file_id: String,
+    #[serde(rename = "file_id")]
+    pub id: String,
 
     /// Unique identifier for this file, which is supposed to be the same over
     /// time and for different bots. Can't be used to download or reuse the
     /// file.
-    pub file_unique_id: String,
+    #[serde(rename = "file_unique_id")]
+    pub unique_id: String,
 
     /// File size in bytes.
-    // This should never be necessary in practice,
+    #[serde(rename = "file_size")]
+    // This fallback should never be necessary in practice,
     // but just in case something goes wrong with the TBA server
     // (see the test below)
     #[serde(default = "file_size_fallback")]
-    pub file_size: u32,
+    pub size: u32,
 }
 
 pub(crate) const fn file_size_fallback() -> u32 {
@@ -58,12 +62,12 @@ pub(crate) const fn file_size_fallback() -> u32 {
 /// ```rust
 /// use teloxide_core::types::File;
 /// #
-/// # let get_file = || File { meta: teloxide_core::types::FileMeta { file_id: String::new(), file_unique_id: String::new(), file_size: 0 }, file_path: String::new() };
+/// # let get_file = || File { meta: teloxide_core::types::FileMeta { id: String::new(), unique_id: String::new(), size: 0 }, path: String::new() };
 /// let file: File = get_file();
 ///
-/// let file_id: &str = &file.file_id;
-/// let file_unique_id: &str = &file.file_unique_id;
-/// let file_size: u32 = file.file_size;
+/// let file_id: &str = &file.id;
+/// let file_unique_id: &str = &file.unique_id;
+/// let file_size: u32 = file.size;
 /// #
 /// # let _ = (file_id, file_unique_id, file_size);
 /// ```
@@ -92,11 +96,11 @@ mod tests {
             file,
             File {
                 meta: FileMeta {
-                    file_id: "FILE_ID".to_owned(),
-                    file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                    file_size: u32::MAX,
+                    id: "FILE_ID".to_owned(),
+                    unique_id: "FILE_UNIQUE_ID".to_owned(),
+                    size: u32::MAX,
                 },
-                file_path: "FILE_PATH".to_owned(),
+                path: "FILE_PATH".to_owned(),
             }
         );
     }
@@ -111,9 +115,9 @@ mod tests {
         assert_eq!(
             file,
             FileMeta {
-                file_id: "FILE_ID".to_owned(),
-                file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                file_size: 42,
+                id: "FILE_ID".to_owned(),
+                unique_id: "FILE_UNIQUE_ID".to_owned(),
+                size: 42,
             }
         );
     }
@@ -127,11 +131,11 @@ mod tests {
             file,
             File {
                 meta: FileMeta {
-                    file_id: "FILE_ID".to_owned(),
-                    file_unique_id: "FILE_UNIQUE_ID".to_owned(),
-                    file_size: 42,
+                    id: "FILE_ID".to_owned(),
+                    unique_id: "FILE_UNIQUE_ID".to_owned(),
+                    size: 42,
                 },
-                file_path: "FILE_PATH".to_owned(),
+                path: "FILE_PATH".to_owned(),
             }
         );
     }
diff --git a/src/types/passport_file.rs b/src/types/passport_file.rs
index 935b3567..05b97225 100644
--- a/src/types/passport_file.rs
+++ b/src/types/passport_file.rs
@@ -19,5 +19,6 @@ pub struct PassportFile {
 
     /// Time when the file was uploaded.
     #[serde(with = "crate::types::serde_date_from_unix_timestamp")]
-    pub file_date: DateTime<Utc>,
+    #[serde(rename = "file_date")]
+    pub date: DateTime<Utc>,
 }
diff --git a/src/types/photo_size.rs b/src/types/photo_size.rs
index 5e030bd1..9b0af706 100644
--- a/src/types/photo_size.rs
+++ b/src/types/photo_size.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use serde::{Deserialize, Serialize};
 
 use crate::types::FileMeta;
@@ -8,10 +7,9 @@ use crate::types::FileMeta;
 /// [file]: crate::types::Document
 /// [sticker]: crate::types::Sticker
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct PhotoSize {
     /// Metadata of the photo file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
@@ -32,9 +30,9 @@ mod tests {
                              "file_size":3452}"#;
         let expected = PhotoSize {
             file: FileMeta {
-                file_id: "id".to_owned(),
-                file_unique_id: "".to_owned(),
-                file_size: 3452,
+                id: "id".to_owned(),
+                unique_id: "".to_owned(),
+                size: 3452,
             },
             width: 320,
             height: 320,
diff --git a/src/types/sticker.rs b/src/types/sticker.rs
index 4ee875fd..dd5c651e 100644
--- a/src/types/sticker.rs
+++ b/src/types/sticker.rs
@@ -364,8 +364,8 @@ mod tests {
         assert_eq!(sticker.mask_position().unwrap().point, MaskPoint::Forehead);
         assert_eq!(sticker.is_animated(), false);
         assert_eq!(sticker.is_video(), false);
-        assert_eq!(sticker.thumb.clone().unwrap().file_size, 11028);
-        assert_eq!(sticker.file.file_size, 18290);
+        assert_eq!(sticker.thumb.clone().unwrap().file.size, 11028);
+        assert_eq!(sticker.file.size, 18290);
         assert_eq!(sticker.width, 512);
         assert_eq!(sticker.height, 512);
 
@@ -404,8 +404,8 @@ mod tests {
         assert_eq!(sticker.premium_animation(), None);
         assert_eq!(sticker.is_animated(), false);
         assert_eq!(sticker.is_video(), false);
-        assert_eq!(sticker.thumb.clone().unwrap().file_size, 4558);
-        assert_eq!(sticker.file.file_size, 25734);
+        assert_eq!(sticker.thumb.clone().unwrap().file.size, 4558);
+        assert_eq!(sticker.file.size, 25734);
         assert_eq!(sticker.width, 463);
         assert_eq!(sticker.height, 512);
         assert_eq!(sticker.set_name.as_deref(), Some("menhera2"));
diff --git a/src/types/video.rs b/src/types/video.rs
index e4bc736b..e127167b 100644
--- a/src/types/video.rs
+++ b/src/types/video.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
@@ -8,10 +7,9 @@ use crate::types::{FileMeta, PhotoSize};
 ///
 /// [The official docs](https://core.telegram.org/bots/api#video).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Video {
     /// Metadata of the video file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
diff --git a/src/types/video_note.rs b/src/types/video_note.rs
index 9b82c643..d112c672 100644
--- a/src/types/video_note.rs
+++ b/src/types/video_note.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use serde::{Deserialize, Serialize};
 
 use crate::types::{FileMeta, PhotoSize};
@@ -11,10 +10,9 @@ use crate::types::{FileMeta, PhotoSize};
 /// [video message]: https://telegram.org/blog/video-messages-and-telescope
 /// [v4.0]: https://telegram.org/blog/video-messages-and-telescope
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct VideoNote {
     /// Metadata of the video note file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 
diff --git a/src/types/voice.rs b/src/types/voice.rs
index f124e08d..0dbcd7b8 100644
--- a/src/types/voice.rs
+++ b/src/types/voice.rs
@@ -1,4 +1,3 @@
-use derive_more::Deref;
 use mime::Mime;
 use serde::{Deserialize, Serialize};
 
@@ -8,10 +7,9 @@ use crate::types::FileMeta;
 ///
 /// [The official docs](https://core.telegram.org/bots/api#voice).
 #[serde_with_macros::skip_serializing_none]
-#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Deref)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct Voice {
     /// Metadata of the voice file.
-    #[deref]
     #[serde(flatten)]
     pub file: FileMeta,
 

From 30ad2b854ffb2d8dad2bf9e2443997033534cf7f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sat, 1 Oct 2022 17:36:38 +0400
Subject: [PATCH 722/755] Update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1861a0f..f3a771ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Removed `file_` prefix from `File` and `FileMeta` fields [#255][pr255]
 - `Animation`, `Audio`, `Document`, `PassportFile`, `PhotoSize`, `Video`, `VideoNote` and `Voice` now contain `FileMeta` instead of its fields ([#253][pr253])
-  - Field access should still work via `Deref` impls
+  - Combined with `File` fields renaming, instead of `.file_size` you can write `.file.size` and similarly with other fields
 - **You can now `.await` any `Request`!** ([#249][pr249])
   - `Request` now requires `Self: IntoFuture`
   - There is no need for `AutoSend` anymore
@@ -24,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactored `Sticker` and related types ([#251][pr251])
 
 [pr253]: https://github.com/teloxide/teloxide-core/pull/253
+[pr255]: https://github.com/teloxide/teloxide-core/pull/255
 
 ### Removed
 

From dad9880da0f4e8d2faf8460b0b1d722d4e40a365 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Oct 2022 16:11:22 +0400
Subject: [PATCH 723/755] Use full path when implementing `BotCommands`

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

diff --git a/src/bot_commands.rs b/src/bot_commands.rs
index 02b64e63..46d77672 100644
--- a/src/bot_commands.rs
+++ b/src/bot_commands.rs
@@ -36,7 +36,7 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
     let fn_commands = impl_commands(&var_info, &command_enum);
 
     let trait_impl = quote! {
-        impl BotCommands for #type_name {
+        impl teloxide::utils::command::BotCommands for #type_name {
             #fn_descriptions
             #fn_parse
             #fn_commands

From d593ba8178fd0996c0898f380d64288693c5a840 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Oct 2022 23:07:22 +0000
Subject: [PATCH 724/755] Expand `Requester` docs in an attempt to make them
 useful

---
 src/requests/requester.rs | 100 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 96 insertions(+), 4 deletions(-)

diff --git a/src/requests/requester.rs b/src/requests/requester.rs
index b863cb06..1529c39c 100644
--- a/src/requests/requester.rs
+++ b/src/requests/requester.rs
@@ -9,13 +9,20 @@ use crate::{
     types::*,
 };
 
-/// Methods for building requests.
+/// Telegram Bot API client.
 ///
 /// This trait is implemented by all bots & bot adaptors.
 ///
-/// ## Examples
+/// ## Calling Telegram Bot API methods
 ///
-/// Calling TBA methods:
+/// To call Telegram's methods you first need to get a [`Bot`] instance or any
+/// other type which implement this trait.
+///
+/// Then you can simply call the method you want and pass required parameters to
+/// it. Optional parameters can be supplied by calling setters (like
+/// `parse_mode` in the example below). Lastly, you need to `.await` the request
+/// created in previous steps, to actually send it to telegram and wait for the
+/// response.
 ///
 /// ```
 /// # async {
@@ -38,7 +45,81 @@ use crate::{
 /// # };
 /// ```
 ///
-/// Using `Requester` in a generic context:
+/// ## Adaptors
+///
+/// Similarly to how [`Iterator`] has iterator adaptors ([`FlatMap`],
+/// [`Filter`], etc) that wrap an [`Iterator`] and alter its behaviour, Teloxide
+/// has a similar story with `Requester`.
+///
+/// [`adaptors`] module provides a handful of `Requester` adaptors that can be
+/// created via [`RequesterExt`] methods. For example using [`.parse_mode(...)`]
+/// on a bot will wrap it in [`DefaultParseMode`] adaptor which sets the parse
+/// mode to a default value:
+///
+/// ```rust
+/// # async {
+/// # let chat_id = ChatId(-1);
+/// use teloxide_core::{
+///     prelude::*,
+///     types::{ChatId, ParseMode},
+/// };
+///
+/// let bot = Bot::new("TOKEN")
+///     // Wrap the bot in an adaptor
+///     .parse_mode(ParseMode::Html);
+///
+/// // This will use `ParseMode::Html`
+/// bot.send_message(chat_id, "<b>Text</b>").await?;
+///
+/// // This will use `ParseMode::MarkdownV2`
+/// bot.send_message(chat_id, "**Text**")
+///     .parse_mode(ParseMode::MarkdownV2)
+///     .await?;
+/// # Ok::<_, teloxide_core::RequestError>(())
+/// # };
+/// ```
+///
+/// Note that just as with iterators, adaptors change type:
+///
+/// ```compile_fail
+/// # use teloxide_core::{prelude::*, types::{ChatId, ParseMode}};
+/// let bot: Bot = Bot::new("TOKEN").parse_mode(ParseMode::Html);
+/// ```
+/// ```rust
+/// # use teloxide_core::{prelude::*, types::{ChatId, ParseMode}, adaptors::DefaultParseMode};
+/// let bot: DefaultParseMode<Bot> = Bot::new("TOKEN").parse_mode(ParseMode::Html);
+/// ```
+///
+/// Because of this it's oftentimes more convinient to have a type alias:
+///
+/// ```rust
+/// # async {
+/// # use teloxide_core::{adaptors::{DefaultParseMode, Throttle}, requests::RequesterExt, types::ParseMode};
+/// type Bot = DefaultParseMode<Throttle<teloxide_core::Bot>>;
+///
+/// let bot: Bot = teloxide_core::Bot::new("TOKEN")
+///     .throttle(<_>::default())
+///     .parse_mode(ParseMode::Html);
+/// # let _ = bot;
+/// # };
+/// ```
+///
+/// Also note that most adaptors require specific cargo features to be enabled.
+/// For example, to use [`Throttle`] you need to enable `throttle` feature in
+/// your `Cargo.toml`:
+///
+/// ```toml
+/// teloxide_core = { version = "...", features = ["throttle"] }
+/// ```
+///
+/// Refer to adaptor's documentation for information about what features it
+/// requires.
+///
+/// ## Using `Requester` in a generic context
+///
+/// When writing helper function you may be indifferent to which exact type is
+/// being used as a bot and instead only care that it implements `Requester`
+/// trait. In this case you can use generic bounds to express this exact thing:
 ///
 /// ```
 /// use teloxide_core::{
@@ -52,7 +133,18 @@ use crate::{
 /// {
 ///     bot.send_message(chat, "hi").await.expect("error")
 /// }
+///
+/// // `send_hi` can be called with `Bot`, `DefaultParseMode<Bot>` and so on, and so forth
 /// ```
+///
+/// [`Bot`]: crate::Bot
+/// [`FlatMap`]: std::iter::FlatMap
+/// [`Filter`]: std::iter::Filter
+/// [`adaptors`]: crate::adaptors
+/// [`DefaultParseMode`]: crate::adaptors::DefaultParseMode
+/// [`Throttle`]: crate::adaptors::Throttle
+/// [`RequesterExt`]: crate::requests::RequesterExt
+/// [`.parse_mode(...)`]: crate::requests::RequesterExt::parse_mode
 #[cfg_attr(all(any(docsrs, dep_docsrs), feature = "nightly"), doc(notable_trait))]
 pub trait Requester {
     /// Error type returned by all requests.

From 5fc3d2b81d1ce99acca4ba2a7219dc0a443d72c1 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 3 Oct 2022 04:01:23 +0400
Subject: [PATCH 725/755] Fix how we set `rustdocflags` in the cargo config

---
 .cargo/config.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index b565a218..a16645bb 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -9,5 +9,6 @@ docs = """doc
 --features=tokio/macros --features=tokio/rt-multi-thread
 """
 
+[build]
 # We pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
 rustdocflags = ["--cfg", "docsrs", "-Znormalize-docs"]

From 35d87e415c7f7b42dca29a188086cc0010055da0 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 3 Oct 2022 00:08:00 +0000
Subject: [PATCH 726/755] Dump version `0.7.1` -> `0.8.0`

---
 CHANGELOG.md | 2 ++
 Cargo.toml   | 2 +-
 README.md    | 2 +-
 src/lib.rs   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50dc62e6..a0f27f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.8.0 - 2022-10-03
+
 ### Added 
 
 - Support for Telegram Bot API [version 6.2](https://core.telegram.org/bots/api#august-12-2022) ([#251][pr251])
diff --git a/Cargo.toml b/Cargo.toml
index a3e25291..fb1cfcb1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "teloxide-core"
 description = "Core part of the `teloxide` library - telegram bot API client"
-version = "0.7.1"
+version = "0.8.0"
 edition = "2021"
 
 license = "MIT"
diff --git a/README.md b/README.md
index 1fc5fc94..5ccee596 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 </div>
 
 ```toml
-teloxide-core = "0.7"
+teloxide-core = "0.8"
 ```
 _Compiler support: requires rustc 1.64+_.
 
diff --git a/src/lib.rs b/src/lib.rs
index e7c945f3..36916ec8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@
 //! asynchronous and built using [`tokio`].
 //!
 //!```toml
-//! teloxide_core = "0.7"
+//! teloxide_core = "0.8"
 //! ```
 //! _Compiler support: requires rustc 1.64+_.
 //!

From 66e7ebd7f11d5e307d3c7cda30b6beca16a3a56c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 29 Sep 2022 14:08:27 +0400
Subject: [PATCH 727/755] Actually tests that macros work

---
 Cargo.toml                |  10 +-
 micro-teloxide/Cargo.toml |  11 ++
 micro-teloxide/src/lib.rs | 212 +++++++++++++++++++++++++++
 tests/command.rs          | 292 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 523 insertions(+), 2 deletions(-)
 create mode 100644 micro-teloxide/Cargo.toml
 create mode 100644 micro-teloxide/src/lib.rs
 create mode 100644 tests/command.rs

diff --git a/Cargo.toml b/Cargo.toml
index 83268b75..4a4b43e7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,11 +7,17 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+proc-macro = true
+
 [dependencies]
 quote = "1.0.7"
 proc-macro2 = "1.0.19"
 syn = { version = "1.0.13",  features = ["full"] }
 heck = "0.4.0"
 
-[lib]
-proc-macro = true
+[dev-dependencies]
+teloxide = { path = "micro-teloxide", package = "micro-teloxide" }
+
+[workspace]
+members = [".", "micro-teloxide"]
diff --git a/micro-teloxide/Cargo.toml b/micro-teloxide/Cargo.toml
new file mode 100644
index 00000000..653d32d0
--- /dev/null
+++ b/micro-teloxide/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "micro-teloxide"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+teloxide-macros = { path = ".." }
+serde = { version = "1.0.145", features = ["derive"] }
+serde_with_macros = "1.5.2"
diff --git a/micro-teloxide/src/lib.rs b/micro-teloxide/src/lib.rs
new file mode 100644
index 00000000..1131b329
--- /dev/null
+++ b/micro-teloxide/src/lib.rs
@@ -0,0 +1,212 @@
+//! A minimal "mock" of teloxide crate that is needed to test macros. Changes to
+//! `teloxide`[`-core`] should be kept in sync with this... somehow
+//!
+//! This is a price for placing all crates in separate repositories.
+
+pub use teloxide_macros as macros;
+
+pub mod utils {
+    pub mod command {
+        use std::{
+            error::Error,
+            fmt::{self, Display, Write},
+            marker::PhantomData,
+        };
+
+        pub use teloxide_macros::BotCommands;
+
+        use crate::types::{BotCommand, Me};
+        pub trait BotCommands: Sized {
+            fn parse<N>(s: &str, bot_username: N) -> Result<Self, ParseError>
+            where
+                N: Into<String>;
+
+            fn descriptions() -> CommandDescriptions<'static>;
+
+            fn bot_commands() -> Vec<BotCommand>;
+
+            fn ty() -> PhantomData<Self> {
+                PhantomData
+            }
+        }
+
+        pub type PrefixedBotCommand = String;
+        pub type BotName = String;
+
+        #[derive(Debug)]
+        pub enum ParseError {
+            TooFewArguments { expected: usize, found: usize, message: String },
+            TooManyArguments { expected: usize, found: usize, message: String },
+
+            IncorrectFormat(Box<dyn Error + Send + Sync + 'static>),
+
+            UnknownCommand(PrefixedBotCommand),
+            WrongBotName(BotName),
+
+            Custom(Box<dyn Error + Send + Sync + 'static>),
+        }
+
+        #[derive(Debug, Clone)]
+        #[allow(dead_code)]
+        pub struct CommandDescriptions<'a> {
+            global_description: Option<&'a str>,
+            descriptions: &'a [CommandDescription<'a>],
+            bot_username: Option<&'a str>,
+        }
+
+        #[derive(Debug, Clone)]
+        pub struct CommandDescription<'a> {
+            pub prefix: &'a str,
+            pub command: &'a str,
+            pub description: &'a str,
+        }
+
+        impl<'a> CommandDescriptions<'a> {
+            pub fn new(descriptions: &'a [CommandDescription<'a>]) -> Self {
+                Self {
+                    global_description: None,
+                    descriptions,
+                    bot_username: None,
+                }
+            }
+
+            pub fn global_description(
+                self,
+                global_description: &'a str,
+            ) -> Self {
+                Self { global_description: Some(global_description), ..self }
+            }
+
+            pub fn username(self, bot_username: &'a str) -> Self {
+                Self { bot_username: Some(bot_username), ..self }
+            }
+
+            pub fn username_from_me(
+                self,
+                me: &'a Me,
+            ) -> CommandDescriptions<'a> {
+                self.username(
+                    me.user
+                        .username
+                        .as_deref()
+                        .expect("Bots must have usernames"),
+                )
+            }
+        }
+
+        impl Display for CommandDescriptions<'_> {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                if let Some(global_description) = self.global_description {
+                    f.write_str(global_description)?;
+                    f.write_str("\n\n")?;
+                }
+
+                let mut write =
+                    |&CommandDescription { prefix, command, description },
+                     nls| {
+                        if nls {
+                            f.write_char('\n')?;
+                        }
+
+                        f.write_str(prefix)?;
+                        f.write_str(command)?;
+
+                        if let Some(username) = self.bot_username {
+                            f.write_char('@')?;
+                            f.write_str(username)?;
+                        }
+
+                        if !description.is_empty() {
+                            f.write_str(" — ")?;
+                            f.write_str(description)?;
+                        }
+
+                        fmt::Result::Ok(())
+                    };
+
+                if let Some(descr) = self.descriptions.first() {
+                    write(descr, false)?;
+                    for descr in &self.descriptions[1..] {
+                        write(descr, true)?;
+                    }
+                }
+
+                Ok(())
+            }
+        }
+    }
+}
+
+pub mod types {
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+    pub struct Me {
+        #[serde(flatten)]
+        pub user: User,
+        pub can_join_groups: bool,
+        pub can_read_all_group_messages: bool,
+        pub supports_inline_queries: bool,
+    }
+    #[serde_with_macros::skip_serializing_none]
+    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+    pub struct User {
+        pub id: UserId,
+        pub is_bot: bool,
+        pub first_name: String,
+        pub last_name: Option<String>,
+        pub username: Option<String>,
+        pub language_code: Option<String>,
+        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+        pub is_premium: bool,
+        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+        pub added_to_attachment_menu: bool,
+    }
+
+    #[derive(
+        Clone,
+        Copy,
+        Debug,
+        PartialEq,
+        Eq,
+        PartialOrd,
+        Ord,
+        Hash,
+        Serialize,
+        Deserialize,
+    )]
+    #[serde(transparent)]
+    pub struct UserId(pub u64);
+
+    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+    pub struct BotCommand {
+        pub command: String,
+        pub description: String,
+    }
+
+    impl BotCommand {
+        pub fn new<S1, S2>(command: S1, description: S2) -> Self
+        where
+            S1: Into<String>,
+            S2: Into<String>,
+        {
+            Self { command: command.into(), description: description.into() }
+        }
+
+        pub fn command<S>(mut self, val: S) -> Self
+        where
+            S: Into<String>,
+        {
+            self.command = val.into();
+            self
+        }
+
+        pub fn description<S>(mut self, val: S) -> Self
+        where
+            S: Into<String>,
+        {
+            self.description = val.into();
+            self
+        }
+    }
+}
diff --git a/tests/command.rs b/tests/command.rs
new file mode 100644
index 00000000..248ef9e3
--- /dev/null
+++ b/tests/command.rs
@@ -0,0 +1,292 @@
+//! Test for `teloxide-macros`
+
+use teloxide::utils::command::BotCommands;
+
+#[test]
+fn parse_command_with_args() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        Start(String),
+        Help,
+    }
+
+    let data = "/start arg1 arg2";
+    let expected = DefaultCommands::Start("arg1 arg2".to_string());
+    let actual = DefaultCommands::parse(data, "").unwrap();
+    assert_eq!(actual, expected)
+}
+
+#[test]
+fn parse_command_with_non_string_arg() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        Start(i32),
+        Help,
+    }
+
+    let data = "/start -50";
+    let expected = DefaultCommands::Start("-50".parse().unwrap());
+    let actual = DefaultCommands::parse(data, "").unwrap();
+    assert_eq!(actual, expected)
+}
+
+#[test]
+fn attribute_prefix() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        #[command(prefix = "!")]
+        Start(String),
+        Help,
+    }
+
+    let data = "!start arg1 arg2";
+    let expected = DefaultCommands::Start("arg1 arg2".to_string());
+    let actual = DefaultCommands::parse(data, "").unwrap();
+    assert_eq!(actual, expected)
+}
+
+#[test]
+fn many_attributes() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        #[command(prefix = "!", description = "desc")]
+        Start,
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start,
+        DefaultCommands::parse("!start", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::descriptions().to_string(),
+        "!start — desc\n/help"
+    );
+}
+
+#[test]
+fn global_attributes() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(prefix = "!", rename = "lowercase", description = "Bot commands")]
+    enum DefaultCommands {
+        #[command(prefix = "/")]
+        Start,
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start,
+        DefaultCommands::parse("/start", "MyNameBot").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::Help,
+        DefaultCommands::parse("!help", "MyNameBot").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::descriptions().to_string(),
+        "Bot commands\n\n/start\n!help"
+    );
+}
+
+#[test]
+fn parse_command_with_bot_name() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        #[command(prefix = "/")]
+        Start,
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start,
+        DefaultCommands::parse("/start@MyNameBot", "MyNameBot").unwrap()
+    );
+}
+
+#[test]
+fn parse_with_split() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    #[command(parse_with = "split")]
+    enum DefaultCommands {
+        Start(u8, String),
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start(10, "hello".to_string()),
+        DefaultCommands::parse("/start 10 hello", "").unwrap()
+    );
+}
+
+#[test]
+fn parse_with_split2() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    #[command(parse_with = "split", separator = "|")]
+    enum DefaultCommands {
+        Start(u8, String),
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start(10, "hello".to_string()),
+        DefaultCommands::parse("/start 10|hello", "").unwrap()
+    );
+}
+
+#[test]
+fn parse_custom_parser() {
+    mod parser {
+        use teloxide::utils::command::ParseError;
+
+        pub fn custom_parse_function(
+            s: String,
+        ) -> Result<(u8, String), ParseError> {
+            let vec = s.split_whitespace().collect::<Vec<_>>();
+            let (left, right) = match vec.as_slice() {
+                [l, r] => (l, r),
+                _ => {
+                    return Err(ParseError::IncorrectFormat(
+                        "might be 2 arguments!".into(),
+                    ))
+                }
+            };
+            left.parse::<u8>().map(|res| (res, (*right).to_string())).map_err(
+                |_| {
+                    ParseError::Custom(
+                        "First argument must be a integer!".to_owned().into(),
+                    )
+                },
+            )
+        }
+    }
+
+    use parser::custom_parse_function;
+
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        #[command(parse_with = "custom_parse_function")]
+        Start(u8, String),
+
+        // Test <https://github.com/teloxide/teloxide/issues/668>.
+        #[command(parse_with = "parser::custom_parse_function")]
+        TestPath(u8, String),
+
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start(10, "hello".to_string()),
+        DefaultCommands::parse("/start 10 hello", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::TestPath(10, "hello".to_string()),
+        DefaultCommands::parse("/testpath 10 hello", "").unwrap()
+    );
+}
+
+#[test]
+fn parse_named_fields() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    #[command(parse_with = "split")]
+    enum DefaultCommands {
+        Start { num: u8, data: String },
+        Help,
+    }
+
+    assert_eq!(
+        DefaultCommands::Start { num: 10, data: "hello".to_string() },
+        DefaultCommands::parse("/start 10 hello", "").unwrap()
+    );
+}
+
+#[test]
+fn descriptions_off() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    #[command(rename = "lowercase")]
+    enum DefaultCommands {
+        #[command(description = "off")]
+        Start,
+        Help,
+    }
+
+    assert_eq!(DefaultCommands::descriptions().to_string(), "/help".to_owned());
+}
+
+#[test]
+fn rename_rules() {
+    #[derive(BotCommands, Debug, PartialEq)]
+    enum DefaultCommands {
+        #[command(rename = "lowercase")]
+        AaaAaa,
+        #[command(rename = "UPPERCASE")]
+        BbbBbb,
+        #[command(rename = "PascalCase")]
+        CccCcc,
+        #[command(rename = "camelCase")]
+        DddDdd,
+        #[command(rename = "snake_case")]
+        EeeEee,
+        #[command(rename = "SCREAMING_SNAKE_CASE")]
+        FffFff,
+        #[command(rename = "kebab-case")]
+        GggGgg,
+        #[command(rename = "SCREAMING-KEBAB-CASE")]
+        HhhHhh,
+        //#[command(rename = "Bar")]
+        //Foo,
+    }
+
+    assert_eq!(
+        DefaultCommands::AaaAaa,
+        DefaultCommands::parse("/aaaaaa", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::BbbBbb,
+        DefaultCommands::parse("/BBBBBB", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::CccCcc,
+        DefaultCommands::parse("/CccCcc", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::DddDdd,
+        DefaultCommands::parse("/dddDdd", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::EeeEee,
+        DefaultCommands::parse("/eee_eee", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::FffFff,
+        DefaultCommands::parse("/FFF_FFF", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::GggGgg,
+        DefaultCommands::parse("/ggg-ggg", "").unwrap()
+    );
+    assert_eq!(
+        DefaultCommands::HhhHhh,
+        DefaultCommands::parse("/HHH-HHH", "").unwrap()
+    );
+    //assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar",
+    // "").unwrap());
+
+    // assert_eq!(
+    //     "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/
+    // HHH-HHH\n/Bar",     DefaultCommands::descriptions().to_string()
+    // );
+    assert_eq!(
+        "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/\
+         HHH-HHH",
+        DefaultCommands::descriptions().to_string()
+    );
+}

From 013cd8e01d9e248f1ac556ca052bfd30576c2f42 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 3 Oct 2022 16:28:45 +0400
Subject: [PATCH 728/755] use real `teloxide` for tests

---
 Cargo.toml                |   6 +-
 micro-teloxide/Cargo.toml |  11 --
 micro-teloxide/src/lib.rs | 212 --------------------------------------
 tests/command.rs          |   6 +-
 4 files changed, 7 insertions(+), 228 deletions(-)
 delete mode 100644 micro-teloxide/Cargo.toml
 delete mode 100644 micro-teloxide/src/lib.rs

diff --git a/Cargo.toml b/Cargo.toml
index 4a4b43e7..6a4b28b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,5 @@ syn = { version = "1.0.13",  features = ["full"] }
 heck = "0.4.0"
 
 [dev-dependencies]
-teloxide = { path = "micro-teloxide", package = "micro-teloxide" }
-
-[workspace]
-members = [".", "micro-teloxide"]
+# XXX: Do not enable `macros` feature
+teloxide = { git = "https://github.com/teloxide/teloxide.git", rev = "4246455" }
diff --git a/micro-teloxide/Cargo.toml b/micro-teloxide/Cargo.toml
deleted file mode 100644
index 653d32d0..00000000
--- a/micro-teloxide/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "micro-teloxide"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-teloxide-macros = { path = ".." }
-serde = { version = "1.0.145", features = ["derive"] }
-serde_with_macros = "1.5.2"
diff --git a/micro-teloxide/src/lib.rs b/micro-teloxide/src/lib.rs
deleted file mode 100644
index 1131b329..00000000
--- a/micro-teloxide/src/lib.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-//! A minimal "mock" of teloxide crate that is needed to test macros. Changes to
-//! `teloxide`[`-core`] should be kept in sync with this... somehow
-//!
-//! This is a price for placing all crates in separate repositories.
-
-pub use teloxide_macros as macros;
-
-pub mod utils {
-    pub mod command {
-        use std::{
-            error::Error,
-            fmt::{self, Display, Write},
-            marker::PhantomData,
-        };
-
-        pub use teloxide_macros::BotCommands;
-
-        use crate::types::{BotCommand, Me};
-        pub trait BotCommands: Sized {
-            fn parse<N>(s: &str, bot_username: N) -> Result<Self, ParseError>
-            where
-                N: Into<String>;
-
-            fn descriptions() -> CommandDescriptions<'static>;
-
-            fn bot_commands() -> Vec<BotCommand>;
-
-            fn ty() -> PhantomData<Self> {
-                PhantomData
-            }
-        }
-
-        pub type PrefixedBotCommand = String;
-        pub type BotName = String;
-
-        #[derive(Debug)]
-        pub enum ParseError {
-            TooFewArguments { expected: usize, found: usize, message: String },
-            TooManyArguments { expected: usize, found: usize, message: String },
-
-            IncorrectFormat(Box<dyn Error + Send + Sync + 'static>),
-
-            UnknownCommand(PrefixedBotCommand),
-            WrongBotName(BotName),
-
-            Custom(Box<dyn Error + Send + Sync + 'static>),
-        }
-
-        #[derive(Debug, Clone)]
-        #[allow(dead_code)]
-        pub struct CommandDescriptions<'a> {
-            global_description: Option<&'a str>,
-            descriptions: &'a [CommandDescription<'a>],
-            bot_username: Option<&'a str>,
-        }
-
-        #[derive(Debug, Clone)]
-        pub struct CommandDescription<'a> {
-            pub prefix: &'a str,
-            pub command: &'a str,
-            pub description: &'a str,
-        }
-
-        impl<'a> CommandDescriptions<'a> {
-            pub fn new(descriptions: &'a [CommandDescription<'a>]) -> Self {
-                Self {
-                    global_description: None,
-                    descriptions,
-                    bot_username: None,
-                }
-            }
-
-            pub fn global_description(
-                self,
-                global_description: &'a str,
-            ) -> Self {
-                Self { global_description: Some(global_description), ..self }
-            }
-
-            pub fn username(self, bot_username: &'a str) -> Self {
-                Self { bot_username: Some(bot_username), ..self }
-            }
-
-            pub fn username_from_me(
-                self,
-                me: &'a Me,
-            ) -> CommandDescriptions<'a> {
-                self.username(
-                    me.user
-                        .username
-                        .as_deref()
-                        .expect("Bots must have usernames"),
-                )
-            }
-        }
-
-        impl Display for CommandDescriptions<'_> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                if let Some(global_description) = self.global_description {
-                    f.write_str(global_description)?;
-                    f.write_str("\n\n")?;
-                }
-
-                let mut write =
-                    |&CommandDescription { prefix, command, description },
-                     nls| {
-                        if nls {
-                            f.write_char('\n')?;
-                        }
-
-                        f.write_str(prefix)?;
-                        f.write_str(command)?;
-
-                        if let Some(username) = self.bot_username {
-                            f.write_char('@')?;
-                            f.write_str(username)?;
-                        }
-
-                        if !description.is_empty() {
-                            f.write_str(" — ")?;
-                            f.write_str(description)?;
-                        }
-
-                        fmt::Result::Ok(())
-                    };
-
-                if let Some(descr) = self.descriptions.first() {
-                    write(descr, false)?;
-                    for descr in &self.descriptions[1..] {
-                        write(descr, true)?;
-                    }
-                }
-
-                Ok(())
-            }
-        }
-    }
-}
-
-pub mod types {
-    use serde::{Deserialize, Serialize};
-
-    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-    pub struct Me {
-        #[serde(flatten)]
-        pub user: User,
-        pub can_join_groups: bool,
-        pub can_read_all_group_messages: bool,
-        pub supports_inline_queries: bool,
-    }
-    #[serde_with_macros::skip_serializing_none]
-    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-    pub struct User {
-        pub id: UserId,
-        pub is_bot: bool,
-        pub first_name: String,
-        pub last_name: Option<String>,
-        pub username: Option<String>,
-        pub language_code: Option<String>,
-        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-        pub is_premium: bool,
-        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
-        pub added_to_attachment_menu: bool,
-    }
-
-    #[derive(
-        Clone,
-        Copy,
-        Debug,
-        PartialEq,
-        Eq,
-        PartialOrd,
-        Ord,
-        Hash,
-        Serialize,
-        Deserialize,
-    )]
-    #[serde(transparent)]
-    pub struct UserId(pub u64);
-
-    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
-    pub struct BotCommand {
-        pub command: String,
-        pub description: String,
-    }
-
-    impl BotCommand {
-        pub fn new<S1, S2>(command: S1, description: S2) -> Self
-        where
-            S1: Into<String>,
-            S2: Into<String>,
-        {
-            Self { command: command.into(), description: description.into() }
-        }
-
-        pub fn command<S>(mut self, val: S) -> Self
-        where
-            S: Into<String>,
-        {
-            self.command = val.into();
-            self
-        }
-
-        pub fn description<S>(mut self, val: S) -> Self
-        where
-            S: Into<String>,
-        {
-            self.description = val.into();
-            self
-        }
-    }
-}
diff --git a/tests/command.rs b/tests/command.rs
index 248ef9e3..f8fe32a7 100644
--- a/tests/command.rs
+++ b/tests/command.rs
@@ -1,6 +1,10 @@
 //! Test for `teloxide-macros`
 
-use teloxide::utils::command::BotCommands;
+use teloxide_macros::BotCommands;
+
+// Import only trait _methods_, such that we can call `parse`, but we also test
+// that proc macros works without the trait being imported.
+use teloxide::utils::command::BotCommands as _;
 
 #[test]
 fn parse_command_with_args() {

From bd4b74a2971758fdca9813732ee5723d4d633adc Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Mon, 3 Oct 2022 20:28:57 +0600
Subject: [PATCH 729/755] Fix a typo in `tests/command.rs`

---
 tests/command.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/command.rs b/tests/command.rs
index f8fe32a7..135610cf 100644
--- a/tests/command.rs
+++ b/tests/command.rs
@@ -3,7 +3,7 @@
 use teloxide_macros::BotCommands;
 
 // Import only trait _methods_, such that we can call `parse`, but we also test
-// that proc macros works without the trait being imported.
+// that proc macros work without the trait being imported.
 use teloxide::utils::command::BotCommands as _;
 
 #[test]

From 26eba3eb14ea215ade607d86c9f4eb453f6e2f57 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Oct 2022 16:24:28 +0400
Subject: [PATCH 730/755] Rename `rename` => `rename_rule`

---
 src/command_attr.rs | 10 ++++++----
 tests/command.rs    | 42 +++++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/command_attr.rs b/src/command_attr.rs
index 4550f679..fa15d4f0 100644
--- a/src/command_attr.rs
+++ b/src/command_attr.rs
@@ -27,7 +27,7 @@ pub(crate) struct CommandAttr {
 pub(crate) enum CommandAttrKind {
     Prefix(String),
     Description(String),
-    Rename(RenameRule),
+    RenameRule(RenameRule),
     ParseWith(ParserType),
     Separator(String),
 }
@@ -67,7 +67,7 @@ impl CommandAttrs {
                 match attr.kind {
                     Prefix(p) => insert(&mut this.prefix, p, attr.sp),
                     Description(d) => insert(&mut this.description, d, attr.sp),
-                    Rename(r) => insert(&mut this.rename_rule, r, attr.sp),
+                    RenameRule(r) => insert(&mut this.rename_rule, r, attr.sp),
                     ParseWith(p) => insert(&mut this.parser, p, attr.sp),
                     Separator(s) => insert(&mut this.separator, s, attr.sp),
                 }?;
@@ -87,8 +87,10 @@ impl CommandAttr {
         let kind = match &*key.to_string() {
             "prefix" => Prefix(value.expect_string()?),
             "description" => Description(value.expect_string()?),
-            "rename" => Rename(
-                value.expect_string().and_then(|r| RenameRule::parse(&r))?,
+            "rename_rule" => RenameRule(
+                value
+                    .expect_string()
+                    .and_then(|r| self::RenameRule::parse(&r))?,
             ),
             "parse_with" => {
                 ParseWith(value.expect_string().map(|p| ParserType::parse(&p))?)
diff --git a/tests/command.rs b/tests/command.rs
index 135610cf..6300c063 100644
--- a/tests/command.rs
+++ b/tests/command.rs
@@ -9,7 +9,7 @@ use teloxide::utils::command::BotCommands as _;
 #[test]
 fn parse_command_with_args() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         Start(String),
         Help,
@@ -24,7 +24,7 @@ fn parse_command_with_args() {
 #[test]
 fn parse_command_with_non_string_arg() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         Start(i32),
         Help,
@@ -39,7 +39,7 @@ fn parse_command_with_non_string_arg() {
 #[test]
 fn attribute_prefix() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         #[command(prefix = "!")]
         Start(String),
@@ -55,7 +55,7 @@ fn attribute_prefix() {
 #[test]
 fn many_attributes() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         #[command(prefix = "!", description = "desc")]
         Start,
@@ -75,7 +75,11 @@ fn many_attributes() {
 #[test]
 fn global_attributes() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(prefix = "!", rename = "lowercase", description = "Bot commands")]
+    #[command(
+        prefix = "!",
+        rename_rule = "lowercase",
+        description = "Bot commands"
+    )]
     enum DefaultCommands {
         #[command(prefix = "/")]
         Start,
@@ -99,7 +103,7 @@ fn global_attributes() {
 #[test]
 fn parse_command_with_bot_name() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         #[command(prefix = "/")]
         Start,
@@ -115,7 +119,7 @@ fn parse_command_with_bot_name() {
 #[test]
 fn parse_with_split() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     #[command(parse_with = "split")]
     enum DefaultCommands {
         Start(u8, String),
@@ -131,7 +135,7 @@ fn parse_with_split() {
 #[test]
 fn parse_with_split2() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     #[command(parse_with = "split", separator = "|")]
     enum DefaultCommands {
         Start(u8, String),
@@ -174,7 +178,7 @@ fn parse_custom_parser() {
     use parser::custom_parse_function;
 
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         #[command(parse_with = "custom_parse_function")]
         Start(u8, String),
@@ -199,7 +203,7 @@ fn parse_custom_parser() {
 #[test]
 fn parse_named_fields() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     #[command(parse_with = "split")]
     enum DefaultCommands {
         Start { num: u8, data: String },
@@ -215,7 +219,7 @@ fn parse_named_fields() {
 #[test]
 fn descriptions_off() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename = "lowercase")]
+    #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
         #[command(description = "off")]
         Start,
@@ -229,21 +233,21 @@ fn descriptions_off() {
 fn rename_rules() {
     #[derive(BotCommands, Debug, PartialEq)]
     enum DefaultCommands {
-        #[command(rename = "lowercase")]
+        #[command(rename_rule = "lowercase")]
         AaaAaa,
-        #[command(rename = "UPPERCASE")]
+        #[command(rename_rule = "UPPERCASE")]
         BbbBbb,
-        #[command(rename = "PascalCase")]
+        #[command(rename_rule = "PascalCase")]
         CccCcc,
-        #[command(rename = "camelCase")]
+        #[command(rename_rule = "camelCase")]
         DddDdd,
-        #[command(rename = "snake_case")]
+        #[command(rename_rule = "snake_case")]
         EeeEee,
-        #[command(rename = "SCREAMING_SNAKE_CASE")]
+        #[command(rename_rule = "SCREAMING_SNAKE_CASE")]
         FffFff,
-        #[command(rename = "kebab-case")]
+        #[command(rename_rule = "kebab-case")]
         GggGgg,
-        #[command(rename = "SCREAMING-KEBAB-CASE")]
+        #[command(rename_rule = "SCREAMING-KEBAB-CASE")]
         HhhHhh,
         //#[command(rename = "Bar")]
         //Foo,

From ff08854ca9475791e080d8e10824f0ced27ccc20 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Oct 2022 18:03:10 +0400
Subject: [PATCH 731/755] Refactor attributes AGAIN

---
 src/bot_commands.rs | 40 ++++++++++++++----------------
 src/command.rs      | 59 ++++++++++++++++++++++-----------------------
 src/command_attr.rs | 31 +++++++++++++++---------
 src/command_enum.rs | 19 +++++++++------
 src/fields_parse.rs |  2 +-
 5 files changed, 80 insertions(+), 71 deletions(-)

diff --git a/src/bot_commands.rs b/src/bot_commands.rs
index 46d77672..89ee82ce 100644
--- a/src/bot_commands.rs
+++ b/src/bot_commands.rs
@@ -1,6 +1,6 @@
 use crate::{
-    command::Command, command_attr::CommandAttrs, command_enum::CommandEnum,
-    compile_error, fields_parse::impl_parse_args, unzip::Unzip, Result,
+    command::Command, command_enum::CommandEnum, compile_error,
+    fields_parse::impl_parse_args, unzip::Unzip, Result,
 };
 
 use proc_macro2::TokenStream;
@@ -9,22 +9,23 @@ use syn::DeriveInput;
 
 pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
     let data_enum = get_enum_data(&input)?;
-    let enum_attrs = CommandAttrs::from_attributes(&input.attrs)?;
-    let command_enum = CommandEnum::try_from(enum_attrs)?;
+    let command_enum = CommandEnum::from_attributes(&input.attrs)?;
 
     let Unzip(var_init, var_info) = data_enum
         .variants
         .iter()
         .map(|variant| {
-            let attrs = CommandAttrs::from_attributes(&variant.attrs)?;
-            let command = Command::try_from(attrs, &variant.ident.to_string())?;
+            let command = Command::new(
+                &variant.ident.to_string(),
+                &variant.attrs,
+                &command_enum,
+            )?;
 
             let variant_name = &variant.ident;
             let self_variant = quote! { Self::#variant_name };
 
-            let parser =
-                command.parser.as_ref().unwrap_or(&command_enum.parser_type);
-            let parse = impl_parse_args(&variant.fields, self_variant, parser);
+            let parse =
+                impl_parse_args(&variant.fields, self_variant, &command.parser);
 
             Ok((parse, command))
         })
@@ -32,8 +33,8 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
 
     let type_name = &input.ident;
     let fn_descriptions = impl_descriptions(&var_info, &command_enum);
-    let fn_parse = impl_parse(&var_info, &command_enum, &var_init);
-    let fn_commands = impl_commands(&var_info, &command_enum);
+    let fn_parse = impl_parse(&var_info, &var_init);
+    let fn_commands = impl_commands(&var_info);
 
     let trait_impl = quote! {
         impl teloxide::utils::command::BotCommands for #type_name {
@@ -46,15 +47,12 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
     Ok(trait_impl)
 }
 
-fn impl_commands(
-    infos: &[Command],
-    global: &CommandEnum,
-) -> proc_macro2::TokenStream {
+fn impl_commands(infos: &[Command]) -> proc_macro2::TokenStream {
     let commands = infos
         .iter()
         .filter(|command| command.description_is_enabled())
         .map(|command| {
-            let c = command.get_matched_value(global);
+            let c = command.get_prefixed_command();
             let d = command.description.as_deref().unwrap_or_default();
             quote! { BotCommand::new(#c,#d) }
         });
@@ -74,10 +72,9 @@ fn impl_descriptions(
     let command_descriptions = infos
         .iter()
         .filter(|command| command.description_is_enabled())
-        .map(|c| {
-            let (prefix, command) = c.get_matched_value2(global);
-            let description = c.description.clone().unwrap_or_default();
-            quote! { CommandDescription { prefix: #prefix, command: #command, description: #description } }
+        .map(|Command { prefix, name, description, ..}| {
+            let description = description.clone().unwrap_or_default();
+            quote! { CommandDescription { prefix: #prefix, command: #name, description: #description } }
         });
 
     let global_description = match global.description.as_deref() {
@@ -100,10 +97,9 @@ fn impl_descriptions(
 
 fn impl_parse(
     infos: &[Command],
-    global: &CommandEnum,
     variants_initialization: &[proc_macro2::TokenStream],
 ) -> proc_macro2::TokenStream {
-    let matching_values = infos.iter().map(|c| c.get_matched_value(global));
+    let matching_values = infos.iter().map(|c| c.get_prefixed_command());
 
     quote! {
          fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::command::ParseError>
diff --git a/src/command.rs b/src/command.rs
index 769c83cc..1aa8ca21 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,55 +1,54 @@
 use crate::{
     command_attr::CommandAttrs, command_enum::CommandEnum,
-    fields_parse::ParserType, rename_rules::RenameRule, Result,
+    fields_parse::ParserType, Result,
 };
 
 pub(crate) struct Command {
-    pub prefix: Option<String>,
+    /// Prefix of this command, for example "/".
+    pub prefix: String,
+    /// Description for the command.
     pub description: Option<String>,
-    pub parser: Option<ParserType>,
+    /// Name of the command, with all renames already applied.
     pub name: String,
+    /// Parser for arguments of this command.
+    pub parser: ParserType,
 }
 
 impl Command {
-    pub fn try_from(attrs: CommandAttrs, name: &str) -> Result<Self> {
+    pub fn new(
+        name: &str,
+        attributes: &[syn::Attribute],
+        global_options: &CommandEnum,
+    ) -> Result<Self> {
+        let attrs = CommandAttrs::from_attributes(attributes)?;
         let CommandAttrs {
             prefix,
             description,
             rename_rule,
             parser,
+            // FIXME: error on/do not ignore separator
             separator: _,
         } = attrs;
 
-        let name = rename_rule.unwrap_or(RenameRule::Identity).apply(name);
+        let name = rename_rule
+            .map(|(rr, _)| rr)
+            .unwrap_or(global_options.rename_rule)
+            .apply(name);
+
+        let prefix = prefix
+            .map(|(p, _)| p)
+            .unwrap_or_else(|| global_options.prefix.clone());
+        let description = description.map(|(d, _)| d);
+        let parser = parser
+            .map(|(p, _)| p)
+            .unwrap_or_else(|| global_options.parser_type.clone());
 
         Ok(Self { prefix, description, parser, name })
     }
 
-    pub fn get_matched_value(&self, global_parameters: &CommandEnum) -> String {
-        let prefix = if let Some(prefix) = &self.prefix {
-            prefix
-        } else if let Some(prefix) = &global_parameters.prefix {
-            prefix
-        } else {
-            "/"
-        };
-
-        String::from(prefix) + &global_parameters.rename_rule.apply(&self.name)
-    }
-
-    pub fn get_matched_value2(
-        &self,
-        global_parameters: &CommandEnum,
-    ) -> (String, String) {
-        let prefix = if let Some(prefix) = &self.prefix {
-            prefix
-        } else if let Some(prefix) = &global_parameters.prefix {
-            prefix
-        } else {
-            "/"
-        };
-
-        (String::from(prefix), global_parameters.rename_rule.apply(&self.name))
+    pub fn get_prefixed_command(&self) -> String {
+        let Self { prefix, name, .. } = self;
+        format!("{prefix}{name}")
     }
 
     pub(crate) fn description_is_enabled(&self) -> bool {
diff --git a/src/command_attr.rs b/src/command_attr.rs
index fa15d4f0..c8937891 100644
--- a/src/command_attr.rs
+++ b/src/command_attr.rs
@@ -9,22 +9,31 @@ use crate::{
 use proc_macro2::Span;
 use syn::Attribute;
 
-/// Attributes for `BotCommands` derive macro.
+/// All attributes that can be used for `derive(BotCommands)`
 pub(crate) struct CommandAttrs {
-    pub prefix: Option<String>,
-    pub description: Option<String>,
-    pub rename_rule: Option<RenameRule>,
-    pub parser: Option<ParserType>,
-    pub separator: Option<String>,
+    pub prefix: Option<(String, Span)>,
+    pub description: Option<(String, Span)>,
+    pub rename_rule: Option<(RenameRule, Span)>,
+    pub parser: Option<(ParserType, Span)>,
+    pub separator: Option<(String, Span)>,
 }
 
-/// An attribute for `BotCommands` derive macro.
-pub(crate) struct CommandAttr {
+/// A single k/v attribute for `BotCommands` derive macro.
+///
+/// For example:
+/// ```text
+///   #[command(prefix = "!", rename_rule = "snake_case")]
+///            /^^^^^^^^^^^^  ^^^^^^^^^^^^^^^^^^^^^^^^^^---- CommandAttr { kind: RenameRule(SnakeCase) }
+///            |
+///            CommandAttr { kind: Prefix("!") }
+/// ```
+struct CommandAttr {
     kind: CommandAttrKind,
     sp: Span,
 }
 
-pub(crate) enum CommandAttrKind {
+/// Kind of [`CommandAttr`].
+enum CommandAttrKind {
     Prefix(String),
     Description(String),
     RenameRule(RenameRule),
@@ -49,13 +58,13 @@ impl CommandAttrs {
             },
             |mut this, attr| {
                 fn insert<T>(
-                    opt: &mut Option<T>,
+                    opt: &mut Option<(T, Span)>,
                     x: T,
                     sp: Span,
                 ) -> Result<()> {
                     match opt {
                         slot @ None => {
-                            *slot = Some(x);
+                            *slot = Some((x, sp));
                             Ok(())
                         }
                         Some(_) => {
diff --git a/src/command_enum.rs b/src/command_enum.rs
index ad3959a0..6720c88f 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -5,14 +5,15 @@ use crate::{
 
 #[derive(Debug)]
 pub(crate) struct CommandEnum {
-    pub prefix: Option<String>,
+    pub prefix: String,
     pub description: Option<String>,
     pub rename_rule: RenameRule,
     pub parser_type: ParserType,
 }
 
 impl CommandEnum {
-    pub fn try_from(attrs: CommandAttrs) -> Result<Self> {
+    pub fn from_attributes(attributes: &[syn::Attribute]) -> Result<Self> {
+        let attrs = CommandAttrs::from_attributes(attributes)?;
         let CommandAttrs {
             prefix,
             description,
@@ -20,18 +21,22 @@ impl CommandEnum {
             parser,
             separator,
         } = attrs;
-        let mut parser = parser.unwrap_or(ParserType::Default);
+
+        let mut parser = parser.map(|(p, _)| p).unwrap_or(ParserType::Default);
 
         // FIXME: Error on unused separator
-        if let (ParserType::Split { separator }, Some(s)) =
+        if let (ParserType::Split { separator }, Some((s, _))) =
             (&mut parser, &separator)
         {
             *separator = Some(s.clone())
         }
+
         Ok(Self {
-            prefix,
-            description,
-            rename_rule: rename_rule.unwrap_or(RenameRule::Identity),
+            prefix: prefix.map(|(p, _)| p).unwrap_or_else(|| "/".to_owned()),
+            description: description.map(|(d, _)| d),
+            rename_rule: rename_rule
+                .map(|(rr, _)| rr)
+                .unwrap_or(RenameRule::Identity),
             parser_type: parser,
         })
     }
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index a9a2d0b2..6dc2baeb 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,7 +1,7 @@
 use quote::quote;
 use syn::{Fields, FieldsNamed, FieldsUnnamed, Type};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub(crate) enum ParserType {
     Default,
     Split { separator: Option<String> },

From f3bb54d670e8bb9d9a9d82eb6fb254a231c47fa7 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Sun, 2 Oct 2022 18:13:54 +0400
Subject: [PATCH 732/755] Add `#[command(rename = "blah")]`

---
 src/command.rs      | 18 +++++++++++++-----
 src/command_attr.rs |  5 +++++
 src/command_enum.rs | 12 ++++++++++--
 tests/command.rs    | 16 +++++++---------
 4 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 1aa8ca21..72b05f3e 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -1,6 +1,6 @@
 use crate::{
     command_attr::CommandAttrs, command_enum::CommandEnum,
-    fields_parse::ParserType, Result,
+    error::compile_error_at, fields_parse::ParserType, Result,
 };
 
 pub(crate) struct Command {
@@ -25,15 +25,23 @@ impl Command {
             prefix,
             description,
             rename_rule,
+            rename,
             parser,
             // FIXME: error on/do not ignore separator
             separator: _,
         } = attrs;
 
-        let name = rename_rule
-            .map(|(rr, _)| rr)
-            .unwrap_or(global_options.rename_rule)
-            .apply(name);
+        let name = match (rename, rename_rule) {
+            (Some((rename, _)), None) => rename,
+            (Some(_), Some((_, sp))) => {
+                return Err(compile_error_at(
+                    "`rename_rule` can't be applied to `rename`-d variant",
+                    sp,
+                ))
+            }
+            (None, Some((rule, _))) => rule.apply(name),
+            (None, None) => global_options.rename_rule.apply(name),
+        };
 
         let prefix = prefix
             .map(|(p, _)| p)
diff --git a/src/command_attr.rs b/src/command_attr.rs
index c8937891..3aeb8e63 100644
--- a/src/command_attr.rs
+++ b/src/command_attr.rs
@@ -14,6 +14,7 @@ pub(crate) struct CommandAttrs {
     pub prefix: Option<(String, Span)>,
     pub description: Option<(String, Span)>,
     pub rename_rule: Option<(RenameRule, Span)>,
+    pub rename: Option<(String, Span)>,
     pub parser: Option<(ParserType, Span)>,
     pub separator: Option<(String, Span)>,
 }
@@ -37,6 +38,7 @@ enum CommandAttrKind {
     Prefix(String),
     Description(String),
     RenameRule(RenameRule),
+    Rename(String),
     ParseWith(ParserType),
     Separator(String),
 }
@@ -53,6 +55,7 @@ impl CommandAttrs {
                 prefix: None,
                 description: None,
                 rename_rule: None,
+                rename: None,
                 parser: None,
                 separator: None,
             },
@@ -77,6 +80,7 @@ impl CommandAttrs {
                     Prefix(p) => insert(&mut this.prefix, p, attr.sp),
                     Description(d) => insert(&mut this.description, d, attr.sp),
                     RenameRule(r) => insert(&mut this.rename_rule, r, attr.sp),
+                    Rename(r) => insert(&mut this.rename, r, attr.sp),
                     ParseWith(p) => insert(&mut this.parser, p, attr.sp),
                     Separator(s) => insert(&mut this.separator, s, attr.sp),
                 }?;
@@ -101,6 +105,7 @@ impl CommandAttr {
                     .expect_string()
                     .and_then(|r| self::RenameRule::parse(&r))?,
             ),
+            "rename" => Rename(value.expect_string()?),
             "parse_with" => {
                 ParseWith(value.expect_string().map(|p| ParserType::parse(&p))?)
             }
diff --git a/src/command_enum.rs b/src/command_enum.rs
index 6720c88f..2a882e17 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -1,6 +1,6 @@
 use crate::{
-    command_attr::CommandAttrs, fields_parse::ParserType,
-    rename_rules::RenameRule, Result,
+    command_attr::CommandAttrs, error::compile_error_at,
+    fields_parse::ParserType, rename_rules::RenameRule, Result,
 };
 
 #[derive(Debug)]
@@ -18,10 +18,18 @@ impl CommandEnum {
             prefix,
             description,
             rename_rule,
+            rename,
             parser,
             separator,
         } = attrs;
 
+        if let Some((_rename, sp)) = rename {
+            return Err(compile_error_at(
+                "`rename` attribute can only be applied to enums *variants*",
+                sp,
+            ));
+        }
+
         let mut parser = parser.map(|(p, _)| p).unwrap_or(ParserType::Default);
 
         // FIXME: Error on unused separator
diff --git a/tests/command.rs b/tests/command.rs
index 6300c063..f7297c8d 100644
--- a/tests/command.rs
+++ b/tests/command.rs
@@ -249,8 +249,8 @@ fn rename_rules() {
         GggGgg,
         #[command(rename_rule = "SCREAMING-KEBAB-CASE")]
         HhhHhh,
-        //#[command(rename = "Bar")]
-        //Foo,
+        #[command(rename = "Bar")]
+        Foo,
     }
 
     assert_eq!(
@@ -285,16 +285,14 @@ fn rename_rules() {
         DefaultCommands::HhhHhh,
         DefaultCommands::parse("/HHH-HHH", "").unwrap()
     );
-    //assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar",
-    // "").unwrap());
+    assert_eq!(
+        DefaultCommands::Foo,
+        DefaultCommands::parse("/Bar", "").unwrap()
+    );
 
-    // assert_eq!(
-    //     "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/
-    // HHH-HHH\n/Bar",     DefaultCommands::descriptions().to_string()
-    // );
     assert_eq!(
         "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/\
-         HHH-HHH",
+         HHH-HHH\n/Bar",
         DefaultCommands::descriptions().to_string()
     );
 }

From 7beb705b4ae7a88867b7d8a760c4f5ab8df6aafe Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 3 Oct 2022 20:54:05 +0400
Subject: [PATCH 733/755] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0916ad5..9c997856 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- `#[command(rename = "a_name_that_is_not_a_case_name")]` doesn't work anymore
+- `#[command(rename = "...")]` now always renames to `"..."`, to rename multiple commands using the same pattern, use `#[command(rename_rule = "snake_case")]` and the like.
 
 ## 0.6.3 - 2022-07-19
 

From a2a79e29cb106a5d3052cf32a23e698db859cc2a Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Wed, 5 Oct 2022 09:58:25 +0400
Subject: [PATCH 734/755] adapt to teloxide changes

---
 Cargo.toml          | 2 +-
 src/bot_commands.rs | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6a4b28b1..5900ee5f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,4 +18,4 @@ heck = "0.4.0"
 
 [dev-dependencies]
 # XXX: Do not enable `macros` feature
-teloxide = { git = "https://github.com/teloxide/teloxide.git", rev = "4246455" }
+teloxide = { git = "https://github.com/teloxide/teloxide.git", rev = "b5e237a8a22f9f987b6e4245b9b6c3ca1f804c19" }
diff --git a/src/bot_commands.rs b/src/bot_commands.rs
index 89ee82ce..7d7337e6 100644
--- a/src/bot_commands.rs
+++ b/src/bot_commands.rs
@@ -102,10 +102,7 @@ fn impl_parse(
     let matching_values = infos.iter().map(|c| c.get_prefixed_command());
 
     quote! {
-         fn parse<N>(s: &str, bot_name: N) -> Result<Self, teloxide::utils::command::ParseError>
-         where
-              N: Into<String>
-         {
+         fn parse(s: &str, bot_name: &str) -> Result<Self, teloxide::utils::command::ParseError> {
               // FIXME: we should probably just call a helper function from `teloxide`, instead of parsing command syntax ourselves
               use std::str::FromStr;
               use teloxide::utils::command::ParseError;
@@ -121,7 +118,7 @@ fn impl_parse(
               let bot_username = full_command.next();
               match bot_username {
                   None => {}
-                  Some(username) if username.eq_ignore_ascii_case(&bot_name.into()) => {}
+                  Some(username) if username.eq_ignore_ascii_case(bot_name) => {}
                   Some(n) => return Err(ParseError::WrongBotName(n.to_owned())),
               }
 

From ff1e0fc305587f0c51976cc942dba1aa535f1b27 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Thu, 6 Oct 2022 14:18:29 +0400
Subject: [PATCH 735/755] Parse path instead of string when parsing
 `parse_with`

---
 CHANGELOG.md        |  1 +
 src/attr.rs         |  2 +-
 src/command_attr.rs |  4 +---
 src/fields_parse.rs | 28 ++++++++++++++--------------
 tests/command.rs    |  4 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c997856..a3bc8fec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - `#[command(rename = "...")]` now always renames to `"..."`, to rename multiple commands using the same pattern, use `#[command(rename_rule = "snake_case")]` and the like.
+- `#[command(parse_with = ...)]` now requires a path, instead of a string, when specifying custom parsers
 
 ## 0.6.3 - 2022-07-19
 
diff --git a/src/attr.rs b/src/attr.rs
index dd4b9493..04a070ed 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -99,7 +99,7 @@ impl AttrValue {
     //     })
     // }
 
-    fn expect<T>(
+    pub fn expect<T>(
         self,
         expected: &str,
         f: impl FnOnce(Self) -> Result<T, Self>,
diff --git a/src/command_attr.rs b/src/command_attr.rs
index 3aeb8e63..e735b7bb 100644
--- a/src/command_attr.rs
+++ b/src/command_attr.rs
@@ -106,9 +106,7 @@ impl CommandAttr {
                     .and_then(|r| self::RenameRule::parse(&r))?,
             ),
             "rename" => Rename(value.expect_string()?),
-            "parse_with" => {
-                ParseWith(value.expect_string().map(|p| ParserType::parse(&p))?)
-            }
+            "parse_with" => ParseWith(ParserType::parse(value)?),
             "separator" => Separator(value.expect_string()?),
             _ => {
                 return Err(compile_error_at(
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 6dc2baeb..1845812a 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -1,21 +1,26 @@
 use quote::quote;
 use syn::{Fields, FieldsNamed, FieldsUnnamed, Type};
 
+use crate::{attr::AttrValue, error::Result};
+
 #[derive(Debug, Clone)]
 pub(crate) enum ParserType {
     Default,
     Split { separator: Option<String> },
-    Custom(String),
+    Custom(syn::Path),
 }
 
 impl ParserType {
-    // FIXME: use path for custom
-    pub fn parse(data: &str) -> Self {
-        match data {
-            "default" => ParserType::Default,
-            "split" => ParserType::Split { separator: None },
-            s => ParserType::Custom(s.to_owned()),
-        }
+    pub fn parse(value: AttrValue) -> Result<Self> {
+        value.expect(r#""default", "split" or a path"#, |v| match v {
+            AttrValue::Path(p) => Ok(ParserType::Custom(p)),
+            AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {
+                "default" => Ok(ParserType::Default),
+                "split" => Ok(ParserType::Split { separator: None }),
+                _ => Err(v),
+            },
+            _ => Err(v),
+        })
     }
 }
 
@@ -101,12 +106,7 @@ fn create_parser<'a>(
             &separator.clone().unwrap_or_else(|| " ".to_owned()),
             types,
         ),
-        ParserType::Custom(s) => {
-            let path = syn::parse_str::<syn::Path>(s).unwrap_or_else(|_| {
-                panic!("Failed to parse a custom command parser, {}", s)
-            });
-            quote! { #path }
-        }
+        ParserType::Custom(path) => quote! { #path },
     };
 
     quote! {
diff --git a/tests/command.rs b/tests/command.rs
index f7297c8d..65aea651 100644
--- a/tests/command.rs
+++ b/tests/command.rs
@@ -180,11 +180,11 @@ fn parse_custom_parser() {
     #[derive(BotCommands, Debug, PartialEq)]
     #[command(rename_rule = "lowercase")]
     enum DefaultCommands {
-        #[command(parse_with = "custom_parse_function")]
+        #[command(parse_with = custom_parse_function)]
         Start(u8, String),
 
         // Test <https://github.com/teloxide/teloxide/issues/668>.
-        #[command(parse_with = "parser::custom_parse_function")]
+        #[command(parse_with = parser::custom_parse_function)]
         TestPath(u8, String),
 
         Help,

From 6ae6b0024e9f1e0cca78bde9c84513e6d08720d0 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 6 Oct 2022 17:54:31 +0600
Subject: [PATCH 736/755] Enhance an error message about a path

---
 src/fields_parse.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 1845812a..a94de2ae 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -12,15 +12,18 @@ pub(crate) enum ParserType {
 
 impl ParserType {
     pub fn parse(value: AttrValue) -> Result<Self> {
-        value.expect(r#""default", "split" or a path"#, |v| match v {
-            AttrValue::Path(p) => Ok(ParserType::Custom(p)),
-            AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {
-                "default" => Ok(ParserType::Default),
-                "split" => Ok(ParserType::Split { separator: None }),
+        value.expect(
+            r#""default", "split", or a path for custom parsers"#,
+            |v| match v {
+                AttrValue::Path(p) => Ok(ParserType::Custom(p)),
+                AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {
+                    "default" => Ok(ParserType::Default),
+                    "split" => Ok(ParserType::Split { separator: None }),
+                    _ => Err(v),
+                },
                 _ => Err(v),
             },
-            _ => Err(v),
-        })
+        )
     }
 }
 

From ff2b479dc9f649cf7071f981ae28f7b6bc65a95f Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 6 Oct 2022 18:02:28 +0600
Subject: [PATCH 737/755] Update the error message wording

Co-authored-by: Waffle Maybe <waffle.lapkin@gmail.com>
---
 src/fields_parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index a94de2ae..599aa0c4 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -13,7 +13,7 @@ pub(crate) enum ParserType {
 impl ParserType {
     pub fn parse(value: AttrValue) -> Result<Self> {
         value.expect(
-            r#""default", "split", or a path for custom parsers"#,
+            r#""default", "split", or a path to a custom parser function"#,
             |v| match v {
                 AttrValue::Path(p) => Ok(ParserType::Custom(p)),
                 AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {

From e5d08c168efeabffac7377fddf6923df53d2d73e Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 6 Oct 2022 22:54:30 +0600
Subject: [PATCH 738/755] Release v0.7.0

---
 CHANGELOG.md | 12 +++++++++---
 Cargo.toml   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3bc8fec..34b61e81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,14 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## 0.7.0 - 2022-10-06
+
 ### Removed
 
-- Remove `derive(DialogueState)` macro
+- `derive(DialogueState)` macro
 
 ### Changed
 
-- `#[command(rename = "...")]` now always renames to `"..."`, to rename multiple commands using the same pattern, use `#[command(rename_rule = "snake_case")]` and the like.
-- `#[command(parse_with = ...)]` now requires a path, instead of a string, when specifying custom parsers
+- `#[command(rename = "...")]` now always renames to `"..."`; to rename multiple commands using the same pattern, use `#[command(rename_rule = "snake_case")]` and the like.
+- `#[command(parse_with = ...)]` now requires a path, instead of a string, when specifying custom parsers.
+
+### Fixed
+
+- `#[derive(BotCommands)]` even if the trait is not imported ([issue #717](https://github.com/teloxide/teloxide/issues/717)).
 
 ## 0.6.3 - 2022-07-19
 
diff --git a/Cargo.toml b/Cargo.toml
index 5900ee5f..d9295f49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "teloxide-macros"
-version = "0.6.3"
+version = "0.7.0"
 description = "The teloxide's procedural macros"
 license = "MIT"
 edition = "2018"

From d17ebafb386e78d0e068d95484e6c5ded0aacab8 Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 6 Oct 2022 23:08:34 +0600
Subject: [PATCH 739/755] Remove `#[derive(Debug)]`

For some reason, it doesn't allow publishing a new release.
---
 src/command_enum.rs | 1 -
 src/fields_parse.rs | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/command_enum.rs b/src/command_enum.rs
index 2a882e17..55f37610 100644
--- a/src/command_enum.rs
+++ b/src/command_enum.rs
@@ -3,7 +3,6 @@ use crate::{
     fields_parse::ParserType, rename_rules::RenameRule, Result,
 };
 
-#[derive(Debug)]
 pub(crate) struct CommandEnum {
     pub prefix: String,
     pub description: Option<String>,
diff --git a/src/fields_parse.rs b/src/fields_parse.rs
index 599aa0c4..caf53127 100644
--- a/src/fields_parse.rs
+++ b/src/fields_parse.rs
@@ -3,7 +3,7 @@ use syn::{Fields, FieldsNamed, FieldsUnnamed, Type};
 
 use crate::{attr::AttrValue, error::Result};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub(crate) enum ParserType {
     Default,
     Split { separator: Option<String> },

From 1ec3eabfeb2fbf84b07ea6c563ecbd6e6c65a8ac Mon Sep 17 00:00:00 2001
From: Hirrolot <hirrolot@gmail.com>
Date: Thu, 6 Oct 2022 23:37:04 +0600
Subject: [PATCH 740/755] Move to the 2021 edition

---
 Cargo.toml   | 2 +-
 src/error.rs | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d9295f49..e2cb3d1c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "teloxide-macros"
 version = "0.7.0"
 description = "The teloxide's procedural macros"
 license = "MIT"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/src/error.rs b/src/error.rs
index 3f1603bf..0d27c475 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -17,8 +17,6 @@ pub(crate) fn compile_error_at(msg: &str, sp: Span) -> Error {
     use proc_macro2::{
         Delimiter, Group, Ident, Literal, Punct, Spacing, TokenTree,
     };
-    use std::iter::FromIterator;
-
     // compile_error! { $msg }
     let ts = TokenStream::from_iter(vec![
         TokenTree::Ident(Ident::new("compile_error", sp)),

From c56e1cbe6f1b22c92bdfd98085b97dd08181ad6c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Nov 2022 15:13:11 +0400
Subject: [PATCH 741/755] Move teloxide to `crates/` folder

---
 .gitignore                                    |   2 -
 Cargo.toml                                    | 174 +-----------------
 crates/teloxide/Cargo.toml                    | 172 +++++++++++++++++
 .../teloxide/examples}/Procfile               |   0
 .../teloxide/examples}/README.md              |   0
 .../teloxide/examples}/admin.rs               |   0
 .../teloxide/examples}/buttons.rs             |   0
 .../teloxide/examples}/command.rs             |   0
 .../teloxide/examples}/db_remember.rs         |   0
 .../teloxide/examples}/dialogue.rs            |   0
 .../examples}/dispatching_features.rs         |   0
 .../teloxide/examples}/heroku_ping_pong.rs    |   0
 .../teloxide/examples}/inline.rs              |   0
 .../teloxide/examples}/ngrok_ping_pong.rs     |   0
 .../teloxide/examples}/purchase.rs            |   0
 .../teloxide/examples}/shared_state.rs        |   0
 .../teloxide/examples}/throw_dice.rs          |   0
 {src => crates/teloxide/src}/dispatching.rs   |   0
 .../teloxide/src}/dispatching/dialogue.rs     |   0
 .../src}/dispatching/dialogue/get_chat_id.rs  |   0
 .../src}/dispatching/dialogue/storage.rs      |   0
 .../dialogue/storage/in_mem_storage.rs        |   0
 .../dialogue/storage/redis_storage.rs         |   0
 .../dialogue/storage/rocksdb_storage.rs       |   0
 .../dialogue/storage/serializer.rs            |   0
 .../dialogue/storage/sqlite_storage.rs        |   0
 .../dialogue/storage/trace_storage.rs         |   0
 .../teloxide/src}/dispatching/dispatcher.rs   |   0
 .../teloxide/src}/dispatching/distribution.rs |   0
 .../teloxide/src}/dispatching/filter_ext.rs   |   0
 .../src}/dispatching/handler_description.rs   |   0
 .../teloxide/src}/dispatching/handler_ext.rs  |   0
 .../teloxide/src}/dispatching/repls.rs        |   0
 .../src}/dispatching/repls/caution.md         |   0
 .../src}/dispatching/repls/commands_repl.rs   |   0
 .../src}/dispatching/repls/preamble.md        |   0
 .../teloxide/src}/dispatching/repls/repl.rs   |   0
 .../src}/dispatching/repls/stopping.md        |   0
 .../src}/dispatching/update_listeners.rs      |   0
 .../dispatching/update_listeners/polling.rs   |   0
 .../update_listeners/stateful_listener.rs     |   0
 .../dispatching/update_listeners/webhooks.rs  |   0
 .../update_listeners/webhooks/axum.rs         |   0
 .../teloxide/src}/error_handlers.rs           |   0
 {src => crates/teloxide/src}/features.md      |   0
 {src => crates/teloxide/src}/lib.rs           |   0
 {src => crates/teloxide/src}/prelude.rs       |   0
 {src => crates/teloxide/src}/stop.rs          |   0
 {src => crates/teloxide/src}/utils.rs         |   0
 {src => crates/teloxide/src}/utils/command.rs |   0
 {src => crates/teloxide/src}/utils/html.rs    |   0
 .../teloxide/src}/utils/markdown.rs           |   0
 .../teloxide/src}/utils/shutdown_token.rs     |   0
 {tests => crates/teloxide/tests}/command.rs   |   0
 {tests => crates/teloxide/tests}/redis.rs     |   0
 {tests => crates/teloxide/tests}/rocksdb.rs   |   0
 {tests => crates/teloxide/tests}/sqlite.rs    |   0
 57 files changed, 174 insertions(+), 174 deletions(-)
 create mode 100644 crates/teloxide/Cargo.toml
 rename {examples => crates/teloxide/examples}/Procfile (100%)
 rename {examples => crates/teloxide/examples}/README.md (100%)
 rename {examples => crates/teloxide/examples}/admin.rs (100%)
 rename {examples => crates/teloxide/examples}/buttons.rs (100%)
 rename {examples => crates/teloxide/examples}/command.rs (100%)
 rename {examples => crates/teloxide/examples}/db_remember.rs (100%)
 rename {examples => crates/teloxide/examples}/dialogue.rs (100%)
 rename {examples => crates/teloxide/examples}/dispatching_features.rs (100%)
 rename {examples => crates/teloxide/examples}/heroku_ping_pong.rs (100%)
 rename {examples => crates/teloxide/examples}/inline.rs (100%)
 rename {examples => crates/teloxide/examples}/ngrok_ping_pong.rs (100%)
 rename {examples => crates/teloxide/examples}/purchase.rs (100%)
 rename {examples => crates/teloxide/examples}/shared_state.rs (100%)
 rename {examples => crates/teloxide/examples}/throw_dice.rs (100%)
 rename {src => crates/teloxide/src}/dispatching.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/get_chat_id.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/in_mem_storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/redis_storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/rocksdb_storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/serializer.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/sqlite_storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dialogue/storage/trace_storage.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/dispatcher.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/distribution.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/filter_ext.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/handler_description.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/handler_ext.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/repls.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/repls/caution.md (100%)
 rename {src => crates/teloxide/src}/dispatching/repls/commands_repl.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/repls/preamble.md (100%)
 rename {src => crates/teloxide/src}/dispatching/repls/repl.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/repls/stopping.md (100%)
 rename {src => crates/teloxide/src}/dispatching/update_listeners.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/update_listeners/polling.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/update_listeners/stateful_listener.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/update_listeners/webhooks.rs (100%)
 rename {src => crates/teloxide/src}/dispatching/update_listeners/webhooks/axum.rs (100%)
 rename {src => crates/teloxide/src}/error_handlers.rs (100%)
 rename {src => crates/teloxide/src}/features.md (100%)
 rename {src => crates/teloxide/src}/lib.rs (100%)
 rename {src => crates/teloxide/src}/prelude.rs (100%)
 rename {src => crates/teloxide/src}/stop.rs (100%)
 rename {src => crates/teloxide/src}/utils.rs (100%)
 rename {src => crates/teloxide/src}/utils/command.rs (100%)
 rename {src => crates/teloxide/src}/utils/html.rs (100%)
 rename {src => crates/teloxide/src}/utils/markdown.rs (100%)
 rename {src => crates/teloxide/src}/utils/shutdown_token.rs (100%)
 rename {tests => crates/teloxide/tests}/command.rs (100%)
 rename {tests => crates/teloxide/tests}/redis.rs (100%)
 rename {tests => crates/teloxide/tests}/rocksdb.rs (100%)
 rename {tests => crates/teloxide/tests}/sqlite.rs (100%)

diff --git a/.gitignore b/.gitignore
index b1c241c5..97693892 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 /target
-**/*.rs.bk
 Cargo.lock
 .idea/
 .vscode/
-examples/*/target
 *.sqlite
diff --git a/Cargo.toml b/Cargo.toml
index f4056c49..c66a4d73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,172 +1,2 @@
-[package]
-name = "teloxide"
-version = "0.11.1"
-edition = "2021"
-description = "An elegant Telegram bots framework for Rust"
-repository = "https://github.com/teloxide/teloxide"
-documentation = "https://docs.rs/teloxide/"
-readme = "README.md"
-keywords = ["teloxide", "telegram", "telegram-bot", "telegram-bot-api"]
-categories = ["web-programming", "api-bindings", "asynchronous"]
-license = "MIT"
-exclude = ["media"]
-
-[features]
-default = ["native-tls", "ctrlc_handler", "teloxide-core/default",  "auto-send"]
-
-webhooks = ["rand"]
-webhooks-axum = ["webhooks", "axum", "tower", "tower-http"]
-
-sqlite-storage = ["sqlx"]
-redis-storage = ["redis"]
-rocksdb-storage = ["rocksdb"]
-cbor-serializer = ["serde_cbor"]
-bincode-serializer = ["bincode"]
-
-macros = ["teloxide-macros"]
-
-ctrlc_handler = ["tokio/signal"]
-
-native-tls = ["teloxide-core/native-tls"]
-rustls = ["teloxide-core/rustls"]
-auto-send = ["teloxide-core/auto_send"]
-throttle = ["teloxide-core/throttle"]
-cache-me = ["teloxide-core/cache_me"]
-trace-adaptor = ["teloxide-core/trace_adaptor"]
-erased = ["teloxide-core/erased"]
-
-# currently used for `README.md` tests, building docs for `docsrs` to add `This is supported on feature="..." only.`,
-# and for teloxide-core.
-nightly = ["teloxide-core/nightly"]
-
-full = [
-    "webhooks-axum",
-    "sqlite-storage",
-    "redis-storage",
-    "rocksdb-storage",
-    "cbor-serializer",
-    "bincode-serializer",
-    "macros",
-    "ctrlc_handler",
-    "teloxide-core/full",
-    "native-tls",
-    "rustls",
-    "auto-send",
-    "throttle",
-    "cache-me",
-    "trace-adaptor",
-    "erased",
-]
-
-[dependencies]
-teloxide-core = { version = "0.8.0", default-features = false }
-teloxide-macros = { version = "0.7.0", optional = true }
-
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-
-dptree = "0.3.0"
-
-# These lines are used only for development.
-# teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "00165e6", default-features = false }
-# teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true }
-# dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" }
-
-tokio = { version = "1.8", features = ["fs"] }
-tokio-util = "0.7"
-tokio-stream = "0.1.8"
-
-url = "2.2.2"
-log = "0.4"
-bytes = "1.0"
-mime = "0.3"
-
-derive_more = "0.99"
-thiserror = "1.0"
-futures = "0.3.15"
-pin-project = "1.0"
-serde_with_macros = "1.4"
-aquamarine = "0.1.11"
-
-sqlx = { version = "0.6", optional = true, default-features = false, features = [
-        "runtime-tokio-native-tls",
-        "macros",
-        "sqlite",
-] }
-redis = { version = "0.21", features = ["tokio-comp"], optional = true }
-rocksdb = { version = "0.19", optional = true, default-features = false, features = [
-        "lz4",
-] }
-serde_cbor = { version = "0.11", optional = true }
-bincode = { version = "1.3", optional = true }
-axum = { version = "0.5.13", optional = true }
-tower = { version = "0.4.12", optional = true }
-tower-http = { version = "0.3.4", features = ["trace"], optional = true }
-rand = { version = "0.8.5", optional = true }
-
-[dev-dependencies]
-rand = "0.8.3"
-pretty_env_logger = "0.4.0"
-serde = "1"
-serde_json = "1"
-tokio = { version = "1.8", features = ["fs", "rt-multi-thread", "macros"] }
-reqwest = "0.11.11"
-chrono = "0.4"
-tokio-stream = "0.1"
-
-[package.metadata.docs.rs]
-all-features = true
-# FIXME: Add back "-Znormalize-docs" when https://github.com/rust-lang/rust/issues/93703 is fixed
-rustdoc-args = ["--cfg", "docsrs"]
-rustc-args = ["--cfg", "dep_docsrs"]
-cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples=examples"]
-
-[[test]]
-name = "redis"
-path = "tests/redis.rs"
-required-features = ["redis-storage", "cbor-serializer", "bincode-serializer"]
-
-[[test]]
-name = "sqlite"
-path = "tests/sqlite.rs"
-required-features = ["sqlite-storage", "cbor-serializer", "bincode-serializer"]
-
-[[example]]
-name = "dialogue"
-required-features = ["macros"]
-
-[[example]]
-name = "command"
-required-features = ["macros"]
-
-[[example]]
-name = "db_remember"
-required-features = ["sqlite-storage", "redis-storage", "bincode-serializer", "macros"]
-
-[[example]]
-name = "inline"
-required-features = ["macros"]
-
-[[example]]
-name = "buttons"
-required-features = ["macros"]
-
-[[example]]
-name = "admin"
-required-features = ["macros"]
-
-[[example]]
-name = "dispatching_features"
-required-features = ["macros"]
-
-[[example]]
-name = "ngrok_ping_pong"
-required-features = ["webhooks-axum"]
-
-[[example]]
-name = "heroku_ping_pong"
-required-features = ["webhooks-axum"]
-
-[[example]]
-name = "purchase"
-required-features = ["macros"]
+[workspace]
+members = ["crates/*"]
diff --git a/crates/teloxide/Cargo.toml b/crates/teloxide/Cargo.toml
new file mode 100644
index 00000000..f4056c49
--- /dev/null
+++ b/crates/teloxide/Cargo.toml
@@ -0,0 +1,172 @@
+[package]
+name = "teloxide"
+version = "0.11.1"
+edition = "2021"
+description = "An elegant Telegram bots framework for Rust"
+repository = "https://github.com/teloxide/teloxide"
+documentation = "https://docs.rs/teloxide/"
+readme = "README.md"
+keywords = ["teloxide", "telegram", "telegram-bot", "telegram-bot-api"]
+categories = ["web-programming", "api-bindings", "asynchronous"]
+license = "MIT"
+exclude = ["media"]
+
+[features]
+default = ["native-tls", "ctrlc_handler", "teloxide-core/default",  "auto-send"]
+
+webhooks = ["rand"]
+webhooks-axum = ["webhooks", "axum", "tower", "tower-http"]
+
+sqlite-storage = ["sqlx"]
+redis-storage = ["redis"]
+rocksdb-storage = ["rocksdb"]
+cbor-serializer = ["serde_cbor"]
+bincode-serializer = ["bincode"]
+
+macros = ["teloxide-macros"]
+
+ctrlc_handler = ["tokio/signal"]
+
+native-tls = ["teloxide-core/native-tls"]
+rustls = ["teloxide-core/rustls"]
+auto-send = ["teloxide-core/auto_send"]
+throttle = ["teloxide-core/throttle"]
+cache-me = ["teloxide-core/cache_me"]
+trace-adaptor = ["teloxide-core/trace_adaptor"]
+erased = ["teloxide-core/erased"]
+
+# currently used for `README.md` tests, building docs for `docsrs` to add `This is supported on feature="..." only.`,
+# and for teloxide-core.
+nightly = ["teloxide-core/nightly"]
+
+full = [
+    "webhooks-axum",
+    "sqlite-storage",
+    "redis-storage",
+    "rocksdb-storage",
+    "cbor-serializer",
+    "bincode-serializer",
+    "macros",
+    "ctrlc_handler",
+    "teloxide-core/full",
+    "native-tls",
+    "rustls",
+    "auto-send",
+    "throttle",
+    "cache-me",
+    "trace-adaptor",
+    "erased",
+]
+
+[dependencies]
+teloxide-core = { version = "0.8.0", default-features = false }
+teloxide-macros = { version = "0.7.0", optional = true }
+
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+
+dptree = "0.3.0"
+
+# These lines are used only for development.
+# teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "00165e6", default-features = false }
+# teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true }
+# dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" }
+
+tokio = { version = "1.8", features = ["fs"] }
+tokio-util = "0.7"
+tokio-stream = "0.1.8"
+
+url = "2.2.2"
+log = "0.4"
+bytes = "1.0"
+mime = "0.3"
+
+derive_more = "0.99"
+thiserror = "1.0"
+futures = "0.3.15"
+pin-project = "1.0"
+serde_with_macros = "1.4"
+aquamarine = "0.1.11"
+
+sqlx = { version = "0.6", optional = true, default-features = false, features = [
+        "runtime-tokio-native-tls",
+        "macros",
+        "sqlite",
+] }
+redis = { version = "0.21", features = ["tokio-comp"], optional = true }
+rocksdb = { version = "0.19", optional = true, default-features = false, features = [
+        "lz4",
+] }
+serde_cbor = { version = "0.11", optional = true }
+bincode = { version = "1.3", optional = true }
+axum = { version = "0.5.13", optional = true }
+tower = { version = "0.4.12", optional = true }
+tower-http = { version = "0.3.4", features = ["trace"], optional = true }
+rand = { version = "0.8.5", optional = true }
+
+[dev-dependencies]
+rand = "0.8.3"
+pretty_env_logger = "0.4.0"
+serde = "1"
+serde_json = "1"
+tokio = { version = "1.8", features = ["fs", "rt-multi-thread", "macros"] }
+reqwest = "0.11.11"
+chrono = "0.4"
+tokio-stream = "0.1"
+
+[package.metadata.docs.rs]
+all-features = true
+# FIXME: Add back "-Znormalize-docs" when https://github.com/rust-lang/rust/issues/93703 is fixed
+rustdoc-args = ["--cfg", "docsrs"]
+rustc-args = ["--cfg", "dep_docsrs"]
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples=examples"]
+
+[[test]]
+name = "redis"
+path = "tests/redis.rs"
+required-features = ["redis-storage", "cbor-serializer", "bincode-serializer"]
+
+[[test]]
+name = "sqlite"
+path = "tests/sqlite.rs"
+required-features = ["sqlite-storage", "cbor-serializer", "bincode-serializer"]
+
+[[example]]
+name = "dialogue"
+required-features = ["macros"]
+
+[[example]]
+name = "command"
+required-features = ["macros"]
+
+[[example]]
+name = "db_remember"
+required-features = ["sqlite-storage", "redis-storage", "bincode-serializer", "macros"]
+
+[[example]]
+name = "inline"
+required-features = ["macros"]
+
+[[example]]
+name = "buttons"
+required-features = ["macros"]
+
+[[example]]
+name = "admin"
+required-features = ["macros"]
+
+[[example]]
+name = "dispatching_features"
+required-features = ["macros"]
+
+[[example]]
+name = "ngrok_ping_pong"
+required-features = ["webhooks-axum"]
+
+[[example]]
+name = "heroku_ping_pong"
+required-features = ["webhooks-axum"]
+
+[[example]]
+name = "purchase"
+required-features = ["macros"]
diff --git a/examples/Procfile b/crates/teloxide/examples/Procfile
similarity index 100%
rename from examples/Procfile
rename to crates/teloxide/examples/Procfile
diff --git a/examples/README.md b/crates/teloxide/examples/README.md
similarity index 100%
rename from examples/README.md
rename to crates/teloxide/examples/README.md
diff --git a/examples/admin.rs b/crates/teloxide/examples/admin.rs
similarity index 100%
rename from examples/admin.rs
rename to crates/teloxide/examples/admin.rs
diff --git a/examples/buttons.rs b/crates/teloxide/examples/buttons.rs
similarity index 100%
rename from examples/buttons.rs
rename to crates/teloxide/examples/buttons.rs
diff --git a/examples/command.rs b/crates/teloxide/examples/command.rs
similarity index 100%
rename from examples/command.rs
rename to crates/teloxide/examples/command.rs
diff --git a/examples/db_remember.rs b/crates/teloxide/examples/db_remember.rs
similarity index 100%
rename from examples/db_remember.rs
rename to crates/teloxide/examples/db_remember.rs
diff --git a/examples/dialogue.rs b/crates/teloxide/examples/dialogue.rs
similarity index 100%
rename from examples/dialogue.rs
rename to crates/teloxide/examples/dialogue.rs
diff --git a/examples/dispatching_features.rs b/crates/teloxide/examples/dispatching_features.rs
similarity index 100%
rename from examples/dispatching_features.rs
rename to crates/teloxide/examples/dispatching_features.rs
diff --git a/examples/heroku_ping_pong.rs b/crates/teloxide/examples/heroku_ping_pong.rs
similarity index 100%
rename from examples/heroku_ping_pong.rs
rename to crates/teloxide/examples/heroku_ping_pong.rs
diff --git a/examples/inline.rs b/crates/teloxide/examples/inline.rs
similarity index 100%
rename from examples/inline.rs
rename to crates/teloxide/examples/inline.rs
diff --git a/examples/ngrok_ping_pong.rs b/crates/teloxide/examples/ngrok_ping_pong.rs
similarity index 100%
rename from examples/ngrok_ping_pong.rs
rename to crates/teloxide/examples/ngrok_ping_pong.rs
diff --git a/examples/purchase.rs b/crates/teloxide/examples/purchase.rs
similarity index 100%
rename from examples/purchase.rs
rename to crates/teloxide/examples/purchase.rs
diff --git a/examples/shared_state.rs b/crates/teloxide/examples/shared_state.rs
similarity index 100%
rename from examples/shared_state.rs
rename to crates/teloxide/examples/shared_state.rs
diff --git a/examples/throw_dice.rs b/crates/teloxide/examples/throw_dice.rs
similarity index 100%
rename from examples/throw_dice.rs
rename to crates/teloxide/examples/throw_dice.rs
diff --git a/src/dispatching.rs b/crates/teloxide/src/dispatching.rs
similarity index 100%
rename from src/dispatching.rs
rename to crates/teloxide/src/dispatching.rs
diff --git a/src/dispatching/dialogue.rs b/crates/teloxide/src/dispatching/dialogue.rs
similarity index 100%
rename from src/dispatching/dialogue.rs
rename to crates/teloxide/src/dispatching/dialogue.rs
diff --git a/src/dispatching/dialogue/get_chat_id.rs b/crates/teloxide/src/dispatching/dialogue/get_chat_id.rs
similarity index 100%
rename from src/dispatching/dialogue/get_chat_id.rs
rename to crates/teloxide/src/dispatching/dialogue/get_chat_id.rs
diff --git a/src/dispatching/dialogue/storage.rs b/crates/teloxide/src/dispatching/dialogue/storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage.rs
diff --git a/src/dispatching/dialogue/storage/in_mem_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/in_mem_storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/in_mem_storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/in_mem_storage.rs
diff --git a/src/dispatching/dialogue/storage/redis_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/redis_storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/redis_storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/redis_storage.rs
diff --git a/src/dispatching/dialogue/storage/rocksdb_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/rocksdb_storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs
diff --git a/src/dispatching/dialogue/storage/serializer.rs b/crates/teloxide/src/dispatching/dialogue/storage/serializer.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/serializer.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/serializer.rs
diff --git a/src/dispatching/dialogue/storage/sqlite_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/sqlite_storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/sqlite_storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/sqlite_storage.rs
diff --git a/src/dispatching/dialogue/storage/trace_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/trace_storage.rs
similarity index 100%
rename from src/dispatching/dialogue/storage/trace_storage.rs
rename to crates/teloxide/src/dispatching/dialogue/storage/trace_storage.rs
diff --git a/src/dispatching/dispatcher.rs b/crates/teloxide/src/dispatching/dispatcher.rs
similarity index 100%
rename from src/dispatching/dispatcher.rs
rename to crates/teloxide/src/dispatching/dispatcher.rs
diff --git a/src/dispatching/distribution.rs b/crates/teloxide/src/dispatching/distribution.rs
similarity index 100%
rename from src/dispatching/distribution.rs
rename to crates/teloxide/src/dispatching/distribution.rs
diff --git a/src/dispatching/filter_ext.rs b/crates/teloxide/src/dispatching/filter_ext.rs
similarity index 100%
rename from src/dispatching/filter_ext.rs
rename to crates/teloxide/src/dispatching/filter_ext.rs
diff --git a/src/dispatching/handler_description.rs b/crates/teloxide/src/dispatching/handler_description.rs
similarity index 100%
rename from src/dispatching/handler_description.rs
rename to crates/teloxide/src/dispatching/handler_description.rs
diff --git a/src/dispatching/handler_ext.rs b/crates/teloxide/src/dispatching/handler_ext.rs
similarity index 100%
rename from src/dispatching/handler_ext.rs
rename to crates/teloxide/src/dispatching/handler_ext.rs
diff --git a/src/dispatching/repls.rs b/crates/teloxide/src/dispatching/repls.rs
similarity index 100%
rename from src/dispatching/repls.rs
rename to crates/teloxide/src/dispatching/repls.rs
diff --git a/src/dispatching/repls/caution.md b/crates/teloxide/src/dispatching/repls/caution.md
similarity index 100%
rename from src/dispatching/repls/caution.md
rename to crates/teloxide/src/dispatching/repls/caution.md
diff --git a/src/dispatching/repls/commands_repl.rs b/crates/teloxide/src/dispatching/repls/commands_repl.rs
similarity index 100%
rename from src/dispatching/repls/commands_repl.rs
rename to crates/teloxide/src/dispatching/repls/commands_repl.rs
diff --git a/src/dispatching/repls/preamble.md b/crates/teloxide/src/dispatching/repls/preamble.md
similarity index 100%
rename from src/dispatching/repls/preamble.md
rename to crates/teloxide/src/dispatching/repls/preamble.md
diff --git a/src/dispatching/repls/repl.rs b/crates/teloxide/src/dispatching/repls/repl.rs
similarity index 100%
rename from src/dispatching/repls/repl.rs
rename to crates/teloxide/src/dispatching/repls/repl.rs
diff --git a/src/dispatching/repls/stopping.md b/crates/teloxide/src/dispatching/repls/stopping.md
similarity index 100%
rename from src/dispatching/repls/stopping.md
rename to crates/teloxide/src/dispatching/repls/stopping.md
diff --git a/src/dispatching/update_listeners.rs b/crates/teloxide/src/dispatching/update_listeners.rs
similarity index 100%
rename from src/dispatching/update_listeners.rs
rename to crates/teloxide/src/dispatching/update_listeners.rs
diff --git a/src/dispatching/update_listeners/polling.rs b/crates/teloxide/src/dispatching/update_listeners/polling.rs
similarity index 100%
rename from src/dispatching/update_listeners/polling.rs
rename to crates/teloxide/src/dispatching/update_listeners/polling.rs
diff --git a/src/dispatching/update_listeners/stateful_listener.rs b/crates/teloxide/src/dispatching/update_listeners/stateful_listener.rs
similarity index 100%
rename from src/dispatching/update_listeners/stateful_listener.rs
rename to crates/teloxide/src/dispatching/update_listeners/stateful_listener.rs
diff --git a/src/dispatching/update_listeners/webhooks.rs b/crates/teloxide/src/dispatching/update_listeners/webhooks.rs
similarity index 100%
rename from src/dispatching/update_listeners/webhooks.rs
rename to crates/teloxide/src/dispatching/update_listeners/webhooks.rs
diff --git a/src/dispatching/update_listeners/webhooks/axum.rs b/crates/teloxide/src/dispatching/update_listeners/webhooks/axum.rs
similarity index 100%
rename from src/dispatching/update_listeners/webhooks/axum.rs
rename to crates/teloxide/src/dispatching/update_listeners/webhooks/axum.rs
diff --git a/src/error_handlers.rs b/crates/teloxide/src/error_handlers.rs
similarity index 100%
rename from src/error_handlers.rs
rename to crates/teloxide/src/error_handlers.rs
diff --git a/src/features.md b/crates/teloxide/src/features.md
similarity index 100%
rename from src/features.md
rename to crates/teloxide/src/features.md
diff --git a/src/lib.rs b/crates/teloxide/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to crates/teloxide/src/lib.rs
diff --git a/src/prelude.rs b/crates/teloxide/src/prelude.rs
similarity index 100%
rename from src/prelude.rs
rename to crates/teloxide/src/prelude.rs
diff --git a/src/stop.rs b/crates/teloxide/src/stop.rs
similarity index 100%
rename from src/stop.rs
rename to crates/teloxide/src/stop.rs
diff --git a/src/utils.rs b/crates/teloxide/src/utils.rs
similarity index 100%
rename from src/utils.rs
rename to crates/teloxide/src/utils.rs
diff --git a/src/utils/command.rs b/crates/teloxide/src/utils/command.rs
similarity index 100%
rename from src/utils/command.rs
rename to crates/teloxide/src/utils/command.rs
diff --git a/src/utils/html.rs b/crates/teloxide/src/utils/html.rs
similarity index 100%
rename from src/utils/html.rs
rename to crates/teloxide/src/utils/html.rs
diff --git a/src/utils/markdown.rs b/crates/teloxide/src/utils/markdown.rs
similarity index 100%
rename from src/utils/markdown.rs
rename to crates/teloxide/src/utils/markdown.rs
diff --git a/src/utils/shutdown_token.rs b/crates/teloxide/src/utils/shutdown_token.rs
similarity index 100%
rename from src/utils/shutdown_token.rs
rename to crates/teloxide/src/utils/shutdown_token.rs
diff --git a/tests/command.rs b/crates/teloxide/tests/command.rs
similarity index 100%
rename from tests/command.rs
rename to crates/teloxide/tests/command.rs
diff --git a/tests/redis.rs b/crates/teloxide/tests/redis.rs
similarity index 100%
rename from tests/redis.rs
rename to crates/teloxide/tests/redis.rs
diff --git a/tests/rocksdb.rs b/crates/teloxide/tests/rocksdb.rs
similarity index 100%
rename from tests/rocksdb.rs
rename to crates/teloxide/tests/rocksdb.rs
diff --git a/tests/sqlite.rs b/crates/teloxide/tests/sqlite.rs
similarity index 100%
rename from tests/sqlite.rs
rename to crates/teloxide/tests/sqlite.rs

From 0a3c5519dc79a143c3fbe25dbf3f1d92f02d2199 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Nov 2022 15:59:53 +0400
Subject: [PATCH 742/755] move teloxide-macros to crates/

---
 .gitignore                                                    | 4 ----
 .../teloxide-macros/.github}/workflows/rust.yml               | 0
 CHANGELOG.md => crates/teloxide-macros/CHANGELOG.md           | 0
 Cargo.toml => crates/teloxide-macros/Cargo.toml               | 0
 LICENSE => crates/teloxide-macros/LICENSE                     | 0
 rustfmt.toml => crates/teloxide-macros/rustfmt.toml           | 0
 {src => crates/teloxide-macros/src}/attr.rs                   | 0
 {src => crates/teloxide-macros/src}/bot_commands.rs           | 0
 {src => crates/teloxide-macros/src}/command.rs                | 0
 {src => crates/teloxide-macros/src}/command_attr.rs           | 0
 {src => crates/teloxide-macros/src}/command_enum.rs           | 0
 {src => crates/teloxide-macros/src}/error.rs                  | 0
 {src => crates/teloxide-macros/src}/fields_parse.rs           | 0
 {src => crates/teloxide-macros/src}/lib.rs                    | 0
 {src => crates/teloxide-macros/src}/rename_rules.rs           | 0
 {src => crates/teloxide-macros/src}/unzip.rs                  | 0
 {tests => crates/teloxide-macros/tests}/command.rs            | 0
 17 files changed, 4 deletions(-)
 delete mode 100644 .gitignore
 rename {.github => crates/teloxide-macros/.github}/workflows/rust.yml (100%)
 rename CHANGELOG.md => crates/teloxide-macros/CHANGELOG.md (100%)
 rename Cargo.toml => crates/teloxide-macros/Cargo.toml (100%)
 rename LICENSE => crates/teloxide-macros/LICENSE (100%)
 rename rustfmt.toml => crates/teloxide-macros/rustfmt.toml (100%)
 rename {src => crates/teloxide-macros/src}/attr.rs (100%)
 rename {src => crates/teloxide-macros/src}/bot_commands.rs (100%)
 rename {src => crates/teloxide-macros/src}/command.rs (100%)
 rename {src => crates/teloxide-macros/src}/command_attr.rs (100%)
 rename {src => crates/teloxide-macros/src}/command_enum.rs (100%)
 rename {src => crates/teloxide-macros/src}/error.rs (100%)
 rename {src => crates/teloxide-macros/src}/fields_parse.rs (100%)
 rename {src => crates/teloxide-macros/src}/lib.rs (100%)
 rename {src => crates/teloxide-macros/src}/rename_rules.rs (100%)
 rename {src => crates/teloxide-macros/src}/unzip.rs (100%)
 rename {tests => crates/teloxide-macros/tests}/command.rs (100%)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f940c081..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-Cargo.lock
-.idea
-.vscode
diff --git a/.github/workflows/rust.yml b/crates/teloxide-macros/.github/workflows/rust.yml
similarity index 100%
rename from .github/workflows/rust.yml
rename to crates/teloxide-macros/.github/workflows/rust.yml
diff --git a/CHANGELOG.md b/crates/teloxide-macros/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to crates/teloxide-macros/CHANGELOG.md
diff --git a/Cargo.toml b/crates/teloxide-macros/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to crates/teloxide-macros/Cargo.toml
diff --git a/LICENSE b/crates/teloxide-macros/LICENSE
similarity index 100%
rename from LICENSE
rename to crates/teloxide-macros/LICENSE
diff --git a/rustfmt.toml b/crates/teloxide-macros/rustfmt.toml
similarity index 100%
rename from rustfmt.toml
rename to crates/teloxide-macros/rustfmt.toml
diff --git a/src/attr.rs b/crates/teloxide-macros/src/attr.rs
similarity index 100%
rename from src/attr.rs
rename to crates/teloxide-macros/src/attr.rs
diff --git a/src/bot_commands.rs b/crates/teloxide-macros/src/bot_commands.rs
similarity index 100%
rename from src/bot_commands.rs
rename to crates/teloxide-macros/src/bot_commands.rs
diff --git a/src/command.rs b/crates/teloxide-macros/src/command.rs
similarity index 100%
rename from src/command.rs
rename to crates/teloxide-macros/src/command.rs
diff --git a/src/command_attr.rs b/crates/teloxide-macros/src/command_attr.rs
similarity index 100%
rename from src/command_attr.rs
rename to crates/teloxide-macros/src/command_attr.rs
diff --git a/src/command_enum.rs b/crates/teloxide-macros/src/command_enum.rs
similarity index 100%
rename from src/command_enum.rs
rename to crates/teloxide-macros/src/command_enum.rs
diff --git a/src/error.rs b/crates/teloxide-macros/src/error.rs
similarity index 100%
rename from src/error.rs
rename to crates/teloxide-macros/src/error.rs
diff --git a/src/fields_parse.rs b/crates/teloxide-macros/src/fields_parse.rs
similarity index 100%
rename from src/fields_parse.rs
rename to crates/teloxide-macros/src/fields_parse.rs
diff --git a/src/lib.rs b/crates/teloxide-macros/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to crates/teloxide-macros/src/lib.rs
diff --git a/src/rename_rules.rs b/crates/teloxide-macros/src/rename_rules.rs
similarity index 100%
rename from src/rename_rules.rs
rename to crates/teloxide-macros/src/rename_rules.rs
diff --git a/src/unzip.rs b/crates/teloxide-macros/src/unzip.rs
similarity index 100%
rename from src/unzip.rs
rename to crates/teloxide-macros/src/unzip.rs
diff --git a/tests/command.rs b/crates/teloxide-macros/tests/command.rs
similarity index 100%
rename from tests/command.rs
rename to crates/teloxide-macros/tests/command.rs

From 71dd29b1acdae06c15fdb20f7257d4ea314662b2 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Nov 2022 16:33:54 +0400
Subject: [PATCH 743/755] move teloxide-core to crates/

---
 .gitignore                                          |   2 --
 {.cargo => crates/teloxide-core/.cargo}/config.toml |   0
 .../teloxide-core/.github}/workflows/ci.yml         |   0
 CHANGELOG.md => crates/teloxide-core/CHANGELOG.md   |   0
 Cargo.toml => crates/teloxide-core/Cargo.toml       |   0
 LICENSE => crates/teloxide-core/LICENSE             |   0
 README.md => crates/teloxide-core/README.md         |   0
 .../teloxide-core/examples}/erased.rs               |   0
 .../teloxide-core/examples}/self_info.rs            |   0
 {media => crates/teloxide-core/media}/example.gif   | Bin
 {media => crates/teloxide-core/media}/logo.png      | Bin
 {media => crates/teloxide-core/media}/logo.svg      |   0
 .../teloxide-core/rust-toolchain.toml               |   0
 rustfmt.toml => crates/teloxide-core/rustfmt.toml   |   0
 schema.ron => crates/teloxide-core/schema.ron       |   0
 {src => crates/teloxide-core/src}/adaptors.rs       |   0
 .../teloxide-core/src}/adaptors/auto_send.rs        |   0
 .../teloxide-core/src}/adaptors/cache_me.rs         |   0
 .../teloxide-core/src}/adaptors/erased.rs           |   0
 .../teloxide-core/src}/adaptors/parse_mode.rs       |   0
 .../teloxide-core/src}/adaptors/throttle.rs         |   0
 .../teloxide-core/src}/adaptors/throttle/request.rs |   0
 .../src}/adaptors/throttle/request_lock.rs          |   0
 .../src}/adaptors/throttle/requester_impl.rs        |   0
 .../src}/adaptors/throttle/settings.rs              |   0
 .../teloxide-core/src}/adaptors/throttle/worker.rs  |   0
 {src => crates/teloxide-core/src}/adaptors/trace.rs |   0
 {src => crates/teloxide-core/src}/bot.rs            |   0
 {src => crates/teloxide-core/src}/bot/api.rs        |   0
 {src => crates/teloxide-core/src}/bot/download.rs   |   0
 {src => crates/teloxide-core/src}/codegen.rs        |   0
 .../teloxide-core/src}/codegen/convert.rs           |   0
 {src => crates/teloxide-core/src}/codegen/patch.rs  |   0
 {src => crates/teloxide-core/src}/codegen/schema.rs |   0
 {src => crates/teloxide-core/src}/errors.rs         |   0
 {src => crates/teloxide-core/src}/lib.rs            |   0
 {src => crates/teloxide-core/src}/local_macros.rs   |   0
 {src => crates/teloxide-core/src}/net.rs            |   0
 {src => crates/teloxide-core/src}/net/download.rs   |   0
 {src => crates/teloxide-core/src}/net/request.rs    |   0
 .../teloxide-core/src}/net/telegram_response.rs     |   0
 {src => crates/teloxide-core/src}/payloads.rs       |   0
 .../src}/payloads/add_sticker_to_set.rs             |   0
 .../src}/payloads/answer_callback_query.rs          |   0
 .../src}/payloads/answer_inline_query.rs            |   0
 .../src}/payloads/answer_pre_checkout_query.rs      |   0
 .../src}/payloads/answer_shipping_query.rs          |   0
 .../src}/payloads/answer_web_app_query.rs           |   0
 .../src}/payloads/approve_chat_join_request.rs      |   0
 .../teloxide-core/src}/payloads/ban_chat_member.rs  |   0
 .../src}/payloads/ban_chat_sender_chat.rs           |   0
 {src => crates/teloxide-core/src}/payloads/close.rs |   0
 .../teloxide-core/src}/payloads/codegen.rs          |   0
 .../teloxide-core/src}/payloads/copy_message.rs     |   0
 .../src}/payloads/create_chat_invite_link.rs        |   0
 .../src}/payloads/create_invoice_link.rs            |   0
 .../src}/payloads/create_new_sticker_set.rs         |   0
 .../src}/payloads/decline_chat_join_request.rs      |   0
 .../src}/payloads/delete_chat_photo.rs              |   0
 .../src}/payloads/delete_chat_sticker_set.rs        |   0
 .../teloxide-core/src}/payloads/delete_message.rs   |   0
 .../src}/payloads/delete_my_commands.rs             |   0
 .../src}/payloads/delete_sticker_from_set.rs        |   0
 .../teloxide-core/src}/payloads/delete_webhook.rs   |   0
 .../src}/payloads/edit_chat_invite_link.rs          |   0
 .../src}/payloads/edit_message_caption.rs           |   0
 .../src}/payloads/edit_message_caption_inline.rs    |   0
 .../src}/payloads/edit_message_live_location.rs     |   0
 .../payloads/edit_message_live_location_inline.rs   |   0
 .../src}/payloads/edit_message_media.rs             |   0
 .../src}/payloads/edit_message_media_inline.rs      |   0
 .../src}/payloads/edit_message_reply_markup.rs      |   0
 .../payloads/edit_message_reply_markup_inline.rs    |   0
 .../src}/payloads/edit_message_text.rs              |   0
 .../src}/payloads/edit_message_text_inline.rs       |   0
 .../src}/payloads/export_chat_invite_link.rs        |   0
 .../teloxide-core/src}/payloads/forward_message.rs  |   0
 .../teloxide-core/src}/payloads/get_chat.rs         |   0
 .../src}/payloads/get_chat_administrators.rs        |   0
 .../teloxide-core/src}/payloads/get_chat_member.rs  |   0
 .../src}/payloads/get_chat_member_count.rs          |   0
 .../src}/payloads/get_chat_members_count.rs         |   0
 .../src}/payloads/get_chat_menu_button.rs           |   0
 .../src}/payloads/get_custom_emoji_stickers.rs      |   0
 .../teloxide-core/src}/payloads/get_file.rs         |   0
 .../src}/payloads/get_game_high_scores.rs           |   0
 .../teloxide-core/src}/payloads/get_me.rs           |   0
 .../teloxide-core/src}/payloads/get_my_commands.rs  |   0
 .../payloads/get_my_default_administrator_rights.rs |   0
 .../teloxide-core/src}/payloads/get_sticker_set.rs  |   0
 .../teloxide-core/src}/payloads/get_updates.rs      |   0
 .../src}/payloads/get_user_profile_photos.rs        |   0
 .../teloxide-core/src}/payloads/get_webhook_info.rs |   0
 .../teloxide-core/src}/payloads/kick_chat_member.rs |   0
 .../teloxide-core/src}/payloads/leave_chat.rs       |   0
 .../teloxide-core/src}/payloads/log_out.rs          |   0
 .../teloxide-core/src}/payloads/pin_chat_message.rs |   0
 .../src}/payloads/promote_chat_member.rs            |   0
 .../src}/payloads/restrict_chat_member.rs           |   0
 .../src}/payloads/revoke_chat_invite_link.rs        |   0
 .../teloxide-core/src}/payloads/send_animation.rs   |   0
 .../teloxide-core/src}/payloads/send_audio.rs       |   0
 .../teloxide-core/src}/payloads/send_chat_action.rs |   0
 .../teloxide-core/src}/payloads/send_contact.rs     |   0
 .../teloxide-core/src}/payloads/send_dice.rs        |   0
 .../teloxide-core/src}/payloads/send_document.rs    |   0
 .../teloxide-core/src}/payloads/send_game.rs        |   0
 .../teloxide-core/src}/payloads/send_invoice.rs     |   0
 .../teloxide-core/src}/payloads/send_location.rs    |   0
 .../teloxide-core/src}/payloads/send_media_group.rs |   0
 .../teloxide-core/src}/payloads/send_message.rs     |   0
 .../teloxide-core/src}/payloads/send_photo.rs       |   0
 .../teloxide-core/src}/payloads/send_poll.rs        |   0
 .../teloxide-core/src}/payloads/send_sticker.rs     |   0
 .../teloxide-core/src}/payloads/send_venue.rs       |   0
 .../teloxide-core/src}/payloads/send_video.rs       |   0
 .../teloxide-core/src}/payloads/send_video_note.rs  |   0
 .../teloxide-core/src}/payloads/send_voice.rs       |   0
 .../payloads/set_chat_administrator_custom_title.rs |   0
 .../src}/payloads/set_chat_description.rs           |   0
 .../src}/payloads/set_chat_menu_button.rs           |   0
 .../src}/payloads/set_chat_permissions.rs           |   0
 .../teloxide-core/src}/payloads/set_chat_photo.rs   |   0
 .../src}/payloads/set_chat_sticker_set.rs           |   0
 .../teloxide-core/src}/payloads/set_chat_title.rs   |   0
 .../teloxide-core/src}/payloads/set_game_score.rs   |   0
 .../src}/payloads/set_game_score_inline.rs          |   0
 .../teloxide-core/src}/payloads/set_my_commands.rs  |   0
 .../payloads/set_my_default_administrator_rights.rs |   0
 .../src}/payloads/set_passport_data_errors.rs       |   0
 .../src}/payloads/set_sticker_position_in_set.rs    |   0
 .../src}/payloads/set_sticker_set_thumb.rs          |   0
 .../teloxide-core/src}/payloads/set_webhook.rs      |   0
 .../teloxide-core/src}/payloads/setters.rs          |   0
 .../src}/payloads/stop_message_live_location.rs     |   0
 .../payloads/stop_message_live_location_inline.rs   |   0
 .../teloxide-core/src}/payloads/stop_poll.rs        |   0
 .../src}/payloads/unban_chat_member.rs              |   0
 .../src}/payloads/unban_chat_sender_chat.rs         |   0
 .../src}/payloads/unpin_all_chat_messages.rs        |   0
 .../src}/payloads/unpin_chat_message.rs             |   0
 .../src}/payloads/upload_sticker_file.rs            |   0
 {src => crates/teloxide-core/src}/prelude.rs        |   0
 {src => crates/teloxide-core/src}/requests.rs       |   0
 .../teloxide-core/src}/requests/has_payload.rs      |   0
 {src => crates/teloxide-core/src}/requests/json.rs  |   0
 .../teloxide-core/src}/requests/multipart.rs        |   0
 .../src}/requests/multipart_payload.rs              |   0
 .../teloxide-core/src}/requests/payload.rs          |   0
 .../teloxide-core/src}/requests/request.rs          |   0
 .../teloxide-core/src}/requests/requester.rs        |   0
 .../teloxide-core/src}/requests/requester_ext.rs    |   0
 {src => crates/teloxide-core/src}/requests/utils.rs |   0
 .../teloxide-core/src}/serde_multipart/error.rs     |   0
 .../teloxide-core/src}/serde_multipart/mod.rs       |   0
 .../src}/serde_multipart/serializers.rs             |   0
 .../src}/serde_multipart/unserializers.rs           |   0
 .../serde_multipart/unserializers/input_file.rs     |   0
 {src => crates/teloxide-core/src}/types.rs          |   0
 .../teloxide-core/src}/types/allowed_update.rs      |   0
 .../teloxide-core/src}/types/animation.rs           |   0
 {src => crates/teloxide-core/src}/types/audio.rs    |   0
 .../teloxide-core/src}/types/bot_command.rs         |   0
 .../teloxide-core/src}/types/bot_command_scope.rs   |   0
 .../teloxide-core/src}/types/callback_game.rs       |   0
 .../teloxide-core/src}/types/callback_query.rs      |   0
 {src => crates/teloxide-core/src}/types/chat.rs     |   0
 .../teloxide-core/src}/types/chat_action.rs         |   0
 .../src}/types/chat_administrator_rights.rs         |   0
 {src => crates/teloxide-core/src}/types/chat_id.rs  |   0
 .../teloxide-core/src}/types/chat_invite_link.rs    |   0
 .../teloxide-core/src}/types/chat_join_request.rs   |   0
 .../teloxide-core/src}/types/chat_location.rs       |   0
 .../teloxide-core/src}/types/chat_member.rs         |   0
 .../teloxide-core/src}/types/chat_member_updated.rs |   0
 .../teloxide-core/src}/types/chat_permissions.rs    |   0
 .../teloxide-core/src}/types/chat_photo.rs          |   0
 .../teloxide-core/src}/types/chat_type.rs           |   0
 .../src}/types/chosen_inline_result.rs              |   0
 {src => crates/teloxide-core/src}/types/contact.rs  |   0
 {src => crates/teloxide-core/src}/types/dice.rs     |   0
 .../teloxide-core/src}/types/dice_emoji.rs          |   0
 {src => crates/teloxide-core/src}/types/document.rs |   0
 .../src}/types/encrypted_credentials.rs             |   0
 .../src}/types/encrypted_passport_element.rs        |   0
 {src => crates/teloxide-core/src}/types/file.rs     |   0
 .../teloxide-core/src}/types/force_reply.rs         |   0
 {src => crates/teloxide-core/src}/types/game.rs     |   0
 .../teloxide-core/src}/types/game_high_score.rs     |   0
 .../src}/types/inline_keyboard_button.rs            |   0
 .../src}/types/inline_keyboard_markup.rs            |   0
 .../teloxide-core/src}/types/inline_query.rs        |   0
 .../teloxide-core/src}/types/inline_query_result.rs |   0
 .../src}/types/inline_query_result_article.rs       |   0
 .../src}/types/inline_query_result_audio.rs         |   0
 .../src}/types/inline_query_result_cached_audio.rs  |   0
 .../types/inline_query_result_cached_document.rs    |   0
 .../src}/types/inline_query_result_cached_gif.rs    |   0
 .../types/inline_query_result_cached_mpeg4_gif.rs   |   0
 .../src}/types/inline_query_result_cached_photo.rs  |   0
 .../types/inline_query_result_cached_sticker.rs     |   0
 .../src}/types/inline_query_result_cached_video.rs  |   0
 .../src}/types/inline_query_result_cached_voice.rs  |   0
 .../src}/types/inline_query_result_contact.rs       |   0
 .../src}/types/inline_query_result_document.rs      |   0
 .../src}/types/inline_query_result_game.rs          |   0
 .../src}/types/inline_query_result_gif.rs           |   0
 .../src}/types/inline_query_result_location.rs      |   0
 .../src}/types/inline_query_result_mpeg4_gif.rs     |   0
 .../src}/types/inline_query_result_photo.rs         |   0
 .../src}/types/inline_query_result_venue.rs         |   0
 .../src}/types/inline_query_result_video.rs         |   0
 .../src}/types/inline_query_result_voice.rs         |   0
 .../teloxide-core/src}/types/input_file.rs          |   0
 .../teloxide-core/src}/types/input_media.rs         |   0
 .../src}/types/input_message_content.rs             |   0
 .../teloxide-core/src}/types/input_sticker.rs       |   0
 {src => crates/teloxide-core/src}/types/invoice.rs  |   0
 .../teloxide-core/src}/types/keyboard_button.rs     |   0
 .../src}/types/keyboard_button_poll_type.rs         |   0
 .../teloxide-core/src}/types/label_price.rs         |   0
 {src => crates/teloxide-core/src}/types/location.rs |   0
 .../teloxide-core/src}/types/login_url.rs           |   0
 .../teloxide-core/src}/types/mask_position.rs       |   0
 {src => crates/teloxide-core/src}/types/me.rs       |   0
 .../teloxide-core/src}/types/menu_button.rs         |   0
 {src => crates/teloxide-core/src}/types/message.rs  |   0
 .../src}/types/message_auto_delete_timer_changed.rs |   0
 .../teloxide-core/src}/types/message_entity.rs      |   0
 .../teloxide-core/src}/types/message_id.rs          |   0
 .../src}/types/non_telegram_types/country_code.rs   |   0
 .../src}/types/non_telegram_types/currency.rs       |   0
 .../src}/types/non_telegram_types/mime.rs           |   0
 .../src}/types/non_telegram_types/until_date.rs     |   0
 .../teloxide-core/src}/types/order_info.rs          |   0
 .../teloxide-core/src}/types/parse_mode.rs          |   0
 .../teloxide-core/src}/types/passport_data.rs       |   0
 .../src}/types/passport_element_error.rs            |   0
 .../teloxide-core/src}/types/passport_file.rs       |   0
 .../teloxide-core/src}/types/photo_size.rs          |   0
 {src => crates/teloxide-core/src}/types/poll.rs     |   0
 .../teloxide-core/src}/types/poll_answer.rs         |   0
 .../teloxide-core/src}/types/poll_type.rs           |   0
 .../teloxide-core/src}/types/pre_checkout_query.rs  |   0
 .../src}/types/proximity_alert_triggered.rs         |   0
 .../teloxide-core/src}/types/recipient.rs           |   0
 .../src}/types/reply_keyboard_markup.rs             |   0
 .../src}/types/reply_keyboard_remove.rs             |   0
 .../teloxide-core/src}/types/reply_markup.rs        |   0
 .../teloxide-core/src}/types/response_parameters.rs |   0
 .../src}/types/sent_web_app_message.rs              |   0
 .../teloxide-core/src}/types/shipping_address.rs    |   0
 .../teloxide-core/src}/types/shipping_option.rs     |   0
 .../teloxide-core/src}/types/shipping_query.rs      |   0
 {src => crates/teloxide-core/src}/types/sticker.rs  |   0
 .../teloxide-core/src}/types/sticker_set.rs         |   0
 .../teloxide-core/src}/types/successful_payment.rs  |   0
 .../teloxide-core/src}/types/target_message.rs      |   0
 .../teloxide-core/src}/types/unit_false.rs          |   0
 .../teloxide-core/src}/types/unit_true.rs           |   0
 {src => crates/teloxide-core/src}/types/update.rs   |   0
 {src => crates/teloxide-core/src}/types/user.rs     |   0
 {src => crates/teloxide-core/src}/types/user_id.rs  |   0
 .../teloxide-core/src}/types/user_profile_photos.rs |   0
 {src => crates/teloxide-core/src}/types/venue.rs    |   0
 {src => crates/teloxide-core/src}/types/video.rs    |   0
 .../teloxide-core/src}/types/video_chat_ended.rs    |   0
 .../src}/types/video_chat_participants_invited.rs   |   0
 .../src}/types/video_chat_scheduled.rs              |   0
 .../teloxide-core/src}/types/video_chat_started.rs  |   0
 .../teloxide-core/src}/types/video_note.rs          |   0
 {src => crates/teloxide-core/src}/types/voice.rs    |   0
 .../teloxide-core/src}/types/web_app_data.rs        |   0
 .../teloxide-core/src}/types/web_app_info.rs        |   0
 .../teloxide-core/src}/types/webhook_info.rs        |   0
 275 files changed, 2 deletions(-)
 delete mode 100644 .gitignore
 rename {.cargo => crates/teloxide-core/.cargo}/config.toml (100%)
 rename {.github => crates/teloxide-core/.github}/workflows/ci.yml (100%)
 rename CHANGELOG.md => crates/teloxide-core/CHANGELOG.md (100%)
 rename Cargo.toml => crates/teloxide-core/Cargo.toml (100%)
 rename LICENSE => crates/teloxide-core/LICENSE (100%)
 rename README.md => crates/teloxide-core/README.md (100%)
 rename {examples => crates/teloxide-core/examples}/erased.rs (100%)
 rename {examples => crates/teloxide-core/examples}/self_info.rs (100%)
 rename {media => crates/teloxide-core/media}/example.gif (100%)
 rename {media => crates/teloxide-core/media}/logo.png (100%)
 rename {media => crates/teloxide-core/media}/logo.svg (100%)
 rename rust-toolchain.toml => crates/teloxide-core/rust-toolchain.toml (100%)
 rename rustfmt.toml => crates/teloxide-core/rustfmt.toml (100%)
 rename schema.ron => crates/teloxide-core/schema.ron (100%)
 rename {src => crates/teloxide-core/src}/adaptors.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/auto_send.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/cache_me.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/erased.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/parse_mode.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle/request.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle/request_lock.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle/requester_impl.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle/settings.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/throttle/worker.rs (100%)
 rename {src => crates/teloxide-core/src}/adaptors/trace.rs (100%)
 rename {src => crates/teloxide-core/src}/bot.rs (100%)
 rename {src => crates/teloxide-core/src}/bot/api.rs (100%)
 rename {src => crates/teloxide-core/src}/bot/download.rs (100%)
 rename {src => crates/teloxide-core/src}/codegen.rs (100%)
 rename {src => crates/teloxide-core/src}/codegen/convert.rs (100%)
 rename {src => crates/teloxide-core/src}/codegen/patch.rs (100%)
 rename {src => crates/teloxide-core/src}/codegen/schema.rs (100%)
 rename {src => crates/teloxide-core/src}/errors.rs (100%)
 rename {src => crates/teloxide-core/src}/lib.rs (100%)
 rename {src => crates/teloxide-core/src}/local_macros.rs (100%)
 rename {src => crates/teloxide-core/src}/net.rs (100%)
 rename {src => crates/teloxide-core/src}/net/download.rs (100%)
 rename {src => crates/teloxide-core/src}/net/request.rs (100%)
 rename {src => crates/teloxide-core/src}/net/telegram_response.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/add_sticker_to_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/answer_callback_query.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/answer_inline_query.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/answer_pre_checkout_query.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/answer_shipping_query.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/answer_web_app_query.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/approve_chat_join_request.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/ban_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/ban_chat_sender_chat.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/close.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/codegen.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/copy_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/create_chat_invite_link.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/create_invoice_link.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/create_new_sticker_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/decline_chat_join_request.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_chat_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_chat_sticker_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_my_commands.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_sticker_from_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/delete_webhook.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_chat_invite_link.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_caption.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_caption_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_live_location.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_live_location_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_media.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_media_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_reply_markup.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_reply_markup_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_text.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/edit_message_text_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/export_chat_invite_link.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/forward_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat_administrators.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat_member_count.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat_members_count.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_chat_menu_button.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_custom_emoji_stickers.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_file.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_game_high_scores.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_me.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_my_commands.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_my_default_administrator_rights.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_sticker_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_updates.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_user_profile_photos.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/get_webhook_info.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/kick_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/leave_chat.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/log_out.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/pin_chat_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/promote_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/restrict_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/revoke_chat_invite_link.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_animation.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_audio.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_chat_action.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_contact.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_dice.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_document.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_game.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_invoice.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_location.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_media_group.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_poll.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_sticker.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_venue.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_video.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_video_note.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/send_voice.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_administrator_custom_title.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_description.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_menu_button.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_permissions.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_sticker_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_chat_title.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_game_score.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_game_score_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_my_commands.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_my_default_administrator_rights.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_passport_data_errors.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_sticker_position_in_set.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_sticker_set_thumb.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/set_webhook.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/setters.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/stop_message_live_location.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/stop_message_live_location_inline.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/stop_poll.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/unban_chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/unban_chat_sender_chat.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/unpin_all_chat_messages.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/unpin_chat_message.rs (100%)
 rename {src => crates/teloxide-core/src}/payloads/upload_sticker_file.rs (100%)
 rename {src => crates/teloxide-core/src}/prelude.rs (100%)
 rename {src => crates/teloxide-core/src}/requests.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/has_payload.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/json.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/multipart.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/multipart_payload.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/payload.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/request.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/requester.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/requester_ext.rs (100%)
 rename {src => crates/teloxide-core/src}/requests/utils.rs (100%)
 rename {src => crates/teloxide-core/src}/serde_multipart/error.rs (100%)
 rename {src => crates/teloxide-core/src}/serde_multipart/mod.rs (100%)
 rename {src => crates/teloxide-core/src}/serde_multipart/serializers.rs (100%)
 rename {src => crates/teloxide-core/src}/serde_multipart/unserializers.rs (100%)
 rename {src => crates/teloxide-core/src}/serde_multipart/unserializers/input_file.rs (100%)
 rename {src => crates/teloxide-core/src}/types.rs (100%)
 rename {src => crates/teloxide-core/src}/types/allowed_update.rs (100%)
 rename {src => crates/teloxide-core/src}/types/animation.rs (100%)
 rename {src => crates/teloxide-core/src}/types/audio.rs (100%)
 rename {src => crates/teloxide-core/src}/types/bot_command.rs (100%)
 rename {src => crates/teloxide-core/src}/types/bot_command_scope.rs (100%)
 rename {src => crates/teloxide-core/src}/types/callback_game.rs (100%)
 rename {src => crates/teloxide-core/src}/types/callback_query.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_action.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_administrator_rights.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_id.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_invite_link.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_join_request.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_location.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_member.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_member_updated.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_permissions.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chat_type.rs (100%)
 rename {src => crates/teloxide-core/src}/types/chosen_inline_result.rs (100%)
 rename {src => crates/teloxide-core/src}/types/contact.rs (100%)
 rename {src => crates/teloxide-core/src}/types/dice.rs (100%)
 rename {src => crates/teloxide-core/src}/types/dice_emoji.rs (100%)
 rename {src => crates/teloxide-core/src}/types/document.rs (100%)
 rename {src => crates/teloxide-core/src}/types/encrypted_credentials.rs (100%)
 rename {src => crates/teloxide-core/src}/types/encrypted_passport_element.rs (100%)
 rename {src => crates/teloxide-core/src}/types/file.rs (100%)
 rename {src => crates/teloxide-core/src}/types/force_reply.rs (100%)
 rename {src => crates/teloxide-core/src}/types/game.rs (100%)
 rename {src => crates/teloxide-core/src}/types/game_high_score.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_keyboard_button.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_keyboard_markup.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_article.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_audio.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_audio.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_document.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_gif.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_mpeg4_gif.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_sticker.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_video.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_cached_voice.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_contact.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_document.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_game.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_gif.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_location.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_mpeg4_gif.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_photo.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_venue.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_video.rs (100%)
 rename {src => crates/teloxide-core/src}/types/inline_query_result_voice.rs (100%)
 rename {src => crates/teloxide-core/src}/types/input_file.rs (100%)
 rename {src => crates/teloxide-core/src}/types/input_media.rs (100%)
 rename {src => crates/teloxide-core/src}/types/input_message_content.rs (100%)
 rename {src => crates/teloxide-core/src}/types/input_sticker.rs (100%)
 rename {src => crates/teloxide-core/src}/types/invoice.rs (100%)
 rename {src => crates/teloxide-core/src}/types/keyboard_button.rs (100%)
 rename {src => crates/teloxide-core/src}/types/keyboard_button_poll_type.rs (100%)
 rename {src => crates/teloxide-core/src}/types/label_price.rs (100%)
 rename {src => crates/teloxide-core/src}/types/location.rs (100%)
 rename {src => crates/teloxide-core/src}/types/login_url.rs (100%)
 rename {src => crates/teloxide-core/src}/types/mask_position.rs (100%)
 rename {src => crates/teloxide-core/src}/types/me.rs (100%)
 rename {src => crates/teloxide-core/src}/types/menu_button.rs (100%)
 rename {src => crates/teloxide-core/src}/types/message.rs (100%)
 rename {src => crates/teloxide-core/src}/types/message_auto_delete_timer_changed.rs (100%)
 rename {src => crates/teloxide-core/src}/types/message_entity.rs (100%)
 rename {src => crates/teloxide-core/src}/types/message_id.rs (100%)
 rename {src => crates/teloxide-core/src}/types/non_telegram_types/country_code.rs (100%)
 rename {src => crates/teloxide-core/src}/types/non_telegram_types/currency.rs (100%)
 rename {src => crates/teloxide-core/src}/types/non_telegram_types/mime.rs (100%)
 rename {src => crates/teloxide-core/src}/types/non_telegram_types/until_date.rs (100%)
 rename {src => crates/teloxide-core/src}/types/order_info.rs (100%)
 rename {src => crates/teloxide-core/src}/types/parse_mode.rs (100%)
 rename {src => crates/teloxide-core/src}/types/passport_data.rs (100%)
 rename {src => crates/teloxide-core/src}/types/passport_element_error.rs (100%)
 rename {src => crates/teloxide-core/src}/types/passport_file.rs (100%)
 rename {src => crates/teloxide-core/src}/types/photo_size.rs (100%)
 rename {src => crates/teloxide-core/src}/types/poll.rs (100%)
 rename {src => crates/teloxide-core/src}/types/poll_answer.rs (100%)
 rename {src => crates/teloxide-core/src}/types/poll_type.rs (100%)
 rename {src => crates/teloxide-core/src}/types/pre_checkout_query.rs (100%)
 rename {src => crates/teloxide-core/src}/types/proximity_alert_triggered.rs (100%)
 rename {src => crates/teloxide-core/src}/types/recipient.rs (100%)
 rename {src => crates/teloxide-core/src}/types/reply_keyboard_markup.rs (100%)
 rename {src => crates/teloxide-core/src}/types/reply_keyboard_remove.rs (100%)
 rename {src => crates/teloxide-core/src}/types/reply_markup.rs (100%)
 rename {src => crates/teloxide-core/src}/types/response_parameters.rs (100%)
 rename {src => crates/teloxide-core/src}/types/sent_web_app_message.rs (100%)
 rename {src => crates/teloxide-core/src}/types/shipping_address.rs (100%)
 rename {src => crates/teloxide-core/src}/types/shipping_option.rs (100%)
 rename {src => crates/teloxide-core/src}/types/shipping_query.rs (100%)
 rename {src => crates/teloxide-core/src}/types/sticker.rs (100%)
 rename {src => crates/teloxide-core/src}/types/sticker_set.rs (100%)
 rename {src => crates/teloxide-core/src}/types/successful_payment.rs (100%)
 rename {src => crates/teloxide-core/src}/types/target_message.rs (100%)
 rename {src => crates/teloxide-core/src}/types/unit_false.rs (100%)
 rename {src => crates/teloxide-core/src}/types/unit_true.rs (100%)
 rename {src => crates/teloxide-core/src}/types/update.rs (100%)
 rename {src => crates/teloxide-core/src}/types/user.rs (100%)
 rename {src => crates/teloxide-core/src}/types/user_id.rs (100%)
 rename {src => crates/teloxide-core/src}/types/user_profile_photos.rs (100%)
 rename {src => crates/teloxide-core/src}/types/venue.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video_chat_ended.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video_chat_participants_invited.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video_chat_scheduled.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video_chat_started.rs (100%)
 rename {src => crates/teloxide-core/src}/types/video_note.rs (100%)
 rename {src => crates/teloxide-core/src}/types/voice.rs (100%)
 rename {src => crates/teloxide-core/src}/types/web_app_data.rs (100%)
 rename {src => crates/teloxide-core/src}/types/web_app_info.rs (100%)
 rename {src => crates/teloxide-core/src}/types/webhook_info.rs (100%)

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 96ef6c0b..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-Cargo.lock
diff --git a/.cargo/config.toml b/crates/teloxide-core/.cargo/config.toml
similarity index 100%
rename from .cargo/config.toml
rename to crates/teloxide-core/.cargo/config.toml
diff --git a/.github/workflows/ci.yml b/crates/teloxide-core/.github/workflows/ci.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to crates/teloxide-core/.github/workflows/ci.yml
diff --git a/CHANGELOG.md b/crates/teloxide-core/CHANGELOG.md
similarity index 100%
rename from CHANGELOG.md
rename to crates/teloxide-core/CHANGELOG.md
diff --git a/Cargo.toml b/crates/teloxide-core/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to crates/teloxide-core/Cargo.toml
diff --git a/LICENSE b/crates/teloxide-core/LICENSE
similarity index 100%
rename from LICENSE
rename to crates/teloxide-core/LICENSE
diff --git a/README.md b/crates/teloxide-core/README.md
similarity index 100%
rename from README.md
rename to crates/teloxide-core/README.md
diff --git a/examples/erased.rs b/crates/teloxide-core/examples/erased.rs
similarity index 100%
rename from examples/erased.rs
rename to crates/teloxide-core/examples/erased.rs
diff --git a/examples/self_info.rs b/crates/teloxide-core/examples/self_info.rs
similarity index 100%
rename from examples/self_info.rs
rename to crates/teloxide-core/examples/self_info.rs
diff --git a/media/example.gif b/crates/teloxide-core/media/example.gif
similarity index 100%
rename from media/example.gif
rename to crates/teloxide-core/media/example.gif
diff --git a/media/logo.png b/crates/teloxide-core/media/logo.png
similarity index 100%
rename from media/logo.png
rename to crates/teloxide-core/media/logo.png
diff --git a/media/logo.svg b/crates/teloxide-core/media/logo.svg
similarity index 100%
rename from media/logo.svg
rename to crates/teloxide-core/media/logo.svg
diff --git a/rust-toolchain.toml b/crates/teloxide-core/rust-toolchain.toml
similarity index 100%
rename from rust-toolchain.toml
rename to crates/teloxide-core/rust-toolchain.toml
diff --git a/rustfmt.toml b/crates/teloxide-core/rustfmt.toml
similarity index 100%
rename from rustfmt.toml
rename to crates/teloxide-core/rustfmt.toml
diff --git a/schema.ron b/crates/teloxide-core/schema.ron
similarity index 100%
rename from schema.ron
rename to crates/teloxide-core/schema.ron
diff --git a/src/adaptors.rs b/crates/teloxide-core/src/adaptors.rs
similarity index 100%
rename from src/adaptors.rs
rename to crates/teloxide-core/src/adaptors.rs
diff --git a/src/adaptors/auto_send.rs b/crates/teloxide-core/src/adaptors/auto_send.rs
similarity index 100%
rename from src/adaptors/auto_send.rs
rename to crates/teloxide-core/src/adaptors/auto_send.rs
diff --git a/src/adaptors/cache_me.rs b/crates/teloxide-core/src/adaptors/cache_me.rs
similarity index 100%
rename from src/adaptors/cache_me.rs
rename to crates/teloxide-core/src/adaptors/cache_me.rs
diff --git a/src/adaptors/erased.rs b/crates/teloxide-core/src/adaptors/erased.rs
similarity index 100%
rename from src/adaptors/erased.rs
rename to crates/teloxide-core/src/adaptors/erased.rs
diff --git a/src/adaptors/parse_mode.rs b/crates/teloxide-core/src/adaptors/parse_mode.rs
similarity index 100%
rename from src/adaptors/parse_mode.rs
rename to crates/teloxide-core/src/adaptors/parse_mode.rs
diff --git a/src/adaptors/throttle.rs b/crates/teloxide-core/src/adaptors/throttle.rs
similarity index 100%
rename from src/adaptors/throttle.rs
rename to crates/teloxide-core/src/adaptors/throttle.rs
diff --git a/src/adaptors/throttle/request.rs b/crates/teloxide-core/src/adaptors/throttle/request.rs
similarity index 100%
rename from src/adaptors/throttle/request.rs
rename to crates/teloxide-core/src/adaptors/throttle/request.rs
diff --git a/src/adaptors/throttle/request_lock.rs b/crates/teloxide-core/src/adaptors/throttle/request_lock.rs
similarity index 100%
rename from src/adaptors/throttle/request_lock.rs
rename to crates/teloxide-core/src/adaptors/throttle/request_lock.rs
diff --git a/src/adaptors/throttle/requester_impl.rs b/crates/teloxide-core/src/adaptors/throttle/requester_impl.rs
similarity index 100%
rename from src/adaptors/throttle/requester_impl.rs
rename to crates/teloxide-core/src/adaptors/throttle/requester_impl.rs
diff --git a/src/adaptors/throttle/settings.rs b/crates/teloxide-core/src/adaptors/throttle/settings.rs
similarity index 100%
rename from src/adaptors/throttle/settings.rs
rename to crates/teloxide-core/src/adaptors/throttle/settings.rs
diff --git a/src/adaptors/throttle/worker.rs b/crates/teloxide-core/src/adaptors/throttle/worker.rs
similarity index 100%
rename from src/adaptors/throttle/worker.rs
rename to crates/teloxide-core/src/adaptors/throttle/worker.rs
diff --git a/src/adaptors/trace.rs b/crates/teloxide-core/src/adaptors/trace.rs
similarity index 100%
rename from src/adaptors/trace.rs
rename to crates/teloxide-core/src/adaptors/trace.rs
diff --git a/src/bot.rs b/crates/teloxide-core/src/bot.rs
similarity index 100%
rename from src/bot.rs
rename to crates/teloxide-core/src/bot.rs
diff --git a/src/bot/api.rs b/crates/teloxide-core/src/bot/api.rs
similarity index 100%
rename from src/bot/api.rs
rename to crates/teloxide-core/src/bot/api.rs
diff --git a/src/bot/download.rs b/crates/teloxide-core/src/bot/download.rs
similarity index 100%
rename from src/bot/download.rs
rename to crates/teloxide-core/src/bot/download.rs
diff --git a/src/codegen.rs b/crates/teloxide-core/src/codegen.rs
similarity index 100%
rename from src/codegen.rs
rename to crates/teloxide-core/src/codegen.rs
diff --git a/src/codegen/convert.rs b/crates/teloxide-core/src/codegen/convert.rs
similarity index 100%
rename from src/codegen/convert.rs
rename to crates/teloxide-core/src/codegen/convert.rs
diff --git a/src/codegen/patch.rs b/crates/teloxide-core/src/codegen/patch.rs
similarity index 100%
rename from src/codegen/patch.rs
rename to crates/teloxide-core/src/codegen/patch.rs
diff --git a/src/codegen/schema.rs b/crates/teloxide-core/src/codegen/schema.rs
similarity index 100%
rename from src/codegen/schema.rs
rename to crates/teloxide-core/src/codegen/schema.rs
diff --git a/src/errors.rs b/crates/teloxide-core/src/errors.rs
similarity index 100%
rename from src/errors.rs
rename to crates/teloxide-core/src/errors.rs
diff --git a/src/lib.rs b/crates/teloxide-core/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to crates/teloxide-core/src/lib.rs
diff --git a/src/local_macros.rs b/crates/teloxide-core/src/local_macros.rs
similarity index 100%
rename from src/local_macros.rs
rename to crates/teloxide-core/src/local_macros.rs
diff --git a/src/net.rs b/crates/teloxide-core/src/net.rs
similarity index 100%
rename from src/net.rs
rename to crates/teloxide-core/src/net.rs
diff --git a/src/net/download.rs b/crates/teloxide-core/src/net/download.rs
similarity index 100%
rename from src/net/download.rs
rename to crates/teloxide-core/src/net/download.rs
diff --git a/src/net/request.rs b/crates/teloxide-core/src/net/request.rs
similarity index 100%
rename from src/net/request.rs
rename to crates/teloxide-core/src/net/request.rs
diff --git a/src/net/telegram_response.rs b/crates/teloxide-core/src/net/telegram_response.rs
similarity index 100%
rename from src/net/telegram_response.rs
rename to crates/teloxide-core/src/net/telegram_response.rs
diff --git a/src/payloads.rs b/crates/teloxide-core/src/payloads.rs
similarity index 100%
rename from src/payloads.rs
rename to crates/teloxide-core/src/payloads.rs
diff --git a/src/payloads/add_sticker_to_set.rs b/crates/teloxide-core/src/payloads/add_sticker_to_set.rs
similarity index 100%
rename from src/payloads/add_sticker_to_set.rs
rename to crates/teloxide-core/src/payloads/add_sticker_to_set.rs
diff --git a/src/payloads/answer_callback_query.rs b/crates/teloxide-core/src/payloads/answer_callback_query.rs
similarity index 100%
rename from src/payloads/answer_callback_query.rs
rename to crates/teloxide-core/src/payloads/answer_callback_query.rs
diff --git a/src/payloads/answer_inline_query.rs b/crates/teloxide-core/src/payloads/answer_inline_query.rs
similarity index 100%
rename from src/payloads/answer_inline_query.rs
rename to crates/teloxide-core/src/payloads/answer_inline_query.rs
diff --git a/src/payloads/answer_pre_checkout_query.rs b/crates/teloxide-core/src/payloads/answer_pre_checkout_query.rs
similarity index 100%
rename from src/payloads/answer_pre_checkout_query.rs
rename to crates/teloxide-core/src/payloads/answer_pre_checkout_query.rs
diff --git a/src/payloads/answer_shipping_query.rs b/crates/teloxide-core/src/payloads/answer_shipping_query.rs
similarity index 100%
rename from src/payloads/answer_shipping_query.rs
rename to crates/teloxide-core/src/payloads/answer_shipping_query.rs
diff --git a/src/payloads/answer_web_app_query.rs b/crates/teloxide-core/src/payloads/answer_web_app_query.rs
similarity index 100%
rename from src/payloads/answer_web_app_query.rs
rename to crates/teloxide-core/src/payloads/answer_web_app_query.rs
diff --git a/src/payloads/approve_chat_join_request.rs b/crates/teloxide-core/src/payloads/approve_chat_join_request.rs
similarity index 100%
rename from src/payloads/approve_chat_join_request.rs
rename to crates/teloxide-core/src/payloads/approve_chat_join_request.rs
diff --git a/src/payloads/ban_chat_member.rs b/crates/teloxide-core/src/payloads/ban_chat_member.rs
similarity index 100%
rename from src/payloads/ban_chat_member.rs
rename to crates/teloxide-core/src/payloads/ban_chat_member.rs
diff --git a/src/payloads/ban_chat_sender_chat.rs b/crates/teloxide-core/src/payloads/ban_chat_sender_chat.rs
similarity index 100%
rename from src/payloads/ban_chat_sender_chat.rs
rename to crates/teloxide-core/src/payloads/ban_chat_sender_chat.rs
diff --git a/src/payloads/close.rs b/crates/teloxide-core/src/payloads/close.rs
similarity index 100%
rename from src/payloads/close.rs
rename to crates/teloxide-core/src/payloads/close.rs
diff --git a/src/payloads/codegen.rs b/crates/teloxide-core/src/payloads/codegen.rs
similarity index 100%
rename from src/payloads/codegen.rs
rename to crates/teloxide-core/src/payloads/codegen.rs
diff --git a/src/payloads/copy_message.rs b/crates/teloxide-core/src/payloads/copy_message.rs
similarity index 100%
rename from src/payloads/copy_message.rs
rename to crates/teloxide-core/src/payloads/copy_message.rs
diff --git a/src/payloads/create_chat_invite_link.rs b/crates/teloxide-core/src/payloads/create_chat_invite_link.rs
similarity index 100%
rename from src/payloads/create_chat_invite_link.rs
rename to crates/teloxide-core/src/payloads/create_chat_invite_link.rs
diff --git a/src/payloads/create_invoice_link.rs b/crates/teloxide-core/src/payloads/create_invoice_link.rs
similarity index 100%
rename from src/payloads/create_invoice_link.rs
rename to crates/teloxide-core/src/payloads/create_invoice_link.rs
diff --git a/src/payloads/create_new_sticker_set.rs b/crates/teloxide-core/src/payloads/create_new_sticker_set.rs
similarity index 100%
rename from src/payloads/create_new_sticker_set.rs
rename to crates/teloxide-core/src/payloads/create_new_sticker_set.rs
diff --git a/src/payloads/decline_chat_join_request.rs b/crates/teloxide-core/src/payloads/decline_chat_join_request.rs
similarity index 100%
rename from src/payloads/decline_chat_join_request.rs
rename to crates/teloxide-core/src/payloads/decline_chat_join_request.rs
diff --git a/src/payloads/delete_chat_photo.rs b/crates/teloxide-core/src/payloads/delete_chat_photo.rs
similarity index 100%
rename from src/payloads/delete_chat_photo.rs
rename to crates/teloxide-core/src/payloads/delete_chat_photo.rs
diff --git a/src/payloads/delete_chat_sticker_set.rs b/crates/teloxide-core/src/payloads/delete_chat_sticker_set.rs
similarity index 100%
rename from src/payloads/delete_chat_sticker_set.rs
rename to crates/teloxide-core/src/payloads/delete_chat_sticker_set.rs
diff --git a/src/payloads/delete_message.rs b/crates/teloxide-core/src/payloads/delete_message.rs
similarity index 100%
rename from src/payloads/delete_message.rs
rename to crates/teloxide-core/src/payloads/delete_message.rs
diff --git a/src/payloads/delete_my_commands.rs b/crates/teloxide-core/src/payloads/delete_my_commands.rs
similarity index 100%
rename from src/payloads/delete_my_commands.rs
rename to crates/teloxide-core/src/payloads/delete_my_commands.rs
diff --git a/src/payloads/delete_sticker_from_set.rs b/crates/teloxide-core/src/payloads/delete_sticker_from_set.rs
similarity index 100%
rename from src/payloads/delete_sticker_from_set.rs
rename to crates/teloxide-core/src/payloads/delete_sticker_from_set.rs
diff --git a/src/payloads/delete_webhook.rs b/crates/teloxide-core/src/payloads/delete_webhook.rs
similarity index 100%
rename from src/payloads/delete_webhook.rs
rename to crates/teloxide-core/src/payloads/delete_webhook.rs
diff --git a/src/payloads/edit_chat_invite_link.rs b/crates/teloxide-core/src/payloads/edit_chat_invite_link.rs
similarity index 100%
rename from src/payloads/edit_chat_invite_link.rs
rename to crates/teloxide-core/src/payloads/edit_chat_invite_link.rs
diff --git a/src/payloads/edit_message_caption.rs b/crates/teloxide-core/src/payloads/edit_message_caption.rs
similarity index 100%
rename from src/payloads/edit_message_caption.rs
rename to crates/teloxide-core/src/payloads/edit_message_caption.rs
diff --git a/src/payloads/edit_message_caption_inline.rs b/crates/teloxide-core/src/payloads/edit_message_caption_inline.rs
similarity index 100%
rename from src/payloads/edit_message_caption_inline.rs
rename to crates/teloxide-core/src/payloads/edit_message_caption_inline.rs
diff --git a/src/payloads/edit_message_live_location.rs b/crates/teloxide-core/src/payloads/edit_message_live_location.rs
similarity index 100%
rename from src/payloads/edit_message_live_location.rs
rename to crates/teloxide-core/src/payloads/edit_message_live_location.rs
diff --git a/src/payloads/edit_message_live_location_inline.rs b/crates/teloxide-core/src/payloads/edit_message_live_location_inline.rs
similarity index 100%
rename from src/payloads/edit_message_live_location_inline.rs
rename to crates/teloxide-core/src/payloads/edit_message_live_location_inline.rs
diff --git a/src/payloads/edit_message_media.rs b/crates/teloxide-core/src/payloads/edit_message_media.rs
similarity index 100%
rename from src/payloads/edit_message_media.rs
rename to crates/teloxide-core/src/payloads/edit_message_media.rs
diff --git a/src/payloads/edit_message_media_inline.rs b/crates/teloxide-core/src/payloads/edit_message_media_inline.rs
similarity index 100%
rename from src/payloads/edit_message_media_inline.rs
rename to crates/teloxide-core/src/payloads/edit_message_media_inline.rs
diff --git a/src/payloads/edit_message_reply_markup.rs b/crates/teloxide-core/src/payloads/edit_message_reply_markup.rs
similarity index 100%
rename from src/payloads/edit_message_reply_markup.rs
rename to crates/teloxide-core/src/payloads/edit_message_reply_markup.rs
diff --git a/src/payloads/edit_message_reply_markup_inline.rs b/crates/teloxide-core/src/payloads/edit_message_reply_markup_inline.rs
similarity index 100%
rename from src/payloads/edit_message_reply_markup_inline.rs
rename to crates/teloxide-core/src/payloads/edit_message_reply_markup_inline.rs
diff --git a/src/payloads/edit_message_text.rs b/crates/teloxide-core/src/payloads/edit_message_text.rs
similarity index 100%
rename from src/payloads/edit_message_text.rs
rename to crates/teloxide-core/src/payloads/edit_message_text.rs
diff --git a/src/payloads/edit_message_text_inline.rs b/crates/teloxide-core/src/payloads/edit_message_text_inline.rs
similarity index 100%
rename from src/payloads/edit_message_text_inline.rs
rename to crates/teloxide-core/src/payloads/edit_message_text_inline.rs
diff --git a/src/payloads/export_chat_invite_link.rs b/crates/teloxide-core/src/payloads/export_chat_invite_link.rs
similarity index 100%
rename from src/payloads/export_chat_invite_link.rs
rename to crates/teloxide-core/src/payloads/export_chat_invite_link.rs
diff --git a/src/payloads/forward_message.rs b/crates/teloxide-core/src/payloads/forward_message.rs
similarity index 100%
rename from src/payloads/forward_message.rs
rename to crates/teloxide-core/src/payloads/forward_message.rs
diff --git a/src/payloads/get_chat.rs b/crates/teloxide-core/src/payloads/get_chat.rs
similarity index 100%
rename from src/payloads/get_chat.rs
rename to crates/teloxide-core/src/payloads/get_chat.rs
diff --git a/src/payloads/get_chat_administrators.rs b/crates/teloxide-core/src/payloads/get_chat_administrators.rs
similarity index 100%
rename from src/payloads/get_chat_administrators.rs
rename to crates/teloxide-core/src/payloads/get_chat_administrators.rs
diff --git a/src/payloads/get_chat_member.rs b/crates/teloxide-core/src/payloads/get_chat_member.rs
similarity index 100%
rename from src/payloads/get_chat_member.rs
rename to crates/teloxide-core/src/payloads/get_chat_member.rs
diff --git a/src/payloads/get_chat_member_count.rs b/crates/teloxide-core/src/payloads/get_chat_member_count.rs
similarity index 100%
rename from src/payloads/get_chat_member_count.rs
rename to crates/teloxide-core/src/payloads/get_chat_member_count.rs
diff --git a/src/payloads/get_chat_members_count.rs b/crates/teloxide-core/src/payloads/get_chat_members_count.rs
similarity index 100%
rename from src/payloads/get_chat_members_count.rs
rename to crates/teloxide-core/src/payloads/get_chat_members_count.rs
diff --git a/src/payloads/get_chat_menu_button.rs b/crates/teloxide-core/src/payloads/get_chat_menu_button.rs
similarity index 100%
rename from src/payloads/get_chat_menu_button.rs
rename to crates/teloxide-core/src/payloads/get_chat_menu_button.rs
diff --git a/src/payloads/get_custom_emoji_stickers.rs b/crates/teloxide-core/src/payloads/get_custom_emoji_stickers.rs
similarity index 100%
rename from src/payloads/get_custom_emoji_stickers.rs
rename to crates/teloxide-core/src/payloads/get_custom_emoji_stickers.rs
diff --git a/src/payloads/get_file.rs b/crates/teloxide-core/src/payloads/get_file.rs
similarity index 100%
rename from src/payloads/get_file.rs
rename to crates/teloxide-core/src/payloads/get_file.rs
diff --git a/src/payloads/get_game_high_scores.rs b/crates/teloxide-core/src/payloads/get_game_high_scores.rs
similarity index 100%
rename from src/payloads/get_game_high_scores.rs
rename to crates/teloxide-core/src/payloads/get_game_high_scores.rs
diff --git a/src/payloads/get_me.rs b/crates/teloxide-core/src/payloads/get_me.rs
similarity index 100%
rename from src/payloads/get_me.rs
rename to crates/teloxide-core/src/payloads/get_me.rs
diff --git a/src/payloads/get_my_commands.rs b/crates/teloxide-core/src/payloads/get_my_commands.rs
similarity index 100%
rename from src/payloads/get_my_commands.rs
rename to crates/teloxide-core/src/payloads/get_my_commands.rs
diff --git a/src/payloads/get_my_default_administrator_rights.rs b/crates/teloxide-core/src/payloads/get_my_default_administrator_rights.rs
similarity index 100%
rename from src/payloads/get_my_default_administrator_rights.rs
rename to crates/teloxide-core/src/payloads/get_my_default_administrator_rights.rs
diff --git a/src/payloads/get_sticker_set.rs b/crates/teloxide-core/src/payloads/get_sticker_set.rs
similarity index 100%
rename from src/payloads/get_sticker_set.rs
rename to crates/teloxide-core/src/payloads/get_sticker_set.rs
diff --git a/src/payloads/get_updates.rs b/crates/teloxide-core/src/payloads/get_updates.rs
similarity index 100%
rename from src/payloads/get_updates.rs
rename to crates/teloxide-core/src/payloads/get_updates.rs
diff --git a/src/payloads/get_user_profile_photos.rs b/crates/teloxide-core/src/payloads/get_user_profile_photos.rs
similarity index 100%
rename from src/payloads/get_user_profile_photos.rs
rename to crates/teloxide-core/src/payloads/get_user_profile_photos.rs
diff --git a/src/payloads/get_webhook_info.rs b/crates/teloxide-core/src/payloads/get_webhook_info.rs
similarity index 100%
rename from src/payloads/get_webhook_info.rs
rename to crates/teloxide-core/src/payloads/get_webhook_info.rs
diff --git a/src/payloads/kick_chat_member.rs b/crates/teloxide-core/src/payloads/kick_chat_member.rs
similarity index 100%
rename from src/payloads/kick_chat_member.rs
rename to crates/teloxide-core/src/payloads/kick_chat_member.rs
diff --git a/src/payloads/leave_chat.rs b/crates/teloxide-core/src/payloads/leave_chat.rs
similarity index 100%
rename from src/payloads/leave_chat.rs
rename to crates/teloxide-core/src/payloads/leave_chat.rs
diff --git a/src/payloads/log_out.rs b/crates/teloxide-core/src/payloads/log_out.rs
similarity index 100%
rename from src/payloads/log_out.rs
rename to crates/teloxide-core/src/payloads/log_out.rs
diff --git a/src/payloads/pin_chat_message.rs b/crates/teloxide-core/src/payloads/pin_chat_message.rs
similarity index 100%
rename from src/payloads/pin_chat_message.rs
rename to crates/teloxide-core/src/payloads/pin_chat_message.rs
diff --git a/src/payloads/promote_chat_member.rs b/crates/teloxide-core/src/payloads/promote_chat_member.rs
similarity index 100%
rename from src/payloads/promote_chat_member.rs
rename to crates/teloxide-core/src/payloads/promote_chat_member.rs
diff --git a/src/payloads/restrict_chat_member.rs b/crates/teloxide-core/src/payloads/restrict_chat_member.rs
similarity index 100%
rename from src/payloads/restrict_chat_member.rs
rename to crates/teloxide-core/src/payloads/restrict_chat_member.rs
diff --git a/src/payloads/revoke_chat_invite_link.rs b/crates/teloxide-core/src/payloads/revoke_chat_invite_link.rs
similarity index 100%
rename from src/payloads/revoke_chat_invite_link.rs
rename to crates/teloxide-core/src/payloads/revoke_chat_invite_link.rs
diff --git a/src/payloads/send_animation.rs b/crates/teloxide-core/src/payloads/send_animation.rs
similarity index 100%
rename from src/payloads/send_animation.rs
rename to crates/teloxide-core/src/payloads/send_animation.rs
diff --git a/src/payloads/send_audio.rs b/crates/teloxide-core/src/payloads/send_audio.rs
similarity index 100%
rename from src/payloads/send_audio.rs
rename to crates/teloxide-core/src/payloads/send_audio.rs
diff --git a/src/payloads/send_chat_action.rs b/crates/teloxide-core/src/payloads/send_chat_action.rs
similarity index 100%
rename from src/payloads/send_chat_action.rs
rename to crates/teloxide-core/src/payloads/send_chat_action.rs
diff --git a/src/payloads/send_contact.rs b/crates/teloxide-core/src/payloads/send_contact.rs
similarity index 100%
rename from src/payloads/send_contact.rs
rename to crates/teloxide-core/src/payloads/send_contact.rs
diff --git a/src/payloads/send_dice.rs b/crates/teloxide-core/src/payloads/send_dice.rs
similarity index 100%
rename from src/payloads/send_dice.rs
rename to crates/teloxide-core/src/payloads/send_dice.rs
diff --git a/src/payloads/send_document.rs b/crates/teloxide-core/src/payloads/send_document.rs
similarity index 100%
rename from src/payloads/send_document.rs
rename to crates/teloxide-core/src/payloads/send_document.rs
diff --git a/src/payloads/send_game.rs b/crates/teloxide-core/src/payloads/send_game.rs
similarity index 100%
rename from src/payloads/send_game.rs
rename to crates/teloxide-core/src/payloads/send_game.rs
diff --git a/src/payloads/send_invoice.rs b/crates/teloxide-core/src/payloads/send_invoice.rs
similarity index 100%
rename from src/payloads/send_invoice.rs
rename to crates/teloxide-core/src/payloads/send_invoice.rs
diff --git a/src/payloads/send_location.rs b/crates/teloxide-core/src/payloads/send_location.rs
similarity index 100%
rename from src/payloads/send_location.rs
rename to crates/teloxide-core/src/payloads/send_location.rs
diff --git a/src/payloads/send_media_group.rs b/crates/teloxide-core/src/payloads/send_media_group.rs
similarity index 100%
rename from src/payloads/send_media_group.rs
rename to crates/teloxide-core/src/payloads/send_media_group.rs
diff --git a/src/payloads/send_message.rs b/crates/teloxide-core/src/payloads/send_message.rs
similarity index 100%
rename from src/payloads/send_message.rs
rename to crates/teloxide-core/src/payloads/send_message.rs
diff --git a/src/payloads/send_photo.rs b/crates/teloxide-core/src/payloads/send_photo.rs
similarity index 100%
rename from src/payloads/send_photo.rs
rename to crates/teloxide-core/src/payloads/send_photo.rs
diff --git a/src/payloads/send_poll.rs b/crates/teloxide-core/src/payloads/send_poll.rs
similarity index 100%
rename from src/payloads/send_poll.rs
rename to crates/teloxide-core/src/payloads/send_poll.rs
diff --git a/src/payloads/send_sticker.rs b/crates/teloxide-core/src/payloads/send_sticker.rs
similarity index 100%
rename from src/payloads/send_sticker.rs
rename to crates/teloxide-core/src/payloads/send_sticker.rs
diff --git a/src/payloads/send_venue.rs b/crates/teloxide-core/src/payloads/send_venue.rs
similarity index 100%
rename from src/payloads/send_venue.rs
rename to crates/teloxide-core/src/payloads/send_venue.rs
diff --git a/src/payloads/send_video.rs b/crates/teloxide-core/src/payloads/send_video.rs
similarity index 100%
rename from src/payloads/send_video.rs
rename to crates/teloxide-core/src/payloads/send_video.rs
diff --git a/src/payloads/send_video_note.rs b/crates/teloxide-core/src/payloads/send_video_note.rs
similarity index 100%
rename from src/payloads/send_video_note.rs
rename to crates/teloxide-core/src/payloads/send_video_note.rs
diff --git a/src/payloads/send_voice.rs b/crates/teloxide-core/src/payloads/send_voice.rs
similarity index 100%
rename from src/payloads/send_voice.rs
rename to crates/teloxide-core/src/payloads/send_voice.rs
diff --git a/src/payloads/set_chat_administrator_custom_title.rs b/crates/teloxide-core/src/payloads/set_chat_administrator_custom_title.rs
similarity index 100%
rename from src/payloads/set_chat_administrator_custom_title.rs
rename to crates/teloxide-core/src/payloads/set_chat_administrator_custom_title.rs
diff --git a/src/payloads/set_chat_description.rs b/crates/teloxide-core/src/payloads/set_chat_description.rs
similarity index 100%
rename from src/payloads/set_chat_description.rs
rename to crates/teloxide-core/src/payloads/set_chat_description.rs
diff --git a/src/payloads/set_chat_menu_button.rs b/crates/teloxide-core/src/payloads/set_chat_menu_button.rs
similarity index 100%
rename from src/payloads/set_chat_menu_button.rs
rename to crates/teloxide-core/src/payloads/set_chat_menu_button.rs
diff --git a/src/payloads/set_chat_permissions.rs b/crates/teloxide-core/src/payloads/set_chat_permissions.rs
similarity index 100%
rename from src/payloads/set_chat_permissions.rs
rename to crates/teloxide-core/src/payloads/set_chat_permissions.rs
diff --git a/src/payloads/set_chat_photo.rs b/crates/teloxide-core/src/payloads/set_chat_photo.rs
similarity index 100%
rename from src/payloads/set_chat_photo.rs
rename to crates/teloxide-core/src/payloads/set_chat_photo.rs
diff --git a/src/payloads/set_chat_sticker_set.rs b/crates/teloxide-core/src/payloads/set_chat_sticker_set.rs
similarity index 100%
rename from src/payloads/set_chat_sticker_set.rs
rename to crates/teloxide-core/src/payloads/set_chat_sticker_set.rs
diff --git a/src/payloads/set_chat_title.rs b/crates/teloxide-core/src/payloads/set_chat_title.rs
similarity index 100%
rename from src/payloads/set_chat_title.rs
rename to crates/teloxide-core/src/payloads/set_chat_title.rs
diff --git a/src/payloads/set_game_score.rs b/crates/teloxide-core/src/payloads/set_game_score.rs
similarity index 100%
rename from src/payloads/set_game_score.rs
rename to crates/teloxide-core/src/payloads/set_game_score.rs
diff --git a/src/payloads/set_game_score_inline.rs b/crates/teloxide-core/src/payloads/set_game_score_inline.rs
similarity index 100%
rename from src/payloads/set_game_score_inline.rs
rename to crates/teloxide-core/src/payloads/set_game_score_inline.rs
diff --git a/src/payloads/set_my_commands.rs b/crates/teloxide-core/src/payloads/set_my_commands.rs
similarity index 100%
rename from src/payloads/set_my_commands.rs
rename to crates/teloxide-core/src/payloads/set_my_commands.rs
diff --git a/src/payloads/set_my_default_administrator_rights.rs b/crates/teloxide-core/src/payloads/set_my_default_administrator_rights.rs
similarity index 100%
rename from src/payloads/set_my_default_administrator_rights.rs
rename to crates/teloxide-core/src/payloads/set_my_default_administrator_rights.rs
diff --git a/src/payloads/set_passport_data_errors.rs b/crates/teloxide-core/src/payloads/set_passport_data_errors.rs
similarity index 100%
rename from src/payloads/set_passport_data_errors.rs
rename to crates/teloxide-core/src/payloads/set_passport_data_errors.rs
diff --git a/src/payloads/set_sticker_position_in_set.rs b/crates/teloxide-core/src/payloads/set_sticker_position_in_set.rs
similarity index 100%
rename from src/payloads/set_sticker_position_in_set.rs
rename to crates/teloxide-core/src/payloads/set_sticker_position_in_set.rs
diff --git a/src/payloads/set_sticker_set_thumb.rs b/crates/teloxide-core/src/payloads/set_sticker_set_thumb.rs
similarity index 100%
rename from src/payloads/set_sticker_set_thumb.rs
rename to crates/teloxide-core/src/payloads/set_sticker_set_thumb.rs
diff --git a/src/payloads/set_webhook.rs b/crates/teloxide-core/src/payloads/set_webhook.rs
similarity index 100%
rename from src/payloads/set_webhook.rs
rename to crates/teloxide-core/src/payloads/set_webhook.rs
diff --git a/src/payloads/setters.rs b/crates/teloxide-core/src/payloads/setters.rs
similarity index 100%
rename from src/payloads/setters.rs
rename to crates/teloxide-core/src/payloads/setters.rs
diff --git a/src/payloads/stop_message_live_location.rs b/crates/teloxide-core/src/payloads/stop_message_live_location.rs
similarity index 100%
rename from src/payloads/stop_message_live_location.rs
rename to crates/teloxide-core/src/payloads/stop_message_live_location.rs
diff --git a/src/payloads/stop_message_live_location_inline.rs b/crates/teloxide-core/src/payloads/stop_message_live_location_inline.rs
similarity index 100%
rename from src/payloads/stop_message_live_location_inline.rs
rename to crates/teloxide-core/src/payloads/stop_message_live_location_inline.rs
diff --git a/src/payloads/stop_poll.rs b/crates/teloxide-core/src/payloads/stop_poll.rs
similarity index 100%
rename from src/payloads/stop_poll.rs
rename to crates/teloxide-core/src/payloads/stop_poll.rs
diff --git a/src/payloads/unban_chat_member.rs b/crates/teloxide-core/src/payloads/unban_chat_member.rs
similarity index 100%
rename from src/payloads/unban_chat_member.rs
rename to crates/teloxide-core/src/payloads/unban_chat_member.rs
diff --git a/src/payloads/unban_chat_sender_chat.rs b/crates/teloxide-core/src/payloads/unban_chat_sender_chat.rs
similarity index 100%
rename from src/payloads/unban_chat_sender_chat.rs
rename to crates/teloxide-core/src/payloads/unban_chat_sender_chat.rs
diff --git a/src/payloads/unpin_all_chat_messages.rs b/crates/teloxide-core/src/payloads/unpin_all_chat_messages.rs
similarity index 100%
rename from src/payloads/unpin_all_chat_messages.rs
rename to crates/teloxide-core/src/payloads/unpin_all_chat_messages.rs
diff --git a/src/payloads/unpin_chat_message.rs b/crates/teloxide-core/src/payloads/unpin_chat_message.rs
similarity index 100%
rename from src/payloads/unpin_chat_message.rs
rename to crates/teloxide-core/src/payloads/unpin_chat_message.rs
diff --git a/src/payloads/upload_sticker_file.rs b/crates/teloxide-core/src/payloads/upload_sticker_file.rs
similarity index 100%
rename from src/payloads/upload_sticker_file.rs
rename to crates/teloxide-core/src/payloads/upload_sticker_file.rs
diff --git a/src/prelude.rs b/crates/teloxide-core/src/prelude.rs
similarity index 100%
rename from src/prelude.rs
rename to crates/teloxide-core/src/prelude.rs
diff --git a/src/requests.rs b/crates/teloxide-core/src/requests.rs
similarity index 100%
rename from src/requests.rs
rename to crates/teloxide-core/src/requests.rs
diff --git a/src/requests/has_payload.rs b/crates/teloxide-core/src/requests/has_payload.rs
similarity index 100%
rename from src/requests/has_payload.rs
rename to crates/teloxide-core/src/requests/has_payload.rs
diff --git a/src/requests/json.rs b/crates/teloxide-core/src/requests/json.rs
similarity index 100%
rename from src/requests/json.rs
rename to crates/teloxide-core/src/requests/json.rs
diff --git a/src/requests/multipart.rs b/crates/teloxide-core/src/requests/multipart.rs
similarity index 100%
rename from src/requests/multipart.rs
rename to crates/teloxide-core/src/requests/multipart.rs
diff --git a/src/requests/multipart_payload.rs b/crates/teloxide-core/src/requests/multipart_payload.rs
similarity index 100%
rename from src/requests/multipart_payload.rs
rename to crates/teloxide-core/src/requests/multipart_payload.rs
diff --git a/src/requests/payload.rs b/crates/teloxide-core/src/requests/payload.rs
similarity index 100%
rename from src/requests/payload.rs
rename to crates/teloxide-core/src/requests/payload.rs
diff --git a/src/requests/request.rs b/crates/teloxide-core/src/requests/request.rs
similarity index 100%
rename from src/requests/request.rs
rename to crates/teloxide-core/src/requests/request.rs
diff --git a/src/requests/requester.rs b/crates/teloxide-core/src/requests/requester.rs
similarity index 100%
rename from src/requests/requester.rs
rename to crates/teloxide-core/src/requests/requester.rs
diff --git a/src/requests/requester_ext.rs b/crates/teloxide-core/src/requests/requester_ext.rs
similarity index 100%
rename from src/requests/requester_ext.rs
rename to crates/teloxide-core/src/requests/requester_ext.rs
diff --git a/src/requests/utils.rs b/crates/teloxide-core/src/requests/utils.rs
similarity index 100%
rename from src/requests/utils.rs
rename to crates/teloxide-core/src/requests/utils.rs
diff --git a/src/serde_multipart/error.rs b/crates/teloxide-core/src/serde_multipart/error.rs
similarity index 100%
rename from src/serde_multipart/error.rs
rename to crates/teloxide-core/src/serde_multipart/error.rs
diff --git a/src/serde_multipart/mod.rs b/crates/teloxide-core/src/serde_multipart/mod.rs
similarity index 100%
rename from src/serde_multipart/mod.rs
rename to crates/teloxide-core/src/serde_multipart/mod.rs
diff --git a/src/serde_multipart/serializers.rs b/crates/teloxide-core/src/serde_multipart/serializers.rs
similarity index 100%
rename from src/serde_multipart/serializers.rs
rename to crates/teloxide-core/src/serde_multipart/serializers.rs
diff --git a/src/serde_multipart/unserializers.rs b/crates/teloxide-core/src/serde_multipart/unserializers.rs
similarity index 100%
rename from src/serde_multipart/unserializers.rs
rename to crates/teloxide-core/src/serde_multipart/unserializers.rs
diff --git a/src/serde_multipart/unserializers/input_file.rs b/crates/teloxide-core/src/serde_multipart/unserializers/input_file.rs
similarity index 100%
rename from src/serde_multipart/unserializers/input_file.rs
rename to crates/teloxide-core/src/serde_multipart/unserializers/input_file.rs
diff --git a/src/types.rs b/crates/teloxide-core/src/types.rs
similarity index 100%
rename from src/types.rs
rename to crates/teloxide-core/src/types.rs
diff --git a/src/types/allowed_update.rs b/crates/teloxide-core/src/types/allowed_update.rs
similarity index 100%
rename from src/types/allowed_update.rs
rename to crates/teloxide-core/src/types/allowed_update.rs
diff --git a/src/types/animation.rs b/crates/teloxide-core/src/types/animation.rs
similarity index 100%
rename from src/types/animation.rs
rename to crates/teloxide-core/src/types/animation.rs
diff --git a/src/types/audio.rs b/crates/teloxide-core/src/types/audio.rs
similarity index 100%
rename from src/types/audio.rs
rename to crates/teloxide-core/src/types/audio.rs
diff --git a/src/types/bot_command.rs b/crates/teloxide-core/src/types/bot_command.rs
similarity index 100%
rename from src/types/bot_command.rs
rename to crates/teloxide-core/src/types/bot_command.rs
diff --git a/src/types/bot_command_scope.rs b/crates/teloxide-core/src/types/bot_command_scope.rs
similarity index 100%
rename from src/types/bot_command_scope.rs
rename to crates/teloxide-core/src/types/bot_command_scope.rs
diff --git a/src/types/callback_game.rs b/crates/teloxide-core/src/types/callback_game.rs
similarity index 100%
rename from src/types/callback_game.rs
rename to crates/teloxide-core/src/types/callback_game.rs
diff --git a/src/types/callback_query.rs b/crates/teloxide-core/src/types/callback_query.rs
similarity index 100%
rename from src/types/callback_query.rs
rename to crates/teloxide-core/src/types/callback_query.rs
diff --git a/src/types/chat.rs b/crates/teloxide-core/src/types/chat.rs
similarity index 100%
rename from src/types/chat.rs
rename to crates/teloxide-core/src/types/chat.rs
diff --git a/src/types/chat_action.rs b/crates/teloxide-core/src/types/chat_action.rs
similarity index 100%
rename from src/types/chat_action.rs
rename to crates/teloxide-core/src/types/chat_action.rs
diff --git a/src/types/chat_administrator_rights.rs b/crates/teloxide-core/src/types/chat_administrator_rights.rs
similarity index 100%
rename from src/types/chat_administrator_rights.rs
rename to crates/teloxide-core/src/types/chat_administrator_rights.rs
diff --git a/src/types/chat_id.rs b/crates/teloxide-core/src/types/chat_id.rs
similarity index 100%
rename from src/types/chat_id.rs
rename to crates/teloxide-core/src/types/chat_id.rs
diff --git a/src/types/chat_invite_link.rs b/crates/teloxide-core/src/types/chat_invite_link.rs
similarity index 100%
rename from src/types/chat_invite_link.rs
rename to crates/teloxide-core/src/types/chat_invite_link.rs
diff --git a/src/types/chat_join_request.rs b/crates/teloxide-core/src/types/chat_join_request.rs
similarity index 100%
rename from src/types/chat_join_request.rs
rename to crates/teloxide-core/src/types/chat_join_request.rs
diff --git a/src/types/chat_location.rs b/crates/teloxide-core/src/types/chat_location.rs
similarity index 100%
rename from src/types/chat_location.rs
rename to crates/teloxide-core/src/types/chat_location.rs
diff --git a/src/types/chat_member.rs b/crates/teloxide-core/src/types/chat_member.rs
similarity index 100%
rename from src/types/chat_member.rs
rename to crates/teloxide-core/src/types/chat_member.rs
diff --git a/src/types/chat_member_updated.rs b/crates/teloxide-core/src/types/chat_member_updated.rs
similarity index 100%
rename from src/types/chat_member_updated.rs
rename to crates/teloxide-core/src/types/chat_member_updated.rs
diff --git a/src/types/chat_permissions.rs b/crates/teloxide-core/src/types/chat_permissions.rs
similarity index 100%
rename from src/types/chat_permissions.rs
rename to crates/teloxide-core/src/types/chat_permissions.rs
diff --git a/src/types/chat_photo.rs b/crates/teloxide-core/src/types/chat_photo.rs
similarity index 100%
rename from src/types/chat_photo.rs
rename to crates/teloxide-core/src/types/chat_photo.rs
diff --git a/src/types/chat_type.rs b/crates/teloxide-core/src/types/chat_type.rs
similarity index 100%
rename from src/types/chat_type.rs
rename to crates/teloxide-core/src/types/chat_type.rs
diff --git a/src/types/chosen_inline_result.rs b/crates/teloxide-core/src/types/chosen_inline_result.rs
similarity index 100%
rename from src/types/chosen_inline_result.rs
rename to crates/teloxide-core/src/types/chosen_inline_result.rs
diff --git a/src/types/contact.rs b/crates/teloxide-core/src/types/contact.rs
similarity index 100%
rename from src/types/contact.rs
rename to crates/teloxide-core/src/types/contact.rs
diff --git a/src/types/dice.rs b/crates/teloxide-core/src/types/dice.rs
similarity index 100%
rename from src/types/dice.rs
rename to crates/teloxide-core/src/types/dice.rs
diff --git a/src/types/dice_emoji.rs b/crates/teloxide-core/src/types/dice_emoji.rs
similarity index 100%
rename from src/types/dice_emoji.rs
rename to crates/teloxide-core/src/types/dice_emoji.rs
diff --git a/src/types/document.rs b/crates/teloxide-core/src/types/document.rs
similarity index 100%
rename from src/types/document.rs
rename to crates/teloxide-core/src/types/document.rs
diff --git a/src/types/encrypted_credentials.rs b/crates/teloxide-core/src/types/encrypted_credentials.rs
similarity index 100%
rename from src/types/encrypted_credentials.rs
rename to crates/teloxide-core/src/types/encrypted_credentials.rs
diff --git a/src/types/encrypted_passport_element.rs b/crates/teloxide-core/src/types/encrypted_passport_element.rs
similarity index 100%
rename from src/types/encrypted_passport_element.rs
rename to crates/teloxide-core/src/types/encrypted_passport_element.rs
diff --git a/src/types/file.rs b/crates/teloxide-core/src/types/file.rs
similarity index 100%
rename from src/types/file.rs
rename to crates/teloxide-core/src/types/file.rs
diff --git a/src/types/force_reply.rs b/crates/teloxide-core/src/types/force_reply.rs
similarity index 100%
rename from src/types/force_reply.rs
rename to crates/teloxide-core/src/types/force_reply.rs
diff --git a/src/types/game.rs b/crates/teloxide-core/src/types/game.rs
similarity index 100%
rename from src/types/game.rs
rename to crates/teloxide-core/src/types/game.rs
diff --git a/src/types/game_high_score.rs b/crates/teloxide-core/src/types/game_high_score.rs
similarity index 100%
rename from src/types/game_high_score.rs
rename to crates/teloxide-core/src/types/game_high_score.rs
diff --git a/src/types/inline_keyboard_button.rs b/crates/teloxide-core/src/types/inline_keyboard_button.rs
similarity index 100%
rename from src/types/inline_keyboard_button.rs
rename to crates/teloxide-core/src/types/inline_keyboard_button.rs
diff --git a/src/types/inline_keyboard_markup.rs b/crates/teloxide-core/src/types/inline_keyboard_markup.rs
similarity index 100%
rename from src/types/inline_keyboard_markup.rs
rename to crates/teloxide-core/src/types/inline_keyboard_markup.rs
diff --git a/src/types/inline_query.rs b/crates/teloxide-core/src/types/inline_query.rs
similarity index 100%
rename from src/types/inline_query.rs
rename to crates/teloxide-core/src/types/inline_query.rs
diff --git a/src/types/inline_query_result.rs b/crates/teloxide-core/src/types/inline_query_result.rs
similarity index 100%
rename from src/types/inline_query_result.rs
rename to crates/teloxide-core/src/types/inline_query_result.rs
diff --git a/src/types/inline_query_result_article.rs b/crates/teloxide-core/src/types/inline_query_result_article.rs
similarity index 100%
rename from src/types/inline_query_result_article.rs
rename to crates/teloxide-core/src/types/inline_query_result_article.rs
diff --git a/src/types/inline_query_result_audio.rs b/crates/teloxide-core/src/types/inline_query_result_audio.rs
similarity index 100%
rename from src/types/inline_query_result_audio.rs
rename to crates/teloxide-core/src/types/inline_query_result_audio.rs
diff --git a/src/types/inline_query_result_cached_audio.rs b/crates/teloxide-core/src/types/inline_query_result_cached_audio.rs
similarity index 100%
rename from src/types/inline_query_result_cached_audio.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_audio.rs
diff --git a/src/types/inline_query_result_cached_document.rs b/crates/teloxide-core/src/types/inline_query_result_cached_document.rs
similarity index 100%
rename from src/types/inline_query_result_cached_document.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_document.rs
diff --git a/src/types/inline_query_result_cached_gif.rs b/crates/teloxide-core/src/types/inline_query_result_cached_gif.rs
similarity index 100%
rename from src/types/inline_query_result_cached_gif.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_gif.rs
diff --git a/src/types/inline_query_result_cached_mpeg4_gif.rs b/crates/teloxide-core/src/types/inline_query_result_cached_mpeg4_gif.rs
similarity index 100%
rename from src/types/inline_query_result_cached_mpeg4_gif.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_mpeg4_gif.rs
diff --git a/src/types/inline_query_result_cached_photo.rs b/crates/teloxide-core/src/types/inline_query_result_cached_photo.rs
similarity index 100%
rename from src/types/inline_query_result_cached_photo.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_photo.rs
diff --git a/src/types/inline_query_result_cached_sticker.rs b/crates/teloxide-core/src/types/inline_query_result_cached_sticker.rs
similarity index 100%
rename from src/types/inline_query_result_cached_sticker.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_sticker.rs
diff --git a/src/types/inline_query_result_cached_video.rs b/crates/teloxide-core/src/types/inline_query_result_cached_video.rs
similarity index 100%
rename from src/types/inline_query_result_cached_video.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_video.rs
diff --git a/src/types/inline_query_result_cached_voice.rs b/crates/teloxide-core/src/types/inline_query_result_cached_voice.rs
similarity index 100%
rename from src/types/inline_query_result_cached_voice.rs
rename to crates/teloxide-core/src/types/inline_query_result_cached_voice.rs
diff --git a/src/types/inline_query_result_contact.rs b/crates/teloxide-core/src/types/inline_query_result_contact.rs
similarity index 100%
rename from src/types/inline_query_result_contact.rs
rename to crates/teloxide-core/src/types/inline_query_result_contact.rs
diff --git a/src/types/inline_query_result_document.rs b/crates/teloxide-core/src/types/inline_query_result_document.rs
similarity index 100%
rename from src/types/inline_query_result_document.rs
rename to crates/teloxide-core/src/types/inline_query_result_document.rs
diff --git a/src/types/inline_query_result_game.rs b/crates/teloxide-core/src/types/inline_query_result_game.rs
similarity index 100%
rename from src/types/inline_query_result_game.rs
rename to crates/teloxide-core/src/types/inline_query_result_game.rs
diff --git a/src/types/inline_query_result_gif.rs b/crates/teloxide-core/src/types/inline_query_result_gif.rs
similarity index 100%
rename from src/types/inline_query_result_gif.rs
rename to crates/teloxide-core/src/types/inline_query_result_gif.rs
diff --git a/src/types/inline_query_result_location.rs b/crates/teloxide-core/src/types/inline_query_result_location.rs
similarity index 100%
rename from src/types/inline_query_result_location.rs
rename to crates/teloxide-core/src/types/inline_query_result_location.rs
diff --git a/src/types/inline_query_result_mpeg4_gif.rs b/crates/teloxide-core/src/types/inline_query_result_mpeg4_gif.rs
similarity index 100%
rename from src/types/inline_query_result_mpeg4_gif.rs
rename to crates/teloxide-core/src/types/inline_query_result_mpeg4_gif.rs
diff --git a/src/types/inline_query_result_photo.rs b/crates/teloxide-core/src/types/inline_query_result_photo.rs
similarity index 100%
rename from src/types/inline_query_result_photo.rs
rename to crates/teloxide-core/src/types/inline_query_result_photo.rs
diff --git a/src/types/inline_query_result_venue.rs b/crates/teloxide-core/src/types/inline_query_result_venue.rs
similarity index 100%
rename from src/types/inline_query_result_venue.rs
rename to crates/teloxide-core/src/types/inline_query_result_venue.rs
diff --git a/src/types/inline_query_result_video.rs b/crates/teloxide-core/src/types/inline_query_result_video.rs
similarity index 100%
rename from src/types/inline_query_result_video.rs
rename to crates/teloxide-core/src/types/inline_query_result_video.rs
diff --git a/src/types/inline_query_result_voice.rs b/crates/teloxide-core/src/types/inline_query_result_voice.rs
similarity index 100%
rename from src/types/inline_query_result_voice.rs
rename to crates/teloxide-core/src/types/inline_query_result_voice.rs
diff --git a/src/types/input_file.rs b/crates/teloxide-core/src/types/input_file.rs
similarity index 100%
rename from src/types/input_file.rs
rename to crates/teloxide-core/src/types/input_file.rs
diff --git a/src/types/input_media.rs b/crates/teloxide-core/src/types/input_media.rs
similarity index 100%
rename from src/types/input_media.rs
rename to crates/teloxide-core/src/types/input_media.rs
diff --git a/src/types/input_message_content.rs b/crates/teloxide-core/src/types/input_message_content.rs
similarity index 100%
rename from src/types/input_message_content.rs
rename to crates/teloxide-core/src/types/input_message_content.rs
diff --git a/src/types/input_sticker.rs b/crates/teloxide-core/src/types/input_sticker.rs
similarity index 100%
rename from src/types/input_sticker.rs
rename to crates/teloxide-core/src/types/input_sticker.rs
diff --git a/src/types/invoice.rs b/crates/teloxide-core/src/types/invoice.rs
similarity index 100%
rename from src/types/invoice.rs
rename to crates/teloxide-core/src/types/invoice.rs
diff --git a/src/types/keyboard_button.rs b/crates/teloxide-core/src/types/keyboard_button.rs
similarity index 100%
rename from src/types/keyboard_button.rs
rename to crates/teloxide-core/src/types/keyboard_button.rs
diff --git a/src/types/keyboard_button_poll_type.rs b/crates/teloxide-core/src/types/keyboard_button_poll_type.rs
similarity index 100%
rename from src/types/keyboard_button_poll_type.rs
rename to crates/teloxide-core/src/types/keyboard_button_poll_type.rs
diff --git a/src/types/label_price.rs b/crates/teloxide-core/src/types/label_price.rs
similarity index 100%
rename from src/types/label_price.rs
rename to crates/teloxide-core/src/types/label_price.rs
diff --git a/src/types/location.rs b/crates/teloxide-core/src/types/location.rs
similarity index 100%
rename from src/types/location.rs
rename to crates/teloxide-core/src/types/location.rs
diff --git a/src/types/login_url.rs b/crates/teloxide-core/src/types/login_url.rs
similarity index 100%
rename from src/types/login_url.rs
rename to crates/teloxide-core/src/types/login_url.rs
diff --git a/src/types/mask_position.rs b/crates/teloxide-core/src/types/mask_position.rs
similarity index 100%
rename from src/types/mask_position.rs
rename to crates/teloxide-core/src/types/mask_position.rs
diff --git a/src/types/me.rs b/crates/teloxide-core/src/types/me.rs
similarity index 100%
rename from src/types/me.rs
rename to crates/teloxide-core/src/types/me.rs
diff --git a/src/types/menu_button.rs b/crates/teloxide-core/src/types/menu_button.rs
similarity index 100%
rename from src/types/menu_button.rs
rename to crates/teloxide-core/src/types/menu_button.rs
diff --git a/src/types/message.rs b/crates/teloxide-core/src/types/message.rs
similarity index 100%
rename from src/types/message.rs
rename to crates/teloxide-core/src/types/message.rs
diff --git a/src/types/message_auto_delete_timer_changed.rs b/crates/teloxide-core/src/types/message_auto_delete_timer_changed.rs
similarity index 100%
rename from src/types/message_auto_delete_timer_changed.rs
rename to crates/teloxide-core/src/types/message_auto_delete_timer_changed.rs
diff --git a/src/types/message_entity.rs b/crates/teloxide-core/src/types/message_entity.rs
similarity index 100%
rename from src/types/message_entity.rs
rename to crates/teloxide-core/src/types/message_entity.rs
diff --git a/src/types/message_id.rs b/crates/teloxide-core/src/types/message_id.rs
similarity index 100%
rename from src/types/message_id.rs
rename to crates/teloxide-core/src/types/message_id.rs
diff --git a/src/types/non_telegram_types/country_code.rs b/crates/teloxide-core/src/types/non_telegram_types/country_code.rs
similarity index 100%
rename from src/types/non_telegram_types/country_code.rs
rename to crates/teloxide-core/src/types/non_telegram_types/country_code.rs
diff --git a/src/types/non_telegram_types/currency.rs b/crates/teloxide-core/src/types/non_telegram_types/currency.rs
similarity index 100%
rename from src/types/non_telegram_types/currency.rs
rename to crates/teloxide-core/src/types/non_telegram_types/currency.rs
diff --git a/src/types/non_telegram_types/mime.rs b/crates/teloxide-core/src/types/non_telegram_types/mime.rs
similarity index 100%
rename from src/types/non_telegram_types/mime.rs
rename to crates/teloxide-core/src/types/non_telegram_types/mime.rs
diff --git a/src/types/non_telegram_types/until_date.rs b/crates/teloxide-core/src/types/non_telegram_types/until_date.rs
similarity index 100%
rename from src/types/non_telegram_types/until_date.rs
rename to crates/teloxide-core/src/types/non_telegram_types/until_date.rs
diff --git a/src/types/order_info.rs b/crates/teloxide-core/src/types/order_info.rs
similarity index 100%
rename from src/types/order_info.rs
rename to crates/teloxide-core/src/types/order_info.rs
diff --git a/src/types/parse_mode.rs b/crates/teloxide-core/src/types/parse_mode.rs
similarity index 100%
rename from src/types/parse_mode.rs
rename to crates/teloxide-core/src/types/parse_mode.rs
diff --git a/src/types/passport_data.rs b/crates/teloxide-core/src/types/passport_data.rs
similarity index 100%
rename from src/types/passport_data.rs
rename to crates/teloxide-core/src/types/passport_data.rs
diff --git a/src/types/passport_element_error.rs b/crates/teloxide-core/src/types/passport_element_error.rs
similarity index 100%
rename from src/types/passport_element_error.rs
rename to crates/teloxide-core/src/types/passport_element_error.rs
diff --git a/src/types/passport_file.rs b/crates/teloxide-core/src/types/passport_file.rs
similarity index 100%
rename from src/types/passport_file.rs
rename to crates/teloxide-core/src/types/passport_file.rs
diff --git a/src/types/photo_size.rs b/crates/teloxide-core/src/types/photo_size.rs
similarity index 100%
rename from src/types/photo_size.rs
rename to crates/teloxide-core/src/types/photo_size.rs
diff --git a/src/types/poll.rs b/crates/teloxide-core/src/types/poll.rs
similarity index 100%
rename from src/types/poll.rs
rename to crates/teloxide-core/src/types/poll.rs
diff --git a/src/types/poll_answer.rs b/crates/teloxide-core/src/types/poll_answer.rs
similarity index 100%
rename from src/types/poll_answer.rs
rename to crates/teloxide-core/src/types/poll_answer.rs
diff --git a/src/types/poll_type.rs b/crates/teloxide-core/src/types/poll_type.rs
similarity index 100%
rename from src/types/poll_type.rs
rename to crates/teloxide-core/src/types/poll_type.rs
diff --git a/src/types/pre_checkout_query.rs b/crates/teloxide-core/src/types/pre_checkout_query.rs
similarity index 100%
rename from src/types/pre_checkout_query.rs
rename to crates/teloxide-core/src/types/pre_checkout_query.rs
diff --git a/src/types/proximity_alert_triggered.rs b/crates/teloxide-core/src/types/proximity_alert_triggered.rs
similarity index 100%
rename from src/types/proximity_alert_triggered.rs
rename to crates/teloxide-core/src/types/proximity_alert_triggered.rs
diff --git a/src/types/recipient.rs b/crates/teloxide-core/src/types/recipient.rs
similarity index 100%
rename from src/types/recipient.rs
rename to crates/teloxide-core/src/types/recipient.rs
diff --git a/src/types/reply_keyboard_markup.rs b/crates/teloxide-core/src/types/reply_keyboard_markup.rs
similarity index 100%
rename from src/types/reply_keyboard_markup.rs
rename to crates/teloxide-core/src/types/reply_keyboard_markup.rs
diff --git a/src/types/reply_keyboard_remove.rs b/crates/teloxide-core/src/types/reply_keyboard_remove.rs
similarity index 100%
rename from src/types/reply_keyboard_remove.rs
rename to crates/teloxide-core/src/types/reply_keyboard_remove.rs
diff --git a/src/types/reply_markup.rs b/crates/teloxide-core/src/types/reply_markup.rs
similarity index 100%
rename from src/types/reply_markup.rs
rename to crates/teloxide-core/src/types/reply_markup.rs
diff --git a/src/types/response_parameters.rs b/crates/teloxide-core/src/types/response_parameters.rs
similarity index 100%
rename from src/types/response_parameters.rs
rename to crates/teloxide-core/src/types/response_parameters.rs
diff --git a/src/types/sent_web_app_message.rs b/crates/teloxide-core/src/types/sent_web_app_message.rs
similarity index 100%
rename from src/types/sent_web_app_message.rs
rename to crates/teloxide-core/src/types/sent_web_app_message.rs
diff --git a/src/types/shipping_address.rs b/crates/teloxide-core/src/types/shipping_address.rs
similarity index 100%
rename from src/types/shipping_address.rs
rename to crates/teloxide-core/src/types/shipping_address.rs
diff --git a/src/types/shipping_option.rs b/crates/teloxide-core/src/types/shipping_option.rs
similarity index 100%
rename from src/types/shipping_option.rs
rename to crates/teloxide-core/src/types/shipping_option.rs
diff --git a/src/types/shipping_query.rs b/crates/teloxide-core/src/types/shipping_query.rs
similarity index 100%
rename from src/types/shipping_query.rs
rename to crates/teloxide-core/src/types/shipping_query.rs
diff --git a/src/types/sticker.rs b/crates/teloxide-core/src/types/sticker.rs
similarity index 100%
rename from src/types/sticker.rs
rename to crates/teloxide-core/src/types/sticker.rs
diff --git a/src/types/sticker_set.rs b/crates/teloxide-core/src/types/sticker_set.rs
similarity index 100%
rename from src/types/sticker_set.rs
rename to crates/teloxide-core/src/types/sticker_set.rs
diff --git a/src/types/successful_payment.rs b/crates/teloxide-core/src/types/successful_payment.rs
similarity index 100%
rename from src/types/successful_payment.rs
rename to crates/teloxide-core/src/types/successful_payment.rs
diff --git a/src/types/target_message.rs b/crates/teloxide-core/src/types/target_message.rs
similarity index 100%
rename from src/types/target_message.rs
rename to crates/teloxide-core/src/types/target_message.rs
diff --git a/src/types/unit_false.rs b/crates/teloxide-core/src/types/unit_false.rs
similarity index 100%
rename from src/types/unit_false.rs
rename to crates/teloxide-core/src/types/unit_false.rs
diff --git a/src/types/unit_true.rs b/crates/teloxide-core/src/types/unit_true.rs
similarity index 100%
rename from src/types/unit_true.rs
rename to crates/teloxide-core/src/types/unit_true.rs
diff --git a/src/types/update.rs b/crates/teloxide-core/src/types/update.rs
similarity index 100%
rename from src/types/update.rs
rename to crates/teloxide-core/src/types/update.rs
diff --git a/src/types/user.rs b/crates/teloxide-core/src/types/user.rs
similarity index 100%
rename from src/types/user.rs
rename to crates/teloxide-core/src/types/user.rs
diff --git a/src/types/user_id.rs b/crates/teloxide-core/src/types/user_id.rs
similarity index 100%
rename from src/types/user_id.rs
rename to crates/teloxide-core/src/types/user_id.rs
diff --git a/src/types/user_profile_photos.rs b/crates/teloxide-core/src/types/user_profile_photos.rs
similarity index 100%
rename from src/types/user_profile_photos.rs
rename to crates/teloxide-core/src/types/user_profile_photos.rs
diff --git a/src/types/venue.rs b/crates/teloxide-core/src/types/venue.rs
similarity index 100%
rename from src/types/venue.rs
rename to crates/teloxide-core/src/types/venue.rs
diff --git a/src/types/video.rs b/crates/teloxide-core/src/types/video.rs
similarity index 100%
rename from src/types/video.rs
rename to crates/teloxide-core/src/types/video.rs
diff --git a/src/types/video_chat_ended.rs b/crates/teloxide-core/src/types/video_chat_ended.rs
similarity index 100%
rename from src/types/video_chat_ended.rs
rename to crates/teloxide-core/src/types/video_chat_ended.rs
diff --git a/src/types/video_chat_participants_invited.rs b/crates/teloxide-core/src/types/video_chat_participants_invited.rs
similarity index 100%
rename from src/types/video_chat_participants_invited.rs
rename to crates/teloxide-core/src/types/video_chat_participants_invited.rs
diff --git a/src/types/video_chat_scheduled.rs b/crates/teloxide-core/src/types/video_chat_scheduled.rs
similarity index 100%
rename from src/types/video_chat_scheduled.rs
rename to crates/teloxide-core/src/types/video_chat_scheduled.rs
diff --git a/src/types/video_chat_started.rs b/crates/teloxide-core/src/types/video_chat_started.rs
similarity index 100%
rename from src/types/video_chat_started.rs
rename to crates/teloxide-core/src/types/video_chat_started.rs
diff --git a/src/types/video_note.rs b/crates/teloxide-core/src/types/video_note.rs
similarity index 100%
rename from src/types/video_note.rs
rename to crates/teloxide-core/src/types/video_note.rs
diff --git a/src/types/voice.rs b/crates/teloxide-core/src/types/voice.rs
similarity index 100%
rename from src/types/voice.rs
rename to crates/teloxide-core/src/types/voice.rs
diff --git a/src/types/web_app_data.rs b/crates/teloxide-core/src/types/web_app_data.rs
similarity index 100%
rename from src/types/web_app_data.rs
rename to crates/teloxide-core/src/types/web_app_data.rs
diff --git a/src/types/web_app_info.rs b/crates/teloxide-core/src/types/web_app_info.rs
similarity index 100%
rename from src/types/web_app_info.rs
rename to crates/teloxide-core/src/types/web_app_info.rs
diff --git a/src/types/webhook_info.rs b/crates/teloxide-core/src/types/webhook_info.rs
similarity index 100%
rename from src/types/webhook_info.rs
rename to crates/teloxide-core/src/types/webhook_info.rs

From c84fa49600edd8d1faaad3f08c5db975ddba821c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Nov 2022 16:50:24 +0400
Subject: [PATCH 744/755] Fix teloxide readme

---
 README.md                  | 12 ++++++------
 crates/teloxide/README.md  |  3 +++
 crates/teloxide/src/lib.rs |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 crates/teloxide/README.md

diff --git a/README.md b/README.md
index f211a547..1087a09d 100644
--- a/README.md
+++ b/README.md
@@ -85,7 +85,7 @@ tokio = { version =  "1.8", features = ["rt-multi-thread", "macros"] }
 
 This bot replies with a die throw to each received message:
 
-[[`examples/throw_dice.rs`](examples/throw_dice.rs)]
+[[`examples/throw_dice.rs`](crates/teloxide/examples/throw_dice.rs)]
 
 ```rust,no_run
 use teloxide::prelude::*;
@@ -120,7 +120,7 @@ Commands are strongly typed and defined declaratively, similar to how we define
 [structopt]: https://docs.rs/structopt/0.3.9/structopt/
 [serde-json]: https://github.com/serde-rs/json
 
-[[`examples/command.rs`](examples/command.rs)]
+[[`examples/command.rs`](crates/teloxide/examples/command.rs)]
 
 ```rust,no_run
 use teloxide::{prelude::*, utils::command::BotCommands};
@@ -174,7 +174,7 @@ A dialogue is typically described by an enumeration where each variant is one po
 
 Below is a bot that asks you three questions and then sends the answers back to you:
 
-[[`examples/dialogue.rs`](examples/dialogue.rs)]
+[[`examples/dialogue.rs`](crates/teloxide/examples/dialogue.rs)]
 
 ```rust,ignore
 use teloxide::{dispatching::dialogue::InMemStorage, prelude::*};
@@ -285,7 +285,7 @@ async fn receive_location(
     <img src="./media/dialogue.gif" width="420" />
 </div>
 
-[More examples >>](examples/)
+[More examples >>](crates/teloxide/examples/)
 
 ## FAQ
 
@@ -307,11 +307,11 @@ A: No, only the bots API.
 
 **Q: Can I use webhooks?**
 
-A: You can! `teloxide` has a built-in support for webhooks in `dispatching::update_listeners::webhooks` module. See how it's used in [`examples/ngrok_ping_pong_bot`](examples/ngrok_ping_pong.rs) and [`examples/heroku_ping_pong_bot`](examples/heroku_ping_pong.rs).
+A: You can! `teloxide` has a built-in support for webhooks in `dispatching::update_listeners::webhooks` module. See how it's used in [`examples/ngrok_ping_pong_bot`](crates/teloxide/examples/ngrok_ping_pong.rs) and [`examples/heroku_ping_pong_bot`](crates/teloxide/examples/heroku_ping_pong.rs).
 
 **Q: Can I handle both callback queries and messages within a single dialogue?**
 
-A: Yes, see [`examples/purchase.rs`](examples/purchase.rs).
+A: Yes, see [`examples/purchase.rs`](crates/teloxide/examples/purchase.rs).
 
 ## Community bots
 
diff --git a/crates/teloxide/README.md b/crates/teloxide/README.md
new file mode 100644
index 00000000..e2ce90e9
--- /dev/null
+++ b/crates/teloxide/README.md
@@ -0,0 +1,3 @@
+See [`README.md`] at the root of the repository.
+
+[`README.md`]: ../../README.md
diff --git a/crates/teloxide/src/lib.rs b/crates/teloxide/src/lib.rs
index 04012a60..b401de2a 100644
--- a/crates/teloxide/src/lib.rs
+++ b/crates/teloxide/src/lib.rs
@@ -79,7 +79,7 @@ pub use dispatching::filter_command;
 pub use dptree::{self, case as handler};
 
 #[cfg(all(feature = "nightly", doctest))]
-#[cfg_attr(feature = "nightly", cfg_attr(feature = "nightly", doc = include_str!("../README.md")))]
+#[cfg_attr(feature = "nightly", cfg_attr(feature = "nightly", doc = include_str!("../../README.md")))]
 enum ReadmeDocTests {}
 
 use teloxide_core::requests::ResponseResult;

From 1a56c6fc77cfc6e2c53cb1e41102d55471a61d7c Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Tue, 1 Nov 2022 18:30:52 +0400
Subject: [PATCH 745/755] Move all media to `media/`

---
 README.md                                     |   2 +-
 crates/teloxide-core/README.md                |   2 +-
 .../teloxide-core/src/serde_multipart/mod.rs  |  27 +++++++++++-------
 crates/teloxide/src/lib.rs                    |   6 ++--
 .../teloxide-core/media => media}/example.gif | Bin
 .../logo.png => media/teloxide-core-logo.png  | Bin
 .../logo.svg => media/teloxide-core-logo.svg  |   0
 ICON.png => media/teloxide-logo.png           | Bin
 logo.svg => media/teloxide-logo.svg           |   0
 9 files changed, 22 insertions(+), 15 deletions(-)
 rename {crates/teloxide-core/media => media}/example.gif (100%)
 rename crates/teloxide-core/media/logo.png => media/teloxide-core-logo.png (100%)
 rename crates/teloxide-core/media/logo.svg => media/teloxide-core-logo.svg (100%)
 rename ICON.png => media/teloxide-logo.png (100%)
 rename logo.svg => media/teloxide-logo.svg (100%)

diff --git a/README.md b/README.md
index 1087a09d..94b9e44b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 > [v0.11 -> v0.11.1 migration guide >>](MIGRATION_GUIDE.md#011---0111)
 
 <div align="center">
-  <img src="./ICON.png" width="250"/>
+  <img src="./media/teloxide-logo.png" width="250"/>
   <h1><code>teloxide</code></h1>
   <a href="https://docs.rs/teloxide/">
     <img src="https://docs.rs/teloxide/badge.svg">
diff --git a/crates/teloxide-core/README.md b/crates/teloxide-core/README.md
index 5ccee596..d4c80ba5 100644
--- a/crates/teloxide-core/README.md
+++ b/crates/teloxide-core/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="media/logo.svg" width="250"/>
+  <img src="../../media/teloxide-core-logo.svg" width="250"/>
 
   <h1>teloxide-core</h1>
   <a href="https://github.com/teloxide/teloxide-core/actions">
diff --git a/crates/teloxide-core/src/serde_multipart/mod.rs b/crates/teloxide-core/src/serde_multipart/mod.rs
index 5d04902a..51b24fd8 100644
--- a/crates/teloxide-core/src/serde_multipart/mod.rs
+++ b/crates/teloxide-core/src/serde_multipart/mod.rs
@@ -118,7 +118,7 @@ mod tests {
             ChatId(0),
             [
                 InputMedia::Photo(
-                    InputMediaPhoto::new(InputFile::file("./media/logo.png"))
+                    InputMediaPhoto::new(InputFile::file("../../media/teloxide-core-logo.png"))
                         .caption(CAPTION)
                         .parse_mode(ParseMode::MarkdownV2)
                         .caption_entities(entities()),
@@ -128,10 +128,12 @@ mod tests {
                 ),
                 InputMedia::Animation(
                     InputMediaAnimation::new(InputFile::read(
-                        File::open("./media/example.gif").await.unwrap(),
+                        File::open("../../media/example.gif").await.unwrap(),
                     ))
                     .thumb(InputFile::read(
-                        File::open("./media/logo.png").await.unwrap(),
+                        File::open("../../media/teloxide-core-logo.png")
+                            .await
+                            .unwrap(),
                     ))
                     .duration(17),
                 ),
@@ -153,7 +155,7 @@ mod tests {
         to_form_ref(&payloads::AddStickerToSet::new(
             UserId(0),
             "name",
-            InputSticker::Png(InputFile::file("./media/logo.png")),
+            InputSticker::Png(InputFile::file("../../media/teloxide-core-logo.png")),
             "✈️⚙️",
         ))
         .unwrap()
@@ -163,12 +165,17 @@ mod tests {
     #[tokio::test]
     async fn test_send_animation() {
         to_form_ref(
-            &payloads::SendAnimation::new(ChatId(0), InputFile::file("./media/logo.png"))
-                .caption_entities(entities())
-                .thumb(InputFile::read(
-                    File::open("./media/logo.png").await.unwrap(),
-                ))
-                .allow_sending_without_reply(true),
+            &payloads::SendAnimation::new(
+                ChatId(0),
+                InputFile::file("../../media/teloxide-core-logo.png"),
+            )
+            .caption_entities(entities())
+            .thumb(InputFile::read(
+                File::open("../../media/teloxide-core-logo.png")
+                    .await
+                    .unwrap(),
+            ))
+            .allow_sending_without_reply(true),
         )
         .unwrap()
         .await;
diff --git a/crates/teloxide/src/lib.rs b/crates/teloxide/src/lib.rs
index b401de2a..b7c6234b 100644
--- a/crates/teloxide/src/lib.rs
+++ b/crates/teloxide/src/lib.rs
@@ -39,10 +39,10 @@
 // [2]: https://github.com/rust-lang/rustfmt/issues/4787
 // [3]: https://github.com/rust-lang/rust/issues/82768#issuecomment-803935643
 #![cfg_attr(feature = "nightly", cfg_attr(feature = "nightly", doc = include_str!("features.md")))]
-// https://github.com/teloxide/teloxide/raw/master/logo.svg doesn't work in html_logo_url, I don't know why.
+// https://github.com/teloxide/teloxide/raw/master/media/teloxide-logo.svg doesn't work in html_logo_url, I don't know why.
 #![doc(
-    html_logo_url = "https://github.com/teloxide/teloxide/raw/master/ICON.png",
-    html_favicon_url = "https://github.com/teloxide/teloxide/raw/master/ICON.png"
+    html_logo_url = "https://github.com/teloxide/teloxide/raw/master/media/teloxide-logo.png",
+    html_favicon_url = "https://github.com/teloxide/teloxide/raw/master/teloxide-logo.png"
 )]
 // To properly build docs of this crate run
 // ```console
diff --git a/crates/teloxide-core/media/example.gif b/media/example.gif
similarity index 100%
rename from crates/teloxide-core/media/example.gif
rename to media/example.gif
diff --git a/crates/teloxide-core/media/logo.png b/media/teloxide-core-logo.png
similarity index 100%
rename from crates/teloxide-core/media/logo.png
rename to media/teloxide-core-logo.png
diff --git a/crates/teloxide-core/media/logo.svg b/media/teloxide-core-logo.svg
similarity index 100%
rename from crates/teloxide-core/media/logo.svg
rename to media/teloxide-core-logo.svg
diff --git a/ICON.png b/media/teloxide-logo.png
similarity index 100%
rename from ICON.png
rename to media/teloxide-logo.png
diff --git a/logo.svg b/media/teloxide-logo.svg
similarity index 100%
rename from logo.svg
rename to media/teloxide-logo.svg

From 1d84b2b76a3136f20623dbe131d56feb3507aaaf Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 16:13:29 +0400
Subject: [PATCH 746/755] Merge `rustfmt.toml`s

---
 crates/teloxide-core/examples/erased.rs       |   7 +-
 crates/teloxide-core/examples/self_info.rs    |  10 +-
 crates/teloxide-core/rustfmt.toml             |   6 -
 crates/teloxide-core/src/adaptors/cache_me.rs |   5 +-
 crates/teloxide-core/src/adaptors/erased.rs   |  12 +-
 .../teloxide-core/src/adaptors/parse_mode.rs  |   5 +-
 crates/teloxide-core/src/adaptors/throttle.rs |  21 +--
 .../src/adaptors/throttle/worker.rs           |  17 +-
 crates/teloxide-core/src/adaptors/trace.rs    |  16 +-
 crates/teloxide-core/src/bot.rs               |  10 +-
 crates/teloxide-core/src/bot/api.rs           |  40 +----
 crates/teloxide-core/src/codegen.rs           |  26 +--
 crates/teloxide-core/src/codegen/patch.rs     |  60 ++-----
 crates/teloxide-core/src/errors.rs            |  35 ++--
 crates/teloxide-core/src/lib.rs               |   6 +-
 crates/teloxide-core/src/local_macros.rs      |  15 +-
 crates/teloxide-core/src/net.rs               |  16 +-
 crates/teloxide-core/src/net/download.rs      |  27 ++-
 crates/teloxide-core/src/net/request.rs       |   5 +-
 .../src/net/telegram_response.rs              |  10 +-
 crates/teloxide-core/src/payloads.rs          |   5 +-
 crates/teloxide-core/src/payloads/codegen.rs  |  38 +----
 .../src/requests/multipart_payload.rs         |  10 +-
 .../teloxide-core/src/requests/requester.rs   |  19 +--
 .../teloxide-core/src/serde_multipart/mod.rs  |  28 +---
 .../src/serde_multipart/serializers.rs        |  20 +--
 crates/teloxide-core/src/types.rs             |  10 +-
 crates/teloxide-core/src/types/animation.rs   |  12 +-
 crates/teloxide-core/src/types/audio.rs       |  12 +-
 crates/teloxide-core/src/types/bot_command.rs |   5 +-
 .../src/types/bot_command_scope.rs            |   5 +-
 crates/teloxide-core/src/types/chat.rs        |  21 +--
 crates/teloxide-core/src/types/chat_id.rs     |  24 +--
 crates/teloxide-core/src/types/chat_member.rs |  79 ++++-----
 crates/teloxide-core/src/types/file.rs        |   6 +-
 crates/teloxide-core/src/types/force_reply.rs |   6 +-
 .../src/types/inline_keyboard_button.rs       |  15 +-
 .../src/types/inline_keyboard_markup.rs       |  18 +-
 .../src/types/inline_query_result_game.rs     |   6 +-
 crates/teloxide-core/src/types/input_file.rs  |  16 +-
 crates/teloxide-core/src/types/input_media.rs |   7 +-
 .../src/types/keyboard_button.rs              |  61 ++-----
 crates/teloxide-core/src/types/label_price.rs |  10 +-
 .../teloxide-core/src/types/mask_position.rs  |   7 +-
 crates/teloxide-core/src/types/me.rs          |  10 +-
 crates/teloxide-core/src/types/message.rs     |  84 +++-------
 .../teloxide-core/src/types/message_entity.rs | 155 +++---------------
 .../src/types/passport_element_error.rs       |  51 ++----
 crates/teloxide-core/src/types/photo_size.rs  |   6 +-
 .../src/types/reply_keyboard_markup.rs        |   6 +-
 .../src/types/reply_keyboard_remove.rs        |   5 +-
 .../src/types/shipping_option.rs              |  11 +-
 crates/teloxide-core/src/types/sticker.rs     |  20 +--
 crates/teloxide-core/src/types/update.rs      |  12 +-
 crates/teloxide-core/src/types/user.rs        |  21 +--
 crates/teloxide-core/src/types/user_id.rs     |   4 +-
 crates/teloxide-macros/rustfmt.toml           |   7 -
 crates/teloxide-macros/src/attr.rs            |  29 +---
 crates/teloxide-macros/src/bot_commands.rs    |  31 ++--
 crates/teloxide-macros/src/command.rs         |  12 +-
 crates/teloxide-macros/src/command_attr.rs    |  22 +--
 crates/teloxide-macros/src/command_enum.rs    |  21 +--
 crates/teloxide-macros/src/error.rs           |   4 +-
 crates/teloxide-macros/src/fields_parse.rs    |  38 ++---
 crates/teloxide-macros/src/rename_rules.rs    |  10 +-
 crates/teloxide-macros/tests/command.rs       |  99 +++--------
 rustfmt.toml                                  |   1 +
 67 files changed, 341 insertions(+), 1107 deletions(-)
 delete mode 100644 crates/teloxide-core/rustfmt.toml
 delete mode 100644 crates/teloxide-macros/rustfmt.toml

diff --git a/crates/teloxide-core/examples/erased.rs b/crates/teloxide-core/examples/erased.rs
index 2c54123c..feeffbdc 100644
--- a/crates/teloxide-core/examples/erased.rs
+++ b/crates/teloxide-core/examples/erased.rs
@@ -6,11 +6,8 @@ use teloxide_core::{adaptors::trace, prelude::*, types::ChatAction};
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     pretty_env_logger::init();
 
-    let chat_id = ChatId(
-        std::env::var("CHAT_ID")
-            .expect("Expected CHAT_ID env var")
-            .parse::<i64>()?,
-    );
+    let chat_id =
+        ChatId(std::env::var("CHAT_ID").expect("Expected CHAT_ID env var").parse::<i64>()?);
 
     let trace_settings = match std::env::var("TRACE").as_deref() {
         Ok("EVERYTHING_VERBOSE") => trace::Settings::TRACE_EVERYTHING_VERBOSE,
diff --git a/crates/teloxide-core/examples/self_info.rs b/crates/teloxide-core/examples/self_info.rs
index e3747671..6ea7cb24 100644
--- a/crates/teloxide-core/examples/self_info.rs
+++ b/crates/teloxide-core/examples/self_info.rs
@@ -7,19 +7,15 @@ use teloxide_core::{
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     pretty_env_logger::init();
 
-    let chat_id = ChatId(
-        std::env::var("CHAT_ID")
-            .expect("Expected CHAT_ID env var")
-            .parse::<i64>()?,
-    );
+    let chat_id =
+        ChatId(std::env::var("CHAT_ID").expect("Expected CHAT_ID env var").parse::<i64>()?);
 
     let bot = Bot::from_env().parse_mode(ParseMode::MarkdownV2);
 
     let Me { user: me, .. } = bot.get_me().await?;
 
     bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
-    bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name))
-        .await?;
+    bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.first_name)).await?;
 
     Ok(())
 }
diff --git a/crates/teloxide-core/rustfmt.toml b/crates/teloxide-core/rustfmt.toml
deleted file mode 100644
index 16746573..00000000
--- a/crates/teloxide-core/rustfmt.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-format_code_in_doc_comments = true
-wrap_comments = true
-format_strings = true
-imports_granularity = "Crate"
-use_field_init_shorthand = true
-merge_derives = false
diff --git a/crates/teloxide-core/src/adaptors/cache_me.rs b/crates/teloxide-core/src/adaptors/cache_me.rs
index 30365693..86ee8118 100644
--- a/crates/teloxide-core/src/adaptors/cache_me.rs
+++ b/crates/teloxide-core/src/adaptors/cache_me.rs
@@ -32,10 +32,7 @@ impl<B> CacheMe<B> {
     ///
     /// [`RequesterExt::cache_me`]: crate::requests::RequesterExt::cache_me
     pub fn new(bot: B) -> CacheMe<B> {
-        Self {
-            bot,
-            me: Arc::new(OnceCell::new()),
-        }
+        Self { bot, me: Arc::new(OnceCell::new()) }
     }
 
     /// Allows to access inner bot
diff --git a/crates/teloxide-core/src/adaptors/erased.rs b/crates/teloxide-core/src/adaptors/erased.rs
index 1cac5f5c..f5d2d6bf 100644
--- a/crates/teloxide-core/src/adaptors/erased.rs
+++ b/crates/teloxide-core/src/adaptors/erased.rs
@@ -24,9 +24,7 @@ impl<'a, E> ErasedRequester<'a, E> {
     where
         B: Requester<Err = E> + 'a,
     {
-        Self {
-            inner: Arc::new(requester),
-        }
+        Self { inner: Arc::new(requester) }
     }
 }
 
@@ -39,9 +37,7 @@ impl<E> std::fmt::Debug for ErasedRequester<'_, E> {
 // NB. hand-written impl to avoid `E: Clone` bound
 impl<E> Clone for ErasedRequester<'_, E> {
     fn clone(&self) -> Self {
-        Self {
-            inner: Arc::clone(&self.inner),
-        }
+        Self { inner: Arc::clone(&self.inner) }
     }
 }
 
@@ -54,9 +50,7 @@ pub struct ErasedRequest<'a, T, E> {
 // `T: Payload` required b/c of <https://github.com/rust-lang/rust/issues/102185>
 impl<'a, T: Payload, E> ErasedRequest<'a, T, E> {
     pub(crate) fn erase(request: impl Request<Payload = T, Err = E> + 'a) -> Self {
-        Self {
-            inner: Box::new(request),
-        }
+        Self { inner: Box::new(request) }
     }
 }
 
diff --git a/crates/teloxide-core/src/adaptors/parse_mode.rs b/crates/teloxide-core/src/adaptors/parse_mode.rs
index 04516105..cd6e6870 100644
--- a/crates/teloxide-core/src/adaptors/parse_mode.rs
+++ b/crates/teloxide-core/src/adaptors/parse_mode.rs
@@ -21,10 +21,7 @@ impl<B> DefaultParseMode<B> {
     ///
     /// [`RequesterExt::parse_mode`]: crate::requests::RequesterExt::parse_mode
     pub fn new(bot: B, parse_mode: ParseMode) -> Self {
-        Self {
-            bot,
-            mode: parse_mode,
-        }
+        Self { bot, mode: parse_mode }
     }
 
     /// Allows to access the inner bot.
diff --git a/crates/teloxide-core/src/adaptors/throttle.rs b/crates/teloxide-core/src/adaptors/throttle.rs
index d55b3d88..7c4aaba3 100644
--- a/crates/teloxide-core/src/adaptors/throttle.rs
+++ b/crates/teloxide-core/src/adaptors/throttle.rs
@@ -88,10 +88,7 @@ impl<B> Throttle<B> {
         B: Requester + Clone,
         B::Err: AsResponseParameters,
     {
-        let settings = Settings {
-            limits,
-            ..<_>::default()
-        };
+        let settings = Settings { limits, ..<_>::default() };
         Self::with_settings(bot, settings)
     }
 
@@ -108,11 +105,7 @@ impl<B> Throttle<B> {
         let (info_tx, info_rx) = mpsc::channel(2);
 
         let worker = worker(settings, rx, info_rx, bot.clone());
-        let this = Self {
-            bot,
-            queue: tx,
-            info_tx,
-        };
+        let this = Self { bot, queue: tx, info_tx };
 
         (this, worker)
     }
@@ -164,10 +157,7 @@ impl<B> Throttle<B> {
 
         let (tx, rx) = oneshot::channel();
 
-        self.info_tx
-            .send(InfoMessage::GetLimits { response: tx })
-            .await
-            .expect(WORKER_DIED);
+        self.info_tx.send(InfoMessage::GetLimits { response: tx }).await.expect(WORKER_DIED);
 
         rx.await.expect(WORKER_DIED)
     }
@@ -178,10 +168,7 @@ impl<B> Throttle<B> {
     pub async fn set_limits(&self, new: Limits) {
         let (tx, rx) = oneshot::channel();
 
-        self.info_tx
-            .send(InfoMessage::SetLimits { new, response: tx })
-            .await
-            .ok();
+        self.info_tx.send(InfoMessage::SetLimits { new, response: tx }).await.ok();
 
         rx.await.ok();
     }
diff --git a/crates/teloxide-core/src/adaptors/throttle/worker.rs b/crates/teloxide-core/src/adaptors/throttle/worker.rs
index 62438013..6a2994dd 100644
--- a/crates/teloxide-core/src/adaptors/throttle/worker.rs
+++ b/crates/teloxide-core/src/adaptors/throttle/worker.rs
@@ -90,12 +90,7 @@ pub(super) struct FreezeUntil {
 // the request that it can be now executed, increase counts, add record to the
 // history.
 pub(super) async fn worker<B>(
-    Settings {
-        mut limits,
-        mut on_queue_full,
-        retry,
-        check_slow_mode,
-    }: Settings,
+    Settings { mut limits, mut on_queue_full, retry, check_slow_mode }: Settings,
     mut rx: mpsc::Receiver<(ChatIdHash, RequestLock)>,
     mut info_rx: mpsc::Receiver<InfoMessage>,
     bot: B,
@@ -117,9 +112,8 @@ pub(super) async fn worker<B>(
 
     let mut rx_is_closed = false;
 
-    let mut last_queue_full = Instant::now()
-        .checked_sub(QUEUE_FULL_DELAY)
-        .unwrap_or_else(Instant::now);
+    let mut last_queue_full =
+        Instant::now().checked_sub(QUEUE_FULL_DELAY).unwrap_or_else(Instant::now);
 
     let (freeze_tx, mut freeze_rx) = mpsc::channel::<FreezeUntil>(1);
 
@@ -214,10 +208,7 @@ pub(super) async fn worker<B>(
 
         // as truncates which is ok since in case of truncation it would always be >=
         // limits.overall_s
-        let used = history
-            .iter()
-            .take_while(|(_, time)| time > &sec_back)
-            .count() as u32;
+        let used = history.iter().take_while(|(_, time)| time > &sec_back).count() as u32;
         let mut allowed = limits.messages_per_sec_overall.saturating_sub(used);
 
         if allowed == 0 {
diff --git a/crates/teloxide-core/src/adaptors/trace.rs b/crates/teloxide-core/src/adaptors/trace.rs
index fef86e76..bcc43828 100644
--- a/crates/teloxide-core/src/adaptors/trace.rs
+++ b/crates/teloxide-core/src/adaptors/trace.rs
@@ -249,11 +249,7 @@ where
     {
         if self.settings.contains(Settings::TRACE_RESPONSES_VERBOSE) {
             |response| {
-                log::trace!(
-                    "Got response from `{}` request: {:?}",
-                    R::Payload::NAME,
-                    response
-                )
+                log::trace!("Got response from `{}` request: {:?}", R::Payload::NAME, response)
             }
         } else if self.settings.contains(Settings::TRACE_RESPONSES) {
             |_| log::trace!("Got response from `{}` request", R::Payload::NAME)
@@ -294,19 +290,13 @@ where
     fn send(self) -> Self::Send {
         self.trace_request();
 
-        Send {
-            trace_fn: self.trace_response_fn(),
-            inner: self.inner.send(),
-        }
+        Send { trace_fn: self.trace_response_fn(), inner: self.inner.send() }
     }
 
     fn send_ref(&self) -> Self::SendRef {
         self.trace_request();
 
-        Send {
-            trace_fn: self.trace_response_fn(),
-            inner: self.inner.send_ref(),
-        }
+        Send { trace_fn: self.trace_response_fn(), inner: self.inner.send_ref() }
     }
 }
 
diff --git a/crates/teloxide-core/src/bot.rs b/crates/teloxide-core/src/bot.rs
index 19bb00d5..ef0801f8 100644
--- a/crates/teloxide-core/src/bot.rs
+++ b/crates/teloxide-core/src/bot.rs
@@ -71,9 +71,7 @@ impl Bot {
     where
         S: Into<String>,
     {
-        let client = net::default_reqwest_settings()
-            .build()
-            .expect("Client creation failed");
+        let client = net::default_reqwest_settings().build().expect("Client creation failed");
 
         Self::with_client(token, client)
     }
@@ -98,11 +96,7 @@ impl Bot {
                 .expect("Failed to parse default Telegram bot API url"),
         );
 
-        Self {
-            token,
-            api_url,
-            client,
-        }
+        Self { token, api_url, client }
     }
 
     /// Creates a new `Bot` with the `TELOXIDE_TOKEN` & `TELOXIDE_PROXY`
diff --git a/crates/teloxide-core/src/bot/api.rs b/crates/teloxide-core/src/bot/api.rs
index f0fbfa78..1572a371 100644
--- a/crates/teloxide-core/src/bot/api.rs
+++ b/crates/teloxide-core/src/bot/api.rs
@@ -114,10 +114,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::SendAnimation::new(
-            self.clone(),
-            payloads::SendAnimation::new(chat_id, animation),
-        )
+        Self::SendAnimation::new(self.clone(), payloads::SendAnimation::new(chat_id, animation))
     }
 
     type SendVoice = MultipartRequest<payloads::SendVoice>;
@@ -135,10 +132,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::SendVideoNote::new(
-            self.clone(),
-            payloads::SendVideoNote::new(chat_id, video_note),
-        )
+        Self::SendVideoNote::new(self.clone(), payloads::SendVideoNote::new(chat_id, video_note))
     }
 
     type SendMediaGroup = MultipartRequest<payloads::SendMediaGroup>;
@@ -276,10 +270,7 @@ impl Requester for Bot {
         Q: Into<String>,
         O: IntoIterator<Item = String>,
     {
-        Self::SendPoll::new(
-            self.clone(),
-            payloads::SendPoll::new(chat_id, question, options),
-        )
+        Self::SendPoll::new(self.clone(), payloads::SendPoll::new(chat_id, question, options))
     }
 
     type SendDice = JsonRequest<payloads::SendDice>;
@@ -325,10 +316,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::KickChatMember::new(
-            self.clone(),
-            payloads::KickChatMember::new(chat_id, user_id),
-        )
+        Self::KickChatMember::new(self.clone(), payloads::KickChatMember::new(chat_id, user_id))
     }
 
     type BanChatMember = JsonRequest<payloads::BanChatMember>;
@@ -346,10 +334,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::UnbanChatMember::new(
-            self.clone(),
-            payloads::UnbanChatMember::new(chat_id, user_id),
-        )
+        Self::UnbanChatMember::new(self.clone(), payloads::UnbanChatMember::new(chat_id, user_id))
     }
 
     type RestrictChatMember = JsonRequest<payloads::RestrictChatMember>;
@@ -568,10 +553,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::PinChatMessage::new(
-            self.clone(),
-            payloads::PinChatMessage::new(chat_id, message_id),
-        )
+        Self::PinChatMessage::new(self.clone(), payloads::PinChatMessage::new(chat_id, message_id))
     }
 
     type UnpinChatMessage = JsonRequest<payloads::UnpinChatMessage>;
@@ -892,10 +874,7 @@ impl Requester for Bot {
     where
         C: Into<Recipient>,
     {
-        Self::DeleteMessage::new(
-            self.clone(),
-            payloads::DeleteMessage::new(chat_id, message_id),
-        )
+        Self::DeleteMessage::new(self.clone(), payloads::DeleteMessage::new(chat_id, message_id))
     }
 
     type SendSticker = MultipartRequest<payloads::SendSticker>;
@@ -1131,10 +1110,7 @@ impl Requester for Bot {
     where
         G: Into<String>,
     {
-        Self::SendGame::new(
-            self.clone(),
-            payloads::SendGame::new(chat_id, game_short_name),
-        )
+        Self::SendGame::new(self.clone(), payloads::SendGame::new(chat_id, game_short_name))
     }
 
     type SetGameScore = JsonRequest<payloads::SetGameScore>;
diff --git a/crates/teloxide-core/src/codegen.rs b/crates/teloxide-core/src/codegen.rs
index fa165066..5a11f801 100644
--- a/crates/teloxide-core/src/codegen.rs
+++ b/crates/teloxide-core/src/codegen.rs
@@ -26,9 +26,7 @@ fn ensure_rustfmt(sh: &Shell) {
     // FIXME(waffle): find a better way to set toolchain
     let toolchain = "nightly-2022-09-23";
 
-    let version = cmd!(sh, "rustup run {toolchain} rustfmt --version")
-        .read()
-        .unwrap_or_default();
+    let version = cmd!(sh, "rustup run {toolchain} rustfmt --version").read().unwrap_or_default();
 
     if !version.contains("nightly") {
         panic!(
@@ -81,12 +79,7 @@ pub fn ensure_files_contents<'a>(
     let mut err_count = 0;
 
     for (path, contents) in files_and_contents {
-        let mut file = fs::File::options()
-            .read(true)
-            .write(true)
-            .create(true)
-            .open(path)
-            .unwrap();
+        let mut file = fs::File::options().read(true).write(true).create(true).open(path).unwrap();
         let mut old_contents = String::with_capacity(contents.len());
         file.read_to_string(&mut old_contents).unwrap();
 
@@ -146,28 +139,19 @@ pub fn replace_block(path: &Path, title: &str, new: &str) -> String {
     }
 
     let start_offset = match &*starts {
-        [] => panic!(
-            "Coulnd't find start of block {title} in {p}",
-            p = path.display()
-        ),
+        [] => panic!("Coulnd't find start of block {title} in {p}", p = path.display()),
         [offset] => offset.end,
         [..] => panic!(),
     };
 
     let end_offset = match &*ends {
-        [] => panic!(
-            "Coulnd't find end of block {title} in {p}",
-            p = path.display()
-        ),
+        [] => panic!("Coulnd't find end of block {title} in {p}", p = path.display()),
         [offset] => offset.start,
         [..] => panic!(),
     };
 
     if end_offset < start_offset {
-        panic!(
-            "End of the {title} block is located before the start in {p}",
-            p = path.display()
-        );
+        panic!("End of the {title} block is located before the start in {p}", p = path.display());
     }
 
     format!("{}{}{}", &file[..start_offset], new, &file[end_offset..])
diff --git a/crates/teloxide-core/src/codegen/patch.rs b/crates/teloxide-core/src/codegen/patch.rs
index a235fcd2..60ebc820 100644
--- a/crates/teloxide-core/src/codegen/patch.rs
+++ b/crates/teloxide-core/src/codegen/patch.rs
@@ -6,11 +6,7 @@ pub fn patch_schema(mut schema: Schema) -> Schema {
     }
 
     schema.methods.iter_mut().for_each(|method| {
-        method
-            .params
-            .iter_mut()
-            .map(|p| &mut p.name)
-            .for_each(escape_kw);
+        method.params.iter_mut().map(|p| &mut p.name).for_each(escape_kw);
 
         DOC_PATCHES.iter().for_each(|(key, patch)| match key {
             Target::Method(m) => {
@@ -18,10 +14,7 @@ pub fn patch_schema(mut schema: Schema) -> Schema {
                     method.doc.patch(patch, *key);
                 }
             }
-            Target::Field {
-                method_name: m,
-                field_name: f,
-            } => {
+            Target::Field { method_name: m, field_name: f } => {
                 if check(m, &method.names.0) {
                     method
                         .params
@@ -34,10 +27,7 @@ pub fn patch_schema(mut schema: Schema) -> Schema {
                 if check(m, &method.names.0) {
                     method.doc.patch(patch, *key);
 
-                    method
-                        .params
-                        .iter_mut()
-                        .for_each(|p| p.descr.patch(patch, *key))
+                    method.params.iter_mut().for_each(|p| p.descr.patch(patch, *key))
                 }
             }
         });
@@ -164,24 +154,18 @@ static DOC_PATCHES: &[(Target, Patch)] = &[
 
 #[derive(Debug, Clone, Copy)]
 enum Target<'a> {
-    Any {
-        method_name: Option<&'a str>,
-    },
+    Any { method_name: Option<&'a str> },
     Method(Option<&'a str>),
-    Field {
-        method_name: Option<&'a str>,
-        field_name: Option<&'a str>,
-    },
+    Field { method_name: Option<&'a str>, field_name: Option<&'a str> },
 }
 
 impl<'a> Target<'a> {
     fn is_exact(&self) -> bool {
         match self {
             Target::Method(m) => m.is_some(),
-            Target::Field {
-                method_name,
-                field_name,
-            } => method_name.is_some() && field_name.is_some(),
+            Target::Field { method_name, field_name } => {
+                method_name.is_some() && field_name.is_some()
+            }
             Target::Any { method_name: _ } => false,
         }
     }
@@ -208,8 +192,7 @@ impl Doc {
                 }
             }
             Patch::AddLink { name, value } => {
-                self.md_links
-                    .insert((*name).to_owned(), (*value).to_owned());
+                self.md_links.insert((*name).to_owned(), (*value).to_owned());
             }
             // Patch::RemoveLink { name } => drop(self.md_links.remove(*name)),
             // Patch::FullReplace { text, with } => {
@@ -253,9 +236,7 @@ fn intra_links(doc: &mut Doc) {
 
     for repl in repls_t {
         if let Some(value) = doc.md_links.remove(repl.as_str()) {
-            doc.md = doc
-                .md
-                .replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repl));
+            doc.md = doc.md.replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repl));
             doc.md_links.insert(format!("`{}`", repl), value);
         }
     }
@@ -263,9 +244,7 @@ fn intra_links(doc: &mut Doc) {
     for repl in repls_m {
         if let Some(value) = doc.md_links.remove(repl.as_str()) {
             let repln = to_uppercase(&repl);
-            doc.md = doc
-                .md
-                .replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repln));
+            doc.md = doc.md.replace(format!("[{}]", repl).as_str(), &format!("[`{}`]", repln));
             doc.md_links.insert(format!("`{}`", repln), value);
         }
     }
@@ -284,21 +263,13 @@ fn to_uppercase(s: &str) -> String {
 
 pub(crate) fn patch_ty(mut schema: Schema) -> Schema {
     // URLs
-    patch_types(
-        &mut schema,
-        Type::String,
-        Type::Url,
-        &[("set_webhook", "url")],
-    );
+    patch_types(&mut schema, Type::String, Type::Url, &[("set_webhook", "url")]);
 
     patch_types(
         &mut schema,
         Type::Option(Box::new(Type::String)),
         Type::Option(Box::new(Type::Url)),
-        &[
-            ("answer_callback_query", "url"),
-            ("send_invoice", "photo_url"),
-        ],
+        &[("answer_callback_query", "url"), ("send_invoice", "photo_url")],
     );
 
     // Dates
@@ -317,10 +288,7 @@ pub(crate) fn patch_ty(mut schema: Schema) -> Schema {
         &mut schema,
         Type::Option(Box::new(Type::i64)),
         Type::Option(Box::new(Type::DateTime)),
-        &[
-            ("create_chat_invite_link", "expire_date"),
-            ("edit_chat_invite_link", "expire_date"),
-        ],
+        &[("create_chat_invite_link", "expire_date"), ("edit_chat_invite_link", "expire_date")],
     );
 
     schema
diff --git a/crates/teloxide-core/src/errors.rs b/crates/teloxide-core/src/errors.rs
index f6529608..3de77f09 100644
--- a/crates/teloxide-core/src/errors.rs
+++ b/crates/teloxide-core/src/errors.rs
@@ -110,10 +110,9 @@ pub enum ApiError {
     /// 1. [`EditMessageText`]
     ///
     /// [`EditMessageText`]: crate::payloads::EditMessageText
-    #[serde(
-        rename = "Bad Request: message is not modified: specified new message content and reply \
-                  markup are exactly the same as a current content and reply markup of the message"
-    )]
+    #[serde(rename = "Bad Request: message is not modified: specified new message content and \
+                      reply markup are exactly the same as a current content and reply markup \
+                      of the message")]
     #[error(
         "Bad Request: message is not modified: specified new message content and reply markup are \
          exactly the same as a current content and reply markup of the message"
@@ -390,10 +389,8 @@ pub enum ApiError {
     /// 1. [`AnswerCallbackQuery`]
     ///
     /// [`AnswerCallbackQuery`]: crate::payloads::AnswerCallbackQuery
-    #[serde(
-        rename = "Bad Request: query is too old and response timeout expired or query id is \
-                  invalid"
-    )]
+    #[serde(rename = "Bad Request: query is too old and response timeout expired or query id is \
+                      invalid")]
     #[error("Bad Request: query is too old and response timeout expired or query id is invalid")]
     InvalidQueryId,
 
@@ -424,10 +421,8 @@ pub enum ApiError {
     /// 1. [`SendMessage`]
     ///
     /// [`SendMessage`]: crate::payloads::SendMessage
-    #[serde(
-        rename = "Bad Request: can't parse inline keyboard button: Text buttons are unallowed in \
-                  the inline keyboard"
-    )]
+    #[serde(rename = "Bad Request: can't parse inline keyboard button: Text buttons are \
+                      unallowed in the inline keyboard")]
     #[error(
         "Bad Request: can't parse inline keyboard button: Text buttons are unallowed in the \
          inline keyboard"
@@ -614,10 +609,8 @@ pub enum ApiError {
     /// 1. [`SetWebhook`]
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
-    #[serde(
-        rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 or \
-                  8443"
-    )]
+    #[serde(rename = "Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 \
+                      or 8443")]
     #[error("Bad Request: bad webhook: Webhook can be set up only on ports 80, 88, 443 or 8443")]
     BadWebhookPort,
 
@@ -627,9 +620,7 @@ pub enum ApiError {
     /// 1. [`SetWebhook`]
     ///
     /// [`SetWebhook`]: crate::payloads::SetWebhook
-    #[serde(
-        rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known"
-    )]
+    #[serde(rename = "Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
     #[error("Bad Request: bad webhook: Failed to resolve host: Name or service not known")]
     UnknownHost,
 
@@ -732,10 +723,8 @@ pub enum ApiError {
     /// 1. [`GetUpdates`]
     ///
     /// [`GetUpdates`]: crate::payloads::GetUpdates
-    #[serde(
-        rename = "Conflict: terminated by other getUpdates request; make sure that only one bot \
-                  instance is running"
-    )]
+    #[serde(rename = "Conflict: terminated by other getUpdates request; make sure that only one \
+                      bot instance is running")]
     #[error(
         "Conflict: terminated by other getUpdates request; make sure that only one bot instance \
          is running"
diff --git a/crates/teloxide-core/src/lib.rs b/crates/teloxide-core/src/lib.rs
index 36916ec8..7ac35e29 100644
--- a/crates/teloxide-core/src/lib.rs
+++ b/crates/teloxide-core/src/lib.rs
@@ -22,11 +22,7 @@
 //! let me = bot.get_me().await?;
 //!
 //! bot.send_dice(chat_id).emoji(DiceEmoji::Dice).await?;
-//! bot.send_message(
-//!     chat_id,
-//!     format!("Hi, my name is **{}** 👋", me.user.first_name),
-//! )
-//! .await?;
+//! bot.send_message(chat_id, format!("Hi, my name is **{}** 👋", me.user.first_name)).await?;
 //! # Ok::<_, Box<dyn std::error::Error>>(()) };
 //! ```
 //!
diff --git a/crates/teloxide-core/src/local_macros.rs b/crates/teloxide-core/src/local_macros.rs
index 8ab0370f..de69f36d 100644
--- a/crates/teloxide-core/src/local_macros.rs
+++ b/crates/teloxide-core/src/local_macros.rs
@@ -1293,11 +1293,9 @@ fn codegen_requester_forward() {
                 .filter(|p| !matches!(p.ty, Type::Option(_)))
                 .flat_map(|p| match convert_for(&p.ty) {
                     Convert::Id(_) => None,
-                    Convert::Into(ty) => Some(format!(
-                        "{}: Into<{}>",
-                        &to_uppercase(prefixes[&*p.name]),
-                        ty
-                    )),
+                    Convert::Into(ty) => {
+                        Some(format!("{}: Into<{}>", &to_uppercase(prefixes[&*p.name]), ty))
+                    }
                     Convert::Collect(ty) => Some(format!(
                         "{}: IntoIterator<Item = {}>",
                         &to_uppercase(prefixes[&*p.name]),
@@ -1306,11 +1304,8 @@ fn codegen_requester_forward() {
                 })
                 .join(",\n        ");
 
-            let generics = if generics.is_empty() {
-                String::from("")
-            } else {
-                format!("<{}>", generics)
-            };
+            let generics =
+                if generics.is_empty() { String::from("") } else { format!("<{}>", generics) };
 
             let where_clause = if where_clause.is_empty() {
                 String::from("")
diff --git a/crates/teloxide-core/src/net.rs b/crates/teloxide-core/src/net.rs
index 4f76fdb1..d7f96a76 100644
--- a/crates/teloxide-core/src/net.rs
+++ b/crates/teloxide-core/src/net.rs
@@ -80,24 +80,16 @@ pub fn default_reqwest_settings() -> reqwest::ClientBuilder {
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#making-requests
 fn method_url(base: reqwest::Url, token: &str, method_name: &str) -> reqwest::Url {
-    base.join(&format!(
-        "/bot{token}/{method}",
-        token = token,
-        method = method_name
-    ))
-    .expect("failed to format url")
+    base.join(&format!("/bot{token}/{method}", token = token, method = method_name))
+        .expect("failed to format url")
 }
 
 /// Creates URL for downloading a file. See the [Telegram documentation].
 ///
 /// [Telegram documentation]: https://core.telegram.org/bots/api#file
 fn file_url(base: reqwest::Url, token: &str, file_path: &str) -> reqwest::Url {
-    base.join(&format!(
-        "file/bot{token}/{file}",
-        token = token,
-        file = file_path
-    ))
-    .expect("failed to format url")
+    base.join(&format!("file/bot{token}/{file}", token = token, file = file_path))
+        .expect("failed to format url")
 }
 
 #[cfg(test)]
diff --git a/crates/teloxide-core/src/net/download.rs b/crates/teloxide-core/src/net/download.rs
index 685d9f57..ac419a79 100644
--- a/crates/teloxide-core/src/net/download.rs
+++ b/crates/teloxide-core/src/net/download.rs
@@ -94,18 +94,15 @@ pub fn download_file<'o, D>(
 where
     D: ?Sized + AsyncWrite + Unpin,
 {
-    client
-        .get(file_url(api_url, token, path))
-        .send()
-        .then(move |r| async move {
-            let mut res = r?.error_for_status()?;
+    client.get(file_url(api_url, token, path)).send().then(move |r| async move {
+        let mut res = r?.error_for_status()?;
 
-            while let Some(chunk) = res.chunk().await? {
-                dst.write_all(&chunk).await?;
-            }
+        while let Some(chunk) = res.chunk().await? {
+            dst.write_all(&chunk).await?;
+        }
 
-            Ok(())
-        })
+        Ok(())
+    })
 }
 
 /// Download a file from Telegram as [`Stream`].
@@ -119,11 +116,8 @@ pub fn download_file_stream(
     token: &str,
     path: &str,
 ) -> impl Stream<Item = reqwest::Result<Bytes>> + 'static {
-    client
-        .get(file_url(api_url, token, path))
-        .send()
-        .into_stream()
-        .flat_map(|res| match res.and_then(Response::error_for_status) {
+    client.get(file_url(api_url, token, path)).send().into_stream().flat_map(|res| {
+        match res.and_then(Response::error_for_status) {
             Ok(res) => Either::Left(unfold(res, |mut res| async {
                 match res.chunk().await {
                     Err(err) => Some((Err(err), res)),
@@ -132,5 +126,6 @@ pub fn download_file_stream(
                 }
             })),
             Err(err) => Either::Right(once(ready(Err(err)))),
-        })
+        }
+    })
 }
diff --git a/crates/teloxide-core/src/net/request.rs b/crates/teloxide-core/src/net/request.rs
index 1b2273cd..7fa345ec 100644
--- a/crates/teloxide-core/src/net/request.rs
+++ b/crates/teloxide-core/src/net/request.rs
@@ -100,9 +100,6 @@ where
     let text = response.text().await?;
 
     serde_json::from_str::<TelegramResponse<T>>(&text)
-        .map_err(|source| RequestError::InvalidJson {
-            source,
-            raw: text.into(),
-        })?
+        .map_err(|source| RequestError::InvalidJson { source, raw: text.into() })?
         .into()
 }
diff --git a/crates/teloxide-core/src/net/telegram_response.rs b/crates/teloxide-core/src/net/telegram_response.rs
index 2c99235e..4dfa5ba1 100644
--- a/crates/teloxide-core/src/net/telegram_response.rs
+++ b/crates/teloxide-core/src/net/telegram_response.rs
@@ -37,10 +37,7 @@ impl<R> From<TelegramResponse<R>> for ResponseResult<R> {
     fn from(this: TelegramResponse<R>) -> ResponseResult<R> {
         match this {
             TelegramResponse::Ok { response, .. } => Ok(response),
-            TelegramResponse::Err {
-                response_parameters: Some(params),
-                ..
-            } => Err(match params {
+            TelegramResponse::Err { response_parameters: Some(params), .. } => Err(match params {
                 ResponseParameters::RetryAfter(i) => RequestError::RetryAfter(i),
                 ResponseParameters::MigrateToChatId(to) => RequestError::MigrateToChatId(to),
             }),
@@ -61,10 +58,7 @@ mod tests {
 
         assert!(matches!(
             val,
-            TelegramResponse::Err {
-                error: ApiError::TerminatedByOtherGetUpdates,
-                ..
-            }
+            TelegramResponse::Err { error: ApiError::TerminatedByOtherGetUpdates, .. }
         ));
     }
 
diff --git a/crates/teloxide-core/src/payloads.rs b/crates/teloxide-core/src/payloads.rs
index 168c257a..ee37f29c 100644
--- a/crates/teloxide-core/src/payloads.rs
+++ b/crates/teloxide-core/src/payloads.rs
@@ -237,10 +237,7 @@ fn codegen_payload_mods_and_reexports() {
     let schema = schema::get();
     let mut block = String::new();
 
-    schema
-        .methods
-        .iter()
-        .for_each(|m| block.push_str(&format!("mod {};\n", m.names.2)));
+    schema.methods.iter().for_each(|m| block.push_str(&format!("mod {};\n", m.names.2)));
 
     block.push('\n');
 
diff --git a/crates/teloxide-core/src/payloads/codegen.rs b/crates/teloxide-core/src/payloads/codegen.rs
index 0032f9a5..771caa7d 100644
--- a/crates/teloxide-core/src/payloads/codegen.rs
+++ b/crates/teloxide-core/src/payloads/codegen.rs
@@ -24,19 +24,12 @@ fn codegen_payloads() {
         let uses = uses(&method);
 
         let method_doc = render_doc(&method.doc, method.sibling.as_deref());
-        let eq_hash_derive = eq_hash_suitable(&method)
-            .then(|| " Eq, Hash,")
-            .unwrap_or("");
+        let eq_hash_derive = eq_hash_suitable(&method).then(|| " Eq, Hash,").unwrap_or("");
         let default_derive = default_needed(&method).then(|| " Default,").unwrap_or("");
 
         let return_ty = method.return_ty.to_string();
 
-        let required = params(
-            method
-                .params
-                .iter()
-                .filter(|p| !matches!(&p.ty, Type::Option(_))),
-        );
+        let required = params(method.params.iter().filter(|p| !matches!(&p.ty, Type::Option(_))));
         let required = match &*required {
             "" => "".to_owned(),
             _ => format!("        required {{\n{required}\n        }}"),
@@ -155,10 +148,8 @@ fn render_doc(doc: &Doc, sibling: Option<&str>) -> String {
     let links = match &doc.md_links {
         links if links.is_empty() => String::new(),
         links => {
-            let l: String = links
-                .iter()
-                .map(|(name, link)| format!("\n    /// [{name}]: {link}"))
-                .collect();
+            let l: String =
+                links.iter().map(|(name, link)| format!("\n    /// [{name}]: {link}")).collect();
 
             format!("\n    ///{l}")
         }
@@ -173,13 +164,7 @@ fn render_doc(doc: &Doc, sibling: Option<&str>) -> String {
         })
         .unwrap_or_default();
 
-    [
-        "    /// ",
-        &doc.md.replace('\n', "\n    /// "),
-        &sibling_note,
-        &links,
-    ]
-    .concat()
+    ["    /// ", &doc.md.replace('\n', "\n    /// "), &sibling_note, &links].concat()
 }
 
 fn eq_hash_suitable(method: &Method) -> bool {
@@ -208,10 +193,7 @@ fn eq_hash_suitable(method: &Method) -> bool {
 }
 
 fn default_needed(method: &Method) -> bool {
-    method
-        .params
-        .iter()
-        .all(|p| matches!(p.ty, Type::Option(_)))
+    method.params.iter().all(|p| matches!(p.ty, Type::Option(_)))
 }
 
 fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
@@ -258,12 +240,8 @@ fn params(params: impl Iterator<Item = impl Borrow<Param>>) -> String {
 }
 
 fn multipart_input_file_fields(m: &Method) -> Option<Vec<&str>> {
-    let fields: Vec<_> = m
-        .params
-        .iter()
-        .filter(|&p| ty_is_multiparty(&p.ty))
-        .map(|p| &*p.name)
-        .collect();
+    let fields: Vec<_> =
+        m.params.iter().filter(|&p| ty_is_multiparty(&p.ty)).map(|p| &*p.name).collect();
 
     if fields.is_empty() {
         None
diff --git a/crates/teloxide-core/src/requests/multipart_payload.rs b/crates/teloxide-core/src/requests/multipart_payload.rs
index f55ee74c..1b5b9242 100644
--- a/crates/teloxide-core/src/requests/multipart_payload.rs
+++ b/crates/teloxide-core/src/requests/multipart_payload.rs
@@ -14,17 +14,11 @@ pub trait MultipartPayload: Payload {
 
 impl MultipartPayload for payloads::SendMediaGroup {
     fn copy_files(&self, into: &mut dyn FnMut(InputFile)) {
-        self.media
-            .iter()
-            .flat_map(InputMedia::files)
-            .for_each(|f| f.copy_into(into))
+        self.media.iter().flat_map(InputMedia::files).for_each(|f| f.copy_into(into))
     }
 
     fn move_files(&mut self, into: &mut dyn FnMut(InputFile)) {
-        self.media
-            .iter_mut()
-            .flat_map(InputMedia::files_mut)
-            .for_each(|f| f.move_into(into))
+        self.media.iter_mut().flat_map(InputMedia::files_mut).for_each(|f| f.move_into(into))
     }
 }
 
diff --git a/crates/teloxide-core/src/requests/requester.rs b/crates/teloxide-core/src/requests/requester.rs
index 1529c39c..3fc819bb 100644
--- a/crates/teloxide-core/src/requests/requester.rs
+++ b/crates/teloxide-core/src/requests/requester.rs
@@ -72,9 +72,7 @@ use crate::{
 /// bot.send_message(chat_id, "<b>Text</b>").await?;
 ///
 /// // This will use `ParseMode::MarkdownV2`
-/// bot.send_message(chat_id, "**Text**")
-///     .parse_mode(ParseMode::MarkdownV2)
-///     .await?;
+/// bot.send_message(chat_id, "**Text**").parse_mode(ParseMode::MarkdownV2).await?;
 /// # Ok::<_, teloxide_core::RequestError>(())
 /// # };
 /// ```
@@ -1284,11 +1282,9 @@ fn codegen_requester_methods() {
                 .filter(|p| !matches!(p.ty, Type::Option(_)))
                 .flat_map(|p| match convert_for(&p.ty) {
                     Convert::Id(_) => None,
-                    Convert::Into(ty) => Some(format!(
-                        "{}: Into<{}>",
-                        &to_uppercase(prefixes[&*p.name]),
-                        ty
-                    )),
+                    Convert::Into(ty) => {
+                        Some(format!("{}: Into<{}>", &to_uppercase(prefixes[&*p.name]), ty))
+                    }
                     Convert::Collect(ty) => Some(format!(
                         "{}: IntoIterator<Item = {}>",
                         &to_uppercase(prefixes[&*p.name]),
@@ -1297,11 +1293,8 @@ fn codegen_requester_methods() {
                 })
                 .join(",\n        ");
 
-            let generics = if generics.is_empty() {
-                String::from("")
-            } else {
-                format!("<{}>", generics)
-            };
+            let generics =
+                if generics.is_empty() { String::from("") } else { format!("<{}>", generics) };
 
             let where_clause = if where_clause.is_empty() {
                 String::from("")
diff --git a/crates/teloxide-core/src/serde_multipart/mod.rs b/crates/teloxide-core/src/serde_multipart/mod.rs
index 51b24fd8..ffa7ad09 100644
--- a/crates/teloxide-core/src/serde_multipart/mod.rs
+++ b/crates/teloxide-core/src/serde_multipart/mod.rs
@@ -99,11 +99,7 @@ mod tests {
     async fn issue_473() {
         to_form_ref(
             &payloads::SendPhoto::new(ChatId(0), InputFile::file_id("0")).caption_entities([
-                MessageEntity {
-                    kind: MessageEntityKind::Url,
-                    offset: 0,
-                    length: 0,
-                },
+                MessageEntity { kind: MessageEntityKind::Url, offset: 0, length: 0 },
             ]),
         )
         .unwrap()
@@ -131,9 +127,7 @@ mod tests {
                         File::open("../../media/example.gif").await.unwrap(),
                     ))
                     .thumb(InputFile::read(
-                        File::open("../../media/teloxide-core-logo.png")
-                            .await
-                            .unwrap(),
+                        File::open("../../media/teloxide-core-logo.png").await.unwrap(),
                     ))
                     .duration(17),
                 ),
@@ -170,11 +164,7 @@ mod tests {
                 InputFile::file("../../media/teloxide-core-logo.png"),
             )
             .caption_entities(entities())
-            .thumb(InputFile::read(
-                File::open("../../media/teloxide-core-logo.png")
-                    .await
-                    .unwrap(),
-            ))
+            .thumb(InputFile::read(File::open("../../media/teloxide-core-logo.png").await.unwrap()))
             .allow_sending_without_reply(true),
         )
         .unwrap()
@@ -185,18 +175,10 @@ mod tests {
         <_>::into_iter([
             MessageEntity::new(MessageEntityKind::Url, 0, 0),
             MessageEntity::new(MessageEntityKind::Pre { language: None }, 0, 0),
-            MessageEntity::new(
-                MessageEntityKind::Pre {
-                    language: Some(String::new()),
-                },
-                0,
-                0,
-            ),
+            MessageEntity::new(MessageEntityKind::Pre { language: Some(String::new()) }, 0, 0),
             MessageEntity::new(MessageEntityKind::Url, 0, 0),
             MessageEntity::new(
-                MessageEntityKind::TextLink {
-                    url: "https://example.com".parse().unwrap(),
-                },
+                MessageEntityKind::TextLink { url: "https://example.com".parse().unwrap() },
                 0,
                 0,
             ),
diff --git a/crates/teloxide-core/src/serde_multipart/serializers.rs b/crates/teloxide-core/src/serde_multipart/serializers.rs
index cf3a4b98..0d0f33be 100644
--- a/crates/teloxide-core/src/serde_multipart/serializers.rs
+++ b/crates/teloxide-core/src/serde_multipart/serializers.rs
@@ -62,10 +62,7 @@ impl Serializer for MultipartSerializer {
     type SerializeStructVariant = Impossible<Self::Ok, Self::Error>;
 
     fn serialize_map(self, _: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(MultipartMapSerializer {
-            form: Form::new(),
-            key: None,
-        })
+        Ok(MultipartMapSerializer { form: Form::new(), key: None })
     }
 
     fn serialize_struct(
@@ -266,10 +263,7 @@ impl SerializeMap for MultipartMapSerializer {
     where
         T: Serialize,
     {
-        let key = self
-            .key
-            .take()
-            .expect("Value serialized before key or key is not string");
+        let key = self.key.take().expect("Value serialized before key or key is not string");
 
         let part = value.serialize(PartSerializer {})?;
 
@@ -373,17 +367,11 @@ impl Serializer for PartSerializer {
         _: &'static str,
         _: usize,
     ) -> Result<Self::SerializeStruct, Self::Error> {
-        Ok(JsonPartSerializer {
-            buf: String::new(),
-            state: PartSerializerStructState::Empty,
-        })
+        Ok(JsonPartSerializer { buf: String::new(), state: PartSerializerStructState::Empty })
     }
 
     fn serialize_seq(self, _: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(JsonPartSerializer {
-            buf: String::new(),
-            state: PartSerializerStructState::Empty,
-        })
+        Ok(JsonPartSerializer { buf: String::new(), state: PartSerializerStructState::Empty })
     }
 
     // Unimplemented
diff --git a/crates/teloxide-core/src/types.rs b/crates/teloxide-core/src/types.rs
index 2ff4585a..117830b3 100644
--- a/crates/teloxide-core/src/types.rs
+++ b/crates/teloxide-core/src/types.rs
@@ -303,10 +303,7 @@ pub(crate) mod serde_date_from_unix_timestamp {
     {
         let timestamp = i64::deserialize(deserializer)?;
 
-        Ok(DateTime::from_utc(
-            NaiveDateTime::from_timestamp(timestamp, 0),
-            Utc,
-        ))
+        Ok(DateTime::from_utc(NaiveDateTime::from_timestamp(timestamp, 0), Utc))
     }
 }
 
@@ -348,10 +345,7 @@ pub(crate) mod option_url_from_string {
 
             let json = r#"{"url":"https://github.com/token"}"#;
             let url: Struct = serde_json::from_str(json).unwrap();
-            assert_eq!(
-                url.url,
-                Some(Url::from_str("https://github.com/token").unwrap())
-            );
+            assert_eq!(url.url, Some(Url::from_str("https://github.com/token").unwrap()));
             assert_eq!(serde_json::to_string(&url).unwrap(), json.to_owned());
         }
     }
diff --git a/crates/teloxide-core/src/types/animation.rs b/crates/teloxide-core/src/types/animation.rs
index 22aa8a46..b583cce9 100644
--- a/crates/teloxide-core/src/types/animation.rs
+++ b/crates/teloxide-core/src/types/animation.rs
@@ -59,20 +59,12 @@ mod tests {
         "mime_type":"video/gif",
         "file_size":6500}"#;
         let expected = Animation {
-            file: FileMeta {
-                id: "id".to_string(),
-                unique_id: "".to_string(),
-                size: 6500,
-            },
+            file: FileMeta { id: "id".to_string(), unique_id: "".to_string(), size: 6500 },
             width: 320,
             height: 320,
             duration: 59,
             thumb: Some(PhotoSize {
-                file: FileMeta {
-                    id: "id".to_owned(),
-                    unique_id: "".to_owned(),
-                    size: 3452,
-                },
+                file: FileMeta { id: "id".to_owned(), unique_id: "".to_owned(), size: 3452 },
                 width: 320,
                 height: 320,
             }),
diff --git a/crates/teloxide-core/src/types/audio.rs b/crates/teloxide-core/src/types/audio.rs
index ee7d7468..87b0505e 100644
--- a/crates/teloxide-core/src/types/audio.rs
+++ b/crates/teloxide-core/src/types/audio.rs
@@ -59,21 +59,13 @@ mod tests {
             }
         }"#;
         let expected = Audio {
-            file: FileMeta {
-                id: "id".to_string(),
-                unique_id: "".to_string(),
-                size: 123_456,
-            },
+            file: FileMeta { id: "id".to_string(), unique_id: "".to_string(), size: 123_456 },
             duration: 60,
             performer: Some("Performer".to_string()),
             title: Some("Title".to_string()),
             mime_type: Some("application/zip".parse().unwrap()),
             thumb: Some(PhotoSize {
-                file: FileMeta {
-                    id: "id".to_owned(),
-                    unique_id: "".to_owned(),
-                    size: 3452,
-                },
+                file: FileMeta { id: "id".to_owned(), unique_id: "".to_owned(), size: 3452 },
                 width: 320,
                 height: 320,
             }),
diff --git a/crates/teloxide-core/src/types/bot_command.rs b/crates/teloxide-core/src/types/bot_command.rs
index 5ea4f1c2..cb6d9c6e 100644
--- a/crates/teloxide-core/src/types/bot_command.rs
+++ b/crates/teloxide-core/src/types/bot_command.rs
@@ -20,10 +20,7 @@ impl BotCommand {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self {
-            command: command.into(),
-            description: description.into(),
-        }
+        Self { command: command.into(), description: description.into() }
     }
 
     pub fn command<S>(mut self, val: S) -> Self
diff --git a/crates/teloxide-core/src/types/bot_command_scope.rs b/crates/teloxide-core/src/types/bot_command_scope.rs
index e005aabb..011ccd1b 100644
--- a/crates/teloxide-core/src/types/bot_command_scope.rs
+++ b/crates/teloxide-core/src/types/bot_command_scope.rs
@@ -58,10 +58,7 @@ pub enum BotCommandScope {
 fn issue_486() {
     use crate::types::ChatId;
 
-    serde_json::to_string(&BotCommandScope::Chat {
-        chat_id: Recipient::Id(ChatId(0)),
-    })
-    .unwrap();
+    serde_json::to_string(&BotCommandScope::Chat { chat_id: Recipient::Id(ChatId(0)) }).unwrap();
 
     serde_json::to_string(&BotCommandScope::ChatAdministrators {
         chat_id: Recipient::Id(ChatId(0)),
diff --git a/crates/teloxide-core/src/types/chat.rs b/crates/teloxide-core/src/types/chat.rs
index 6500dfcb..96d470ae 100644
--- a/crates/teloxide-core/src/types/chat.rs
+++ b/crates/teloxide-core/src/types/chat.rs
@@ -205,35 +205,20 @@ impl Chat {
 
     #[must_use]
     pub fn is_group(&self) -> bool {
-        matches!(
-            self.kind,
-            ChatKind::Public(ChatPublic {
-                kind: PublicChatKind::Group(_),
-                ..
-            })
-        )
+        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Group(_), .. }))
     }
 
     #[must_use]
     pub fn is_supergroup(&self) -> bool {
         matches!(
             self.kind,
-            ChatKind::Public(ChatPublic {
-                kind: PublicChatKind::Supergroup(_),
-                ..
-            })
+            ChatKind::Public(ChatPublic { kind: PublicChatKind::Supergroup(_), .. })
         )
     }
 
     #[must_use]
     pub fn is_channel(&self) -> bool {
-        matches!(
-            self.kind,
-            ChatKind::Public(ChatPublic {
-                kind: PublicChatKind::Channel(_),
-                ..
-            })
-        )
+        matches!(self.kind, ChatKind::Public(ChatPublic { kind: PublicChatKind::Channel(_), .. }))
     }
 
     #[must_use]
diff --git a/crates/teloxide-core/src/types/chat_id.rs b/crates/teloxide-core/src/types/chat_id.rs
index a7a53224..21adf49b 100644
--- a/crates/teloxide-core/src/types/chat_id.rs
+++ b/crates/teloxide-core/src/types/chat_id.rs
@@ -104,9 +104,7 @@ mod tests {
     /// Test that `ChatId` is serialized as the underlying integer
     #[test]
     fn deser() {
-        let chat_id = S {
-            chat_id: ChatId(0xAA),
-        };
+        let chat_id = S { chat_id: ChatId(0xAA) };
         let json = r#"{"chat_id":170}"#;
 
         #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
@@ -120,10 +118,7 @@ mod tests {
 
     #[test]
     fn chonky_user_id_to_bare() {
-        assert!(matches!(
-            ChatId(5298363099).to_bare(),
-            BareChatId::User(UserId(5298363099))
-        ));
+        assert!(matches!(ChatId(5298363099).to_bare(), BareChatId::User(UserId(5298363099))));
     }
 
     #[test]
@@ -137,19 +132,8 @@ mod tests {
         }
 
         // Somewhat random numbers
-        let ids = [
-            1,
-            4,
-            17,
-            34,
-            51,
-            777000,
-            1000000,
-            617136926,
-            1666111087,
-            1 << 20,
-            (1 << 35) | 123456,
-        ];
+        let ids =
+            [1, 4, 17, 34, 51, 777000, 1000000, 617136926, 1666111087, 1 << 20, (1 << 35) | 123456];
 
         // rust 2021 when :(
         ids.iter().copied().for_each(assert_identity);
diff --git a/crates/teloxide-core/src/types/chat_member.rs b/crates/teloxide-core/src/types/chat_member.rs
index affed635..79c2e79f 100644
--- a/crates/teloxide-core/src/types/chat_member.rs
+++ b/crates/teloxide-core/src/types/chat_member.rs
@@ -324,9 +324,7 @@ impl ChatMemberKind {
     pub fn can_manage_chat(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_manage_chat, ..
-            }) => *can_manage_chat,
+            Self::Administrator(Administrator { can_manage_chat, .. }) => *can_manage_chat,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => true,
         }
     }
@@ -345,9 +343,7 @@ impl ChatMemberKind {
     pub fn can_change_info(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_change_info, ..
-            }) => *can_change_info,
+            Self::Administrator(Administrator { can_change_info, .. }) => *can_change_info,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -365,9 +361,9 @@ impl ChatMemberKind {
     pub fn can_post_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_post_messages, ..
-            }) => can_post_messages.unwrap_or_default(),
+            Self::Administrator(Administrator { can_post_messages, .. }) => {
+                can_post_messages.unwrap_or_default()
+            }
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -386,9 +382,9 @@ impl ChatMemberKind {
     pub fn can_edit_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_edit_messages, ..
-            }) => can_edit_messages.unwrap_or_default(),
+            Self::Administrator(Administrator { can_edit_messages, .. }) => {
+                can_edit_messages.unwrap_or_default()
+            }
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -406,10 +402,7 @@ impl ChatMemberKind {
     pub fn can_delete_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_delete_messages,
-                ..
-            }) => *can_delete_messages,
+            Self::Administrator(Administrator { can_delete_messages, .. }) => *can_delete_messages,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -427,10 +420,9 @@ impl ChatMemberKind {
     pub fn can_manage_video_chats(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_manage_video_chats,
-                ..
-            }) => *can_manage_video_chats,
+            Self::Administrator(Administrator { can_manage_video_chats, .. }) => {
+                *can_manage_video_chats
+            }
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -454,9 +446,7 @@ impl ChatMemberKind {
     pub fn can_invite_users(&self) -> bool {
         match &self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_invite_users, ..
-            }) => *can_invite_users,
+            Self::Administrator(Administrator { can_invite_users, .. }) => *can_invite_users,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -474,10 +464,9 @@ impl ChatMemberKind {
     pub fn can_restrict_members(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_restrict_members,
-                ..
-            }) => *can_restrict_members,
+            Self::Administrator(Administrator { can_restrict_members, .. }) => {
+                *can_restrict_members
+            }
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -495,9 +484,9 @@ impl ChatMemberKind {
     pub fn can_pin_messages(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_pin_messages, ..
-            }) => can_pin_messages.unwrap_or_default(),
+            Self::Administrator(Administrator { can_pin_messages, .. }) => {
+                can_pin_messages.unwrap_or_default()
+            }
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -518,10 +507,7 @@ impl ChatMemberKind {
     pub fn can_promote_members(&self) -> bool {
         match self {
             Self::Owner(_) => true,
-            Self::Administrator(Administrator {
-                can_promote_members,
-                ..
-            }) => *can_promote_members,
+            Self::Administrator(Administrator { can_promote_members, .. }) => *can_promote_members,
             Self::Member | Self::Restricted(_) | Self::Left | Self::Banned(_) => false,
         }
     }
@@ -541,9 +527,7 @@ impl ChatMemberKind {
     #[must_use]
     pub fn can_send_messages(&self) -> bool {
         match &self {
-            Self::Restricted(Restricted {
-                can_send_messages, ..
-            }) => *can_send_messages,
+            Self::Restricted(Restricted { can_send_messages, .. }) => *can_send_messages,
             Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
             Self::Left | Self::Banned(_) => false,
         }
@@ -561,10 +545,9 @@ impl ChatMemberKind {
     #[must_use]
     pub fn can_send_media_messages(&self) -> bool {
         match &self {
-            Self::Restricted(Restricted {
-                can_send_media_messages,
-                ..
-            }) => *can_send_media_messages,
+            Self::Restricted(Restricted { can_send_media_messages, .. }) => {
+                *can_send_media_messages
+            }
             Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
             Self::Left | Self::Banned(_) => false,
         }
@@ -582,10 +565,9 @@ impl ChatMemberKind {
     #[must_use]
     pub fn can_send_other_messages(&self) -> bool {
         match &self {
-            Self::Restricted(Restricted {
-                can_send_other_messages,
-                ..
-            }) => *can_send_other_messages,
+            Self::Restricted(Restricted { can_send_other_messages, .. }) => {
+                *can_send_other_messages
+            }
             Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
             Self::Left | Self::Banned(_) => false,
         }
@@ -603,10 +585,9 @@ impl ChatMemberKind {
     #[must_use]
     pub fn can_add_web_page_previews(&self) -> bool {
         match &self {
-            Self::Restricted(Restricted {
-                can_add_web_page_previews,
-                ..
-            }) => *can_add_web_page_previews,
+            Self::Restricted(Restricted { can_add_web_page_previews, .. }) => {
+                *can_add_web_page_previews
+            }
             Self::Owner(_) | Self::Administrator(_) | Self::Member => true,
             Self::Left | Self::Banned(_) => false,
         }
diff --git a/crates/teloxide-core/src/types/file.rs b/crates/teloxide-core/src/types/file.rs
index 89ae95f7..f26963df 100644
--- a/crates/teloxide-core/src/types/file.rs
+++ b/crates/teloxide-core/src/types/file.rs
@@ -114,11 +114,7 @@ mod tests {
 
         assert_eq!(
             file,
-            FileMeta {
-                id: "FILE_ID".to_owned(),
-                unique_id: "FILE_UNIQUE_ID".to_owned(),
-                size: 42,
-            }
+            FileMeta { id: "FILE_ID".to_owned(), unique_id: "FILE_UNIQUE_ID".to_owned(), size: 42 }
         );
     }
 
diff --git a/crates/teloxide-core/src/types/force_reply.rs b/crates/teloxide-core/src/types/force_reply.rs
index 471a55a6..f92d8d1c 100644
--- a/crates/teloxide-core/src/types/force_reply.rs
+++ b/crates/teloxide-core/src/types/force_reply.rs
@@ -35,11 +35,7 @@ pub struct ForceReply {
 impl ForceReply {
     #[must_use]
     pub const fn new() -> Self {
-        Self {
-            force_reply: True,
-            input_field_placeholder: None,
-            selective: None,
-        }
+        Self { force_reply: True, input_field_placeholder: None, selective: None }
     }
 
     pub fn input_field_placeholder<T>(mut self, val: T) -> Self
diff --git a/crates/teloxide-core/src/types/inline_keyboard_button.rs b/crates/teloxide-core/src/types/inline_keyboard_button.rs
index 651f8931..4c7d0e95 100644
--- a/crates/teloxide-core/src/types/inline_keyboard_button.rs
+++ b/crates/teloxide-core/src/types/inline_keyboard_button.rs
@@ -96,10 +96,7 @@ impl InlineKeyboardButton {
     where
         S: Into<String>,
     {
-        Self {
-            text: text.into(),
-            kind,
-        }
+        Self { text: text.into(), kind }
     }
 
     /// Constructor for `InlineKeyboardButton` with [`Url`] kind.
@@ -130,10 +127,7 @@ impl InlineKeyboardButton {
         T: Into<String>,
         C: Into<String>,
     {
-        Self::new(
-            text,
-            InlineKeyboardButtonKind::CallbackData(callback_data.into()),
-        )
+        Self::new(text, InlineKeyboardButtonKind::CallbackData(callback_data.into()))
     }
 
     /// Constructor for `InlineKeyboardButton` with [`WebApp`] kind.
@@ -154,10 +148,7 @@ impl InlineKeyboardButton {
         T: Into<String>,
         Q: Into<String>,
     {
-        Self::new(
-            text,
-            InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query.into()),
-        )
+        Self::new(text, InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query.into()))
     }
 
     /// Constructor for `InlineKeyboardButton` with
diff --git a/crates/teloxide-core/src/types/inline_keyboard_markup.rs b/crates/teloxide-core/src/types/inline_keyboard_markup.rs
index f0c61fd1..8b7747d3 100644
--- a/crates/teloxide-core/src/types/inline_keyboard_markup.rs
+++ b/crates/teloxide-core/src/types/inline_keyboard_markup.rs
@@ -50,11 +50,7 @@ impl InlineKeyboardMarkup {
         I: IntoIterator,
         I::Item: IntoIterator<Item = InlineKeyboardButton>,
     {
-        self.inline_keyboard = val
-            .into_iter()
-            .map(<_>::into_iter)
-            .map(<_>::collect)
-            .collect();
+        self.inline_keyboard = val.into_iter().map(<_>::into_iter).map(<_>::collect).collect();
         self
     }
 
@@ -92,9 +88,7 @@ mod tests {
         let markup =
             InlineKeyboardMarkup::default().append_row(vec![button1.clone(), button2.clone()]);
 
-        let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![vec![button1, button2]],
-        };
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
 
         assert_eq!(markup, expected);
     }
@@ -108,9 +102,7 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(0, button2.clone());
 
-        let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![vec![button1, button2]],
-        };
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1, button2]] };
 
         assert_eq!(markup, expected);
     }
@@ -124,9 +116,7 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(1, button2.clone());
 
-        let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![vec![button1], vec![button2]],
-        };
+        let expected = InlineKeyboardMarkup { inline_keyboard: vec![vec![button1], vec![button2]] };
 
         assert_eq!(markup, expected);
     }
diff --git a/crates/teloxide-core/src/types/inline_query_result_game.rs b/crates/teloxide-core/src/types/inline_query_result_game.rs
index 68d01a2e..87eece14 100644
--- a/crates/teloxide-core/src/types/inline_query_result_game.rs
+++ b/crates/teloxide-core/src/types/inline_query_result_game.rs
@@ -28,11 +28,7 @@ impl InlineQueryResultGame {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self {
-            id: id.into(),
-            game_short_name: game_short_name.into(),
-            reply_markup: None,
-        }
+        Self { id: id.into(), game_short_name: game_short_name.into(), reply_markup: None }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
diff --git a/crates/teloxide-core/src/types/input_file.rs b/crates/teloxide-core/src/types/input_file.rs
index f0131db5..631cac82 100644
--- a/crates/teloxide-core/src/types/input_file.rs
+++ b/crates/teloxide-core/src/types/input_file.rs
@@ -116,11 +116,7 @@ impl InputFile {
     /// Shorthand for `Self { file_name: None, inner, id: default() }`
     /// (private because `InnerFile` iы private implementation detail)
     fn new(inner: InnerFile) -> Self {
-        Self {
-            file_name: None,
-            inner,
-            id: OnceCell::new(),
-        }
+        Self { file_name: None, inner, id: OnceCell::new() }
     }
 
     /// Returns id of this file.
@@ -128,8 +124,7 @@ impl InputFile {
     /// This is used to coordinate with `attach://`.
     pub(crate) fn id(&self) -> &str {
         // FIXME: remove extra alloc
-        self.id
-            .get_or_init(|| uuid::Uuid::new_v4().to_string().into())
+        self.id.get_or_init(|| uuid::Uuid::new_v4().to_string().into())
     }
 
     /// Returns `true` if this file needs an attachment i.e. it's not a file_id
@@ -255,12 +250,7 @@ impl Read {
     fn new(it: Arc<TakeCell<dyn AsyncRead + Send + Unpin>>) -> Self {
         let (tx, rx) = watch::channel(());
 
-        Self {
-            inner: it,
-            buf: Arc::default(),
-            notify: Arc::new(tx),
-            wait: rx,
-        }
+        Self { inner: it, buf: Arc::default(), notify: Arc::new(tx), wait: rx }
     }
 
     pub(crate) async fn into_part(mut self, filename: Cow<'static, str>) -> Part {
diff --git a/crates/teloxide-core/src/types/input_media.rs b/crates/teloxide-core/src/types/input_media.rs
index fd4ec1d8..f9953db7 100644
--- a/crates/teloxide-core/src/types/input_media.rs
+++ b/crates/teloxide-core/src/types/input_media.rs
@@ -45,12 +45,7 @@ pub struct InputMediaPhoto {
 
 impl InputMediaPhoto {
     pub const fn new(media: InputFile) -> Self {
-        Self {
-            media,
-            caption: None,
-            parse_mode: None,
-            caption_entities: None,
-        }
+        Self { media, caption: None, parse_mode: None, caption_entities: None }
     }
 
     pub fn media(mut self, val: InputFile) -> Self {
diff --git a/crates/teloxide-core/src/types/keyboard_button.rs b/crates/teloxide-core/src/types/keyboard_button.rs
index ab450cfe..c6c3390d 100644
--- a/crates/teloxide-core/src/types/keyboard_button.rs
+++ b/crates/teloxide-core/src/types/keyboard_button.rs
@@ -28,10 +28,7 @@ impl KeyboardButton {
     where
         T: Into<String>,
     {
-        Self {
-            text: text.into(),
-            request: None,
-        }
+        Self { text: text.into(), request: None }
     }
 
     pub fn request<T>(mut self, val: T) -> Self
@@ -111,13 +108,8 @@ impl<'de> Deserialize<'de> for ButtonRequest {
     {
         let raw = RawRequest::deserialize(deserializer)?;
         match raw {
-            RawRequest {
-                contact,
-                location,
-                poll,
-                web_app,
-            } if 1
-                < (contact.is_some() as u8
+            RawRequest { contact, location, poll, web_app }
+                if 1 < (contact.is_some() as u8
                     + location.is_some() as u8
                     + poll.is_some() as u8
                     + web_app.is_some() as u8) =>
@@ -127,20 +119,10 @@ impl<'de> Deserialize<'de> for ButtonRequest {
                      are mutually exclusive",
                 ))
             }
-            RawRequest {
-                contact: Some(_), ..
-            } => Ok(Self::Contact),
-            RawRequest {
-                location: Some(_), ..
-            } => Ok(Self::Location),
-            RawRequest {
-                poll: Some(poll_type),
-                ..
-            } => Ok(Self::Poll(poll_type)),
-            RawRequest {
-                web_app: Some(web_app),
-                ..
-            } => Ok(Self::WebApp(web_app)),
+            RawRequest { contact: Some(_), .. } => Ok(Self::Contact),
+            RawRequest { location: Some(_), .. } => Ok(Self::Location),
+            RawRequest { poll: Some(poll_type), .. } => Ok(Self::Poll(poll_type)),
+            RawRequest { web_app: Some(web_app), .. } => Ok(Self::WebApp(web_app)),
 
             _ => Err(D::Error::custom(
                 "Either one of `request_contact`, `request_location`, `request_poll` and \
@@ -155,12 +137,7 @@ impl Serialize for ButtonRequest {
     where
         S: Serializer,
     {
-        let mut raw = RawRequest {
-            contact: None,
-            location: None,
-            poll: None,
-            web_app: None,
-        };
+        let mut raw = RawRequest { contact: None, location: None, poll: None, web_app: None };
 
         match self {
             Self::Contact => raw.contact = Some(True),
@@ -179,10 +156,7 @@ mod tests {
 
     #[test]
     fn serialize_no_request() {
-        let button = KeyboardButton {
-            text: String::from(""),
-            request: None,
-        };
+        let button = KeyboardButton { text: String::from(""), request: None };
         let expected = r#"{"text":""}"#;
         let actual = serde_json::to_string(&button).unwrap();
         assert_eq!(expected, actual);
@@ -190,10 +164,8 @@ mod tests {
 
     #[test]
     fn serialize_request_contact() {
-        let button = KeyboardButton {
-            text: String::from(""),
-            request: Some(ButtonRequest::Contact),
-        };
+        let button =
+            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
         let expected = r#"{"text":"","request_contact":true}"#;
         let actual = serde_json::to_string(&button).unwrap();
         assert_eq!(expected, actual);
@@ -202,10 +174,7 @@ mod tests {
     #[test]
     fn deserialize_no_request() {
         let json = r#"{"text":""}"#;
-        let expected = KeyboardButton {
-            text: String::from(""),
-            request: None,
-        };
+        let expected = KeyboardButton { text: String::from(""), request: None };
         let actual = serde_json::from_str(json).unwrap();
         assert_eq!(expected, actual);
     }
@@ -213,10 +182,8 @@ mod tests {
     #[test]
     fn deserialize_request_contact() {
         let json = r#"{"text":"","request_contact":true}"#;
-        let expected = KeyboardButton {
-            text: String::from(""),
-            request: Some(ButtonRequest::Contact),
-        };
+        let expected =
+            KeyboardButton { text: String::from(""), request: Some(ButtonRequest::Contact) };
         let actual = serde_json::from_str(json).unwrap();
         assert_eq!(expected, actual);
     }
diff --git a/crates/teloxide-core/src/types/label_price.rs b/crates/teloxide-core/src/types/label_price.rs
index 33cdd3f4..28cf9b30 100644
--- a/crates/teloxide-core/src/types/label_price.rs
+++ b/crates/teloxide-core/src/types/label_price.rs
@@ -24,10 +24,7 @@ impl LabeledPrice {
     where
         S: Into<String>,
     {
-        Self {
-            label: label.into(),
-            amount,
-        }
+        Self { label: label.into(), amount }
     }
 
     pub fn label<S>(mut self, val: S) -> Self
@@ -51,10 +48,7 @@ mod tests {
 
     #[test]
     fn serialize() {
-        let labeled_price = LabeledPrice {
-            label: "Label".to_string(),
-            amount: 60,
-        };
+        let labeled_price = LabeledPrice { label: "Label".to_string(), amount: 60 };
         let expected = r#"{"label":"Label","amount":60}"#;
         let actual = serde_json::to_string(&labeled_price).unwrap();
         assert_eq!(actual, expected);
diff --git a/crates/teloxide-core/src/types/mask_position.rs b/crates/teloxide-core/src/types/mask_position.rs
index 4f42c675..147654e1 100644
--- a/crates/teloxide-core/src/types/mask_position.rs
+++ b/crates/teloxide-core/src/types/mask_position.rs
@@ -36,12 +36,7 @@ pub enum MaskPoint {
 
 impl MaskPosition {
     pub const fn new(point: MaskPoint, x_shift: f64, y_shift: f64, scale: f64) -> Self {
-        Self {
-            point,
-            x_shift,
-            y_shift,
-            scale,
-        }
+        Self { point, x_shift, y_shift, scale }
     }
 
     pub const fn point(mut self, val: MaskPoint) -> Self {
diff --git a/crates/teloxide-core/src/types/me.rs b/crates/teloxide-core/src/types/me.rs
index b9cf3fe8..bea15ca3 100644
--- a/crates/teloxide-core/src/types/me.rs
+++ b/crates/teloxide-core/src/types/me.rs
@@ -28,10 +28,7 @@ impl Me {
     /// Returns the username of the bot.
     #[must_use]
     pub fn username(&self) -> &str {
-        self.user
-            .username
-            .as_deref()
-            .expect("Bots must have usernames")
+        self.user.username.as_deref().expect("Bots must have usernames")
     }
 
     /// Returns a username mention of this bot.
@@ -79,9 +76,6 @@ mod tests {
 
         assert_eq!(me.username(), "SomethingSomethingBot");
         assert_eq!(me.mention(), "@SomethingSomethingBot");
-        assert_eq!(
-            me.tme_url(),
-            "https://t.me/SomethingSomethingBot".parse().unwrap()
-        );
+        assert_eq!(me.tme_url(), "https://t.me/SomethingSomethingBot".parse().unwrap());
     }
 }
diff --git a/crates/teloxide-core/src/types/message.rs b/crates/teloxide-core/src/types/message.rs
index 6edc9451..d0ff1510 100644
--- a/crates/teloxide-core/src/types/message.rs
+++ b/crates/teloxide-core/src/types/message.rs
@@ -555,9 +555,7 @@ mod getters {
         #[must_use]
         pub fn author_signature(&self) -> Option<&str> {
             match &self.kind {
-                Common(MessageCommon {
-                    author_signature, ..
-                }) => author_signature.as_deref(),
+                Common(MessageCommon { author_signature, .. }) => author_signature.as_deref(),
                 _ => None,
             }
         }
@@ -711,45 +709,27 @@ mod getters {
         pub fn caption_entities(&self) -> Option<&[MessageEntity]> {
             match &self.kind {
                 Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Animation(MediaAnimation {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Animation(MediaAnimation { caption_entities, .. }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Audio(MediaAudio {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Audio(MediaAudio { caption_entities, .. }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Document(MediaDocument {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Document(MediaDocument { caption_entities, .. }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Photo(MediaPhoto {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Photo(MediaPhoto { caption_entities, .. }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Video(MediaVideo {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Video(MediaVideo { caption_entities, .. }),
                     ..
                 })
                 | Common(MessageCommon {
-                    media_kind:
-                        MediaKind::Voice(MediaVoice {
-                            caption_entities, ..
-                        }),
+                    media_kind: MediaKind::Voice(MediaVoice { caption_entities, .. }),
                     ..
                 }) => Some(caption_entities),
                 _ => None,
@@ -978,9 +958,9 @@ mod getters {
         #[must_use]
         pub fn super_group_chat_created(&self) -> Option<True> {
             match &self.kind {
-                SupergroupChatCreated(MessageSupergroupChatCreated {
-                    supergroup_chat_created,
-                }) => Some(*supergroup_chat_created),
+                SupergroupChatCreated(MessageSupergroupChatCreated { supergroup_chat_created }) => {
+                    Some(*supergroup_chat_created)
+                }
                 _ => None,
             }
         }
@@ -988,9 +968,9 @@ mod getters {
         #[must_use]
         pub fn channel_chat_created(&self) -> Option<True> {
             match &self.kind {
-                ChannelChatCreated(MessageChannelChatCreated {
-                    channel_chat_created,
-                }) => Some(*channel_chat_created),
+                ChannelChatCreated(MessageChannelChatCreated { channel_chat_created }) => {
+                    Some(*channel_chat_created)
+                }
                 _ => None,
             }
         }
@@ -999,8 +979,7 @@ mod getters {
         pub fn chat_migration(&self) -> Option<ChatMigration> {
             match &self.kind {
                 Common(MessageCommon {
-                    media_kind: MediaKind::Migration(chat_migration),
-                    ..
+                    media_kind: MediaKind::Migration(chat_migration), ..
                 }) => Some(*chat_migration),
                 _ => None,
             }
@@ -1101,10 +1080,7 @@ mod getters {
         #[must_use]
         pub fn is_automatic_forward(&self) -> bool {
             match &self.kind {
-                Common(MessageCommon {
-                    is_automatic_forward,
-                    ..
-                }) => *is_automatic_forward,
+                Common(MessageCommon { is_automatic_forward, .. }) => *is_automatic_forward,
                 _ => false,
             }
         }
@@ -1112,10 +1088,7 @@ mod getters {
         #[must_use]
         pub fn has_protected_content(&self) -> bool {
             match &self.kind {
-                Common(MessageCommon {
-                    has_protected_content,
-                    ..
-                }) => *has_protected_content,
+                Common(MessageCommon { has_protected_content, .. }) => *has_protected_content,
                 _ => false,
             }
         }
@@ -1250,12 +1223,7 @@ impl Message {
     /// supergroups).
     #[must_use]
     pub fn url_in_thread(&self, thread_starter_msg_id: MessageId) -> Option<Url> {
-        Self::url_in_thread_of(
-            self.chat.id,
-            self.chat.username(),
-            thread_starter_msg_id,
-            self.id,
-        )
+        Self::url_in_thread_of(self.chat.id, self.chat.username(), thread_starter_msg_id, self.id)
     }
 
     /// Produces a direct link to a message in a given thread.
@@ -1300,9 +1268,7 @@ impl Message {
     /// [`parse_caption_entities`]: Message::parse_caption_entities
     #[must_use]
     pub fn parse_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
-        self.text()
-            .zip(self.entities())
-            .map(|(t, e)| MessageEntityRef::parse(t, e))
+        self.text().zip(self.entities()).map(|(t, e)| MessageEntityRef::parse(t, e))
     }
 
     /// Returns message entities that represent text formatting.
@@ -1315,9 +1281,7 @@ impl Message {
     /// [`parse_entities`]: Message::parse_entities
     #[must_use]
     pub fn parse_caption_entities(&self) -> Option<Vec<MessageEntityRef<'_>>> {
-        self.caption()
-            .zip(self.caption_entities())
-            .map(|(t, e)| MessageEntityRef::parse(t, e))
+        self.caption().zip(self.caption_entities()).map(|(t, e)| MessageEntityRef::parse(t, e))
     }
 }
 
@@ -1610,10 +1574,7 @@ mod tests {
         let message: Message = from_str(json).unwrap();
 
         assert_eq!(message.chat.id, old);
-        assert_eq!(
-            message.chat_migration(),
-            Some(ChatMigration::To { chat_id: new })
-        );
+        assert_eq!(message.chat_migration(), Some(ChatMigration::To { chat_id: new }));
         assert_eq!(message.migrate_to_chat_id(), Some(new));
 
         // The user who initialized the migration
@@ -1624,10 +1585,7 @@ mod tests {
         let message: Message = from_str(json).unwrap();
 
         assert_eq!(message.chat.id, new);
-        assert_eq!(
-            message.chat_migration(),
-            Some(ChatMigration::From { chat_id: old })
-        );
+        assert_eq!(message.chat_migration(), Some(ChatMigration::From { chat_id: old }));
         assert_eq!(message.migrate_from_chat_id(), Some(old));
 
         // Anonymous bot
diff --git a/crates/teloxide-core/src/types/message_entity.rs b/crates/teloxide-core/src/types/message_entity.rs
index f417d442..98f90615 100644
--- a/crates/teloxide-core/src/types/message_entity.rs
+++ b/crates/teloxide-core/src/types/message_entity.rs
@@ -45,91 +45,55 @@ pub struct MessageEntityRef<'a> {
 impl MessageEntity {
     #[must_use]
     pub const fn new(kind: MessageEntityKind, offset: usize, length: usize) -> Self {
-        Self {
-            kind,
-            offset,
-            length,
-        }
+        Self { kind, offset, length }
     }
 
     /// Create a message entity representing a bold text.
     #[must_use]
     pub const fn bold(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Bold,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Bold, offset, length }
     }
 
     /// Create a message entity representing an italic text.
     #[must_use]
     pub const fn italic(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Italic,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Italic, offset, length }
     }
 
     /// Create a message entity representing an underline text.
     #[must_use]
     pub const fn underline(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Underline,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Underline, offset, length }
     }
 
     /// Create a message entity representing a strikethrough text.
     #[must_use]
     pub const fn strikethrough(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Strikethrough,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Strikethrough, offset, length }
     }
 
     /// Create a message entity representing a spoiler text.
     #[must_use]
     pub const fn spoiler(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Spoiler,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Spoiler, offset, length }
     }
 
     /// Create a message entity representing a monowidth text.
     #[must_use]
     pub const fn code(offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Code,
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Code, offset, length }
     }
 
     /// Create a message entity representing a monowidth block.
     #[must_use]
     pub const fn pre(language: Option<String>, offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::Pre { language },
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::Pre { language }, offset, length }
     }
 
     /// Create a message entity representing a clickable text URL.
     #[must_use]
     pub const fn text_link(url: reqwest::Url, offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::TextLink { url },
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::TextLink { url }, offset, length }
     }
 
     /// Create a message entity representing a text mention.
@@ -140,32 +104,20 @@ impl MessageEntity {
     /// [`MessageEntity::text_mention_id`] instead.
     #[must_use]
     pub const fn text_mention(user: User, offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::TextMention { user },
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::TextMention { user }, offset, length }
     }
 
     /// Create a message entity representing a text link in the form of
     /// `tg://user/?id=...` that mentions user with `user_id`.
     #[must_use]
     pub fn text_mention_id(user_id: UserId, offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::TextLink { url: user_id.url() },
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::TextLink { url: user_id.url() }, offset, length }
     }
 
     /// Create a message entity representing a custom emoji.
     #[must_use]
     pub const fn custom_emoji(custom_emoji_id: String, offset: usize, length: usize) -> Self {
-        Self {
-            kind: MessageEntityKind::CustomEmoji { custom_emoji_id },
-            offset,
-            length,
-        }
+        Self { kind: MessageEntityKind::CustomEmoji { custom_emoji_id }, offset, length }
     }
 
     #[must_use]
@@ -242,11 +194,7 @@ impl<'a> MessageEntityRef<'a> {
         // This creates entities with **wrong** offsets (UTF-16) that we later patch.
         let mut entities: Vec<_> = entities
             .iter()
-            .map(|e| Self {
-                message: text,
-                range: e.offset..e.offset + e.length,
-                kind: &e.kind,
-            })
+            .map(|e| Self { message: text, range: e.offset..e.offset + e.length, kind: &e.kind })
             .collect();
 
         // Convert offsets
@@ -254,12 +202,7 @@ impl<'a> MessageEntityRef<'a> {
         // References to all offsets that need patching
         let mut offsets: Vec<&mut usize> = entities
             .iter_mut()
-            .flat_map(
-                |Self {
-                     range: Range { start, end },
-                     ..
-                 }| [start, end],
-            )
+            .flat_map(|Self { range: Range { start, end }, .. }| [start, end])
             .collect();
 
         // Sort in decreasing order, so the smallest elements are at the end and can be
@@ -276,11 +219,7 @@ impl<'a> MessageEntityRef<'a> {
                 }
 
                 // Patch all offsets that can be patched
-                while offsets
-                    .last()
-                    .map(|&&mut offset| offset <= len_utf16)
-                    .unwrap_or(false)
-                {
+                while offsets.last().map(|&&mut offset| offset <= len_utf16).unwrap_or(false) {
                     let offset = offsets.pop().unwrap();
                     assert_eq!(*offset, len_utf16, "Invalid utf-16 offset");
 
@@ -352,9 +291,7 @@ mod tests {
 
         assert_eq!(
             MessageEntity {
-                kind: MessageEntityKind::Pre {
-                    language: Some("rust".to_string())
-                },
+                kind: MessageEntityKind::Pre { language: Some("rust".to_string()) },
                 offset: 1,
                 length: 2,
             },
@@ -385,26 +322,10 @@ mod tests {
         let parsed = MessageEntityRef::parse(
             "быба",
             &[
-                MessageEntity {
-                    kind: Strikethrough,
-                    offset: 0,
-                    length: 1,
-                },
-                MessageEntity {
-                    kind: Bold,
-                    offset: 1,
-                    length: 1,
-                },
-                MessageEntity {
-                    kind: Italic,
-                    offset: 2,
-                    length: 1,
-                },
-                MessageEntity {
-                    kind: Code,
-                    offset: 3,
-                    length: 1,
-                },
+                MessageEntity { kind: Strikethrough, offset: 0, length: 1 },
+                MessageEntity { kind: Bold, offset: 1, length: 1 },
+                MessageEntity { kind: Italic, offset: 2, length: 1 },
+                MessageEntity { kind: Code, offset: 3, length: 1 },
             ],
         );
 
@@ -424,11 +345,7 @@ mod tests {
     fn parse_symbol_24bit() {
         let parsed = MessageEntityRef::parse(
             "xx আ #tt",
-            &[MessageEntity {
-                kind: Hashtag,
-                offset: 5,
-                length: 3,
-            }],
+            &[MessageEntity { kind: Hashtag, offset: 5, length: 3 }],
         );
 
         assert_matches!(
@@ -443,21 +360,9 @@ mod tests {
             "b i b",
             // For some reason this is how telegram encodes <b>b <i>i<i/> b<b/>
             &[
-                MessageEntity {
-                    kind: Bold,
-                    offset: 0,
-                    length: 2,
-                },
-                MessageEntity {
-                    kind: Bold,
-                    offset: 2,
-                    length: 3,
-                },
-                MessageEntity {
-                    kind: Italic,
-                    offset: 2,
-                    length: 1,
-                },
+                MessageEntity { kind: Bold, offset: 0, length: 2 },
+                MessageEntity { kind: Bold, offset: 2, length: 3 },
+                MessageEntity { kind: Italic, offset: 2, length: 1 },
             ],
         );
 
@@ -484,16 +389,8 @@ mod tests {
         let parsed = MessageEntityRef::parse(
             "",
             &[
-                MessageEntity {
-                    kind: Bold,
-                    offset: 0,
-                    length: 0,
-                },
-                MessageEntity {
-                    kind: Italic,
-                    offset: 0,
-                    length: 0,
-                },
+                MessageEntity { kind: Bold, offset: 0, length: 0 },
+                MessageEntity { kind: Italic, offset: 0, length: 0 },
             ],
         );
 
diff --git a/crates/teloxide-core/src/types/passport_element_error.rs b/crates/teloxide-core/src/types/passport_element_error.rs
index 3021bc69..6769bcf2 100644
--- a/crates/teloxide-core/src/types/passport_element_error.rs
+++ b/crates/teloxide-core/src/types/passport_element_error.rs
@@ -18,10 +18,7 @@ impl PassportElementError {
     where
         S: Into<String>,
     {
-        Self {
-            message: message.into(),
-            kind,
-        }
+        Self { message: message.into(), kind }
     }
 
     pub fn message<S>(mut self, val: S) -> Self
@@ -98,11 +95,7 @@ impl PassportElementErrorDataField {
         S1: Into<String>,
         S2: Into<String>,
     {
-        Self {
-            r#type,
-            field_name: field_name.into(),
-            data_hash: data_hash.into(),
-        }
+        Self { r#type, field_name: field_name.into(), data_hash: data_hash.into() }
     }
 
     #[must_use]
@@ -149,10 +142,7 @@ impl PassportElementErrorFrontSide {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            file_hash: file_hash.into(),
-        }
+        Self { r#type, file_hash: file_hash.into() }
     }
 
     #[must_use]
@@ -191,10 +181,7 @@ impl PassportElementErrorReverseSide {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            file_hash: file_hash.into(),
-        }
+        Self { r#type, file_hash: file_hash.into() }
     }
 
     #[must_use]
@@ -231,10 +218,7 @@ impl PassportElementErrorSelfie {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            file_hash: file_hash.into(),
-        }
+        Self { r#type, file_hash: file_hash.into() }
     }
 
     #[must_use]
@@ -272,10 +256,7 @@ impl PassportElementErrorFile {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            file_hash: file_hash.into(),
-        }
+        Self { r#type, file_hash: file_hash.into() }
     }
 
     #[must_use]
@@ -313,10 +294,7 @@ impl PassportElementErrorFiles {
     where
         S: IntoIterator<Item = String>,
     {
-        Self {
-            r#type,
-            file_hashes: file_hashes.into_iter().collect(),
-        }
+        Self { r#type, file_hashes: file_hashes.into_iter().collect() }
     }
 
     #[must_use]
@@ -355,10 +333,7 @@ impl PassportElementErrorTranslationFile {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            file_hash: file_hash.into(),
-        }
+        Self { r#type, file_hash: file_hash.into() }
     }
 
     #[must_use]
@@ -396,10 +371,7 @@ impl PassportElementErrorTranslationFiles {
     where
         S: IntoIterator<Item = String>,
     {
-        Self {
-            r#type,
-            file_hashes: file_hashes.into_iter().collect(),
-        }
+        Self { r#type, file_hashes: file_hashes.into_iter().collect() }
     }
 
     #[must_use]
@@ -437,10 +409,7 @@ impl PassportElementErrorUnspecified {
     where
         S: Into<String>,
     {
-        Self {
-            r#type,
-            element_hash: file_hash.into(),
-        }
+        Self { r#type, element_hash: file_hash.into() }
     }
 
     #[must_use]
diff --git a/crates/teloxide-core/src/types/photo_size.rs b/crates/teloxide-core/src/types/photo_size.rs
index 9b0af706..f75955a2 100644
--- a/crates/teloxide-core/src/types/photo_size.rs
+++ b/crates/teloxide-core/src/types/photo_size.rs
@@ -29,11 +29,7 @@ mod tests {
         let json = r#"{"file_id":"id","file_unique_id":"","width":320,"height":320,
                              "file_size":3452}"#;
         let expected = PhotoSize {
-            file: FileMeta {
-                id: "id".to_owned(),
-                unique_id: "".to_owned(),
-                size: 3452,
-            },
+            file: FileMeta { id: "id".to_owned(), unique_id: "".to_owned(), size: 3452 },
             width: 320,
             height: 320,
         };
diff --git a/crates/teloxide-core/src/types/reply_keyboard_markup.rs b/crates/teloxide-core/src/types/reply_keyboard_markup.rs
index 8a80cb7b..649d9ee2 100644
--- a/crates/teloxide-core/src/types/reply_keyboard_markup.rs
+++ b/crates/teloxide-core/src/types/reply_keyboard_markup.rs
@@ -55,11 +55,7 @@ impl KeyboardMarkup {
         K::Item: IntoIterator<Item = KeyboardButton>,
     {
         Self {
-            keyboard: keyboard
-                .into_iter()
-                .map(<_>::into_iter)
-                .map(<_>::collect)
-                .collect(),
+            keyboard: keyboard.into_iter().map(<_>::into_iter).map(<_>::collect).collect(),
             resize_keyboard: None,
             one_time_keyboard: None,
             input_field_placeholder: None,
diff --git a/crates/teloxide-core/src/types/reply_keyboard_remove.rs b/crates/teloxide-core/src/types/reply_keyboard_remove.rs
index 4f2e85e1..0f48434b 100644
--- a/crates/teloxide-core/src/types/reply_keyboard_remove.rs
+++ b/crates/teloxide-core/src/types/reply_keyboard_remove.rs
@@ -40,10 +40,7 @@ pub struct KeyboardRemove {
 impl KeyboardRemove {
     #[must_use]
     pub const fn new() -> Self {
-        Self {
-            remove_keyboard: True,
-            selective: None,
-        }
+        Self { remove_keyboard: True, selective: None }
     }
 
     #[must_use]
diff --git a/crates/teloxide-core/src/types/shipping_option.rs b/crates/teloxide-core/src/types/shipping_option.rs
index ec6e8a3e..d1b4fe6e 100644
--- a/crates/teloxide-core/src/types/shipping_option.rs
+++ b/crates/teloxide-core/src/types/shipping_option.rs
@@ -24,11 +24,7 @@ impl ShippingOption {
         S2: Into<String>,
         P: IntoIterator<Item = LabeledPrice>,
     {
-        Self {
-            id: id.into(),
-            title: title.into(),
-            prices: prices.into_iter().collect(),
-        }
+        Self { id: id.into(), title: title.into(), prices: prices.into_iter().collect() }
     }
 
     pub fn id<S>(mut self, val: S) -> Self
@@ -65,10 +61,7 @@ mod tests {
         let shipping_option = ShippingOption {
             id: "0".to_string(),
             title: "Option".to_string(),
-            prices: vec![LabeledPrice {
-                label: "Label".to_string(),
-                amount: 60,
-            }],
+            prices: vec![LabeledPrice { label: "Label".to_string(), amount: 60 }],
         };
         let expected = r#"{"id":"0","title":"Option","prices":[{"label":"Label","amount":60}]}"#;
         let actual = serde_json::to_string(&shipping_option).unwrap();
diff --git a/crates/teloxide-core/src/types/sticker.rs b/crates/teloxide-core/src/types/sticker.rs
index dd5c651e..0424b7ae 100644
--- a/crates/teloxide-core/src/types/sticker.rs
+++ b/crates/teloxide-core/src/types/sticker.rs
@@ -289,10 +289,7 @@ impl TryFrom<StickerFormatRaw> for StickerFormat {
     type Error = &'static str;
 
     fn try_from(
-        StickerFormatRaw {
-            is_animated,
-            is_video,
-        }: StickerFormatRaw,
+        StickerFormatRaw { is_animated, is_video }: StickerFormatRaw,
     ) -> Result<Self, Self::Error> {
         let ret = match (is_animated, is_video) {
             (false, false) => Self::Raster,
@@ -308,18 +305,9 @@ impl TryFrom<StickerFormatRaw> for StickerFormat {
 impl From<StickerFormat> for StickerFormatRaw {
     fn from(kind: StickerFormat) -> Self {
         match kind {
-            StickerFormat::Raster => Self {
-                is_animated: false,
-                is_video: false,
-            },
-            StickerFormat::Animated => Self {
-                is_animated: true,
-                is_video: false,
-            },
-            StickerFormat::Video => Self {
-                is_animated: false,
-                is_video: true,
-            },
+            StickerFormat::Raster => Self { is_animated: false, is_video: false },
+            StickerFormat::Animated => Self { is_animated: true, is_video: false },
+            StickerFormat::Video => Self { is_animated: false, is_video: true },
         }
     }
 }
diff --git a/crates/teloxide-core/src/types/update.rs b/crates/teloxide-core/src/types/update.rs
index 0fb34e6e..1cd90467 100644
--- a/crates/teloxide-core/src/types/update.rs
+++ b/crates/teloxide-core/src/types/update.rs
@@ -161,10 +161,9 @@ impl<'de> Deserialize<'de> for UpdateKind {
 
                 if let Ok(Some(k)) = k {
                     let res = match k {
-                        "message" => map
-                            .next_value::<Message>()
-                            .map(UpdateKind::Message)
-                            .map_err(|_| false),
+                        "message" => {
+                            map.next_value::<Message>().map(UpdateKind::Message).map_err(|_| false)
+                        }
                         "edited_message" => map
                             .next_value::<Message>()
                             .map(UpdateKind::EditedMessage)
@@ -197,10 +196,7 @@ impl<'de> Deserialize<'de> for UpdateKind {
                             .next_value::<PreCheckoutQuery>()
                             .map(UpdateKind::PreCheckoutQuery)
                             .map_err(|_| false),
-                        "poll" => map
-                            .next_value::<Poll>()
-                            .map(UpdateKind::Poll)
-                            .map_err(|_| false),
+                        "poll" => map.next_value::<Poll>().map(UpdateKind::Poll).map_err(|_| false),
                         "poll_answer" => map
                             .next_value::<PollAnswer>()
                             .map(UpdateKind::PollAnswer)
diff --git a/crates/teloxide-core/src/types/user.rs b/crates/teloxide-core/src/types/user.rs
index 07c14052..1dc0b672 100644
--- a/crates/teloxide-core/src/types/user.rs
+++ b/crates/teloxide-core/src/types/user.rs
@@ -66,11 +66,7 @@ impl User {
     /// Returns `None` if `self.username.is_none()`.
     #[must_use]
     pub fn tme_url(&self) -> Option<reqwest::Url> {
-        Some(
-            format!("https://t.me/{}", self.username.as_ref()?)
-                .parse()
-                .unwrap(),
-        )
+        Some(format!("https://t.me/{}", self.username.as_ref()?).parse().unwrap())
     }
 
     /// Returns an URL that links to this user in the form of `t.me/<...>` or
@@ -190,19 +186,10 @@ mod tests {
         assert_eq!(user_a.mention(), Some("@aaaaaaaaaaaaaaaa".to_owned()));
         assert_eq!(user_b.mention(), None);
 
-        assert_eq!(
-            user_a.tme_url(),
-            Some("https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap())
-        );
+        assert_eq!(user_a.tme_url(), Some("https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap()));
         assert_eq!(user_b.tme_url(), None);
 
-        assert_eq!(
-            user_a.preferably_tme_url(),
-            "https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap()
-        );
-        assert_eq!(
-            user_b.preferably_tme_url(),
-            "tg://user/?id=44".parse().unwrap()
-        );
+        assert_eq!(user_a.preferably_tme_url(), "https://t.me/aaaaaaaaaaaaaaaa".parse().unwrap());
+        assert_eq!(user_b.preferably_tme_url(), "tg://user/?id=44".parse().unwrap());
     }
 }
diff --git a/crates/teloxide-core/src/types/user_id.rs b/crates/teloxide-core/src/types/user_id.rs
index a767234c..71d41984 100644
--- a/crates/teloxide-core/src/types/user_id.rs
+++ b/crates/teloxide-core/src/types/user_id.rs
@@ -61,9 +61,7 @@ mod tests {
     /// Test that `UserId` is serialized as the underlying integer
     #[test]
     fn deser() {
-        let user_id = S {
-            user_id: UserId(17),
-        };
+        let user_id = S { user_id: UserId(17) };
         let json = r#"{"user_id":17}"#;
 
         #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
diff --git a/crates/teloxide-macros/rustfmt.toml b/crates/teloxide-macros/rustfmt.toml
deleted file mode 100644
index aba42ed2..00000000
--- a/crates/teloxide-macros/rustfmt.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-format_code_in_doc_comments = true
-wrap_comments = true
-format_strings = true
-max_width = 80
-imports_granularity = "Crate"
-use_small_heuristics = "Max"
-use_field_init_shorthand = true
diff --git a/crates/teloxide-macros/src/attr.rs b/crates/teloxide-macros/src/attr.rs
index 04a070ed..9f872946 100644
--- a/crates/teloxide-macros/src/attr.rs
+++ b/crates/teloxide-macros/src/attr.rs
@@ -19,13 +19,12 @@ pub(crate) fn fold_attrs<A, R>(
         .filter(|&a| filter(a))
         .flat_map(|attribute| {
             // FIXME: don't allocate here
-            let attrs =
-                match attribute.parse_args_with(|input: &ParseBuffer| {
-                    input.parse_terminated::<_, Token![,]>(Attr::parse)
-                }) {
-                    Ok(ok) => ok,
-                    Err(err) => return vec![Err(err.into())],
-                };
+            let attrs = match attribute.parse_args_with(|input: &ParseBuffer| {
+                input.parse_terminated::<_, Token![,]>(Attr::parse)
+            }) {
+                Ok(ok) => ok,
+                Err(err) => return vec![Err(err.into())],
+            };
 
             attrs.into_iter().map(&parse).collect()
         })
@@ -75,10 +74,7 @@ impl Parse for Attr {
 
 impl Attr {
     pub(crate) fn span(&self) -> Span {
-        self.key
-            .span()
-            .join(self.value.span())
-            .unwrap_or_else(|| self.key.span())
+        self.key.span().join(self.value.span()).unwrap_or_else(|| self.key.span())
     }
 }
 
@@ -99,16 +95,9 @@ impl AttrValue {
     //     })
     // }
 
-    pub fn expect<T>(
-        self,
-        expected: &str,
-        f: impl FnOnce(Self) -> Result<T, Self>,
-    ) -> Result<T> {
+    pub fn expect<T>(self, expected: &str, f: impl FnOnce(Self) -> Result<T, Self>) -> Result<T> {
         f(self).map_err(|this| {
-            compile_error_at(
-                &format!("expected {expected}, found {}", this.descr()),
-                this.span(),
-            )
+            compile_error_at(&format!("expected {expected}, found {}", this.descr()), this.span())
         })
     }
 
diff --git a/crates/teloxide-macros/src/bot_commands.rs b/crates/teloxide-macros/src/bot_commands.rs
index 7d7337e6..b257d668 100644
--- a/crates/teloxide-macros/src/bot_commands.rs
+++ b/crates/teloxide-macros/src/bot_commands.rs
@@ -1,6 +1,6 @@
 use crate::{
-    command::Command, command_enum::CommandEnum, compile_error,
-    fields_parse::impl_parse_args, unzip::Unzip, Result,
+    command::Command, command_enum::CommandEnum, compile_error, fields_parse::impl_parse_args,
+    unzip::Unzip, Result,
 };
 
 use proc_macro2::TokenStream;
@@ -15,17 +15,12 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
         .variants
         .iter()
         .map(|variant| {
-            let command = Command::new(
-                &variant.ident.to_string(),
-                &variant.attrs,
-                &command_enum,
-            )?;
+            let command = Command::new(&variant.ident.to_string(), &variant.attrs, &command_enum)?;
 
             let variant_name = &variant.ident;
             let self_variant = quote! { Self::#variant_name };
 
-            let parse =
-                impl_parse_args(&variant.fields, self_variant, &command.parser);
+            let parse = impl_parse_args(&variant.fields, self_variant, &command.parser);
 
             Ok((parse, command))
         })
@@ -48,14 +43,11 @@ pub(crate) fn bot_commands_impl(input: DeriveInput) -> Result<TokenStream> {
 }
 
 fn impl_commands(infos: &[Command]) -> proc_macro2::TokenStream {
-    let commands = infos
-        .iter()
-        .filter(|command| command.description_is_enabled())
-        .map(|command| {
-            let c = command.get_prefixed_command();
-            let d = command.description.as_deref().unwrap_or_default();
-            quote! { BotCommand::new(#c,#d) }
-        });
+    let commands = infos.iter().filter(|command| command.description_is_enabled()).map(|command| {
+        let c = command.get_prefixed_command();
+        let d = command.description.as_deref().unwrap_or_default();
+        quote! { BotCommand::new(#c,#d) }
+    });
 
     quote! {
         fn bot_commands() -> Vec<teloxide::types::BotCommand> {
@@ -65,10 +57,7 @@ fn impl_commands(infos: &[Command]) -> proc_macro2::TokenStream {
     }
 }
 
-fn impl_descriptions(
-    infos: &[Command],
-    global: &CommandEnum,
-) -> proc_macro2::TokenStream {
+fn impl_descriptions(infos: &[Command], global: &CommandEnum) -> proc_macro2::TokenStream {
     let command_descriptions = infos
         .iter()
         .filter(|command| command.description_is_enabled())
diff --git a/crates/teloxide-macros/src/command.rs b/crates/teloxide-macros/src/command.rs
index 72b05f3e..fb421e8f 100644
--- a/crates/teloxide-macros/src/command.rs
+++ b/crates/teloxide-macros/src/command.rs
@@ -1,6 +1,6 @@
 use crate::{
-    command_attr::CommandAttrs, command_enum::CommandEnum,
-    error::compile_error_at, fields_parse::ParserType, Result,
+    command_attr::CommandAttrs, command_enum::CommandEnum, error::compile_error_at,
+    fields_parse::ParserType, Result,
 };
 
 pub(crate) struct Command {
@@ -43,13 +43,9 @@ impl Command {
             (None, None) => global_options.rename_rule.apply(name),
         };
 
-        let prefix = prefix
-            .map(|(p, _)| p)
-            .unwrap_or_else(|| global_options.prefix.clone());
+        let prefix = prefix.map(|(p, _)| p).unwrap_or_else(|| global_options.prefix.clone());
         let description = description.map(|(d, _)| d);
-        let parser = parser
-            .map(|(p, _)| p)
-            .unwrap_or_else(|| global_options.parser_type.clone());
+        let parser = parser.map(|(p, _)| p).unwrap_or_else(|| global_options.parser_type.clone());
 
         Ok(Self { prefix, description, parser, name })
     }
diff --git a/crates/teloxide-macros/src/command_attr.rs b/crates/teloxide-macros/src/command_attr.rs
index e735b7bb..96c9c2b7 100644
--- a/crates/teloxide-macros/src/command_attr.rs
+++ b/crates/teloxide-macros/src/command_attr.rs
@@ -60,19 +60,13 @@ impl CommandAttrs {
                 separator: None,
             },
             |mut this, attr| {
-                fn insert<T>(
-                    opt: &mut Option<(T, Span)>,
-                    x: T,
-                    sp: Span,
-                ) -> Result<()> {
+                fn insert<T>(opt: &mut Option<(T, Span)>, x: T, sp: Span) -> Result<()> {
                     match opt {
                         slot @ None => {
                             *slot = Some((x, sp));
                             Ok(())
                         }
-                        Some(_) => {
-                            Err(compile_error_at("duplicate attribute", sp))
-                        }
+                        Some(_) => Err(compile_error_at("duplicate attribute", sp)),
                     }
                 }
 
@@ -100,18 +94,16 @@ impl CommandAttr {
         let kind = match &*key.to_string() {
             "prefix" => Prefix(value.expect_string()?),
             "description" => Description(value.expect_string()?),
-            "rename_rule" => RenameRule(
-                value
-                    .expect_string()
-                    .and_then(|r| self::RenameRule::parse(&r))?,
-            ),
+            "rename_rule" => {
+                RenameRule(value.expect_string().and_then(|r| self::RenameRule::parse(&r))?)
+            }
             "rename" => Rename(value.expect_string()?),
             "parse_with" => ParseWith(ParserType::parse(value)?),
             "separator" => Separator(value.expect_string()?),
             _ => {
                 return Err(compile_error_at(
-                    "unexpected attribute name (expected one of `prefix`, \
-                     `description`, `rename`, `parse_with` and `separator`",
+                    "unexpected attribute name (expected one of `prefix`, `description`, \
+                     `rename`, `parse_with` and `separator`",
                     key.span(),
                 ))
             }
diff --git a/crates/teloxide-macros/src/command_enum.rs b/crates/teloxide-macros/src/command_enum.rs
index 55f37610..83f20dec 100644
--- a/crates/teloxide-macros/src/command_enum.rs
+++ b/crates/teloxide-macros/src/command_enum.rs
@@ -1,6 +1,6 @@
 use crate::{
-    command_attr::CommandAttrs, error::compile_error_at,
-    fields_parse::ParserType, rename_rules::RenameRule, Result,
+    command_attr::CommandAttrs, error::compile_error_at, fields_parse::ParserType,
+    rename_rules::RenameRule, Result,
 };
 
 pub(crate) struct CommandEnum {
@@ -13,14 +13,7 @@ pub(crate) struct CommandEnum {
 impl CommandEnum {
     pub fn from_attributes(attributes: &[syn::Attribute]) -> Result<Self> {
         let attrs = CommandAttrs::from_attributes(attributes)?;
-        let CommandAttrs {
-            prefix,
-            description,
-            rename_rule,
-            rename,
-            parser,
-            separator,
-        } = attrs;
+        let CommandAttrs { prefix, description, rename_rule, rename, parser, separator } = attrs;
 
         if let Some((_rename, sp)) = rename {
             return Err(compile_error_at(
@@ -32,18 +25,14 @@ impl CommandEnum {
         let mut parser = parser.map(|(p, _)| p).unwrap_or(ParserType::Default);
 
         // FIXME: Error on unused separator
-        if let (ParserType::Split { separator }, Some((s, _))) =
-            (&mut parser, &separator)
-        {
+        if let (ParserType::Split { separator }, Some((s, _))) = (&mut parser, &separator) {
             *separator = Some(s.clone())
         }
 
         Ok(Self {
             prefix: prefix.map(|(p, _)| p).unwrap_or_else(|| "/".to_owned()),
             description: description.map(|(d, _)| d),
-            rename_rule: rename_rule
-                .map(|(rr, _)| rr)
-                .unwrap_or(RenameRule::Identity),
+            rename_rule: rename_rule.map(|(rr, _)| rr).unwrap_or(RenameRule::Identity),
             parser_type: parser,
         })
     }
diff --git a/crates/teloxide-macros/src/error.rs b/crates/teloxide-macros/src/error.rs
index 0d27c475..59088db2 100644
--- a/crates/teloxide-macros/src/error.rs
+++ b/crates/teloxide-macros/src/error.rs
@@ -14,9 +14,7 @@ where
 }
 
 pub(crate) fn compile_error_at(msg: &str, sp: Span) -> Error {
-    use proc_macro2::{
-        Delimiter, Group, Ident, Literal, Punct, Spacing, TokenTree,
-    };
+    use proc_macro2::{Delimiter, Group, Ident, Literal, Punct, Spacing, TokenTree};
     // compile_error! { $msg }
     let ts = TokenStream::from_iter(vec![
         TokenTree::Ident(Ident::new("compile_error", sp)),
diff --git a/crates/teloxide-macros/src/fields_parse.rs b/crates/teloxide-macros/src/fields_parse.rs
index caf53127..ba7204d7 100644
--- a/crates/teloxide-macros/src/fields_parse.rs
+++ b/crates/teloxide-macros/src/fields_parse.rs
@@ -12,18 +12,15 @@ pub(crate) enum ParserType {
 
 impl ParserType {
     pub fn parse(value: AttrValue) -> Result<Self> {
-        value.expect(
-            r#""default", "split", or a path to a custom parser function"#,
-            |v| match v {
-                AttrValue::Path(p) => Ok(ParserType::Custom(p)),
-                AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {
-                    "default" => Ok(ParserType::Default),
-                    "split" => Ok(ParserType::Split { separator: None }),
-                    _ => Err(v),
-                },
+        value.expect(r#""default", "split", or a path to a custom parser function"#, |v| match v {
+            AttrValue::Path(p) => Ok(ParserType::Custom(p)),
+            AttrValue::Lit(syn::Lit::Str(ref l)) => match &*l.value() {
+                "default" => Ok(ParserType::Default),
+                "split" => Ok(ParserType::Split { separator: None }),
                 _ => Err(v),
             },
-        )
+            _ => Err(v),
+        })
     }
 }
 
@@ -34,12 +31,8 @@ pub(crate) fn impl_parse_args(
 ) -> proc_macro2::TokenStream {
     match fields {
         Fields::Unit => self_variant,
-        Fields::Unnamed(fields) => {
-            impl_parse_args_unnamed(fields, self_variant, parser)
-        }
-        Fields::Named(named) => {
-            impl_parse_args_named(named, self_variant, parser)
-        }
+        Fields::Unnamed(fields) => impl_parse_args_unnamed(fields, self_variant, parser),
+        Fields::Named(named) => impl_parse_args_named(named, self_variant, parser),
     }
 }
 
@@ -48,8 +41,7 @@ pub(crate) fn impl_parse_args_unnamed(
     variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
-    let get_arguments =
-        create_parser(parser_type, data.unnamed.iter().map(|f| &f.ty));
+    let get_arguments = create_parser(parser_type, data.unnamed.iter().map(|f| &f.ty));
     let iter = (0..data.unnamed.len()).map(syn::Index::from);
     let mut initialization = quote! {};
     for i in iter {
@@ -69,8 +61,7 @@ pub(crate) fn impl_parse_args_named(
     variant: proc_macro2::TokenStream,
     parser_type: &ParserType,
 ) -> proc_macro2::TokenStream {
-    let get_arguments =
-        create_parser(parser_type, data.named.iter().map(|f| &f.ty));
+    let get_arguments = create_parser(parser_type, data.named.iter().map(|f| &f.ty));
     let i = (0..).map(syn::Index::from);
     let name = data.named.iter().map(|f| f.ident.as_ref().unwrap());
     let res = quote! {
@@ -105,10 +96,9 @@ fn create_parser<'a>(
                 quote! { compile_error!("Default parser works only with exactly 1 field") }
             }
         },
-        ParserType::Split { separator } => parser_with_separator(
-            &separator.clone().unwrap_or_else(|| " ".to_owned()),
-            types,
-        ),
+        ParserType::Split { separator } => {
+            parser_with_separator(&separator.clone().unwrap_or_else(|| " ".to_owned()), types)
+        }
         ParserType::Custom(path) => quote! { #path },
     };
 
diff --git a/crates/teloxide-macros/src/rename_rules.rs b/crates/teloxide-macros/src/rename_rules.rs
index 55280617..b4fab615 100644
--- a/crates/teloxide-macros/src/rename_rules.rs
+++ b/crates/teloxide-macros/src/rename_rules.rs
@@ -3,8 +3,7 @@
 use crate::error::{compile_error, Result};
 
 use heck::{
-    ToKebabCase, ToLowerCamelCase, ToPascalCase, ToShoutyKebabCase,
-    ToShoutySnakeCase, ToSnakeCase,
+    ToKebabCase, ToLowerCamelCase, ToPascalCase, ToShoutyKebabCase, ToShoutySnakeCase, ToSnakeCase,
 };
 
 #[derive(Copy, Clone, Debug)]
@@ -65,10 +64,9 @@ impl RenameRule {
             "identity" => Identity,
             invalid => {
                 return Err(compile_error(format!(
-                    "invalid rename rule `{invalid}` (supported rules: \
-                     `lowercase`, `UPPERCASE`, `PascalCase`, `camelCase`, \
-                     `snake_case`, `SCREAMING_SNAKE_CASE`, `kebab-case`, \
-                     `SCREAMING-KEBAB-CASE` and `identity`)"
+                    "invalid rename rule `{invalid}` (supported rules: `lowercase`, `UPPERCASE`, \
+                     `PascalCase`, `camelCase`, `snake_case`, `SCREAMING_SNAKE_CASE`, \
+                     `kebab-case`, `SCREAMING-KEBAB-CASE` and `identity`)"
                 )))
             }
         };
diff --git a/crates/teloxide-macros/tests/command.rs b/crates/teloxide-macros/tests/command.rs
index 65aea651..b627aa65 100644
--- a/crates/teloxide-macros/tests/command.rs
+++ b/crates/teloxide-macros/tests/command.rs
@@ -62,42 +62,23 @@ fn many_attributes() {
         Help,
     }
 
-    assert_eq!(
-        DefaultCommands::Start,
-        DefaultCommands::parse("!start", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::descriptions().to_string(),
-        "!start — desc\n/help"
-    );
+    assert_eq!(DefaultCommands::Start, DefaultCommands::parse("!start", "").unwrap());
+    assert_eq!(DefaultCommands::descriptions().to_string(), "!start — desc\n/help");
 }
 
 #[test]
 fn global_attributes() {
     #[derive(BotCommands, Debug, PartialEq)]
-    #[command(
-        prefix = "!",
-        rename_rule = "lowercase",
-        description = "Bot commands"
-    )]
+    #[command(prefix = "!", rename_rule = "lowercase", description = "Bot commands")]
     enum DefaultCommands {
         #[command(prefix = "/")]
         Start,
         Help,
     }
 
-    assert_eq!(
-        DefaultCommands::Start,
-        DefaultCommands::parse("/start", "MyNameBot").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::Help,
-        DefaultCommands::parse("!help", "MyNameBot").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::descriptions().to_string(),
-        "Bot commands\n\n/start\n!help"
-    );
+    assert_eq!(DefaultCommands::Start, DefaultCommands::parse("/start", "MyNameBot").unwrap());
+    assert_eq!(DefaultCommands::Help, DefaultCommands::parse("!help", "MyNameBot").unwrap());
+    assert_eq!(DefaultCommands::descriptions().to_string(), "Bot commands\n\n/start\n!help");
 }
 
 #[test]
@@ -153,25 +134,15 @@ fn parse_custom_parser() {
     mod parser {
         use teloxide::utils::command::ParseError;
 
-        pub fn custom_parse_function(
-            s: String,
-        ) -> Result<(u8, String), ParseError> {
+        pub fn custom_parse_function(s: String) -> Result<(u8, String), ParseError> {
             let vec = s.split_whitespace().collect::<Vec<_>>();
             let (left, right) = match vec.as_slice() {
                 [l, r] => (l, r),
-                _ => {
-                    return Err(ParseError::IncorrectFormat(
-                        "might be 2 arguments!".into(),
-                    ))
-                }
+                _ => return Err(ParseError::IncorrectFormat("might be 2 arguments!".into())),
             };
-            left.parse::<u8>().map(|res| (res, (*right).to_string())).map_err(
-                |_| {
-                    ParseError::Custom(
-                        "First argument must be a integer!".to_owned().into(),
-                    )
-                },
-            )
+            left.parse::<u8>().map(|res| (res, (*right).to_string())).map_err(|_| {
+                ParseError::Custom("First argument must be a integer!".to_owned().into())
+            })
         }
     }
 
@@ -253,46 +224,18 @@ fn rename_rules() {
         Foo,
     }
 
-    assert_eq!(
-        DefaultCommands::AaaAaa,
-        DefaultCommands::parse("/aaaaaa", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::BbbBbb,
-        DefaultCommands::parse("/BBBBBB", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::CccCcc,
-        DefaultCommands::parse("/CccCcc", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::DddDdd,
-        DefaultCommands::parse("/dddDdd", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::EeeEee,
-        DefaultCommands::parse("/eee_eee", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::FffFff,
-        DefaultCommands::parse("/FFF_FFF", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::GggGgg,
-        DefaultCommands::parse("/ggg-ggg", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::HhhHhh,
-        DefaultCommands::parse("/HHH-HHH", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::Foo,
-        DefaultCommands::parse("/Bar", "").unwrap()
-    );
+    assert_eq!(DefaultCommands::AaaAaa, DefaultCommands::parse("/aaaaaa", "").unwrap());
+    assert_eq!(DefaultCommands::BbbBbb, DefaultCommands::parse("/BBBBBB", "").unwrap());
+    assert_eq!(DefaultCommands::CccCcc, DefaultCommands::parse("/CccCcc", "").unwrap());
+    assert_eq!(DefaultCommands::DddDdd, DefaultCommands::parse("/dddDdd", "").unwrap());
+    assert_eq!(DefaultCommands::EeeEee, DefaultCommands::parse("/eee_eee", "").unwrap());
+    assert_eq!(DefaultCommands::FffFff, DefaultCommands::parse("/FFF_FFF", "").unwrap());
+    assert_eq!(DefaultCommands::GggGgg, DefaultCommands::parse("/ggg-ggg", "").unwrap());
+    assert_eq!(DefaultCommands::HhhHhh, DefaultCommands::parse("/HHH-HHH", "").unwrap());
+    assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar", "").unwrap());
 
     assert_eq!(
-        "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/\
-         HHH-HHH\n/Bar",
+        "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/HHH-HHH\n/Bar",
         DefaultCommands::descriptions().to_string()
     );
 }
diff --git a/rustfmt.toml b/rustfmt.toml
index 38db4219..6353e228 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -4,3 +4,4 @@ format_strings = true
 imports_granularity = "Crate"
 use_small_heuristics = "Max"
 use_field_init_shorthand = true
+merge_derives = false

From c942459da8fd64d92059f312a86f235c205eea28 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 16:17:42 +0400
Subject: [PATCH 747/755] Replace `git` dependencies with `path`

---
 crates/teloxide-macros/Cargo.toml | 2 +-
 crates/teloxide/Cargo.toml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/teloxide-macros/Cargo.toml b/crates/teloxide-macros/Cargo.toml
index e2cb3d1c..9ac9b1f8 100644
--- a/crates/teloxide-macros/Cargo.toml
+++ b/crates/teloxide-macros/Cargo.toml
@@ -18,4 +18,4 @@ heck = "0.4.0"
 
 [dev-dependencies]
 # XXX: Do not enable `macros` feature
-teloxide = { git = "https://github.com/teloxide/teloxide.git", rev = "b5e237a8a22f9f987b6e4245b9b6c3ca1f804c19" }
+teloxide = { path = "../teloxide" }
diff --git a/crates/teloxide/Cargo.toml b/crates/teloxide/Cargo.toml
index f4056c49..0317e89e 100644
--- a/crates/teloxide/Cargo.toml
+++ b/crates/teloxide/Cargo.toml
@@ -68,8 +68,8 @@ serde = { version = "1.0", features = ["derive"] }
 dptree = "0.3.0"
 
 # These lines are used only for development.
-# teloxide-core = { git = "https://github.com/teloxide/teloxide-core", rev = "00165e6", default-features = false }
-# teloxide-macros = { git = "https://github.com/teloxide/teloxide-macros", rev = "e715105", optional = true }
+# teloxide-core = { path = "../teloxide-core", default-features = false }
+# teloxide-macros = { path = "../teloxide-macros", optional = true }
 # dptree = { git = "https://github.com/teloxide/dptree", rev = "df578e4" }
 
 tokio = { version = "1.8", features = ["fs"] }

From b6e46f501ea3afa46e3dca5c51b7ced8e163afde Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 16:31:32 +0400
Subject: [PATCH 748/755] fix `teloxide` readme metadata

---
 crates/teloxide/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/teloxide/Cargo.toml b/crates/teloxide/Cargo.toml
index 0317e89e..115d2efb 100644
--- a/crates/teloxide/Cargo.toml
+++ b/crates/teloxide/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 description = "An elegant Telegram bots framework for Rust"
 repository = "https://github.com/teloxide/teloxide"
 documentation = "https://docs.rs/teloxide/"
-readme = "README.md"
+readme = "../../README.md"
 keywords = ["teloxide", "telegram", "telegram-bot", "telegram-bot-api"]
 categories = ["web-programming", "api-bindings", "asynchronous"]
 license = "MIT"
-exclude = ["media"]
+exclude = ["media", "README.md"]
 
 [features]
 default = ["native-tls", "ctrlc_handler", "teloxide-core/default",  "auto-send"]

From 05889b379730fc3c2749ae9a9e331b8616242cf4 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 16:38:57 +0400
Subject: [PATCH 749/755] Merge `rust-toolchain.toml`s

---
 crates/teloxide-core/rust-toolchain.toml | 4 ----
 rust-toolchain.toml                      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 crates/teloxide-core/rust-toolchain.toml

diff --git a/crates/teloxide-core/rust-toolchain.toml b/crates/teloxide-core/rust-toolchain.toml
deleted file mode 100644
index b4990f3d..00000000
--- a/crates/teloxide-core/rust-toolchain.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[toolchain]
-channel = "nightly-2022-09-23"
-components = ["rustfmt", "clippy"]
-profile = "minimal"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index eca55770..b4990f3d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2022-09-01"
+channel = "nightly-2022-09-23"
 components = ["rustfmt", "clippy"]
 profile = "minimal"

From 5c59c6a88695e496a552182a8f7aa2ab16a14b21 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 16:49:18 +0400
Subject: [PATCH 750/755] link licenses

---
 crates/teloxide-core/LICENSE   | 22 +---------------------
 crates/teloxide-macros/LICENSE | 22 +---------------------
 crates/teloxide/LICENSE        |  1 +
 3 files changed, 3 insertions(+), 42 deletions(-)
 mode change 100644 => 120000 crates/teloxide-core/LICENSE
 mode change 100644 => 120000 crates/teloxide-macros/LICENSE
 create mode 120000 crates/teloxide/LICENSE

diff --git a/crates/teloxide-core/LICENSE b/crates/teloxide-core/LICENSE
deleted file mode 100644
index 3bc0c2bb..00000000
--- a/crates/teloxide-core/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2022 teloxide
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/crates/teloxide-core/LICENSE b/crates/teloxide-core/LICENSE
new file mode 120000
index 00000000..30cff740
--- /dev/null
+++ b/crates/teloxide-core/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
\ No newline at end of file
diff --git a/crates/teloxide-macros/LICENSE b/crates/teloxide-macros/LICENSE
deleted file mode 100644
index 8e5427af..00000000
--- a/crates/teloxide-macros/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019-2022 teloxide
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/crates/teloxide-macros/LICENSE b/crates/teloxide-macros/LICENSE
new file mode 120000
index 00000000..30cff740
--- /dev/null
+++ b/crates/teloxide-macros/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
\ No newline at end of file
diff --git a/crates/teloxide/LICENSE b/crates/teloxide/LICENSE
new file mode 120000
index 00000000..30cff740
--- /dev/null
+++ b/crates/teloxide/LICENSE
@@ -0,0 +1 @@
+../../LICENSE
\ No newline at end of file

From 31e73a848bc20ec5742fce9ba08a286c7dce1513 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 19:15:30 +0400
Subject: [PATCH 751/755] =?UTF-8?q?CI=20attempt=20=E2=84=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cargo/config.toml                            |  20 +-
 .github/workflows/ci.yml                      |  11 +-
 crates/teloxide-core/.cargo/config.toml       |  14 -
 crates/teloxide-core/.github/workflows/ci.yml | 191 --------------
 .../.github/workflows/rust.yml                |  72 ------
 crates/teloxide-macros/Cargo.toml             |   4 -
 crates/teloxide-macros/tests/command.rs       | 241 ------------------
 7 files changed, 19 insertions(+), 534 deletions(-)
 delete mode 100644 crates/teloxide-core/.cargo/config.toml
 delete mode 100644 crates/teloxide-core/.github/workflows/ci.yml
 delete mode 100644 crates/teloxide-macros/.github/workflows/rust.yml
 delete mode 100644 crates/teloxide-macros/tests/command.rs

diff --git a/.cargo/config.toml b/.cargo/config.toml
index d6e070ff..a16645bb 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,12 +1,14 @@
 [alias]
-# We pass "--cfg docsrs" when building docs to turn on nightly-only rustdoc features like
-# `This is supported on feature="..." only.`
+# Using `--features=full --features=nightly` instead of `--all-features` because of
+# https://github.com/rust-lang/cargo/issues/10333
 #
-# "--cfg dep_docsrs" is used for the same reason, but for `teloxide-core`.
-docs = """
-doc 
-  --all-features 
-  --config build.rustflags=["--cfg=dep_docsrs"]
-  --config build.rustdocflags=["--cfg=docsrs","-Znormalize-docs"]
-  -Zrustdoc-scrape-examples=examples
+# "tokio/macros" and "tokio/rt-multi-thread" are required for examples
+docs = """doc
+-Zrustdoc-scrape-examples=examples
+--features=full --features=nightly
+--features=tokio/macros --features=tokio/rt-multi-thread
 """
+
+[build]
+# We pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
+rustdocflags = ["--cfg", "docsrs", "-Znormalize-docs"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8396993..053bf592 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,13 +15,18 @@ env:
   CARGO_NET_RETRY: 10
   RUSTUP_MAX_RETRIES: 10
 
-  rust_nightly: nightly-2022-09-01
   # When updating this, also update:
-  # - README.md
-  # - src/lib.rs
+  # - crates/teloxide-core/src/codegen.rs
+  # - rust-toolchain.toml
+  rust_nightly: nightly-2022-09-23
+  # When updating this, also update:
+  # - **/README.md
+  # - **/src/lib.rs
   # - down below in a matrix
   rust_msrv: 1.64.0
 
+  CI: 1
+
 jobs:
   # Depends on all action that are required for a "successful" CI run.
   ci-pass:
diff --git a/crates/teloxide-core/.cargo/config.toml b/crates/teloxide-core/.cargo/config.toml
deleted file mode 100644
index a16645bb..00000000
--- a/crates/teloxide-core/.cargo/config.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[alias]
-# Using `--features=full --features=nightly` instead of `--all-features` because of
-# https://github.com/rust-lang/cargo/issues/10333
-#
-# "tokio/macros" and "tokio/rt-multi-thread" are required for examples
-docs = """doc
--Zrustdoc-scrape-examples=examples
---features=full --features=nightly
---features=tokio/macros --features=tokio/rt-multi-thread
-"""
-
-[build]
-# We pass "--cfg docsrs" when building docs to add `This is supported on feature="..." only.`
-rustdocflags = ["--cfg", "docsrs", "-Znormalize-docs"]
diff --git a/crates/teloxide-core/.github/workflows/ci.yml b/crates/teloxide-core/.github/workflows/ci.yml
deleted file mode 100644
index f05f9948..00000000
--- a/crates/teloxide-core/.github/workflows/ci.yml
+++ /dev/null
@@ -1,191 +0,0 @@
-name: Continuous integration
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-env:
-  RUSTFLAGS: -Dwarnings
-  RUSTDOCFLAGS: -Dwarnings
-  RUST_BACKTRACE: short
-
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  RUSTUP_MAX_RETRIES: 10
-
-  rust_nightly: nightly-2022-09-23
-  # When updating this, also update:
-  # - README.md
-  # - src/lib.rs
-  # - down below in a matrix  
-  rust_msrv: 1.64.0
-
-  CI: 1
-
-jobs:
-  # Depends on all action that are required for a "successful" CI run.
-  ci-pass:
-    name: CI succeeded
-    runs-on: ubuntu-latest
-
-    needs:
-      - fmt
-      - test
-      - check-examples
-      - clippy
-      - doc
-
-    steps:
-      - run: exit 0
-
-  fmt:
-    name: fmt
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ env.rust_nightly }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_nightly }}
-          override: true
-          components: rustfmt
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: Check formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: 
-          - stable
-          - beta
-          - nightly
-          - msrv
-    
-        include:
-          - rust: stable
-            toolchain: stable
-            features: "--features full"
-          - rust: beta
-            toolchain: beta
-            features: "--features full"
-          - rust: nightly
-            toolchain: nightly-2022-09-23
-            features: "--all-features"
-          - rust: msrv
-            toolchain: 1.64.0
-            features: "--features full"
-
-    steps:      
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ matrix.toolchain }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.toolchain }}
-          override: true
-          components: rustfmt # required by codegen
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: Compile 
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-run --verbose ${{ matrix.features }}
-      
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --verbose ${{ matrix.features }}
-
-  check-examples:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: Check examples
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --examples --features full
-
-  clippy:
-    name: Run linter
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ env.rust_nightly }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_nightly }}
-          override: true
-          components: clippy
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-targets --all-features
-
-  doc:
-    name: check docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust ${{ env.rust_nightly }}
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_nightly }}
-          override: true
-
-      - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-
-      - name: rustdoc
-        uses: actions-rs/cargo@v1
-        with:
-          command: docs # from .cargo/config.toml
diff --git a/crates/teloxide-macros/.github/workflows/rust.yml b/crates/teloxide-macros/.github/workflows/rust.yml
deleted file mode 100644
index 0ec2a488..00000000
--- a/crates/teloxide-macros/.github/workflows/rust.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-on: [push, pull_request]
-
-name: Continuous integration
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust: 
-          - stable
-          - beta
-          - nightly
-      
-    steps:
-      - uses: actions/checkout@v1
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: rustfmt, clippy
-
-      - name: stable/beta build 
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'stable' || matrix.rust == 'beta'
-        with:
-          command: build
-          args: --verbose --features ""
-
-      - name: nightly build 
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'nightly'
-        with:
-          command: build
-          args: --verbose --all-features
-
-      - name: stable/beta test 
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'stable' || matrix.rust == 'beta'
-        with:
-          command: test
-          args: --verbose --features ""
-
-      - name: nightly test
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'nightly'
-        with:
-          command: test
-          args: --verbose --all-features
-
-      - name: fmt
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'nightly'
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - name: stable/beta clippy
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'stable' || matrix.rust == 'beta'
-        with:
-          command: clippy
-          args: --all-targets --features "" -- -D warnings
-
-      - name: nightly clippy
-        uses: actions-rs/cargo@v1
-        if: matrix.rust == 'nightly'
-        with:
-          command: clippy
-          args: --all-targets --all-features -- -D warnings
diff --git a/crates/teloxide-macros/Cargo.toml b/crates/teloxide-macros/Cargo.toml
index 9ac9b1f8..c6ea1d39 100644
--- a/crates/teloxide-macros/Cargo.toml
+++ b/crates/teloxide-macros/Cargo.toml
@@ -15,7 +15,3 @@ quote = "1.0.7"
 proc-macro2 = "1.0.19"
 syn = { version = "1.0.13",  features = ["full"] }
 heck = "0.4.0"
-
-[dev-dependencies]
-# XXX: Do not enable `macros` feature
-teloxide = { path = "../teloxide" }
diff --git a/crates/teloxide-macros/tests/command.rs b/crates/teloxide-macros/tests/command.rs
deleted file mode 100644
index b627aa65..00000000
--- a/crates/teloxide-macros/tests/command.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-//! Test for `teloxide-macros`
-
-use teloxide_macros::BotCommands;
-
-// Import only trait _methods_, such that we can call `parse`, but we also test
-// that proc macros work without the trait being imported.
-use teloxide::utils::command::BotCommands as _;
-
-#[test]
-fn parse_command_with_args() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        Start(String),
-        Help,
-    }
-
-    let data = "/start arg1 arg2";
-    let expected = DefaultCommands::Start("arg1 arg2".to_string());
-    let actual = DefaultCommands::parse(data, "").unwrap();
-    assert_eq!(actual, expected)
-}
-
-#[test]
-fn parse_command_with_non_string_arg() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        Start(i32),
-        Help,
-    }
-
-    let data = "/start -50";
-    let expected = DefaultCommands::Start("-50".parse().unwrap());
-    let actual = DefaultCommands::parse(data, "").unwrap();
-    assert_eq!(actual, expected)
-}
-
-#[test]
-fn attribute_prefix() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        #[command(prefix = "!")]
-        Start(String),
-        Help,
-    }
-
-    let data = "!start arg1 arg2";
-    let expected = DefaultCommands::Start("arg1 arg2".to_string());
-    let actual = DefaultCommands::parse(data, "").unwrap();
-    assert_eq!(actual, expected)
-}
-
-#[test]
-fn many_attributes() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        #[command(prefix = "!", description = "desc")]
-        Start,
-        Help,
-    }
-
-    assert_eq!(DefaultCommands::Start, DefaultCommands::parse("!start", "").unwrap());
-    assert_eq!(DefaultCommands::descriptions().to_string(), "!start — desc\n/help");
-}
-
-#[test]
-fn global_attributes() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(prefix = "!", rename_rule = "lowercase", description = "Bot commands")]
-    enum DefaultCommands {
-        #[command(prefix = "/")]
-        Start,
-        Help,
-    }
-
-    assert_eq!(DefaultCommands::Start, DefaultCommands::parse("/start", "MyNameBot").unwrap());
-    assert_eq!(DefaultCommands::Help, DefaultCommands::parse("!help", "MyNameBot").unwrap());
-    assert_eq!(DefaultCommands::descriptions().to_string(), "Bot commands\n\n/start\n!help");
-}
-
-#[test]
-fn parse_command_with_bot_name() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        #[command(prefix = "/")]
-        Start,
-        Help,
-    }
-
-    assert_eq!(
-        DefaultCommands::Start,
-        DefaultCommands::parse("/start@MyNameBot", "MyNameBot").unwrap()
-    );
-}
-
-#[test]
-fn parse_with_split() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    #[command(parse_with = "split")]
-    enum DefaultCommands {
-        Start(u8, String),
-        Help,
-    }
-
-    assert_eq!(
-        DefaultCommands::Start(10, "hello".to_string()),
-        DefaultCommands::parse("/start 10 hello", "").unwrap()
-    );
-}
-
-#[test]
-fn parse_with_split2() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    #[command(parse_with = "split", separator = "|")]
-    enum DefaultCommands {
-        Start(u8, String),
-        Help,
-    }
-
-    assert_eq!(
-        DefaultCommands::Start(10, "hello".to_string()),
-        DefaultCommands::parse("/start 10|hello", "").unwrap()
-    );
-}
-
-#[test]
-fn parse_custom_parser() {
-    mod parser {
-        use teloxide::utils::command::ParseError;
-
-        pub fn custom_parse_function(s: String) -> Result<(u8, String), ParseError> {
-            let vec = s.split_whitespace().collect::<Vec<_>>();
-            let (left, right) = match vec.as_slice() {
-                [l, r] => (l, r),
-                _ => return Err(ParseError::IncorrectFormat("might be 2 arguments!".into())),
-            };
-            left.parse::<u8>().map(|res| (res, (*right).to_string())).map_err(|_| {
-                ParseError::Custom("First argument must be a integer!".to_owned().into())
-            })
-        }
-    }
-
-    use parser::custom_parse_function;
-
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        #[command(parse_with = custom_parse_function)]
-        Start(u8, String),
-
-        // Test <https://github.com/teloxide/teloxide/issues/668>.
-        #[command(parse_with = parser::custom_parse_function)]
-        TestPath(u8, String),
-
-        Help,
-    }
-
-    assert_eq!(
-        DefaultCommands::Start(10, "hello".to_string()),
-        DefaultCommands::parse("/start 10 hello", "").unwrap()
-    );
-    assert_eq!(
-        DefaultCommands::TestPath(10, "hello".to_string()),
-        DefaultCommands::parse("/testpath 10 hello", "").unwrap()
-    );
-}
-
-#[test]
-fn parse_named_fields() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    #[command(parse_with = "split")]
-    enum DefaultCommands {
-        Start { num: u8, data: String },
-        Help,
-    }
-
-    assert_eq!(
-        DefaultCommands::Start { num: 10, data: "hello".to_string() },
-        DefaultCommands::parse("/start 10 hello", "").unwrap()
-    );
-}
-
-#[test]
-fn descriptions_off() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    #[command(rename_rule = "lowercase")]
-    enum DefaultCommands {
-        #[command(description = "off")]
-        Start,
-        Help,
-    }
-
-    assert_eq!(DefaultCommands::descriptions().to_string(), "/help".to_owned());
-}
-
-#[test]
-fn rename_rules() {
-    #[derive(BotCommands, Debug, PartialEq)]
-    enum DefaultCommands {
-        #[command(rename_rule = "lowercase")]
-        AaaAaa,
-        #[command(rename_rule = "UPPERCASE")]
-        BbbBbb,
-        #[command(rename_rule = "PascalCase")]
-        CccCcc,
-        #[command(rename_rule = "camelCase")]
-        DddDdd,
-        #[command(rename_rule = "snake_case")]
-        EeeEee,
-        #[command(rename_rule = "SCREAMING_SNAKE_CASE")]
-        FffFff,
-        #[command(rename_rule = "kebab-case")]
-        GggGgg,
-        #[command(rename_rule = "SCREAMING-KEBAB-CASE")]
-        HhhHhh,
-        #[command(rename = "Bar")]
-        Foo,
-    }
-
-    assert_eq!(DefaultCommands::AaaAaa, DefaultCommands::parse("/aaaaaa", "").unwrap());
-    assert_eq!(DefaultCommands::BbbBbb, DefaultCommands::parse("/BBBBBB", "").unwrap());
-    assert_eq!(DefaultCommands::CccCcc, DefaultCommands::parse("/CccCcc", "").unwrap());
-    assert_eq!(DefaultCommands::DddDdd, DefaultCommands::parse("/dddDdd", "").unwrap());
-    assert_eq!(DefaultCommands::EeeEee, DefaultCommands::parse("/eee_eee", "").unwrap());
-    assert_eq!(DefaultCommands::FffFff, DefaultCommands::parse("/FFF_FFF", "").unwrap());
-    assert_eq!(DefaultCommands::GggGgg, DefaultCommands::parse("/ggg-ggg", "").unwrap());
-    assert_eq!(DefaultCommands::HhhHhh, DefaultCommands::parse("/HHH-HHH", "").unwrap());
-    assert_eq!(DefaultCommands::Foo, DefaultCommands::parse("/Bar", "").unwrap());
-
-    assert_eq!(
-        "/aaaaaa\n/BBBBBB\n/CccCcc\n/dddDdd\n/eee_eee\n/FFF_FFF\n/ggg-ggg\n/HHH-HHH\n/Bar",
-        DefaultCommands::descriptions().to_string()
-    );
-}

From 178a9bcc2f79b1efe8dc223c23a90b346917e4aa Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 20:00:06 +0400
Subject: [PATCH 752/755] =?UTF-8?q?CI=20attempt=20=E2=84=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml            | 2 +-
 crates/teloxide-core/src/codegen.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 053bf592..5c6a7fdb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
             toolchain: beta
             features: "--features full"
           - rust: nightly
-            toolchain: nightly-2022-09-01
+            toolchain: nightly-2022-09-23
             features: "--all-features"
           - rust: msrv
             toolchain: 1.64.0
diff --git a/crates/teloxide-core/src/codegen.rs b/crates/teloxide-core/src/codegen.rs
index 5a11f801..4c71c165 100644
--- a/crates/teloxide-core/src/codegen.rs
+++ b/crates/teloxide-core/src/codegen.rs
@@ -41,7 +41,7 @@ pub fn reformat(text: String) -> String {
 
     let sh = Shell::new().unwrap();
     ensure_rustfmt(&sh);
-    let rustfmt_toml = project_root().join("rustfmt.toml");
+    let rustfmt_toml = project_root().join("../../rustfmt.toml");
     let mut stdout = cmd!(
         sh,
         "rustup run {toolchain} rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"

From 405cf34f03139a4dd1a4c284eb9642f0c92dde20 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 20:19:49 +0400
Subject: [PATCH 753/755] fix readme test path

---
 crates/teloxide/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/teloxide/src/lib.rs b/crates/teloxide/src/lib.rs
index b7c6234b..afb01109 100644
--- a/crates/teloxide/src/lib.rs
+++ b/crates/teloxide/src/lib.rs
@@ -79,7 +79,7 @@ pub use dispatching::filter_command;
 pub use dptree::{self, case as handler};
 
 #[cfg(all(feature = "nightly", doctest))]
-#[cfg_attr(feature = "nightly", cfg_attr(feature = "nightly", doc = include_str!("../../README.md")))]
+#[cfg_attr(feature = "nightly", cfg_attr(feature = "nightly", doc = include_str!("../../../README.md")))]
 enum ReadmeDocTests {}
 
 use teloxide_core::requests::ResponseResult;

From d9bd9e131ff8ed1f11cb1702e88a87e5caace2e5 Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 21:17:01 +0400
Subject: [PATCH 754/755] fix clippy

---
 .../src/dispatching/dialogue/storage/rocksdb_storage.rs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs b/crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs
index d01d8fd9..151a9a29 100644
--- a/crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs
+++ b/crates/teloxide/src/dispatching/dialogue/storage/rocksdb_storage.rs
@@ -72,11 +72,11 @@ where
         Box::pin(async move {
             let key = chat_id.to_le_bytes();
 
-            if self.db.get(&key)?.is_none() {
+            if self.db.get(key)?.is_none() {
                 return Err(RocksDbStorageError::DialogueNotFound);
             }
 
-            self.db.delete(&key).unwrap();
+            self.db.delete(key).unwrap();
 
             Ok(())
         })
@@ -92,7 +92,7 @@ where
                 self.serializer.serialize(&dialogue).map_err(RocksDbStorageError::SerdeError)?;
 
             let key = chat_id.to_le_bytes();
-            self.db.put(&key, &d)?;
+            self.db.put(key, &d)?;
 
             Ok(())
         })
@@ -105,7 +105,7 @@ where
         Box::pin(async move {
             let key = chat_id.to_le_bytes();
             self.db
-                .get(&key)?
+                .get(key)?
                 .map(|d| self.serializer.deserialize(&d).map_err(RocksDbStorageError::SerdeError))
                 .transpose()
         })

From 9e5bb46bcc55c0c1feb7d8794380779a9ea9271f Mon Sep 17 00:00:00 2001
From: Maybe Waffle <waffle.lapkin@gmail.com>
Date: Mon, 7 Nov 2022 21:17:26 +0400
Subject: [PATCH 755/755] require features for rocksdb test

---
 crates/teloxide/Cargo.toml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/teloxide/Cargo.toml b/crates/teloxide/Cargo.toml
index 115d2efb..f7db26f8 100644
--- a/crates/teloxide/Cargo.toml
+++ b/crates/teloxide/Cargo.toml
@@ -131,6 +131,11 @@ name = "sqlite"
 path = "tests/sqlite.rs"
 required-features = ["sqlite-storage", "cbor-serializer", "bincode-serializer"]
 
+[[test]]
+name = "rocksdb"
+path = "tests/rocksdb.rs"
+required-features = ["rocksdb-storage", "cbor-serializer", "bincode-serializer"]
+
 [[example]]
 name = "dialogue"
 required-features = ["macros"]