From 311187b6eb18a5ce1706a67e9abeecbda03be186 Mon Sep 17 00:00:00 2001
From: doryan <sagiev2015@yandex.ru>
Date: Tue, 9 Jul 2024 23:05:29 +0400
Subject: [PATCH] refactor(bot): dice and command endpoints; feat(ban): add ban
endpoint; and etc.
---
src/handlers/actions/ban.rs | 61 ---------------------
src/handlers/actions/mod.rs | 3 -
src/handlers/actions/mute.rs | 58 --------------------
src/handlers/actions/unmute.rs | 48 ----------------
src/handlers/dice_handler/dice.rs | 67 -----------------------
src/handlers/dice_handler/mod.rs | 1 -
src/handlers/mod.rs | 3 -
src/main.rs | 28 +++++-----
src/middlewares/admin_check_middleware.rs | 2 +-
9 files changed, 15 insertions(+), 256 deletions(-)
delete mode 100644 src/handlers/actions/ban.rs
delete mode 100644 src/handlers/actions/mod.rs
delete mode 100644 src/handlers/actions/mute.rs
delete mode 100644 src/handlers/actions/unmute.rs
delete mode 100644 src/handlers/dice_handler/dice.rs
delete mode 100644 src/handlers/dice_handler/mod.rs
delete mode 100644 src/handlers/mod.rs
diff --git a/src/handlers/actions/ban.rs b/src/handlers/actions/ban.rs
deleted file mode 100644
index 1d8506e..0000000
--- a/src/handlers/actions/ban.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-use telers::{
- event::{telegram::HandlerResult, EventReturn},
- Bot,
-};
-
-use tokio::time::{sleep, Duration as DurationSleep};
-
-use crate::{
- types::{
- enums::target_user::TargetUser,
- structs::handler_entity::{ExtractedEntityData, HandlerEntity},
- },
- utils::telegram::{ban_member::ban_chat_member, try_do::try_restrict},
-};
-
-pub async fn ban_member(
- handler_entity: HandlerEntity,
- chat_id: i64,
- user: TargetUser,
- delay: u64,
-) -> 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 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())
- .await
- .is_err()
- {
- Ok(EventReturn::Cancel)
- } else {
- let banned_user_name: String = user.get_user_name(&bot, &message).await.unwrap();
-
- sender_builder
- .reply_to(message.id())
- .text(format!("Пользователь {banned_user_name} забанен."))
- .build()
- .send(&bot)
- .await?;
-
- Ok(EventReturn::Finish)
- }
-}
diff --git a/src/handlers/actions/mod.rs b/src/handlers/actions/mod.rs
deleted file mode 100644
index 36f60f9..0000000
--- a/src/handlers/actions/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod ban;
-pub mod mute;
-pub mod unmute;
diff --git a/src/handlers/actions/mute.rs b/src/handlers/actions/mute.rs
deleted file mode 100644
index 9680adb..0000000
--- a/src/handlers/actions/mute.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use telers::{
- event::{telegram::HandlerResult, EventReturn},
- Bot,
-};
-
-use tokio::time::{sleep, Duration};
-
-use crate::{
- types::{
- enums::target_user::TargetUser,
- structs::handler_entity::{ExtractedEntityData, HandlerEntity},
- TimeValues,
- },
- utils::{
- general::get_duration::{get_duration, ExtractedDuration},
- telegram::{restrict::restrict, try_do::try_restrict},
- },
-};
-
-pub async fn mute_member(
- handler_entity: HandlerEntity,
- chat_id: i64,
- user: TargetUser,
- time: TimeValues,
-) -> HandlerResult {
- let (bot, message, mut sender_builder): ExtractedEntityData = handler_entity.extract();
-
- let user_id: i64 = user.get_id().unwrap();
-
- sleep(Duration::from_millis(time.1)).await;
-
- 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 };
-
- sender_builder.set_text("Невозможно выдать мут.");
-
- if try_restrict(callback, demote_args, sender_builder.clone().build())
- .await
- .is_err()
- {
- Ok(EventReturn::Cancel)
- } else {
- let muted_user_name: String = user.get_user_name(&bot, &message).await.unwrap();
-
- sender_builder
- .reply_to(message.id())
- .text(format!(
- "Пользователю {muted_user_name} выдан мут на {mute_duration} {postfix}."
- ))
- .build()
- .send(&bot)
- .await?;
-
- Ok(EventReturn::Finish)
- }
-}
diff --git a/src/handlers/actions/unmute.rs b/src/handlers/actions/unmute.rs
deleted file mode 100644
index 13882cc..0000000
--- a/src/handlers/actions/unmute.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use telers::{
- event::{telegram::HandlerResult, EventReturn},
- methods::RestrictChatMember,
- types::ChatPermissions,
-};
-
-use crate::types::{
- enums::target_user::TargetUser,
- structs::handler_entity::{ExtractedEntityData, HandlerEntity},
-};
-
-pub async fn unmute_member(
- handler_entity: HandlerEntity,
- chat_id: i64,
- user: TargetUser,
-) -> HandlerResult {
- let (bot, message, sender_builder): ExtractedEntityData = handler_entity.extract();
-
- let user_id: i64 = user.get_id().unwrap();
-
- let default_member_permissions = ChatPermissions::all()
- .can_change_info(false)
- .can_manage_topics(false)
- .can_invite_users(false)
- .can_pin_messages(false);
-
- let bot_action = RestrictChatMember::new(chat_id, user_id, default_member_permissions);
-
- if let Err(error) = bot.send(bot_action).await {
- sender_builder
- .text(format!("Невозможно снять мут с пользователя: {error:?}."))
- .build()
- .send(&bot)
- .await?;
- Ok(EventReturn::Cancel)
- } else {
- let muted_user_name: String = user.get_user_name(&bot, &message).await.unwrap();
-
- sender_builder
- .reply_to(message.id())
- .text(format!("С пользователя {muted_user_name} снят мут."))
- .build()
- .send(&bot)
- .await
- .unwrap();
- Ok(EventReturn::Finish)
- }
-}
diff --git a/src/handlers/dice_handler/dice.rs b/src/handlers/dice_handler/dice.rs
deleted file mode 100644
index ade1c9c..0000000
--- a/src/handlers/dice_handler/dice.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use telers::{
- event::{telegram::HandlerResult, EventReturn},
- types::{Dice, Message},
- Bot,
-};
-
-use crate::{
- handlers::actions::{ban::ban_member, mute::mute_member},
- types::{
- enums::{target_user::TargetUser, time_metrics::TimeMetrics},
- structs::{handler_entity::HandlerEntity, message_sender::MessageSender},
- },
-};
-
-const DICE_DELAY_MS: u64 = 4000u64;
-const CASINO_DELAY_MS: u64 = 1500u64;
-
-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 handler_entity: HandlerEntity = HandlerEntity::new(bot, message, sender);
-
- let (mute_time, emoji): (TimeMetrics, &str) = (TimeMetrics::Days(dice.value), &dice.emoji);
-
- let target: TargetUser = TargetUser::Reply(handler_entity.message_reciever.clone());
-
- if !target.exist() {
- handler_entity
- .message_sender_builder
- .text("Нет ответа на сообщение пользователя.")
- .build()
- .send(&handler_entity.bot_instance)
- .await?;
-
- return Ok(EventReturn::Cancel);
- }
-
- match emoji {
- "🎲" => {
- mute_member(handler_entity, chat_id, target, (mute_time, DICE_DELAY_MS)).await?;
- }
- "🎰" => {
- if dice.value == 64 {
- ban_member(handler_entity, chat_id, target, CASINO_DELAY_MS).await?;
- } else {
- mute_member(
- handler_entity,
- chat_id,
- target,
- (mute_time, CASINO_DELAY_MS),
- )
- .await?;
- }
- }
- _ => {
- handler_entity
- .message_sender_builder
- .text("Эмодзи не имеет привязанных действий.")
- .build()
- .send(&handler_entity.bot_instance)
- .await?;
- }
- }
-
- Ok(EventReturn::Finish)
-}
diff --git a/src/handlers/dice_handler/mod.rs b/src/handlers/dice_handler/mod.rs
deleted file mode 100644
index 99ad3e8..0000000
--- a/src/handlers/dice_handler/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod dice;
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
deleted file mode 100644
index 75beadb..0000000
--- a/src/handlers/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod actions;
-pub mod command_handlers;
-pub mod dice_handler;
diff --git a/src/main.rs b/src/main.rs
index 8ad8e64..4ec7a16 100644
--- a/src/main.rs
+++ b/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,14 +15,15 @@ mod utils;
use middlewares::admin_check_middleware::AdminCheck;
-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,
+mod endpoints;
+use endpoints::{
+ commands::{
+ ban_command::ban,
+ info_commands::{help, privacy},
+ mute_command::mute,
+ unmute_command::unmute
},
- dice_handler::dice::dice_handler,
+ dice::dice::dice_handler,
};
#[cfg(debug_assertions)]
@@ -69,12 +70,6 @@ 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)
@@ -95,6 +90,11 @@ async fn main() {
.register(mute)
.filter(Command::one("mute"));
+ admin_commands
+ .message
+ .register(ban)
+ .filter(Command::one("ban"));
+
admin_commands
.message
.inner_middlewares
diff --git a/src/middlewares/admin_check_middleware.rs b/src/middlewares/admin_check_middleware.rs
index 5a00a01..eac1e25 100644
--- a/src/middlewares/admin_check_middleware.rs
+++ b/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, get_all_admins::get_all_admins},
+ utils::telegram::{admin_check::is_admin, data_getters::get_all_admins},
};
#[derive(Default)]