tensamin/omikron
Watch
6
0
Fork
You've already forked omikron
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

[Fix] Calls, Spelling

Browse source
This commit is contained in:
Alex Emmet 2026-05-03 15:02:15 +02:00
commit fc85e9377e
10 changed files with 246 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/calls/call_manager.rs
View file

@ -3,7 +3,7 @@ use once_cell::sync::Lazy;
use std::sync::Arc;
use uuid::Uuid;
use crate::calls::{call_group::CallGroup, caller::Caller};
use crate::calls::{call_group::CallGroup, call_util, caller::Caller};
pub static CALL_GROUPS: Lazy<DashMap<Uuid, Arc<CallGroup>>> = Lazy::new(|| DashMap::new());
#[allow(dead_code)]
@ -59,29 +59,23 @@ pub async fn get_call_token(user_id: u64, call_id: Uuid) -> Option<String> {
return Some(token);
}
if let Some(cg) = CALL_GROUPS.get(&call_id) {
let cg_clone = cg.clone();
let mut members = cg_clone.members.write().await;
if let Some(member) = members.iter().find(|m| m.user_id == user_id) {
return Some(member.create_token());
}
let new_caller = Arc::new(Caller::new(user_id, call_id, false));
let token = new_caller.create_token();
members.push(new_caller);
return Some(token);
}
let caller = Arc::new(Caller::new(user_id, call_id, true));
let call_group = CallGroup::new(call_id, caller.clone());
call_group.update_admins().await;
let call_group = Arc::new(CallGroup::new(call_id, caller.clone()));
CALL_GROUPS.insert(call_id, Arc::new(call_group));
CALL_GROUPS.insert(call_id, call_group.clone());
let _ = call_util::create_room(call_id).await;
call_group.update_admins().await;
Some(caller.create_token())
}
pub async fn add_invite(call_id: Uuid, inviter_id: u64, invitee_id: u64) -> bool {
pub async fn add_invite(
call_id: Uuid,
inviter_id: u64,
invitee_id: u64,
secret: Option<String>,
) -> bool {
if let Some(cg) = CALL_GROUPS.get(&call_id) {
let mut members = cg.members.write().await;
@ -91,6 +85,13 @@ pub async fn add_invite(call_id: Uuid, inviter_id: u64, invitee_id: u64) -> bool
if !members.iter().any(|m| m.user_id == invitee_id) {
members.push(Arc::new(Caller::new(invitee_id, call_id, false)));
}
if let Some(secret) = secret {
let mut secrets = cg.secrets.write().await;
secrets.insert((inviter_id, invitee_id), secret.clone());
secrets.insert((invitee_id, inviter_id), secret);
}
return true;
}
}

15
src/calls/call_util.rs
View file

@ -1,3 +1,4 @@
use livekit_api::services::room::CreateRoomOptions;
use livekit_api::{
access_token::{self},
services::room::RoomClient,
@ -35,6 +36,20 @@ pub fn get_livekit() -> Result<(String, String, String), ()> {
Ok((hostname, api_key, api_secret))
}
pub async fn create_room(call_id: Uuid) -> Result<(), ()> {
let (hostname, api_key, api_secret) = get_livekit()?;
let room_service = RoomClient::with_api_key(&hostname, &api_key, &api_secret);
let options = CreateRoomOptions::default();
room_service
.create_room(&call_id.to_string(), options)
.await
.map_err(|_| ())?;
Ok(())
}
pub fn create_token(user_id: u64, call_id: Uuid, has_admin: bool) -> Result<String, ()> {
let (_, api_key, api_secret) = get_livekit()?;