feat(moderation): reorder purge parameters

This commit is contained in:
Ushie 2023-04-10 22:14:51 +03:00
parent 6b196b0d97
commit 66c64e2950
No known key found for this signature in database
GPG Key ID: 0EF73F1CA38B2D5F

View File

@ -2,11 +2,7 @@ use bson::{doc, Document};
use chrono::{Duration, Utc}; use chrono::{Duration, Utc};
use mongodb::options::{UpdateModifications, UpdateOptions}; use mongodb::options::{UpdateModifications, UpdateOptions};
use poise::serenity_prelude::{ use poise::serenity_prelude::{
self as serenity, self as serenity, Mentionable, PermissionOverwrite, Permissions, UserId,
Mentionable,
PermissionOverwrite,
Permissions,
UserId,
}; };
use tracing::{debug, error, trace}; use tracing::{debug, error, trace};
@ -14,11 +10,7 @@ use crate::db::model::{LockedChannel, Muted};
use crate::utils::bot::get_member; use crate::utils::bot::get_member;
use crate::utils::macros::to_user; use crate::utils::macros::to_user;
use crate::utils::moderation::{ use crate::utils::moderation::{
ban_moderation, ban_moderation, queue_unmute_member, respond_moderation, BanKind, ModerationKind,
queue_unmute_member,
respond_moderation,
BanKind,
ModerationKind,
}; };
use crate::{Context, Error}; use crate::{Context, Error};
@ -97,11 +89,14 @@ pub async fn lock(ctx: Context<'_>) -> Result<(), Error> {
let permission = Permissions::SEND_MESSAGES & Permissions::ADD_REACTIONS; let permission = Permissions::SEND_MESSAGES & Permissions::ADD_REACTIONS;
if let Err(err) = channel if let Err(err) = channel
.create_permission(http, &PermissionOverwrite { .create_permission(
http,
&PermissionOverwrite {
allow: permission_overwrite.allow & !permission, allow: permission_overwrite.allow & !permission,
deny: permission_overwrite.deny | permission, deny: permission_overwrite.deny | permission,
kind: permission_overwrite.kind, kind: permission_overwrite.kind,
}) },
)
.await .await
{ {
error!("Failed to create the new permission: {:?}", err); error!("Failed to create the new permission: {:?}", err);
@ -338,11 +333,11 @@ pub async fn mute(
pub async fn purge( pub async fn purge(
ctx: Context<'_>, ctx: Context<'_>,
#[description = "Member"] user: Option<UserId>, #[description = "Member"] user: Option<UserId>,
#[description = "Until message"] until: Option<String>,
#[min = 1] #[min = 1]
#[max = 1000] #[max = 1000]
#[description = "Count"] #[description = "Count"]
count: Option<i64>, count: Option<i64>,
#[description = "Until message"] until: Option<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let user = if let Some(id) = user { let user = if let Some(id) = user {
Some(to_user!(id, ctx)) Some(to_user!(id, ctx))