mirror of
https://github.com/supleed2/nanobot.git
synced 2024-12-22 22:25:51 +00:00
Enable clippy::pedantic
lint in code
Add `allow` for unreachable async functions Reduce unnecessary code in main function using 2 functions
This commit is contained in:
parent
497b4576bc
commit
4ddd0315f4
|
@ -2,6 +2,7 @@ use crate::{db, ACtx, Error};
|
||||||
use poise::serenity_prelude as serenity;
|
use poise::serenity_prelude as serenity;
|
||||||
|
|
||||||
/// Unreachable, used to create edit_member command folder
|
/// Unreachable, used to create edit_member command folder
|
||||||
|
#[allow(clippy::unused_async)]
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
slash_command,
|
slash_command,
|
||||||
subcommands(
|
subcommands(
|
||||||
|
|
|
@ -81,6 +81,7 @@ pub(crate) async fn get_all_members(ctx: ACtx<'_>) -> Result<(), Error> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Unreachable, used to create get_member command folder
|
/// Unreachable, used to create get_member command folder
|
||||||
|
#[allow(clippy::unused_async)]
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
slash_command,
|
slash_command,
|
||||||
subcommands(
|
subcommands(
|
||||||
|
|
|
@ -2,6 +2,7 @@ use crate::{db, ACtx, Error};
|
||||||
use poise::serenity_prelude as serenity;
|
use poise::serenity_prelude as serenity;
|
||||||
|
|
||||||
/// Unreachable, used to create whois command folder
|
/// Unreachable, used to create whois command folder
|
||||||
|
#[allow(clippy::unused_async)]
|
||||||
#[poise::command(
|
#[poise::command(
|
||||||
slash_command,
|
slash_command,
|
||||||
subcommands("whois_by_id", "whois_by_nickname", "whois_by_realname")
|
subcommands("whois_by_id", "whois_by_nickname", "whois_by_realname")
|
||||||
|
|
107
src/main.rs
107
src/main.rs
|
@ -1,3 +1,4 @@
|
||||||
|
#![warn(clippy::pedantic)]
|
||||||
use anyhow::Context as _;
|
use anyhow::Context as _;
|
||||||
use poise::serenity_prelude as serenity;
|
use poise::serenity_prelude as serenity;
|
||||||
|
|
||||||
|
@ -55,29 +56,7 @@ async fn poise(
|
||||||
#[shuttle_shared_db::Postgres] pool: sqlx::PgPool,
|
#[shuttle_shared_db::Postgres] pool: sqlx::PgPool,
|
||||||
) -> Result<service::NanoBot, shuttle_runtime::Error> {
|
) -> Result<service::NanoBot, shuttle_runtime::Error> {
|
||||||
// Set Up Tracing Subscriber
|
// Set Up Tracing Subscriber
|
||||||
use tracing_subscriber as ts;
|
init_tracing_subscriber();
|
||||||
use ts::prelude::*;
|
|
||||||
ts::registry()
|
|
||||||
.with(
|
|
||||||
ts::fmt::layer()
|
|
||||||
.without_time()
|
|
||||||
.with_filter(ts::EnvFilter::new(
|
|
||||||
"info,nano=info,shuttle=trace,serenity=off",
|
|
||||||
)),
|
|
||||||
)
|
|
||||||
.with(
|
|
||||||
ts::fmt::layer()
|
|
||||||
.without_time()
|
|
||||||
.fmt_fields(ts::fmt::format::debug_fn(|w, f, v| {
|
|
||||||
if f.name() == "message" {
|
|
||||||
write!(w, "{v:?}")
|
|
||||||
} else {
|
|
||||||
write!(w, "")
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
.with_filter(ts::EnvFilter::new("off,serenity=info")),
|
|
||||||
)
|
|
||||||
.init();
|
|
||||||
tracing::info!("Tracing Subscriber Set Up");
|
tracing::info!("Tracing Subscriber Set Up");
|
||||||
|
|
||||||
// Run SQLx Migrations
|
// Run SQLx Migrations
|
||||||
|
@ -144,32 +123,7 @@ async fn poise(
|
||||||
// Build Poise Instance
|
// Build Poise Instance
|
||||||
let discord = poise::Framework::builder()
|
let discord = poise::Framework::builder()
|
||||||
.options(poise::FrameworkOptions {
|
.options(poise::FrameworkOptions {
|
||||||
commands: vec![
|
commands: all_commands(),
|
||||||
cmds::cmds(),
|
|
||||||
cmds::setup(),
|
|
||||||
cmds::count_members(),
|
|
||||||
cmds::delete_member(),
|
|
||||||
cmds::get_all_members(),
|
|
||||||
cmds::get_member(),
|
|
||||||
cmds::add_member(),
|
|
||||||
cmds::insert_member_from_pending(),
|
|
||||||
cmds::insert_member_from_manual(),
|
|
||||||
cmds::edit_member(),
|
|
||||||
cmds::set_members_non_fresher(),
|
|
||||||
cmds::count_pending(),
|
|
||||||
cmds::delete_pending(),
|
|
||||||
cmds::get_all_pending(),
|
|
||||||
cmds::get_pending(),
|
|
||||||
cmds::add_pending(),
|
|
||||||
cmds::delete_all_pending(),
|
|
||||||
cmds::count_manual(),
|
|
||||||
cmds::delete_manual(),
|
|
||||||
cmds::get_all_manual(),
|
|
||||||
cmds::get_manual(),
|
|
||||||
cmds::add_manual(),
|
|
||||||
cmds::delete_all_manual(),
|
|
||||||
cmds::whois(),
|
|
||||||
],
|
|
||||||
event_handler: { |c, e, f, d| Box::pin(event_handler(c, e, f, d)) },
|
event_handler: { |c, e, f, d| Box::pin(event_handler(c, e, f, d)) },
|
||||||
..Default::default()
|
..Default::default()
|
||||||
})
|
})
|
||||||
|
@ -255,3 +209,58 @@ async fn event_handler(
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn init_tracing_subscriber() {
|
||||||
|
use tracing_subscriber as ts;
|
||||||
|
use ts::prelude::*;
|
||||||
|
ts::registry()
|
||||||
|
.with(
|
||||||
|
ts::fmt::layer()
|
||||||
|
.without_time()
|
||||||
|
.with_filter(ts::EnvFilter::new(
|
||||||
|
"info,nano=info,shuttle=trace,serenity=off",
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
.with(
|
||||||
|
ts::fmt::layer()
|
||||||
|
.without_time()
|
||||||
|
.fmt_fields(ts::fmt::format::debug_fn(|w, f, v| {
|
||||||
|
if f.name() == "message" {
|
||||||
|
write!(w, "{v:?}")
|
||||||
|
} else {
|
||||||
|
write!(w, "")
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
.with_filter(ts::EnvFilter::new("off,serenity=info")),
|
||||||
|
)
|
||||||
|
.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn all_commands() -> Vec<poise::Command<Data, Error>> {
|
||||||
|
vec![
|
||||||
|
cmds::cmds(),
|
||||||
|
cmds::setup(),
|
||||||
|
cmds::count_members(),
|
||||||
|
cmds::delete_member(),
|
||||||
|
cmds::get_all_members(),
|
||||||
|
cmds::get_member(),
|
||||||
|
cmds::add_member(),
|
||||||
|
cmds::insert_member_from_pending(),
|
||||||
|
cmds::insert_member_from_manual(),
|
||||||
|
cmds::edit_member(),
|
||||||
|
cmds::set_members_non_fresher(),
|
||||||
|
cmds::count_pending(),
|
||||||
|
cmds::delete_pending(),
|
||||||
|
cmds::get_all_pending(),
|
||||||
|
cmds::get_pending(),
|
||||||
|
cmds::add_pending(),
|
||||||
|
cmds::delete_all_pending(),
|
||||||
|
cmds::count_manual(),
|
||||||
|
cmds::delete_manual(),
|
||||||
|
cmds::get_all_manual(),
|
||||||
|
cmds::get_manual(),
|
||||||
|
cmds::add_manual(),
|
||||||
|
cmds::delete_all_manual(),
|
||||||
|
cmds::whois(),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue