initial livekit support

fix up code

undo changes to compose file

add back .env.example
This commit is contained in:
Zomatree
2024-04-09 02:18:34 +01:00
parent 7703475868
commit ad0dcad497
26 changed files with 2397 additions and 1334 deletions

View File

@@ -22,7 +22,7 @@ pub enum DatabaseInfo {
}
/// Database
#[derive(Clone)]
#[derive(Clone, Debug)]
pub enum Database {
/// Mock database
Reference(ReferenceDb),
@@ -35,7 +35,7 @@ impl DatabaseInfo {
#[async_recursion]
pub async fn connect(self) -> Result<Database, String> {
let config = config().await;
println!("{config:?}");
Ok(match self {
DatabaseInfo::Auto => {
if std::env::var("TEST_DB").is_ok() {

View File

@@ -12,6 +12,7 @@ use serde::Serialize;
database_derived!(
#[cfg(feature = "mongodb")]
/// MongoDB implementation
#[derive(Debug)]
pub struct MongoDb(pub ::mongodb::Client, pub String);
);

View File

@@ -10,7 +10,7 @@ use crate::{
database_derived!(
/// Reference implementation
#[derive(Default)]
#[derive(Default, Debug)]
pub struct ReferenceDb {
pub bots: Arc<Mutex<HashMap<String, Bot>>>,
pub channels: Arc<Mutex<HashMap<String, Channel>>>,

View File

@@ -5,7 +5,7 @@ use revolt_models::v0::{
AppendMessage, Channel, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer,
FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember,
PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User,
UserSettings, Webhook,
UserSettings, Webhook
};
use revolt_result::Error;
@@ -39,6 +39,25 @@ pub enum ErrorEvent {
APIError(Error),
}
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct UserVoiceState {
pub id: String
// TODO - muted, etc
}
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct ChannelVoiceState {
pub id: String,
pub participants: Vec<UserVoiceState>
}
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct ReadyServer {
#[serde(flatten)]
pub server: Server,
pub voice_states: Vec<ChannelVoiceState>
}
/// Protocol Events
#[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(tag = "type")]
@@ -51,7 +70,7 @@ pub enum EventV1 {
/// Basic data to cache
Ready {
users: Vec<User>,
servers: Vec<Server>,
servers: Vec<ReadyServer>,
channels: Vec<Channel>,
members: Vec<Member>,
emojis: Vec<Emoji>,
@@ -225,6 +244,16 @@ pub enum EventV1 {
/// Auth events
Auth(AuthifierEvent),
/// Voice events
VoiceChannelJoin {
id: String,
user: String,
},
VoiceChannelLeave {
id: String,
user: String,
}
}
impl EventV1 {

View File

@@ -1,7 +1,7 @@
use std::collections::HashMap;
use revolt_config::config;
use revolt_models::v0::{self, MessageAuthor};
use revolt_models::v0::{self, MessageAuthor, VoiceInformation};
use revolt_permissions::OverrideField;
use revolt_result::Result;
use serde::{Deserialize, Serialize};
@@ -103,6 +103,10 @@ auto_derived!(
/// Whether this channel is marked as not safe for work
#[serde(skip_serializing_if = "crate::if_false", default)]
nsfw: bool,
/// Voice Information for when this channel is also a voice channel
#[serde(skip_serializing_if = "Option::is_none")]
voice: Option<VoiceInformation>
},
/// Voice channel belonging to a server
VoiceChannel {
@@ -219,6 +223,7 @@ impl Channel {
default_permissions: None,
role_permissions: HashMap::new(),
nsfw: data.nsfw.unwrap_or(false),
voice: data.voice
},
v0::LegacyServerChannelType::Voice => Channel::VoiceChannel {
id: id.clone(),

View File

@@ -4,6 +4,7 @@ use crate::{events::client::EventV1, Database, File, RatelimitEvent};
use once_cell::sync::Lazy;
use rand::seq::SliceRandom;
use redis_kiss::{get_connection, AsyncCommands};
use revolt_config::config;
use revolt_models::v0;
use revolt_presence::filter_online;
@@ -567,6 +568,15 @@ impl User {
}
}
/// Gets current voice channel
pub async fn current_voice_channel(&self) -> Result<Option<String>> {
let mut conn = get_connection().await.map_err(|_| create_error!(InternalError))?;
conn.get::<_, Option<String>>(format!("vc-{}", &self.id))
.await
.map_err(|_| create_error!(InternalError))
}
/// Update user data
pub async fn update<'a>(
&mut self,

View File

@@ -186,6 +186,7 @@ impl From<crate::Channel> for Channel {
default_permissions,
role_permissions,
nsfw,
voice
} => Channel::TextChannel {
id,
server,
@@ -196,6 +197,7 @@ impl From<crate::Channel> for Channel {
default_permissions,
role_permissions,
nsfw,
voice
},
crate::Channel::VoiceChannel {
id,
@@ -266,6 +268,7 @@ impl From<Channel> for crate::Channel {
default_permissions,
role_permissions,
nsfw,
voice
} => crate::Channel::TextChannel {
id,
server,
@@ -276,6 +279,7 @@ impl From<Channel> for crate::Channel {
default_permissions,
role_permissions,
nsfw,
voice
},
Channel::VoiceChannel {
id,