OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 14:35:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix a few things and format the code

Browse source
This commit is contained in:
Temirkhan Myrzamadi 2019-09-03 13:04:07 +06:00
parent 47d56c7ddd
commit 23b94bab01
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/requests/helpers.rs
View file

@ -9,6 +9,11 @@ where
{ {
value.map_or_else( value.map_or_else(
|| form, || form,
|value| form.text(name.to_owned(), serde_json::to_string(value).expect("Failed to serialize a value to JSON")), |value| {
form.text(
name.to_owned(),
serde_json::to_string(value).expect("serde_json::to_string failed"),
)
},
) )
} }

18
src/core/requests/send_message.rs
View file

@ -32,18 +32,24 @@ impl Request for SendMessage {
} }
fn params(self) -> Option<Form> { fn params(self) -> Option<Form> {
let params = Form::new() let params = Form::new()
.text("chat_id", format!("{}", self.chat_id)) .text("chat_id", serde_json::to_string(&self.chat_id).unwrap())
.text("text", self.text); .text("text", self.text);
let params = helpers::add_to_form_if_some(params, "parse_mode",self.parse_mode.as_ref()); let params = helpers::add_to_form_if_some(params, "parse_mode", self.parse_mode.as_ref());
let params = helpers::add_to_form_if_some( let params = helpers::add_to_form_if_some(
params, params,
"disable_web_page_preview", "disable_web_page_preview",
self.disable_web_page_preview.as_ref(), self.disable_web_page_preview.as_ref(),
); );
let params = let params = helpers::add_to_form_if_some(
helpers::add_to_form_if_some(params, "disable_notification", self.disable_notification.as_ref()); params,
let params = "disable_notification",
helpers::add_to_form_if_some(params, "reply_to_message_id", self.reply_to_message_id.as_ref()); self.disable_notification.as_ref(),
);
let params = helpers::add_to_form_if_some(
params,
"reply_to_message_id",
self.reply_to_message_id.as_ref(),
);
// TODO: // TODO:
// helpers::add_to_form_if_some( // helpers::add_to_form_if_some(