feat(channels): add / remove group members
This commit is contained in:
@@ -1,11 +1,23 @@
|
|||||||
use revolt_quark::{EmptyResponse, Result};
|
use revolt_quark::{Error, EmptyResponse, Result, models::{User, Channel}, Ref, Db, perms, ChannelPermission};
|
||||||
|
|
||||||
use mongodb::bson::doc;
|
use mongodb::bson::doc;
|
||||||
|
|
||||||
#[put("/<target>/recipients/<member>")]
|
#[put("/<target>/recipients/<member>")]
|
||||||
pub async fn req(
|
pub async fn req(
|
||||||
/*user: UserRef, target: Ref, member: Ref*/ target: String,
|
db: &Db,
|
||||||
member: String,
|
user: User, target: Ref, member: Ref
|
||||||
) -> Result<EmptyResponse> {
|
) -> Result<EmptyResponse> {
|
||||||
todo!()
|
let channel = target.as_channel(db).await?;
|
||||||
|
if !perms(&user).channel(&channel).calc_channel(db).await.get_invite_others() {
|
||||||
|
return Err(Error::MissingPermission { permission: ChannelPermission::InviteOthers as i32 })
|
||||||
|
}
|
||||||
|
|
||||||
|
match channel {
|
||||||
|
Channel::Group { id, .. } => {
|
||||||
|
let user = member.as_user(db).await?;
|
||||||
|
db.add_user_to_group(&id, &user.id).await?;
|
||||||
|
Ok(EmptyResponse)
|
||||||
|
}
|
||||||
|
_ => Err(Error::InvalidOperation)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,32 @@
|
|||||||
use revolt_quark::{EmptyResponse, Result};
|
use revolt_quark::{Error, EmptyResponse, Result, Ref, Db, models::{Channel, User}};
|
||||||
|
|
||||||
use mongodb::bson::doc;
|
use mongodb::bson::doc;
|
||||||
|
|
||||||
#[delete("/<target>/recipients/<member>")]
|
#[delete("/<target>/recipients/<member>")]
|
||||||
pub async fn req(
|
pub async fn req(
|
||||||
/*user: UserRef, target: Ref, member: Ref*/ target: String,
|
db: &Db,
|
||||||
member: String,
|
user: User, target: Ref, member: Ref
|
||||||
) -> Result<EmptyResponse> {
|
) -> Result<EmptyResponse> {
|
||||||
todo!()
|
let channel = target.as_channel(db).await?;
|
||||||
|
|
||||||
|
match channel {
|
||||||
|
Channel::Group { id, owner, recipients, .. } => {
|
||||||
|
if user.id != owner {
|
||||||
|
return Err(Error::MissingPermission { permission: 0 })
|
||||||
|
}
|
||||||
|
|
||||||
|
let member = member.as_user(db).await?;
|
||||||
|
if user.id == member.id {
|
||||||
|
return Err(Error::CannotRemoveYourself);
|
||||||
|
}
|
||||||
|
|
||||||
|
if !recipients.iter().any(|x| *x == member.id) {
|
||||||
|
return Err(Error::NotInGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
db.remove_user_from_group(&id, &member.id).await?;
|
||||||
|
Ok(EmptyResponse)
|
||||||
|
}
|
||||||
|
_ => Err(Error::InvalidOperation)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use revolt_quark::{Error, Result};
|
use revolt_quark::{Result, models::User, Ref};
|
||||||
|
|
||||||
use rocket::serde::json::Value;
|
use rocket::serde::json::Value;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@@ -8,7 +8,7 @@ struct CreateUserResponse {
|
|||||||
token: String,
|
token: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/<target>/join_call")]
|
#[post("/<_target>/join_call")]
|
||||||
pub async fn req(/*user: UserRef, target: Ref,*/ target: String) -> Result<Value> {
|
pub async fn req(_user: User, _target: Ref) -> Result<Value> {
|
||||||
todo!()
|
todo!()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user