From 352514d2b0c9ff9054992de83834a89cd6721bb4 Mon Sep 17 00:00:00 2001 From: doryan Date: Wed, 21 Aug 2024 20:56:11 +0400 Subject: [PATCH] refactor: format code --- src/endpoints/commands/info_commands.rs | 15 ++++++--------- src/endpoints/commands/unmute_command.rs | 21 ++++++--------------- src/types/enums/time_metrics.rs | 2 ++ src/utils/telegram/try_do.rs | 2 +- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/endpoints/commands/info_commands.rs b/src/endpoints/commands/info_commands.rs index 473c0a1..509d6ae 100644 --- a/src/endpoints/commands/info_commands.rs +++ b/src/endpoints/commands/info_commands.rs @@ -1,19 +1,16 @@ -use telers::{ - event::telegram::HandlerResult, - types::Message, - Bot, -}; +use telers::{event::telegram::HandlerResult, types::Message, Bot}; use crate::{ + assets::files::{HELP_COMMAND_TEXT, PRIVACY_COMMAND_TEXT}, utils::telegram::senders::send_html, - assets::files::{HELP_COMMAND_TEXT, PRIVACY_COMMAND_TEXT} }; -pub async fn help(bot: Bot, msg: Message) -> HandlerResult { +#[inline] +pub async fn help(bot: Bot, msg: Message) -> HandlerResult { send_html(bot, msg, HELP_COMMAND_TEXT).await } +#[inline] pub async fn privacy(bot: Bot, msg: Message) -> HandlerResult { - send_html(bot, msg, PRIVACY_COMMAND_TEXT).await + send_html(bot, msg, PRIVACY_COMMAND_TEXT).await } - diff --git a/src/endpoints/commands/unmute_command.rs b/src/endpoints/commands/unmute_command.rs index 18bfacd..d3de11e 100644 --- a/src/endpoints/commands/unmute_command.rs +++ b/src/endpoints/commands/unmute_command.rs @@ -6,16 +6,12 @@ use telers::{ }; use crate::{ - assets::files::UNMUTE_COMMAND_HELP, actions::unmute::unmute_member, + assets::files::UNMUTE_COMMAND_HELP, types::{enums::target_user::TargetUser, structs::handler_entity::HandlerEntity}, utils::{ - general::cast_boxed_array::cast_boxed, - telegram::{ - args_parsers::get_user, - data_getters::get_chat_data, - senders::send_html - }, + general::cast_boxed_array::cast_boxed, + telegram::{args_parsers::get_user, data_getters::get_chat_data, senders::send_html}, }, }; @@ -24,14 +20,10 @@ pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> Handl let args: Vec<&'static str> = cast_boxed(command.args); - let target_user: TargetUser = get_user( - handler_entity.clone(), - args.first().copied(), - &mut 0, - ); + let target_user: TargetUser = get_user(handler_entity.clone(), args.first().copied(), &mut 0); - if args.is_empty() && !target_user.exist(){ - send_html(bot, message, UNMUTE_COMMAND_HELP).await?; + if args.is_empty() && !target_user.exist() { + send_html(bot, message, UNMUTE_COMMAND_HELP).await?; return Ok(EventReturn::Cancel); } @@ -44,4 +36,3 @@ pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> Handl Ok(EventReturn::Finish) } - diff --git a/src/types/enums/time_metrics.rs b/src/types/enums/time_metrics.rs index e03509f..3d3641f 100644 --- a/src/types/enums/time_metrics.rs +++ b/src/types/enums/time_metrics.rs @@ -27,6 +27,7 @@ impl TimeMetrics { _ => Self::Days(duration), } } + pub fn extract(self) -> i64 { match self { Self::Minutes(min) => min, @@ -36,6 +37,7 @@ impl TimeMetrics { Self::Mounths(mon) => mon, } } + pub fn get_word_declensions(self) -> (impl Into, impl Into, impl Into) { match self { Self::Minutes(_) => ("минута", "минуты", "минут"), diff --git a/src/utils/telegram/try_do.rs b/src/utils/telegram/try_do.rs index c1ebc50..b8f44a0 100644 --- a/src/utils/telegram/try_do.rs +++ b/src/utils/telegram/try_do.rs @@ -3,7 +3,7 @@ use telers::{errors::SessionErrorKind as ErrorKind, event::EventReturn, types::C use crate::types::structs::message_sender::MessageSender; use std::future::Future; -use super::{admin_check::is_admin, rights_control::demote_user, data_getters::get_all_admins}; +use super::{admin_check::is_admin, data_getters::get_all_admins, rights_control::demote_user}; const DEMOTE_FAILURE_MESSAGE: &str = "Команда не может быть выполнена: \ не удалось удалить административные привилегии пользователя.";