Skip to content

Commit

Permalink
Use pre-command to log the name and defer response
Browse files Browse the repository at this point in the history
  • Loading branch information
SLASHLogin committed Aug 30, 2023
1 parent 0d3b35e commit ca03795
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 28 deletions.
8 changes: 0 additions & 8 deletions src/discord/commands/meeting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ pub(crate) async fn end_meeting(
#[rest]
note: String,
) -> Result<(), Error> {
info!("Received end-meeting command");

let meeting_status = ctx.data().meeting_status.clone();

if !meeting_status.read().await.is_meeting_ongoing() {
Expand Down Expand Up @@ -48,8 +46,6 @@ pub(crate) async fn end_meeting(
pub(crate) async fn status_meeting(ctx: Context<'_>) -> Result<(), Error> {
let mut output = String::new();

info!("Received status-meeting command");

{
let rw_lock = ctx.data().meeting_status.clone();
let meeting_status = rw_lock.read().await;
Expand Down Expand Up @@ -172,7 +168,6 @@ pub async fn add_member(
#[description = "Member to add"] member: crate::database::models::member::Member,
#[description = "Meeting ID to add the member to"] meeting: Option<Meeting>,
) -> Result<(), Error> {
info!("Adding member to meeting");
let mut output = String::new();

let result = match meeting {
Expand All @@ -194,7 +189,6 @@ pub async fn remove_member(
#[description = "Member of the organization"] member: crate::database::models::member::Member,
#[description = "Meeting ID to add the member to"] meeting: Option<Meeting>,
) -> Result<(), Error> {
info!("Removing member from meeting");
let mut output = String::new();

let result = match meeting {
Expand All @@ -216,8 +210,6 @@ pub(crate) async fn list_meetings(
#[description = "Page to list"] page: Option<i64>,
#[description = "Page size"] page_size: Option<i64>,
) -> Result<(), Error> {
info!("Listing meetings");

let page = page.unwrap_or(1);

let (meetings, total_pages) = Meeting::list(page, page_size)?;
Expand Down
6 changes: 0 additions & 6 deletions src/discord/commands/member.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ pub async fn add_member(
#[description = "Display name"] name: Option<String>,
#[description = "Role"] role: Option<MemberRole>,
) -> Result<(), Error> {
info!("Adding member");

let name = if let Some(name) = name {
name
} else {
Expand Down Expand Up @@ -179,7 +177,6 @@ pub async fn remove_member(
#[description = "Member of the organization"] member: Member,
#[description = "Hard delete member from the database"] hard_delete: Option<bool>,
) -> Result<(), Error> {
info!("Removing member");
let mut output = String::new();

if let Some(user_id) = member.discord_id() {
Expand Down Expand Up @@ -232,8 +229,6 @@ pub async fn update_member(
#[description = "Member role"] role: Option<MemberRole>,
#[description = "Member wiki ID"] wiki_id: Option<i64>,
) -> Result<(), Error> {
info!("Updating member");

let mut output = String::new();

if let Some(new_name) = name {
Expand Down Expand Up @@ -337,7 +332,6 @@ pub async fn list_members(
#[description = "Page number"] page: Option<i64>,
#[description = "Page size"] page_size: Option<i64>,
) -> Result<(), Error> {
info!("Listing members");
let page = page.unwrap_or(1);

let (members, total_pages) = Member::list(page, page_size)?;
Expand Down
6 changes: 0 additions & 6 deletions src/discord/commands/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ pub(crate) async fn add_report(
#[description = "Member of the organization"] member: Option<Member>,
#[description = "Summary's ID"] summary: Option<Summary>,
) -> Result<(), Error> {
info!("Adding report");
let member = match member {
Some(member) => member,
None => {
Expand Down Expand Up @@ -48,8 +47,6 @@ pub(crate) async fn remove_report(
ctx: Context<'_>,
#[description = "Report's ID"] report: Report,
) -> Result<(), Error> {
info!("Removing report");

let mut output = String::new();

match report.delete() {
Expand All @@ -76,7 +73,6 @@ pub(crate) async fn list_reports(
#[description = "Member of the organization"] member: Option<Member>,
#[description = "Published"] published: Option<bool>,
) -> Result<(), Error> {
info!("Listing reports");
let page = page.unwrap_or(1);

let member = member.map(|member| member.id());
Expand All @@ -101,8 +97,6 @@ pub(crate) async fn update_report(
#[description = "Report's content"] content: Option<String>,
#[description = "Member of the organization"] member: Option<Member>,
) -> Result<(), Error> {
info!("Updating report");

if let Some(content) = content {
report.content = content;
}
Expand Down
8 changes: 0 additions & 8 deletions src/discord/commands/summary.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::fmt::Write;

use tracing::info;

use crate::{database::models::summary::Summary, discord::Context, error::Error};

#[poise::command(slash_command, rename = "preview")]
Expand All @@ -10,8 +8,6 @@ pub(crate) async fn preview_summary(
#[description = "Preview summary by ID"] summary: Option<Summary>,
#[description = "Note to add to the summary"] note: Option<String>,
) -> Result<(), Error> {
info!("Generating summary preview");

let note = note.unwrap_or_default();

let summary = if let Some(summary) = summary {
Expand All @@ -33,8 +29,6 @@ pub(crate) async fn list_summaries(
#[description = "Page number"] page: Option<i64>,
#[description = "Page size"] page_size: Option<i64>,
) -> Result<(), Error> {
info!("Listing summaries");

let page = page.unwrap_or(1);

let (summaries, total_pages) = Summary::list(page, page_size)?;
Expand All @@ -54,8 +48,6 @@ pub(crate) async fn resend_summary(
ctx: Context<'_>,
#[description = "ID of the summary to resend"] summary: Summary,
) -> Result<(), Error> {
info!("Resending summary");

let output = summary.send_summary(ctx, true).await?;

crate::discord::respond(ctx, output).await
Expand Down
7 changes: 7 additions & 0 deletions src/discord/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ pub async fn start_bot() {
edit_tracker: None,
..Default::default()
},
pre_command: |ctx: Context<'_>| {
Box::pin(async move {
info!("Running command: {}", ctx.command().qualified_name);

ctx.defer().await.unwrap();
})
},
..Default::default()
};

Expand Down

0 comments on commit ca03795

Please sign in to comment.