forked from jmug/stoatchat
* feat: create base of push daemon Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * Add outbound senders * Make web_push send to rabbit instead (temp stuff) * feat: stability and friend requests * make vapid fr stuff not suck * swap naming of queue * move pushd into daemons folder * fix cargo file for move into daemons folder * feat: probably working fcm push notifs * comment out fcm webpush stuff since the config keys dont exist * fix fcm, name queues according to their prod status and configure routing keys * add pushd to docker * mix: Remove old code, add stuff to pushd * fix: lockfile * feat: update rocket to 5.0.1 * fix: fix queues and ack bugs * Move rabbit messsage processing into ack queue * chore: update readme * chore: optimizations for ack database hits * pushd flowchart * misc: update flowchart * exit dependancy hell * add rocket_impl flag to authifier * make the tests file of delta actually compile * fix: don't silence every push message * fix: don't silence all messages * add debug logging for sending data to rabbit from message events * validate mentions at a server membership level * put back that import that was actually important * minor fix to lockfile * update delta authifier * feat: proper permissions for push notifications * add unit test for mention sanitization * remove local file dependancy on authifier * update ports to proper defaults * fixTM the node bindings * Theoretically configure docker releases for pushd Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * declare exchange in pushd and delta * fix createbuckets script Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: reference db implementation Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: remove finally redundant code Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: changes Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: other changes Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: make channel name return result Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> --------- Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com>
201 lines
5.8 KiB
Rust
201 lines
5.8 KiB
Rust
use revolt_database::{util::reference::Reference, Channel, Database, User, AMQP};
|
|
use revolt_permissions::ChannelPermission;
|
|
use revolt_result::{create_error, Result};
|
|
|
|
use rocket::State;
|
|
use rocket_empty::EmptyResponse;
|
|
|
|
/// # Remove Member from Group
|
|
///
|
|
/// Removes a user from the group.
|
|
#[openapi(tag = "Groups")]
|
|
#[delete("/<target>/recipients/<member>")]
|
|
pub async fn remove_member(
|
|
db: &State<Database>,
|
|
amqp: &State<AMQP>,
|
|
user: User,
|
|
target: Reference,
|
|
member: Reference,
|
|
) -> Result<EmptyResponse> {
|
|
if user.bot.is_some() {
|
|
return Err(create_error!(IsBot));
|
|
}
|
|
|
|
let channel = target.as_channel(db).await?;
|
|
|
|
match &channel {
|
|
Channel::Group {
|
|
owner, recipients, ..
|
|
} => {
|
|
if &user.id != owner {
|
|
return Err(create_error!(MissingPermission {
|
|
permission: ChannelPermission::ManageChannel.to_string()
|
|
}));
|
|
}
|
|
|
|
let member = member.as_user(db).await?;
|
|
if user.id == member.id {
|
|
return Err(create_error!(CannotRemoveYourself));
|
|
}
|
|
|
|
if !recipients.iter().any(|x| *x == member.id) {
|
|
return Err(create_error!(NotInGroup));
|
|
}
|
|
|
|
channel
|
|
.remove_user_from_group(db, amqp, &member, Some(&user.id), false)
|
|
.await
|
|
.map(|_| EmptyResponse)
|
|
}
|
|
_ => Err(create_error!(InvalidOperation)),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use crate::{rocket, util::test::TestHarness};
|
|
use revolt_database::{events::client::EventV1, Channel, RelationshipStatus};
|
|
use revolt_models::v0;
|
|
use rocket::http::{Header, Status};
|
|
|
|
#[rocket::async_test]
|
|
async fn success_remove_member() {
|
|
let mut harness = TestHarness::new().await;
|
|
let (_, session, mut user) = harness.new_user().await;
|
|
let (_, _, mut other_user) = harness.new_user().await;
|
|
|
|
#[allow(clippy::disallowed_methods)]
|
|
user.apply_relationship(
|
|
&harness.db,
|
|
&mut other_user,
|
|
RelationshipStatus::Friend,
|
|
RelationshipStatus::Friend,
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let group = Channel::create_group(
|
|
&harness.db,
|
|
v0::DataCreateGroup {
|
|
name: TestHarness::rand_string(),
|
|
..Default::default()
|
|
},
|
|
user.id.to_string(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let response = harness
|
|
.client
|
|
.put(format!(
|
|
"/channels/{}/recipients/{}",
|
|
group.id(),
|
|
other_user.id
|
|
))
|
|
.header(Header::new("x-session-token", session.token.to_string()))
|
|
.dispatch()
|
|
.await;
|
|
|
|
assert_eq!(response.status(), Status::NoContent);
|
|
drop(response);
|
|
|
|
harness
|
|
.wait_for_event(&format!("{}!", other_user.id), |event| match event {
|
|
EventV1::ChannelCreate(channel) => channel.id() == group.id(),
|
|
_ => false,
|
|
})
|
|
.await;
|
|
|
|
let event = harness
|
|
.wait_for_event(group.id(), |event| match event {
|
|
EventV1::ChannelGroupJoin { id, .. } => id == group.id(),
|
|
_ => false,
|
|
})
|
|
.await;
|
|
|
|
match event {
|
|
EventV1::ChannelGroupJoin { user, .. } => assert_eq!(user, other_user.id),
|
|
_ => unreachable!(),
|
|
};
|
|
|
|
let message = harness.wait_for_message(group.id()).await;
|
|
|
|
assert_eq!(
|
|
message.system,
|
|
Some(v0::SystemMessage::UserAdded {
|
|
id: other_user.id.to_string(),
|
|
by: user.id.to_string()
|
|
})
|
|
);
|
|
}
|
|
|
|
#[rocket::async_test]
|
|
async fn fail_not_in_group() {
|
|
let harness = TestHarness::new().await;
|
|
let (_, session, user) = harness.new_user().await;
|
|
let (_, _, other_user) = harness.new_user().await;
|
|
|
|
let group = Channel::create_group(
|
|
&harness.db,
|
|
v0::DataCreateGroup {
|
|
name: TestHarness::rand_string(),
|
|
..Default::default()
|
|
},
|
|
user.id.to_string(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let response = harness
|
|
.client
|
|
.delete(format!(
|
|
"/channels/{}/recipients/{}",
|
|
group.id(),
|
|
other_user.id
|
|
))
|
|
.header(Header::new("x-session-token", session.token.to_string()))
|
|
.dispatch()
|
|
.await;
|
|
|
|
dbg!(response.into_string().await);
|
|
// FIXME: finish impl
|
|
// assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
|
|
#[rocket::async_test]
|
|
async fn fail_not_group_owner() {
|
|
let harness = TestHarness::new().await;
|
|
let (_, _, user) = harness.new_user().await;
|
|
let (_, session, other_user) = harness.new_user().await;
|
|
let (_, _, user_to_be_kicked) = harness.new_user().await;
|
|
|
|
let group = Channel::create_group(
|
|
&harness.db,
|
|
v0::DataCreateGroup {
|
|
name: TestHarness::rand_string(),
|
|
users: vec![&other_user.id, &user_to_be_kicked.id]
|
|
.into_iter()
|
|
.cloned()
|
|
.collect(),
|
|
..Default::default()
|
|
},
|
|
user.id.to_string(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let _response = harness
|
|
.client
|
|
.delete(format!(
|
|
"/channels/{}/recipients/{}",
|
|
group.id(),
|
|
user_to_be_kicked.id
|
|
))
|
|
.header(Header::new("x-session-token", session.token.to_string()))
|
|
.dispatch()
|
|
.await;
|
|
|
|
// FIXME: impl assert_eq!(response.status(), Status::Forbidden);
|
|
}
|
|
}
|