diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs index a887e9f1..aa9fb0b9 100644 --- a/crates/core/database/src/events/client.rs +++ b/crates/core/database/src/events/client.rs @@ -144,7 +144,13 @@ pub enum EventV1 { }, /// User joins server - ServerMemberJoin { id: String, user: String }, + ServerMemberJoin { + id: String, + // Deprecated: use member.id.user + #[deprecated = "Use member.id.user instead"] + user: String, + member: Member, + }, /// User left server ServerMemberLeave { diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs index 25b6979a..c74014ba 100644 --- a/crates/core/database/src/models/server_members/model.rs +++ b/crates/core/database/src/models/server_members/model.rs @@ -124,6 +124,7 @@ impl Member { EventV1::ServerMemberJoin { id: server.id.clone(), user: user.id.clone(), + member: member.clone().into(), } .p(server.id.clone()) .await; diff --git a/crates/delta/src/routes/bots/invite.rs b/crates/delta/src/routes/bots/invite.rs index 39517c51..ad4f16ad 100644 --- a/crates/delta/src/routes/bots/invite.rs +++ b/crates/delta/src/routes/bots/invite.rs @@ -168,8 +168,8 @@ mod test { .await; match event { - EventV1::ServerMemberJoin { user, .. } => { - assert_eq!(bot.id, user); + EventV1::ServerMemberJoin { member, .. } => { + assert_eq!(bot.id, member.id.user); } _ => unreachable!(), }