src/assets/ban_command_help.html

@@ -1,8 +0,0 @@
-<code>/ban {ID | REPLY}</code>
-
-<b>Бан пользователя.</b>
-
-<b><em>1. ID | REPLY.</em></b> ID или ответ на сообщение пользователя.
-
-<b><u>Команда доступна только администраторам.</u></b>
-

src/assets/mod.rs

@@ -3,7 +3,6 @@ use std::include_str;
 pub mod files {
     use super::*;
 
-    pub const BAN_COMMAND_HELP: &str = include_str!("ban_command_help.html");
     pub const HELP_COMMAND_TEXT: &str = include_str!("help_command.html");
     pub const PRIVACY_COMMAND_TEXT: &str = include_str!("privacy_command.html");
     pub const MUTE_COMMAND_HELP: &str = include_str!("mute_command_help.html");

src/assets/privacy_command.html

@@ -1 +1 @@
-В боте <strong>Gluon v.0.1</strong> не предусмотрено хранение данных о пользователе.
+В боте <strong>Gluon v.0.1</strong> ни где не предусмотрено хранение данных о пользователе.

src/endpoints/commands/ban_command.rs

@@ -1,51 +0,0 @@
-use telers::{
-    event::{
-        EventReturn,
-        telegram::HandlerResult
-    },
-    filters::CommandObject,
-    types::Message,
-    Bot
-};
-
-use crate::{
-    assets::files::BAN_COMMAND_HELP, actions::ban::ban_member,
-    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
-        }
-    }
-};
-
-pub async fn ban(bot: Bot, message: Message, command: CommandObject) -> HandlerResult {
-    let args: Vec<&'static str> = cast_boxed(command.args);
-
-    let (chat_id, mut handler_entity): (i64, HandlerEntity) = get_chat_data(&bot, &message);
-
-    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, BAN_COMMAND_HELP).await?; 
-
-        return Ok(EventReturn::Cancel);
-    }
-
-    handler_entity
-        .message_sender_builder
-        .set_text("Нет ID или ответа на сообщение пользователя.");
-
-    ban_member(handler_entity, chat_id, target_user, 0).await?;
-
-    Ok(EventReturn::Finish) 
-}

src/endpoints/commands/info_commands.rs

@@ -1,19 +0,0 @@
-use telers::{
-    event::telegram::HandlerResult,
-    types::Message,
-    Bot,
-};
-
-use crate::{
-    utils::telegram::senders::send_html,
-    assets::files::{HELP_COMMAND_TEXT, PRIVACY_COMMAND_TEXT}
-};
-
-pub async fn help(bot: Bot, msg: Message) -> HandlerResult { 
-    send_html(bot, msg, HELP_COMMAND_TEXT).await
-}
-
-pub async fn privacy(bot: Bot, msg: Message) -> HandlerResult {
-    send_html(bot, msg, PRIVACY_COMMAND_TEXT).await 
-}
-

src/endpoints/commands/mute_command.rs

@@ -1,85 +0,0 @@
-use telers::{
-    event::{telegram::HandlerResult, EventReturn},
-    filters::CommandObject,
-    types::Message,
-    Bot,
-};
-
-use crate::{
-    assets::files::MUTE_COMMAND_HELP,
-    actions::mute::mute_member,
-    types::{
-        enums::{
-            target_user::TargetUser, 
-            time_metrics::TimeMetrics
-        },
-        structs::handler_entity::HandlerEntity,
-    },
-    utils::{
-        general::cast_boxed_array::cast_boxed, 
-        telegram::{
-            args_parsers::get_user, 
-            data_getters::get_chat_data,
-            senders::send_html
-        },
-    },
-};
-
-pub async fn mute(bot: Bot, message: Message, command: CommandObject) -> HandlerResult { 
-    let (chat_id, mut handler_entity): (i64, HandlerEntity) = get_chat_data(&bot, &message);
-
-    let args: Vec<&'static str> = cast_boxed(command.args);
-
-    let mut duration_argument_position = 0usize;
-
-    let target_user: TargetUser = get_user(
-        handler_entity.clone(), 
-        args.first().copied(),
-        &mut duration_argument_position,
-    );
-
-    if args.is_empty() && !target_user.exist(){
-        send_html(bot, message, MUTE_COMMAND_HELP).await?; 
-
-        return Ok(EventReturn::Cancel);
-    }
-
-    handler_entity
-        .message_sender_builder
-        .set_text("Нет ID или ответа на сообщение пользователя.");
-
-    match args.get(duration_argument_position).cloned() {
-        Some(duration_str) => {
-            let metric = args
-                .get(duration_argument_position + 1)
-                .cloned()
-                .unwrap_or("d");
-
-            if let Ok(duration) = duration_str.parse::<i64>() {
-                let mute_duration = TimeMetrics::from(metric, duration);
-
-                mute_member(handler_entity, chat_id, target_user, (mute_duration, 0)).await?;
-            } else {
-                handler_entity
-                    .message_sender_builder
-                    .build()
-                    .send(&handler_entity.bot_instance)
-                    .await?;
-
-                return Ok(EventReturn::Cancel);
-            }
-        }
-        None => {
-            handler_entity
-                .message_sender_builder
-                .text("Не указана длительность мута.")
-                .build()
-                .send(&handler_entity.bot_instance)
-                .await?;
-
-            return Ok(EventReturn::Cancel);
-        }
-    }
-
-    Ok(EventReturn::Finish)
-}

src/endpoints/commands/unmute_command.rs

@@ -1,53 +0,0 @@
-use telers::{
-    event::{telegram::HandlerResult, EventReturn},
-    filters::CommandObject,
-    types::Message,
-    Bot,
-};
-
-use crate::{
-    assets::files::UNMUTE_COMMAND_HELP,
-    actions::unmute::unmute_member,
-    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
-        },
-    },
-};
-
-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(
-        handler_entity.clone(), 
-        args.first().copied(),
-        &mut 0,
-    );
-
-    if args.is_empty() && !target_user.exist(){
-        send_html(bot, message, UNMUTE_COMMAND_HELP).await?; 
-
-        return Ok(EventReturn::Cancel);
-    }
-
-    handler_entity
-        .message_sender_builder
-        .set_text("Нет ID или ответа на сообщение пользователя.");
-
-    unmute_member(handler_entity, chat_id, target_user).await?;
-
-    Ok(EventReturn::Finish)
-}
-    

src/endpoints/mod.rs

@@ -1,2 +0,0 @@
-pub mod commands;
-pub mod dice;

src/handlers/actions/ban.rs

@@ -1,5 +1,6 @@
 use telers::{
-    event::{telegram::HandlerResult, EventReturn}, methods::BanChatMember, Bot
+    event::{telegram::HandlerResult, EventReturn},
+    Bot,
 };
 
 use tokio::time::{sleep, Duration as DurationSleep};
@@ -9,7 +10,7 @@ use crate::{
         enums::target_user::TargetUser,
         structs::handler_entity::{ExtractedEntityData, HandlerEntity},
     },
-    utils::telegram::try_do::try_restrict,
+    utils::telegram::{ban_member::ban_chat_member, try_do::try_restrict},
 };
 
 pub async fn ban_member(
@@ -20,13 +21,24 @@ pub async fn ban_member(
 ) -> HandlerResult {
     let (bot, message, mut sender_builder): ExtractedEntityData = handler_entity.extract();
 
+    let user_id: i64 = match user.get_id() {
+        Some(id) => id,
+        None => {
+            sender_builder
+                .text("Нет ID или ответа на сообщение пользователя.")
+                .reply_to(message.id())
+                .build()
+                .send(&bot)
+                .await
+                .unwrap();
+            return Ok(EventReturn::Cancel);
+        }
+    };
+
     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 callback = || async { ban_chat_member(&bot, user_id, chat_id).await };
     let demote_args: (&Bot, i64, i64) = (&bot, user_id, chat_id);
-
     sender_builder.set_text("Невозможно забанить пользователя.");
 
     if try_restrict(callback, demote_args, sender_builder.clone().build())

src/handlers/actions/mute.rs

@@ -12,8 +12,8 @@ use crate::{
         TimeValues,
     },
     utils::{
-        general::get_expiration_time::{get_expiration_time, ExtractedDuration},
-        telegram::{rights_control::restrict, try_do::try_restrict},
+        general::get_duration::{get_duration, ExtractedDuration},
+        telegram::{restrict::restrict, try_do::try_restrict},
     },
 };
 
@@ -29,7 +29,7 @@ pub async fn mute_member(
 
     sleep(Duration::from_millis(time.1)).await;
 
-    let (unmute_date, postfix, mute_duration): ExtractedDuration = get_expiration_time(time);
+    let (unmute_date, postfix, mute_duration): ExtractedDuration = get_duration(time);
     let demote_args: (&Bot, i64, i64) = (&bot, user_id, chat_id);
 
     let callback = || async { restrict(&bot, user_id, unmute_date, chat_id).await };

src/handlers/actions/unmute.rs

@@ -16,18 +16,7 @@ pub async fn unmute_member(
 ) -> HandlerResult {
     let (bot, message, sender_builder): ExtractedEntityData = handler_entity.extract();
 
-    let user_id: i64;
-
-    if let Some(id) = user.get_id() {
-        user_id = id;
-    } else {
-        sender_builder
-            .build()
-            .send(&bot)
-            .await?;
-
-        return Ok(EventReturn::Cancel);
-    }
+    let user_id: i64 = user.get_id().unwrap();
 
     let default_member_permissions = ChatPermissions::all()
         .can_change_info(false)
@@ -43,7 +32,6 @@ pub async fn unmute_member(
             .build()
             .send(&bot)
             .await?;
-
         Ok(EventReturn::Cancel)
     } else {
         let muted_user_name: String = user.get_user_name(&bot, &message).await.unwrap();
@@ -53,8 +41,8 @@ pub async fn unmute_member(
             .text(format!("С пользователя {muted_user_name} снят мут."))
             .build()
             .send(&bot)
-            .await?;
-
+            .await
+            .unwrap();
         Ok(EventReturn::Finish)
     }
 }

src/handlers/command_handlers/info_commands_template.rs

@@ -1,22 +1,19 @@
 use telers::{
-    event::{
-        telegram::HandlerResult, 
-        EventReturn
-    }, 
-    enums::ParseMode, 
+    enums::parse_mode::ParseMode,
+    event::{telegram::HandlerResult, EventReturn},
     types::Message,
-    Bot
+    Bot,
 };
 
 use crate::types::structs::message_sender::MessageSender;
 
-pub async fn send_html(bot: Bot, message: Message, info_text: &str) -> HandlerResult {
+pub async fn send_info(bot: Bot, message: Message, info_text: &'static str) -> HandlerResult {
     MessageSender::builder(message.chat().id())
         .text(info_text)
         .parse_mode(ParseMode::HTML)
         .build()
         .send(&bot)
-        .await?;
-
+        .await
+        .unwrap();
     Ok(EventReturn::Finish)
 }

src/handlers/command_handlers/mod.rs

@@ -1,4 +1,3 @@
-pub mod ban_command;
-pub mod info_commands;
+pub mod info_commands_template;
 pub mod mute_command;
 pub mod unmute_command;

src/handlers/command_handlers/mute_command.rs

@@ -0,0 +1,97 @@
+use telers::{
+    enums::ParseMode,
+    event::{telegram::HandlerResult, EventReturn},
+    filters::CommandObject,
+    types::Message,
+    Bot,
+};
+
+use crate::{
+    assets::files::MUTE_COMMAND_HELP,
+    handlers::actions::mute::mute_member,
+    types::{
+        enums::{target_user::TargetUser, time_metrics::TimeMetrics},
+        structs::{handler_entity::HandlerEntity, message_sender::MessageSender},
+    },
+    utils::general::parse_boxed_array::parse_boxed,
+};
+
+pub async fn mute(bot: Bot, message: Message, command: CommandObject) -> HandlerResult {
+    let args: Vec<&'static str> = parse_boxed(command.args);
+
+    let (message_id, chat_id): (i64, i64) = (message.id(), message.chat().id());
+    let sender = MessageSender::builder(chat_id).reply_to(message_id);
+    let mut handler_entity: HandlerEntity = HandlerEntity::new(bot, message, sender);
+
+    let mut duration_argument_position: usize = 0;
+
+    let target_user: TargetUser = match (
+        handler_entity.message_reciever.reply_to_message(),
+        args.first(),
+    ) {
+        (Some(msg), _) => TargetUser::CurrentMessage(msg.clone()),
+        (None, Some(raw_id)) => {
+            duration_argument_position += 1;
+            if let Ok(id) = raw_id.parse::<i64>() {
+                TargetUser::Id(id)
+            } else {
+                handler_entity
+                    .message_sender_builder
+                    .text("Нет ID или ответа на сообщение пользователя.")
+                    .build()
+                    .send(&handler_entity.bot_instance)
+                    .await?;
+
+                return Ok(EventReturn::Cancel);
+            }
+        }
+        (None, None) => {
+            handler_entity
+                .message_sender_builder
+                .text(MUTE_COMMAND_HELP)
+                .parse_mode(ParseMode::HTML)
+                .build()
+                .send(&handler_entity.bot_instance)
+                .await?;
+
+            return Ok(EventReturn::Cancel);
+        }
+    };
+
+    handler_entity
+        .message_sender_builder
+        .set_text("Не указана длительность мута.");
+
+    match args.get(duration_argument_position).cloned() {
+        Some(duration_str) => {
+            let metric = args
+                .get(duration_argument_position + 1)
+                .cloned()
+                .unwrap_or("d");
+
+            if let Ok(duration) = duration_str.parse::<i64>() {
+                let mute_duration = TimeMetrics::from(metric, duration);
+                mute_member(handler_entity, chat_id, target_user, (mute_duration, 0)).await?;
+            } else {
+                handler_entity
+                    .message_sender_builder
+                    .build()
+                    .send(&handler_entity.bot_instance)
+                    .await?;
+
+                return Ok(EventReturn::Cancel);
+            }
+        }
+        None => {
+            handler_entity
+                .message_sender_builder
+                .build()
+                .send(&handler_entity.bot_instance)
+                .await?;
+
+            return Ok(EventReturn::Cancel);
+        }
+    }
+
+    Ok(EventReturn::Finish)
+}

src/handlers/command_handlers/unmute_command.rs

@@ -0,0 +1,62 @@
+use telers::{
+    enums::ParseMode,
+    event::{telegram::HandlerResult, EventReturn},
+    filters::CommandObject,
+    types::Message,
+    Bot,
+};
+
+use crate::{
+    assets::files::UNMUTE_COMMAND_HELP,
+    handlers::actions::unmute::unmute_member,
+    types::{
+        enums::target_user::TargetUser,
+        structs::{handler_entity::HandlerEntity, message_sender::MessageSender},
+    },
+    utils::general::parse_boxed_array::parse_boxed,
+};
+
+pub async fn unmute(bot: Bot, message: Message, command: CommandObject) -> HandlerResult {
+    let args: Vec<&'static str> = parse_boxed(command.args);
+
+    let (message_id, chat_id): (i64, i64) = (message.id(), message.chat().id());
+    let sender = MessageSender::builder(chat_id).reply_to(message_id);
+    let mut handler_entity: HandlerEntity = HandlerEntity::new(bot, message, sender);
+
+    match args.first().cloned() {
+        Some(raw_id) => {
+            handler_entity
+                .message_sender_builder
+                .set_text("Нет ID или ответа на сообщение пользователя.");
+
+            if let Ok(parsed_id) = raw_id.parse::<i64>() {
+                let on_id: TargetUser = TargetUser::Id(parsed_id);
+                unmute_member(handler_entity, chat_id, on_id).await?;
+            } else {
+                handler_entity
+                    .message_sender_builder
+                    .build()
+                    .send(&handler_entity.bot_instance)
+                    .await
+                    .unwrap();
+            }
+        }
+        None => {
+            if handler_entity.message_reciever.reply_to_message().is_none() {
+                handler_entity
+                    .message_sender_builder
+                    .text(UNMUTE_COMMAND_HELP)
+                    .parse_mode(ParseMode::HTML)
+                    .build()
+                    .send(&handler_entity.bot_instance)
+                    .await
+                    .unwrap();
+            } else {
+                let on_reply = TargetUser::Reply(handler_entity.message_reciever.clone());
+                unmute_member(handler_entity, chat_id, on_reply).await?;
+            }
+        }
+    }
+
+    Ok(EventReturn::Finish)
+}

src/handlers/dice_handler/dice.rs

@@ -5,7 +5,7 @@ use telers::{
 };
 
 use crate::{
-    actions::{ban::ban_member, mute::mute_member},
+    handlers::actions::{ban::ban_member, mute::mute_member},
     types::{
         enums::{target_user::TargetUser, time_metrics::TimeMetrics},
         structs::{handler_entity::HandlerEntity, message_sender::MessageSender},
@@ -19,15 +19,22 @@ pub async fn dice_handler(bot: Bot, message: Message) -> HandlerResult {
     let (chat_id, dice): (i64, Dice) = (message.chat().id(), message.dice().unwrap().clone());
 
     let sender = MessageSender::builder(chat_id);
-    let mut handler_entity = HandlerEntity::new(bot, message, sender);
+    let handler_entity: HandlerEntity = HandlerEntity::new(bot, message, sender);
 
     let (mute_time, emoji): (TimeMetrics, &str) = (TimeMetrics::Days(dice.value), &dice.emoji);
 
-    let target = TargetUser::Reply(handler_entity.message_reciever.clone());
+    let target: TargetUser = TargetUser::Reply(handler_entity.message_reciever.clone());
 
+    if !target.exist() {
         handler_entity
             .message_sender_builder
-        .set_text("Нет ответа на сообщение пользователя.");
+            .text("Нет ответа на сообщение пользователя.")
+            .build()
+            .send(&handler_entity.bot_instance)
+            .await?;
+
+        return Ok(EventReturn::Cancel);
+    }
 
     match emoji {
         "🎲" => {
@@ -46,7 +53,14 @@ pub async fn dice_handler(bot: Bot, message: Message) -> HandlerResult {
                 .await?;
             }
         }
-        _ => ()
+        _ => {
+            handler_entity
+                .message_sender_builder
+                .text("Эмодзи не имеет привязанных действий.")
+                .build()
+                .send(&handler_entity.bot_instance)
+                .await?;
+        }
     }
 
     Ok(EventReturn::Finish)

src/handlers/mod.rs

@@ -0,0 +1,3 @@
+pub mod actions;
+pub mod command_handlers;
+pub mod dice_handler;

src/main.rs

@@ -4,10 +4,10 @@ use telers::{
     enums::ContentType,
     event::ToServiceProvider,
     filters::{content_type::ContentType as CT, Command},
+    types::Message,
     Bot, Dispatcher, Router,
 };
 
-mod actions;
 mod assets;
 mod middlewares;
 mod types;
@@ -15,15 +15,14 @@ mod utils;
 
 use middlewares::admin_check_middleware::AdminCheck;
 
-mod endpoints;
-use endpoints::{
-    commands::{
-        ban_command::ban,
-        info_commands::{help, privacy},
-        mute_command::mute,
-        unmute_command::unmute
+use assets::files::{HELP_COMMAND_TEXT, PRIVACY_COMMAND_TEXT};
+
+mod handlers;
+use handlers::{
+    command_handlers::{
+        info_commands_template::send_info, mute_command::mute, unmute_command::unmute,
     },
-    dice::dice::dice_handler,
+    dice_handler::dice::dice_handler,
 };
 
 #[cfg(debug_assertions)]
@@ -70,6 +69,12 @@ async fn main() {
             let mut admin_commands = Router::new("admin_commands");
             let mut default_commands = Router::new("default_commands");
 
+            let help =
+                |bot: Bot, msg: Message| async { send_info(bot, msg, HELP_COMMAND_TEXT).await };
+
+            let privacy =
+                |bot: Bot, msg: Message| async { send_info(bot, msg, PRIVACY_COMMAND_TEXT).await };
+
             default_commands
                 .message
                 .register(help)
@@ -90,11 +95,6 @@ async fn main() {
                 .register(mute)
                 .filter(Command::one("mute"));
 
-            admin_commands
-                .message
-                .register(ban)
-                .filter(Command::one("ban"));
-
             admin_commands
                 .message
                 .inner_middlewares

src/middlewares/admin_check_middleware.rs

@@ -9,7 +9,7 @@ use anyhow::Error as Reject;
 
 use crate::{
     types::structs::message_sender::MessageSender,
-    utils::telegram::{admin_check::is_admin, data_getters::get_all_admins},
+    utils::telegram::{admin_check::is_admin, get_all_admins::get_all_admins},
 };
 
 #[derive(Default)]

src/types/enums/target_user.rs

@@ -15,7 +15,6 @@ pub enum TargetUser {
 }
 
 impl TargetUser {
-    #[allow(dead_code)]
     pub fn exist(&self) -> bool {
         match self {
             Self::Id(_id) => true,
@@ -45,7 +44,6 @@ impl TargetUser {
             Self::None => None,
         }
     }
-
     pub async fn get_user_name(&self, bot: &Bot, msg: &Message) -> Option<String> {
         match self {
             Self::Id(id) => {

src/types/structs/handler_entity.rs

@@ -3,7 +3,6 @@ use telers::{types::Message, Bot};
 
 pub type ExtractedEntityData = (Bot, Message, MessageSenderBuilder);
 
-#[derive(Clone)]
 pub struct HandlerEntity {
     pub bot_instance: Bot,
     pub message_reciever: Message,

src/utils/general/cast_boxed_array.rs

@@ -1,11 +0,0 @@
-pub fn cast_box<'a>(boxed: Box<str>) -> &'a str {
-    unsafe { &*Box::into_raw(boxed) }
-}
-
-#[allow(clippy::boxed_local)]
-pub fn cast_boxed<'a>(boxed_array: Box<[Box<str>]>) -> Vec<&'a str> {
-    boxed_array
-        .iter()
-        .map(|arg| cast_box(arg.to_owned()))
-        .collect()
-}

src/utils/general/get_duration.rs

@@ -4,13 +4,13 @@ use crate::types::{
     structs::countable_time::CountableTime, traits::countable_interface::ICountable, TimeValues,
 };
 
-use super::expiration_date::expiration_date;
+use super::unrestrict_date::unrestrict_date;
 
 pub type ExtractedDuration = (NaiveDateTime, String, i64);
 
-pub fn get_expiration_time(time: TimeValues) -> ExtractedDuration {
+pub fn get_duration(time: TimeValues) -> ExtractedDuration {
     let time_duration = time.0.extract();
-    let unmute_date = expiration_date(time);
+    let unmute_date = unrestrict_date(time);
     let postfix = CountableTime::from_value(time_duration)
         .get_postfix(time.0)
         .unwrap();

src/utils/general/mod.rs

@@ -1,3 +1,3 @@
-pub mod expiration_date;
-pub mod get_expiration_time;
-pub mod cast_boxed_array;
+pub mod get_duration;
+pub mod parse_boxed_array;
+pub mod unrestrict_date;

src/utils/general/parse_boxed_array.rs

@@ -0,0 +1,11 @@
+pub fn parse_box<'a>(boxed: Box<str>) -> &'a str {
+    unsafe { &*Box::into_raw(boxed) }
+}
+
+#[allow(clippy::boxed_local)]
+pub fn parse_boxed<'a>(boxed_array: Box<[Box<str>]>) -> Vec<&'a str> {
+    boxed_array
+        .iter()
+        .map(|arg| parse_box(arg.to_owned()))
+        .collect()
+}

src/utils/general/unrestrict_date.rs

@@ -3,7 +3,7 @@ use chrono::{Duration, Local, NaiveDateTime};
 use crate::types::{enums::time_metrics::TimeMetrics, TimeValues};
 
 #[inline]
-pub fn expiration_date(duration: TimeValues) -> NaiveDateTime {
+pub fn unrestrict_date(duration: TimeValues) -> NaiveDateTime {
     let mute_duration = match duration.0 {
         TimeMetrics::Minutes(min) => Duration::minutes(min),
         TimeMetrics::Hours(hrs) => Duration::hours(hrs),

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 {
-    //fix: moderators with non full rights can use admin commands now.
     all_admin_members
         .iter()
         .any(|admin: &ChatMember| match admin {
@@ -10,7 +9,10 @@ pub fn is_admin(all_admin_members: &Vec<ChatMember>, user_id: i64) -> bool {
                     && admin.can_change_info
                     && admin.can_delete_messages
                     && admin.can_promote_members
+                    && admin.can_manage_chat
                     && admin.can_restrict_members
+                    && admin.can_invite_users
+                    && admin.can_manage_topics.unwrap()
             }
             ChatMember::Owner(owner) => owner.user.id == user_id,
             _ => false,

src/utils/telegram/args_parsers.rs

@@ -1,28 +0,0 @@
-use crate::types::{
-    enums::target_user::TargetUser, 
-    structs::handler_entity::HandlerEntity
-};
-
-pub fn get_user(
-    handler_entity: HandlerEntity, 
-    arg: Option<&str>, 
-    arg_pos: &mut usize, 
-) -> TargetUser {
-    match (
-        handler_entity.message_reciever.reply_to_message(),
-        arg,
-    ) {
-        (Some(msg), _) => TargetUser::CurrentMessage(msg.clone()),
-        (None, Some(raw_id)) => {
-            *arg_pos += 1;
-            if let Ok(id) = raw_id.parse::<i64>() {
-                TargetUser::Id(id)
-            } else {
-                TargetUser::None
-}
-        }
-        (None, None) => {
-            TargetUser::None
-        }
-    }
-}

src/utils/telegram/ban_member.rs

@@ -0,0 +1,6 @@
+use telers::{errors::session::ErrorKind, methods::BanChatMember, Bot};
+
+#[inline]
+pub async fn ban_chat_member(bot: &Bot, chat_id: i64, user_id: i64) -> Result<bool, ErrorKind> {
+    bot.send(BanChatMember::new(chat_id, user_id)).await
+}

src/utils/telegram/data_getters.rs

@@ -1,22 +0,0 @@
-use telers::{
-    methods::GetChatAdministrators, 
-    types::{ChatMember, Message}, 
-    Bot, 
-    errors::SessionErrorKind
-};
-
-use crate::types::structs::{handler_entity::HandlerEntity, message_sender::MessageSender};
-
-pub fn get_chat_data(bot: &Bot, message: &Message) -> (i64, HandlerEntity) {
-    let (message_id, chat_id): (i64, i64) = (message.id(), message.chat().id());
-    let sender = MessageSender::builder(chat_id).reply_to(message_id);
-    let handler_entity: HandlerEntity = HandlerEntity::new(bot.clone(), message.clone(), sender);
-
-    (chat_id, handler_entity)
-}
-
-#[inline]
-pub async fn get_all_admins(bot: &Bot, chat_id: i64) -> Result<Vec<ChatMember>, SessionErrorKind> {
-    bot.send(GetChatAdministrators::new(chat_id))
-        .await
-}

src/utils/telegram/demote.rs

@@ -0,0 +1,21 @@
+use telers::{errors::session::ErrorKind, methods::promote_chat_member::PromoteChatMember, Bot};
+
+#[inline]
+pub async fn demote_user(bot: &Bot, user_id: i64, chat_id: i64) -> Result<bool, ErrorKind> {
+    bot.send(
+        PromoteChatMember::new(chat_id, user_id)
+            .can_manage_topics(false)
+            .can_pin_messages(false)
+            .can_invite_users(false)
+            .can_change_info(false)
+            .can_promote_members(false)
+            .can_restrict_members(false)
+            .can_manage_voice_chats(false)
+            .can_delete_messages(false)
+            .can_edit_messages(false)
+            .can_post_messages(false)
+            .can_manage_chat(false)
+            .is_anonymous(false),
+    )
+    .await
+}

src/utils/telegram/get_all_admins.rs

@@ -0,0 +1,7 @@
+use telers::{errors::SessionErrorKind, methods::get_chat_administrators, types::ChatMember, Bot};
+
+#[inline]
+pub async fn get_all_admins(bot: &Bot, chat_id: i64) -> Result<Vec<ChatMember>, SessionErrorKind> {
+    bot.send(get_chat_administrators::GetChatAdministrators::new(chat_id))
+        .await
+}

src/utils/telegram/mod.rs

@@ -1,6 +1,6 @@
 pub mod admin_check;
-pub mod args_parsers;
-pub mod data_getters;
-pub mod rights_control;
-pub mod senders;
+pub mod ban_member;
+pub mod demote;
+pub mod get_all_admins;
+pub mod restrict;
 pub mod try_do;

src/utils/telegram/restrict.rs

@@ -31,23 +31,3 @@ pub async fn restrict(
     )
     .await
 }
-
-#[inline]
-pub async fn demote_user(bot: &Bot, user_id: i64, chat_id: i64) -> Result<bool, ErrorKind> {
-    bot.send(
-        PromoteChatMember::new(chat_id, user_id)
-            .can_manage_topics(false)
-            .can_pin_messages(false)
-            .can_invite_users(false)
-            .can_change_info(false)
-            .can_promote_members(false)
-            .can_restrict_members(false)
-            .can_manage_voice_chats(false)
-            .can_delete_messages(false)
-            .can_edit_messages(false)
-            .can_post_messages(false)
-            .can_manage_chat(false)
-            .is_anonymous(false),
-    )
-    .await
-}

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