* initial livekit support fix up code undo changes to compose file add back .env.example * move voice states to global * track current state * more stuff * fix redis key inconsistancy * split voice ops into its own library * feat(livekit): more permission handling * feat(livekit): push unfinished code * fix: include voice states in servercreate event feat: call started system message in dms * feat: implement missing permission syncs * fix: remove locked rocket version * fix: remove local testing values from config * chore: switch to ids for parameter * feat: make Channel::server return a reference * feat: support multiple voice nodes * fix: expose list of nodes * fix: respond with the url when joining a voice channel * feat: being moved between voice channels * fix: use existing node if someone is already in the voice channel * refactor: Remove VoiceChannel * chore: add pushd to debug image script * refactor: add error messages for Rabbit issues * docs: add some notes on overrides; fix defaults * fix: ensure limit is always at least 1 when sent to database * fix: change permission check for fetching channel webhooks * chore: mount API at /0.8/ as well * fix: ensure ratelimiter adjusts for version prefix * chore: bump version to 0.8.2 * chore: disable LTO because it likely overloads GitHub worker * fix: don't allow users to time themselves out closes #376 * fix: match new error type for status code * feat: init crond crate * feat: file deletion implementation * chore: fix version references * feat: add crond container definitions * chore: clarify cargo deny / tomls * feat: add company information to email footers * chore: bump version to 0.8.3 * fix: don't bump the lockfile version * fix: include `production` default value for config * chore: ignore python venv and dev script for user generation Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * test: Add tests for invite/fetch Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com> * test: add utilities for common setup Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com> * test: add delete server channel test Signed-off-by: phazeschift <51278042+phazeschift@users.noreply.github.com> * feat: allow to set an icon when creating a group Signed-off-by: Nils Ponsard <nilsponsard@gmail.com> * fix: allow message pinning and unpinning for DM-like channels Signed-off-by: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com> * fix: remove SavedMessages and Group due to given permissions Signed-off-by: Bradlee Barnes <69256931+StupidRepo@users.noreply.github.com> * feat: allow bots to manage emojis (#407) * Remove bot check on emoji create Signed-off-by: Builderb <builderbgamer@gmail.com> * Remove bot check on emoji delete Signed-off-by: Builderb <builderbgamer@gmail.com> --------- Signed-off-by: Builderb <builderbgamer@gmail.com> * feat: add option to send message with missing replies Signed-off-by: ShaksterNano <54268387+shaksternano@users.noreply.github.com> * chore: bump version to 0.8.4 chore: enable webhooks in test builds * ci: downgrade lockfile * feat: Add Mass Mentions to the backend (#394) * 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> * Add role mention parsing * feat: update to mongo 3.1, add member generator. * integrate mass mentions into pushd * patch redis-rs with updated versions * feat: chunk role mentions * move permission bits to 37/38 to avoid livekit conflict * change role mention format to <%id> * fix the lockfile from merge * fix: PR change requests * feat: add tests * fix: i am a dumbass * fix: tests, again --------- Signed-off-by: IAmTomahawkx <iamtomahawkx@gmail.com> * fix: show full branch name on github webhook messages * fix: dont leak invisible presence to others * fix: add back missing early adopter badge * fix: update branch from main * fix: update branch from main * Merge remote-tracking branch 'origin/main' into livekit * feat: private livekit nodes * fix: remove node from channel voice state * fix: get_voice_state has incorrect unique_key and allowed_sources should be lowercase * chore: bump livekit dep * feat: ability to force disconnect existing voice connection * chore: cleanup code * feat: - track call length - move voice and video limits to config - seperate VoiceInformation into model and db model - fix build scripts * fix: move call system message to daemon, check max participants when creating a token to avoid giving tokens but erroring when attempting to join, check if the channel actually supports voice * fix: dont set max participants in livekit * fix: remove VoiceChannel channel type fix: calculate user overwrites correctly fix: dont include personal info in livekit user metadata fix: revoke video permissons on denied publish fix: add video to default permissions * fix: update migration * feat: Send push notifications for dm call start/end * chore: cleanup * feat: allow users to specify who is notified when starting a call * feat: track join time * merge: branch 'main' into feat/livekit * fix: include voice-ingress in build * fix: dont presume channel has a node * chore: add error logging to internal errors * chore: add debug logging to voice ingress * refactor: seperate out disconnect logic * fix: return correct error if user is already in a voice channel * fix: dont break on user not still being in channel and force disconnecting * fix: add Speak and Listen to default permissions * fix: include channel ids in UserMoveVoiceChannel * chore: add temp sentry logging system * fix: handle track_muted and track_unmuted * fix: dont set notification recipients when empty vec is passed * fix: only send UserMoveVoiceChannel to the user * fix: preserve order of replies in message (#447) Signed-off-by: Aeledfyr <aeledfyr@gmail.com> * fix: prevent timing out members which have TimeoutMembers permission * chore: update ci * fix: temporarily disable call started system messages See #457 * fix: update code from review
184 lines
5.5 KiB
Rust
184 lines
5.5 KiB
Rust
use revolt_database::{
|
|
util::{permissions::DatabasePermissionQuery, reference::Reference}, voice::{sync_voice_permissions, VoiceClient}, Database, User
|
|
};
|
|
use revolt_models::v0;
|
|
use revolt_permissions::{calculate_server_permissions, ChannelPermission};
|
|
use revolt_result::{create_error, Result};
|
|
use rocket::{serde::json::Json, State};
|
|
|
|
/// # Edits server roles ranks
|
|
///
|
|
/// Edit's server role's ranks.
|
|
#[openapi(tag = "Server Permissions")]
|
|
#[patch("/<target>/roles/ranks", data = "<data>")]
|
|
pub async fn edit_role_ranks(
|
|
db: &State<Database>,
|
|
voice_client: &State<VoiceClient>,
|
|
user: User,
|
|
target: Reference<'_>,
|
|
data: Json<v0::DataEditRoleRanks>,
|
|
) -> Result<Json<v0::Server>> {
|
|
let data = data.into_inner();
|
|
|
|
let mut server = target.as_server(db).await?;
|
|
let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
|
|
calculate_server_permissions(&mut query)
|
|
.await
|
|
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole)?;
|
|
|
|
let existing_order = server
|
|
.ordered_roles()
|
|
.into_iter()
|
|
.map(|(id, _)| id)
|
|
.collect::<Vec<_>>();
|
|
|
|
let new_order = data.ranks.clone().into_iter().collect::<Vec<_>>();
|
|
|
|
// Verify all roles are in the new ordering
|
|
if data.ranks.len() != server.roles.len()
|
|
|| !server.roles.iter().all(|(id, _)| data.ranks.contains(id))
|
|
{
|
|
return Err(create_error!(InvalidOperation));
|
|
}
|
|
|
|
// Don't have to check what the user can't modify if they are the server owner
|
|
if server.owner != user.id {
|
|
let member_top_rank = query.get_member_rank();
|
|
|
|
if server
|
|
.roles
|
|
.iter()
|
|
// Find all roles above the member which we should not be able to reorder
|
|
.filter(|(_, role)| {
|
|
if let Some(top_rank) = member_top_rank {
|
|
role.rank <= top_rank
|
|
} else {
|
|
true
|
|
}
|
|
})
|
|
// Check if user is trying to reorder roles they can't reorder (as found previously)
|
|
.any(|(id, _)| {
|
|
existing_order
|
|
.iter()
|
|
.position(|existing_id| id == existing_id)
|
|
!= new_order.iter().position(|new_id| id == new_id)
|
|
})
|
|
{
|
|
return Err(create_error!(NotElevated));
|
|
}
|
|
}
|
|
|
|
server.set_role_ordering(db, new_order).await?;
|
|
|
|
for channel_id in &server.channels {
|
|
let channel = Reference::from_unchecked(channel_id).as_channel(db).await?;
|
|
|
|
sync_voice_permissions(db, voice_client, &channel, Some(&server), None).await?;
|
|
};
|
|
|
|
Ok(Json(server.into()))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use revolt_database::fixture;
|
|
use revolt_models::v0;
|
|
use rocket::http::{ContentType, Header, Status};
|
|
|
|
use crate::util::test::TestHarness;
|
|
|
|
#[rocket::async_test]
|
|
async fn edit_role_rankings() {
|
|
let harness = TestHarness::new().await;
|
|
|
|
fixture!(harness.db, "server_with_many_roles",
|
|
owner user 0
|
|
moderator user 1
|
|
server server 4);
|
|
|
|
// Moderator can re-order the roles below them
|
|
let (_, moderator_session) = harness.account_from_user(moderator.id).await;
|
|
let mut target_order: Vec<String> = server
|
|
.ordered_roles()
|
|
.into_iter()
|
|
.map(|(id, _)| id)
|
|
.collect();
|
|
|
|
// Swap the two lower ranked roles
|
|
target_order.swap(2, 3);
|
|
|
|
let response = harness
|
|
.client
|
|
.patch(format!("/servers/{}/roles/ranks", server.id))
|
|
.header(ContentType::JSON)
|
|
.body(
|
|
json!(v0::DataEditRoleRanks {
|
|
ranks: target_order.clone()
|
|
})
|
|
.to_string(),
|
|
)
|
|
.header(Header::new(
|
|
"x-session-token",
|
|
moderator_session.token.to_string(),
|
|
))
|
|
.dispatch()
|
|
.await;
|
|
|
|
assert_eq!(response.status(), Status::Ok);
|
|
drop(response);
|
|
|
|
// ... but not above them
|
|
let mut target_order: Vec<String> = server
|
|
.ordered_roles()
|
|
.into_iter()
|
|
.map(|(id, _)| id)
|
|
.collect();
|
|
|
|
// Swap the two lower ranked roles
|
|
target_order.swap(0, 1);
|
|
|
|
let response = harness
|
|
.client
|
|
.patch(format!("/servers/{}/roles/ranks", server.id))
|
|
.header(ContentType::JSON)
|
|
.body(
|
|
json!(v0::DataEditRoleRanks {
|
|
ranks: target_order.clone()
|
|
})
|
|
.to_string(),
|
|
)
|
|
.header(Header::new(
|
|
"x-session-token",
|
|
moderator_session.token.to_string(),
|
|
))
|
|
.dispatch()
|
|
.await;
|
|
|
|
assert_eq!(response.status(), Status::Forbidden);
|
|
drop(response);
|
|
|
|
// The owner can set any order they want
|
|
let (_, owner_session) = harness.account_from_user(owner.id).await;
|
|
|
|
let response = harness
|
|
.client
|
|
.patch(format!("/servers/{}/roles/ranks", server.id))
|
|
.header(ContentType::JSON)
|
|
.body(
|
|
json!(v0::DataEditRoleRanks {
|
|
ranks: target_order.clone()
|
|
})
|
|
.to_string(),
|
|
)
|
|
.header(Header::new(
|
|
"x-session-token",
|
|
owner_session.token.to_string(),
|
|
))
|
|
.dispatch()
|
|
.await;
|
|
|
|
assert_eq!(response.status(), Status::Ok);
|
|
drop(response);
|
|
}
|
|
}
|