Merge branch 'main' into feat/admin-api
# Conflicts: # crates/core/database/src/drivers/mod.rs # crates/core/database/src/drivers/reference.rs # crates/core/database/src/models/admin_migrations/ops/mongodb/init.rs # crates/core/database/src/models/channels/ops.rs # crates/core/database/src/models/server_members/ops.rs # crates/core/database/src/models/server_members/ops/mongodb.rs # crates/core/database/src/models/server_members/ops/reference.rs # crates/core/database/src/util/bridge/v0.rs # crates/core/result/src/axum.rs # crates/core/result/src/lib.rs # crates/core/result/src/rocket.rs # crates/delta/src/routes/mod.rs # crates/delta/src/routes/servers/server_edit.rs
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
use authifier::AuthifierEvent;
|
||||
use revolt_result::Error;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
@@ -11,7 +10,7 @@ use revolt_models::v0::{
|
||||
UserVoiceState, Webhook,
|
||||
};
|
||||
|
||||
use crate::Database;
|
||||
use crate::{Account, Database, Session};
|
||||
|
||||
/// Ping Packet
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
@@ -339,7 +338,20 @@ pub enum EventV1 {
|
||||
},
|
||||
|
||||
/// Auth events
|
||||
Auth(AuthifierEvent),
|
||||
CreateAccount {
|
||||
account: Account,
|
||||
},
|
||||
CreateSession {
|
||||
session: Session,
|
||||
},
|
||||
DeleteSession {
|
||||
user_id: String,
|
||||
session_id: String,
|
||||
},
|
||||
DeleteAllSessions {
|
||||
user_id: String,
|
||||
exclude_session_id: Option<String>,
|
||||
},
|
||||
|
||||
/// Voice events
|
||||
VoiceChannelJoin {
|
||||
|
||||
Reference in New Issue
Block a user