forked from jmug/stoatchat
feat: add ability to leave groups / servers silently
This commit is contained in:
@@ -2,13 +2,27 @@ use revolt_quark::{
|
|||||||
models::{channel::PartialChannel, Channel, User},
|
models::{channel::PartialChannel, Channel, User},
|
||||||
perms, Db, EmptyResponse, Error, Permission, Ref, Result,
|
perms, Db, EmptyResponse, Error, Permission, Ref, Result,
|
||||||
};
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use validator::Validate;
|
||||||
|
|
||||||
|
/// # Query Parameters
|
||||||
|
#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
|
||||||
|
pub struct OptionsChannelDelete {
|
||||||
|
/// Whether to not send a leave message
|
||||||
|
leave_silently: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
/// # Close Channel
|
/// # Close Channel
|
||||||
///
|
///
|
||||||
/// Deletes a server channel, leaves a group or closes a group.
|
/// Deletes a server channel, leaves a group or closes a group.
|
||||||
#[openapi(tag = "Channel Information")]
|
#[openapi(tag = "Channel Information")]
|
||||||
#[delete("/<target>")]
|
#[delete("/<target>?<options..>")]
|
||||||
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
|
pub async fn req(
|
||||||
|
db: &Db,
|
||||||
|
user: User,
|
||||||
|
target: Ref,
|
||||||
|
options: OptionsChannelDelete,
|
||||||
|
) -> Result<EmptyResponse> {
|
||||||
let mut channel = target.as_channel(db).await?;
|
let mut channel = target.as_channel(db).await?;
|
||||||
let mut perms = perms(&user).channel(&channel);
|
let mut perms = perms(&user).channel(&channel);
|
||||||
perms.throw_permission(db, Permission::ViewChannel).await?;
|
perms.throw_permission(db, Permission::ViewChannel).await?;
|
||||||
@@ -27,7 +41,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
|
|||||||
.await
|
.await
|
||||||
.map(|_| EmptyResponse),
|
.map(|_| EmptyResponse),
|
||||||
Channel::Group { .. } => channel
|
Channel::Group { .. } => channel
|
||||||
.remove_user_from_group(db, &user.id, None)
|
.remove_user_from_group(
|
||||||
|
db,
|
||||||
|
&user.id,
|
||||||
|
None,
|
||||||
|
options.leave_silently.unwrap_or_default(),
|
||||||
|
)
|
||||||
.await
|
.await
|
||||||
.map(|_| EmptyResponse),
|
.map(|_| EmptyResponse),
|
||||||
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
|
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ pub struct DataEditChannel {
|
|||||||
icon: Option<String>,
|
icon: Option<String>,
|
||||||
/// Whether this channel is age-restricted
|
/// Whether this channel is age-restricted
|
||||||
nsfw: Option<bool>,
|
nsfw: Option<bool>,
|
||||||
|
/// Whether this channel is archived
|
||||||
|
archived: Option<bool>,
|
||||||
#[validate(length(min = 1))]
|
#[validate(length(min = 1))]
|
||||||
remove: Option<Vec<FieldsChannel>>,
|
remove: Option<Vec<FieldsChannel>>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
|
|||||||
}
|
}
|
||||||
|
|
||||||
channel
|
channel
|
||||||
.remove_user_from_group(db, &member.id, Some(&user.id))
|
.remove_user_from_group(db, &member.id, Some(&user.id), false)
|
||||||
.await
|
.await
|
||||||
.map(|_| EmptyResponse)
|
.map(|_| EmptyResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyR
|
|||||||
}
|
}
|
||||||
|
|
||||||
server
|
server
|
||||||
.remove_member(db, member, RemovalIntention::Kick)
|
.remove_member(db, member, RemovalIntention::Kick, false)
|
||||||
.await
|
.await
|
||||||
.map(|_| EmptyResponse)
|
.map(|_| EmptyResponse)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,27 @@ use revolt_quark::{
|
|||||||
models::{server_member::RemovalIntention, User},
|
models::{server_member::RemovalIntention, User},
|
||||||
Db, EmptyResponse, Ref, Result,
|
Db, EmptyResponse, Ref, Result,
|
||||||
};
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use validator::Validate;
|
||||||
|
|
||||||
|
/// # Query Parameters
|
||||||
|
#[derive(Validate, Serialize, Deserialize, JsonSchema, FromForm)]
|
||||||
|
pub struct OptionsServerDelete {
|
||||||
|
/// Whether to not send a leave message
|
||||||
|
leave_silently: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
/// # Delete / Leave Server
|
/// # Delete / Leave Server
|
||||||
///
|
///
|
||||||
/// Deletes a server if owner otherwise leaves.
|
/// Deletes a server if owner otherwise leaves.
|
||||||
#[openapi(tag = "Server Information")]
|
#[openapi(tag = "Server Information")]
|
||||||
#[delete("/<target>")]
|
#[delete("/<target>?<options..>")]
|
||||||
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
|
pub async fn req(
|
||||||
|
db: &Db,
|
||||||
|
user: User,
|
||||||
|
target: Ref,
|
||||||
|
options: OptionsServerDelete,
|
||||||
|
) -> Result<EmptyResponse> {
|
||||||
let server = target.as_server(db).await?;
|
let server = target.as_server(db).await?;
|
||||||
let member = db.fetch_member(&target.id, &user.id).await?;
|
let member = db.fetch_member(&target.id, &user.id).await?;
|
||||||
|
|
||||||
@@ -16,7 +30,12 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
|
|||||||
server.delete(db).await
|
server.delete(db).await
|
||||||
} else {
|
} else {
|
||||||
server
|
server
|
||||||
.remove_member(db, member, RemovalIntention::Leave)
|
.remove_member(
|
||||||
|
db,
|
||||||
|
member,
|
||||||
|
RemovalIntention::Leave,
|
||||||
|
options.leave_silently.unwrap_or_default(),
|
||||||
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
.map(|_| EmptyResponse)
|
.map(|_| EmptyResponse)
|
||||||
|
|||||||
@@ -286,6 +286,7 @@ impl Channel {
|
|||||||
db: &Database,
|
db: &Database,
|
||||||
user: &str,
|
user: &str,
|
||||||
by: Option<&str>,
|
by: Option<&str>,
|
||||||
|
silent: bool,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
match &self {
|
match &self {
|
||||||
Channel::Group {
|
Channel::Group {
|
||||||
@@ -329,20 +330,22 @@ impl Channel {
|
|||||||
.p(id.to_string())
|
.p(id.to_string())
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
if let Some(by) = by {
|
if !silent {
|
||||||
SystemMessage::UserRemove {
|
if let Some(by) = by {
|
||||||
id: user.to_string(),
|
SystemMessage::UserRemove {
|
||||||
by: by.to_string(),
|
id: user.to_string(),
|
||||||
}
|
by: by.to_string(),
|
||||||
} else {
|
}
|
||||||
SystemMessage::UserLeft {
|
} else {
|
||||||
id: user.to_string(),
|
SystemMessage::UserLeft {
|
||||||
|
id: user.to_string(),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
.into_message(id.to_string())
|
||||||
|
.create(db, self, None)
|
||||||
|
.await
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
.into_message(id.to_string())
|
|
||||||
.create(db, self, None)
|
|
||||||
.await
|
|
||||||
.ok();
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,6 +256,7 @@ impl Server {
|
|||||||
db: &Database,
|
db: &Database,
|
||||||
member: Member,
|
member: Member,
|
||||||
intention: RemovalIntention,
|
intention: RemovalIntention,
|
||||||
|
silent: bool,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
db.delete_member(&member.id).await?;
|
db.delete_member(&member.id).await?;
|
||||||
|
|
||||||
@@ -266,20 +267,22 @@ impl Server {
|
|||||||
.p(member.id.server)
|
.p(member.id.server)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
|
if !silent {
|
||||||
RemovalIntention::Leave => x.user_left.as_ref(),
|
if let Some(id) = self.system_messages.as_ref().and_then(|x| match intention {
|
||||||
RemovalIntention::Kick => x.user_kicked.as_ref(),
|
RemovalIntention::Leave => x.user_left.as_ref(),
|
||||||
RemovalIntention::Ban => x.user_banned.as_ref(),
|
RemovalIntention::Kick => x.user_kicked.as_ref(),
|
||||||
}) {
|
RemovalIntention::Ban => x.user_banned.as_ref(),
|
||||||
match intention {
|
}) {
|
||||||
RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
|
match intention {
|
||||||
RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
|
RemovalIntention::Leave => SystemMessage::UserLeft { id: member.id.user },
|
||||||
RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
|
RemovalIntention::Kick => SystemMessage::UserKicked { id: member.id.user },
|
||||||
|
RemovalIntention::Ban => SystemMessage::UserBanned { id: member.id.user },
|
||||||
|
}
|
||||||
|
.into_message(id.to_string())
|
||||||
|
.create_no_web_push(db, id, false)
|
||||||
|
.await
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
.into_message(id.to_string())
|
|
||||||
.create_no_web_push(db, id, false)
|
|
||||||
.await
|
|
||||||
.ok();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -304,7 +307,7 @@ impl Server {
|
|||||||
member: Member,
|
member: Member,
|
||||||
reason: Option<String>,
|
reason: Option<String>,
|
||||||
) -> Result<ServerBan> {
|
) -> Result<ServerBan> {
|
||||||
self.remove_member(db, member.clone(), RemovalIntention::Ban)
|
self.remove_member(db, member.clone(), RemovalIntention::Ban, false)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
self.ban_user(db, member.id, reason).await
|
self.ban_user(db, member.id, reason).await
|
||||||
|
|||||||
Reference in New Issue
Block a user