OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-22 06:45:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace ApiError::NotFound with InvalidToken

Browse source
This commit is contained in:
Maybe Waffle 2024-01-21 20:27:25 +01:00
parent 5901a89667
commit 1233b913ab
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/teloxide-core/CHANGELOG.md
View file

@ -145,6 +145,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `can_edit_messages` - `can_edit_messages`
- `can_pin_messages` - `can_pin_messages`
- `can_manage_topics` - `can_manage_topics`
- `ApiError::NotFound` is replaced with `ApiError::InvalidToken` which correctly parses all currently known errors caused by invalid bot tokens ([#998][pr998])
[pr998]: https://github.com/teloxide/teloxide/pull/998
### Added ### Added

24
crates/teloxide-core/src/errors.rs
View file

@ -123,7 +123,7 @@ macro_rules! impl_api_error {
where where
E: ::serde::de::Error, E: ::serde::de::Error,
{ {
$(impl_api_error!(@de v, $var_name, $var_string $(, $var_parser)*);)* $(impl_api_error!(@de v, $var_name $( ($var_inner) )?, $var_string $(, $var_parser)*);)*
Err(E::unknown_variant(v, &[])) Err(E::unknown_variant(v, &[]))
} }
} }
@ -138,17 +138,22 @@ macro_rules! impl_api_error {
} }
}; };
}; };
(@de $value: ident, $variant: ident, $val: literal) => { (@de $value:ident, $variant:ident, $val:literal) => {
if $value == $val { if $value == $val {
return Ok(Self::Value::$variant) return Ok(Self::Value::$variant)
} }
}; };
(@de $value: ident, $variant: ident, $val: literal, $block: expr) => { (@de $value:ident, $variant:ident ($var_inner:ty), $val:literal, $block:expr) => {
match $block($value) { match $block($value) {
Some(data) => return Ok(Self::Value::$variant(data)), Some(data) => return Ok(Self::Value::$variant(data)),
_ => {} _ => {}
} }
}; };
(@de $value:ident, $variant:ident, $val:literal, $block:expr) => {
if $block($value) {
return Ok(Self::Value::$variant);
}
};
} }
impl_api_error! { impl_api_error! {
@ -159,9 +164,12 @@ impl_api_error! {
/// Occurs when the bot tries to send message to user who blocked the bot. /// Occurs when the bot tries to send message to user who blocked the bot.
BotBlocked = "Forbidden: bot was blocked by the user", BotBlocked = "Forbidden: bot was blocked by the user",
/// Occurs when the bot token is incorrect. /// Occurs when the bot token is invalid.
// FIXME: rename this to something akin "InvalidToken" // N.B. These errors are actually slightly different, "Unauthorized" is when the bot token
NotFound = "Unauthorized", // is formatted mostly right, but is incorrect, whereas "Not Found" is when the url is
// not handled by TBA at all. From user POV both of those are "token is invalid", but
// there might be some cases where this is not right...
InvalidToken = "Invalid bot token" with |text: &str| text == "Unauthorized" || text == "Not Found",
/// Occurs when bot tries to modify a message without modification content. /// Occurs when bot tries to modify a message without modification content.
/// ///
@ -804,7 +812,8 @@ mod tests {
let cases = &[ let cases = &[
("{\"data\": \"Forbidden: bot was blocked by the user\"}", ApiError::BotBlocked), ("{\"data\": \"Forbidden: bot was blocked by the user\"}", ApiError::BotBlocked),
("{\"data\": \"Unauthorized\"}", ApiError::NotFound), ("{\"data\": \"Unauthorized\"}", ApiError::InvalidToken),
("{\"data\": \"Not Found\"}", ApiError::InvalidToken),
( (
"{\"data\": \"Bad Request: message is not modified: specified new message content \ "{\"data\": \"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 \ and reply markup are exactly the same as a current content and reply markup of \
@ -1019,6 +1028,7 @@ mod tests {
ApiError::Unknown(_) => { ApiError::Unknown(_) => {
format!("Unknown error: \"{raw}\"") format!("Unknown error: \"{raw}\"")
} }
ApiError::InvalidToken => "Invalid bot token".to_owned(),
_ => raw, _ => raw,
}; };
assert_eq!(parsed.to_string(), expected_error_message); assert_eq!(parsed.to_string(), expected_error_message);