supleed2/nanobot
1
0
Fork 0
mirror of https://github.com/supleed2/nanobot.git synced 2024-12-22 14:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cmds logs to print name rather than ping

Browse source
This commit is contained in:
Aadi Desai 2023-09-24 16:17:23 +01:00
parent ff654533e7
commit 8ef1e876d3
Signed by: supleed2
SSH key fingerprint: SHA256:CkbNRs0yVzXEiUp2zd0PSxsfRUMFF9bLlKXtE1xEbKM
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/cmds.rs
View file

@ -5,7 +5,7 @@ use poise::Modal;
/// Buttons to (de-)register application commands globally or by guild /// Buttons to (de-)register application commands globally or by guild
#[poise::command(prefix_command, owners_only)] #[poise::command(prefix_command, owners_only)]
pub(crate) async fn cmds(ctx: poise::Context<'_, Data, Error>) -> Result<(), Error> { pub(crate) async fn cmds(ctx: poise::Context<'_, Data, Error>) -> Result<(), Error> {
println!("Cmd: ({}) cmds", ctx.author()); println!("Cmd: ({}) cmds", ctx.author().name);
poise::builtins::register_application_commands_buttons(ctx).await?; poise::builtins::register_application_commands_buttons(ctx).await?;
Ok(()) Ok(())
} }
@ -18,7 +18,7 @@ pub(crate) async fn setup(
#[channel_types("Text", "News")] #[channel_types("Text", "News")]
channel: serenity::GuildChannel, channel: serenity::GuildChannel,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("Cmd: ({}) setup", ctx.author()); println!("Cmd: ({}) setup", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct Setup { struct Setup {
#[name = "Contents of the verification intro message"] #[name = "Contents of the verification intro message"]
@ -74,7 +74,7 @@ pub(crate) async fn setup(
/// Get the number of members in the members table /// Get the number of members in the members table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn count_members(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn count_members(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) count_members", ctx.author()); println!("Cmd: ({}) count_members", ctx.author().name);
let count = db::count_members(&ctx.data().db).await?; let count = db::count_members(&ctx.data().db).await?;
ctx.say(format!("There are {count} entries in the members table")) ctx.say(format!("There are {count} entries in the members table"))
.await?; .await?;
@ -88,7 +88,7 @@ pub(crate) async fn delete_member(
id: serenity::Member, id: serenity::Member,
remove_roles: Option<bool>, remove_roles: Option<bool>,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("Cmd: ({}) delete_member {id}", ctx.author()); println!("Cmd: ({}) delete_member {id}", ctx.author().name);
match db::delete_member_by_id(&ctx.data().db, id.user.id.0 as i64).await? { match db::delete_member_by_id(&ctx.data().db, id.user.id.0 as i64).await? {
true => { true => {
if remove_roles.unwrap_or(true) { if remove_roles.unwrap_or(true) {
@ -112,7 +112,7 @@ pub(crate) async fn delete_member(
/// Print all members in members table /// Print all members in members table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn get_all_members(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn get_all_members(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) get_all_members", ctx.author()); println!("Cmd: ({}) get_all_members", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct Confirm { struct Confirm {
#[name = "This will output the members db as text"] #[name = "This will output the members db as text"]
@ -153,7 +153,7 @@ pub(crate) async fn get_member(_ctx: ACtx<'_>) -> Result<(), Error> {
/// Get member info by Discord ID /// Get member info by Discord ID
#[poise::command(slash_command, rename = "id")] #[poise::command(slash_command, rename = "id")]
pub(crate) async fn get_member_by_id(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { pub(crate) async fn get_member_by_id(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> {
println!("Cmd: ({}) get_member_by_id {id}", ctx.author()); println!("Cmd: ({}) get_member_by_id {id}", ctx.author().name);
match db::get_member_by_id(&ctx.data().db, id.id.0 as i64).await? { match db::get_member_by_id(&ctx.data().db, id.id.0 as i64).await? {
Some(m) => { Some(m) => {
ctx.say(format!("Member info for {id}:\n```rust\n{m:#?}\n```")) ctx.say(format!("Member info for {id}:\n```rust\n{m:#?}\n```"))
@ -169,7 +169,7 @@ pub(crate) async fn get_member_by_id(ctx: ACtx<'_>, id: serenity::User) -> Resul
pub(crate) async fn get_member_by_shortcode(ctx: ACtx<'_>, shortcode: String) -> Result<(), Error> { pub(crate) async fn get_member_by_shortcode(ctx: ACtx<'_>, shortcode: String) -> Result<(), Error> {
println!( println!(
"Cmd: ({}) get_member_by_shortcode {shortcode}", "Cmd: ({}) get_member_by_shortcode {shortcode}",
ctx.author() ctx.author().name
); );
match db::get_member_by_shortcode(&ctx.data().db, &shortcode).await? { match db::get_member_by_shortcode(&ctx.data().db, &shortcode).await? {
Some(m) => { Some(m) => {
@ -189,7 +189,10 @@ pub(crate) async fn get_member_by_shortcode(ctx: ACtx<'_>, shortcode: String) ->
/// Get member info by Nickname /// Get member info by Nickname
#[poise::command(slash_command, rename = "nick")] #[poise::command(slash_command, rename = "nick")]
pub(crate) async fn get_member_by_nickname(ctx: ACtx<'_>, nickname: String) -> Result<(), Error> { pub(crate) async fn get_member_by_nickname(ctx: ACtx<'_>, nickname: String) -> Result<(), Error> {
println!("Cmd: ({}) get_member_by_nickname {nickname}", ctx.author()); println!(
"Cmd: ({}) get_member_by_nickname {nickname}",
ctx.author().name
);
match db::get_member_by_nickname(&ctx.data().db, &nickname).await? { match db::get_member_by_nickname(&ctx.data().db, &nickname).await? {
Some(m) => { Some(m) => {
ctx.say(format!( ctx.say(format!(
@ -208,7 +211,10 @@ pub(crate) async fn get_member_by_nickname(ctx: ACtx<'_>, nickname: String) -> R
/// Get member info by Real Name /// Get member info by Real Name
#[poise::command(slash_command, rename = "name")] #[poise::command(slash_command, rename = "name")]
pub(crate) async fn get_member_by_realname(ctx: ACtx<'_>, realname: String) -> Result<(), Error> { pub(crate) async fn get_member_by_realname(ctx: ACtx<'_>, realname: String) -> Result<(), Error> {
println!("Cmd: ({}) get_member_by_realname {realname}", ctx.author()); println!(
"Cmd: ({}) get_member_by_realname {realname}",
ctx.author().name
);
match db::get_member_by_realname(&ctx.data().db, &realname).await? { match db::get_member_by_realname(&ctx.data().db, &realname).await? {
Some(m) => { Some(m) => {
ctx.say(format!( ctx.say(format!(
@ -236,7 +242,7 @@ pub(crate) async fn add_member(
) -> Result<(), Error> { ) -> Result<(), Error> {
println!( println!(
"Cmd: ({}) add_member {id}, {shortcode}, {realname}, {nickname}", "Cmd: ({}) add_member {id}, {shortcode}, {realname}, {nickname}",
ctx.author(), ctx.author().name,
); );
db::insert_member( db::insert_member(
&ctx.data().db, &ctx.data().db,
@ -266,7 +272,10 @@ pub(crate) async fn insert_member_from_pending(
nickname: String, nickname: String,
fresher: bool, fresher: bool,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("Cmd: ({}) insert_member_from_pending {id}", ctx.author()); println!(
"Cmd: ({}) insert_member_from_pending {id}",
ctx.author().name
);
match db::insert_member_from_pending(&ctx.data().db, id.id.0 as i64, &nickname, fresher).await { match db::insert_member_from_pending(&ctx.data().db, id.id.0 as i64, &nickname, fresher).await {
Ok(()) => { Ok(()) => {
ctx.say(format!("Member moved from pending to members table: {id}")) ctx.say(format!("Member moved from pending to members table: {id}"))
@ -283,7 +292,10 @@ pub(crate) async fn insert_member_from_manual(
ctx: ACtx<'_>, ctx: ACtx<'_>,
id: serenity::User, id: serenity::User,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("Cmd: ({}) insert_member_from_manual {id}", ctx.author()); println!(
"Cmd: ({}) insert_member_from_manual {id}",
ctx.author().name
);
match db::insert_member_from_manual(&ctx.data().db, id.id.0 as i64).await { match db::insert_member_from_manual(&ctx.data().db, id.id.0 as i64).await {
Ok(()) => { Ok(()) => {
ctx.say(format!("Member moved from manual to members table: {id}")) ctx.say(format!("Member moved from manual to members table: {id}"))
@ -297,7 +309,7 @@ pub(crate) async fn insert_member_from_manual(
/// Get the number of pending members in the pending table /// Get the number of pending members in the pending table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn count_pending(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn count_pending(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) count_pending", ctx.author()); println!("Cmd: ({}) count_pending", ctx.author().name);
let count = db::count_pending(&ctx.data().db).await?; let count = db::count_pending(&ctx.data().db).await?;
ctx.say(format!("There are {count} entries in the pending table")) ctx.say(format!("There are {count} entries in the pending table"))
.await?; .await?;
@ -307,7 +319,7 @@ pub(crate) async fn count_pending(ctx: ACtx<'_>) -> Result<(), Error> {
/// Delete pending member info by Discord ID /// Delete pending member info by Discord ID
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn delete_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { pub(crate) async fn delete_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> {
println!("Cmd: ({}) delete_pending {id}", ctx.author()); println!("Cmd: ({}) delete_pending {id}", ctx.author().name);
match db::delete_pending_by_id(&ctx.data().db, id.id.0 as i64).await? { match db::delete_pending_by_id(&ctx.data().db, id.id.0 as i64).await? {
true => { true => {
ctx.say(format!("Successfully deleted pending member info for {id}")) ctx.say(format!("Successfully deleted pending member info for {id}"))
@ -324,7 +336,7 @@ pub(crate) async fn delete_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<
/// Print all pending members in pending table /// Print all pending members in pending table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn get_all_pending(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn get_all_pending(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) get_all_pending", ctx.author()); println!("Cmd: ({}) get_all_pending", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct ConfirmPending { struct ConfirmPending {
#[name = "This will output the pending db as text"] #[name = "This will output the pending db as text"]
@ -351,7 +363,7 @@ pub(crate) async fn get_all_pending(ctx: ACtx<'_>) -> Result<(), Error> {
/// Get pending member info by Discord ID /// Get pending member info by Discord ID
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn get_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { pub(crate) async fn get_pending(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> {
println!("Cmd: ({}) get_pending {id}", ctx.author()); println!("Cmd: ({}) get_pending {id}", ctx.author().name);
match db::get_pending_by_id(&ctx.data().db, id.id.0 as i64).await? { match db::get_pending_by_id(&ctx.data().db, id.id.0 as i64).await? {
Some(p) => { Some(p) => {
ctx.say(format!("Pending info for {id}:\n```rust\n{p:#?}\n```")) ctx.say(format!("Pending info for {id}:\n```rust\n{p:#?}\n```"))
@ -372,7 +384,7 @@ pub(crate) async fn add_pending(
) -> Result<(), Error> { ) -> Result<(), Error> {
println!( println!(
"Cmd: ({}) add_pending {id}, {shortcode}, {realname}", "Cmd: ({}) add_pending {id}, {shortcode}, {realname}",
ctx.author() ctx.author().name
); );
db::insert_pending( db::insert_pending(
&ctx.data().db, &ctx.data().db,
@ -390,7 +402,7 @@ pub(crate) async fn add_pending(
/// Delete all pending members in pending table /// Delete all pending members in pending table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn delete_all_pending(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn delete_all_pending(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) delete_all_pending", ctx.author()); println!("Cmd: ({}) delete_all_pending", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct ConfirmPurgePending { struct ConfirmPurgePending {
#[name = "This will wipe the pending db"] #[name = "This will wipe the pending db"]
@ -417,7 +429,7 @@ pub(crate) async fn delete_all_pending(ctx: ACtx<'_>) -> Result<(), Error> {
/// Get the number of manual members in the manual table /// Get the number of manual members in the manual table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn count_manual(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn count_manual(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) count_manual", ctx.author()); println!("Cmd: ({}) count_manual", ctx.author().name);
let count = db::count_manual(&ctx.data().db).await?; let count = db::count_manual(&ctx.data().db).await?;
ctx.say(format!("There are {count} entries in the manual table")) ctx.say(format!("There are {count} entries in the manual table"))
.await?; .await?;
@ -427,7 +439,7 @@ pub(crate) async fn count_manual(ctx: ACtx<'_>) -> Result<(), Error> {
/// Delete manual member info by Discord ID /// Delete manual member info by Discord ID
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn delete_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { pub(crate) async fn delete_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> {
println!("Cmd: ({}) delete_manual {id}", ctx.author()); println!("Cmd: ({}) delete_manual {id}", ctx.author().name);
match db::delete_manual_by_id(&ctx.data().db, id.id.0 as i64).await? { match db::delete_manual_by_id(&ctx.data().db, id.id.0 as i64).await? {
true => { true => {
ctx.say(format!("Successfully deleted manual member info for {id}")) ctx.say(format!("Successfully deleted manual member info for {id}"))
@ -444,7 +456,7 @@ pub(crate) async fn delete_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(
/// Print all manual members in manual table /// Print all manual members in manual table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn get_all_manual(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn get_all_manual(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) get_all_manual", ctx.author()); println!("Cmd: ({}) get_all_manual", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct ConfirmManual { struct ConfirmManual {
#[name = "This will output the manual db as text"] #[name = "This will output the manual db as text"]
@ -471,7 +483,7 @@ pub(crate) async fn get_all_manual(ctx: ACtx<'_>) -> Result<(), Error> {
/// Get manual member info by Discord ID /// Get manual member info by Discord ID
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn get_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> { pub(crate) async fn get_manual(ctx: ACtx<'_>, id: serenity::User) -> Result<(), Error> {
println!("Cmd: ({}) get_manual {id}", ctx.author()); println!("Cmd: ({}) get_manual {id}", ctx.author().name);
match db::get_manual_by_id(&ctx.data().db, id.id.0 as i64).await? { match db::get_manual_by_id(&ctx.data().db, id.id.0 as i64).await? {
Some(m) => { Some(m) => {
ctx.say(format!("Manual info for {id}:\n```rust\n{m:#?}\n```")) ctx.say(format!("Manual info for {id}:\n```rust\n{m:#?}\n```"))
@ -494,7 +506,7 @@ pub(crate) async fn add_manual(
) -> Result<(), Error> { ) -> Result<(), Error> {
println!( println!(
"Cmd: ({}) add_manual {id}, {shortcode}, {realname}, {nickname}", "Cmd: ({}) add_manual {id}, {shortcode}, {realname}, {nickname}",
ctx.author() ctx.author().name
); );
db::insert_manual( db::insert_manual(
&ctx.data().db, &ctx.data().db,
@ -514,7 +526,7 @@ pub(crate) async fn add_manual(
/// Delete all manual members in manual table /// Delete all manual members in manual table
#[poise::command(slash_command)] #[poise::command(slash_command)]
pub(crate) async fn delete_all_manual(ctx: ACtx<'_>) -> Result<(), Error> { pub(crate) async fn delete_all_manual(ctx: ACtx<'_>) -> Result<(), Error> {
println!("Cmd: ({}) delete_all_manual", ctx.author()); println!("Cmd: ({}) delete_all_manual", ctx.author().name);
#[derive(Modal)] #[derive(Modal)]
struct ConfirmPurgeManual { struct ConfirmPurgeManual {
#[name = "This will wipe the manual db"] #[name = "This will wipe the manual db"]