uhm...

dice.rs -> dice_handler.rs

src/actions/ban.rs

@@ -1,5 +1,7 @@
 use telers::{
-    event::{telegram::HandlerResult, EventReturn}, methods::BanChatMember, Bot
+    event::{telegram::HandlerResult, EventReturn},
+    methods::BanChatMember,
+    Bot,
 };
 
 use tokio::time::{sleep, Duration as DurationSleep};
@@ -21,10 +23,11 @@ pub async fn ban_member(
     let (bot, message, mut sender_builder): ExtractedEntityData = handler_entity.extract();
 
     sleep(DurationSleep::from_millis(delay)).await;
-    
+
     let user_id: i64 = user.get_id().unwrap();
 
     let callback = || async { bot.send(BanChatMember::new(chat_id, user_id)).await };
+
     let demote_args: (&Bot, i64, i64) = (&bot, user_id, chat_id);
 
     sender_builder.set_text("Невозможно забанить пользователя.");

src/endpoints/commands/info_commands.rs

@@ -1,19 +1,16 @@
-use telers::{
+use telers::{event::telegram::HandlerResult, types::Message, Bot};
-    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
 }
-

src/endpoints/commands/unmute_command.rs

@@ -6,38 +6,24 @@ 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, 
+        general::cast_boxed_array::cast_boxed,
-        telegram::{
+        telegram::{args_parsers::get_user, data_getters::get_chat_data, senders::send_html},
-            args_parsers::get_user,
-            data_getters::get_chat_data, 
-            senders::send_html
-        },
     },
 };
 
-pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> HandlerResult { 
+pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> HandlerResult {
-    if command.args.len() == 0 {
-        send_html(bot, message, UNMUTE_COMMAND_HELP).await?; 
-
-        return Ok(EventReturn::Cancel);
-    }
-    
     let (chat_id, mut handler_entity): (i64, HandlerEntity) = get_chat_data(&bot, &message);
 
     let args: Vec<&'static str> = cast_boxed(command.args);
 
-    let target_user: TargetUser = get_user(
+    let target_user: TargetUser = get_user(handler_entity.clone(), args.first().copied(), &mut 0);
-        handler_entity.clone(), 
-        args.first().copied(),
-        &mut 0,
-    );
 
-    if args.is_empty() && !target_user.exist(){
+    if args.is_empty() && !target_user.exist() {
-        send_html(bot, message, UNMUTE_COMMAND_HELP).await?; 
+        send_html(bot, message, UNMUTE_COMMAND_HELP).await?;
 
         return Ok(EventReturn::Cancel);
     }
@@ -50,4 +36,3 @@ pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> Handl
 
     Ok(EventReturn::Finish)
 }
-    

src/endpoints/dice/mod.rs

@@ -1 +1 @@
-pub mod dice;
+pub mod dice_handler;

src/main.rs

@@ -21,9 +21,9 @@ use endpoints::{
         ban_command::ban,
         info_commands::{help, privacy},
         mute_command::mute,
-        unmute_command::unmute
+        unmute_command::unmute,
     },
-    dice::dice::dice_handler,
+    dice::dice_handler::dice_handler,
 };
 
 #[cfg(debug_assertions)]
@@ -46,6 +46,16 @@ fn logs() {
     );
 }
 
+macro_rules! append_command {
+    ($branch:expr, $($command:expr), *) => {
+        $($branch
+            .message
+            .register($command)
+            .filter(Command::one(stringify!($command)));
+        )*
+    }
+}
+
 #[tokio::main]
 async fn main() {
     logs();
@@ -70,30 +80,8 @@ async fn main() {
             let mut admin_commands = Router::new("admin_commands");
             let mut default_commands = Router::new("default_commands");
 
-            default_commands
+            append_command!(default_commands, help, privacy);
-                .message
+            append_command!(admin_commands, unmute, mute, ban);
-                .register(help)
-                .filter(Command::one("help"));
-
-            default_commands
-                .message
-                .register(privacy)
-                .filter(Command::one("privacy"));
-
-            admin_commands
-                .message
-                .register(unmute)
-                .filter(Command::one("unmute"));
-
-            admin_commands
-                .message
-                .register(mute)
-                .filter(Command::one("mute"));
-
-            admin_commands
-                .message
-                .register(ban)
-                .filter(Command::one("ban"));
 
             admin_commands
                 .message
@@ -115,7 +103,7 @@ async fn main() {
                 .unwrap();
         }
         Err(error) => {
-            println!("Error text: {:?}", error);
+            eprintln!("Error text: {:?}", error);
         }
     }
 }

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<String>, impl Into<String>, impl Into<String>) {
         match self {
             Self::Minutes(_) => ("минута", "минуты", "минут"),

src/utils/telegram/admin_check.rs

@@ -1,7 +1,6 @@
 use telers::types::chat_member::ChatMember;
 
-pub fn is_admin(all_admin_members: &Vec<ChatMember>, user_id: i64) -> bool {
+pub fn is_admin(all_admin_members: &[ChatMember], user_id: i64) -> bool {
-    //fix: moderators with non full rights can use admin commands now.
     all_admin_members
         .iter()
         .any(|admin: &ChatMember| match admin {

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 = "Команда не может быть выполнена: \
     не удалось удалить административные привилегии пользователя.";