Skip to content

feat: explicitely warn on unauthorized command usages #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SidonieBouthors merged 1 commit into from
Sep 19, 2025
Merged

feat: explicitely warn on unauthorized command usages #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ fn require_authorization() -> Endpoint<'static, DependencyMap, HandlerResult, Dp
};

if !authorized {
log::warn!("Chat {} tried to use the commmand {}", msg.chat.id, command.shortand())
log::warn!("Unauthorized Chat {} tried to use the commmand {}", msg.chat.id, command.shortand())
}

authorized
Expand All @@ -91,20 +91,32 @@ fn require_authorization() -> Endpoint<'static, DependencyMap, HandlerResult, Dp
///
/// Required dependencies: `teloxide_core::types::message::Message`, `sqlx_sqlite::SqlitePool`
fn require_admin() -> Endpoint<'static, DependencyMap, HandlerResult, DpHandlerDescription> {
dptree::entry().filter_async(|msg: Message, db: Arc<SqlitePool>| async move {
let Some(user) = msg.from else {
return false;
};

let id = user.id.to_string();
sqlx::query!(
"SELECT COUNT(*) AS is_admin FROM admins WHERE telegram_id = $1",
id
)
.fetch_one(db.as_ref())
.await
.is_ok_and(|r| r.is_admin > 0)
})
dptree::entry().filter_async(
|command: Command, msg: Message, db: Arc<SqlitePool>| async move {
let Some(user) = msg.from else {
return false;
};

let id = user.id.to_string();
let is_admin = sqlx::query!(
"SELECT COUNT(*) AS is_admin FROM admins WHERE telegram_id = $1",
id
)
.fetch_one(db.as_ref())
.await
.is_ok_and(|r| r.is_admin > 0);

if !is_admin {
log::warn!(
"Non-admin User {} tried to use the admin command {}",
id,
command.shortand()
);
}

is_admin
},
)
}

// --------------------------- AVAILABLE COMMANDS -----------------------------
Expand Down