kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some Guild, Integration and Webhook events

This commit is contained in:
kozabrada123 2023-05-14 15:55:20 +02:00
parent 60338933fa
commit fcbca459dc
2 changed files with 125 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/api/types.rs
View File

@ -1192,6 +1192,15 @@ pub struct GatewayVoiceStateUpdate {
impl WebSocketEvent for GatewayVoiceStateUpdate {} impl WebSocketEvent for GatewayVoiceStateUpdate {}
#[derive(Debug, Deserialize, Serialize, Default)]
/// See https://discord.com/developers/docs/topics/gateway-events#webhooks-update
pub struct WebhooksUpdate {
pub guild_id: String,
pub channel_id: String,
}
impl WebSocketEvent for WebhooksUpdate {}
#[derive(Debug, Default, Deserialize, Serialize)] #[derive(Debug, Default, Deserialize, Serialize)]
pub struct GatewayHello { pub struct GatewayHello {
pub op: i32, pub op: i32,
@ -1491,6 +1500,36 @@ pub struct GuildRoleDelete {
impl WebSocketEvent for GuildRoleDelete {} impl WebSocketEvent for GuildRoleDelete {}
#[derive(Debug, Default, Deserialize, Serialize)]
/// See https://discord.com/developers/docs/topics/gateway-events#integration-create
pub struct IntegrationCreate {
#[serde(flatten)]
pub integration: Integration,
pub guild_id: String,
}
impl WebSocketEvent for IntegrationCreate {}
#[derive(Debug, Default, Deserialize, Serialize)]
/// See https://discord.com/developers/docs/topics/gateway-events#integration-update
pub struct IntegrationUpdate {
#[serde(flatten)]
pub integration: Integration,
pub guild_id: String,
}
impl WebSocketEvent for IntegrationUpdate {}
#[derive(Debug, Default, Deserialize, Serialize)]
/// See https://discord.com/developers/docs/topics/gateway-events#integration-delete
pub struct IntegrationDelete {
pub id: String,
pub guild_id: String,
pub application_id: Option<String>,
}
impl WebSocketEvent for IntegrationDelete {}
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
/// Officially Undocumented /// Officially Undocumented
/// {"t":"CALL_CREATE","s":2,"op":0,"d":{"voice_states":[],"ringing":[],"region":"milan","message_id":"1107187514906775613","embedded_activities":[],"channel_id":"837609115475771392"}} /// {"t":"CALL_CREATE","s":2,"op":0,"d":{"voice_states":[],"ringing":[],"region":"milan","message_id":"1107187514906775613","embedded_activities":[],"channel_id":"837609115475771392"}}

116
src/gateway.rs
View File

@ -202,11 +202,11 @@ impl Gateway {
match gateway_payload_t.as_str() { match gateway_payload_t.as_str() {
"READY" => { "READY" => {
let new_data: GatewayReady = serde_json::from_value(gateway_payload.d.unwrap()).unwrap(); let new_data: GatewayReady = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.ready.ready.update_data(new_data).await; self.events.lock().await.session.ready.update_data(new_data).await;
}, },
"READY_SUPPLEMENTAL" => { "READY_SUPPLEMENTAL" => {
let new_data: GatewayReadySupplemental = serde_json::from_value(gateway_payload.d.unwrap()).unwrap(); let new_data: GatewayReadySupplemental = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.ready.ready_supplimental.update_data(new_data).await; self.events.lock().await.session.ready_supplimental.update_data(new_data).await;
} }
"RESUMED" => {} "RESUMED" => {}
"APPLICATION_COMMAND_PERMISSIONS_UPDATE" => {} "APPLICATION_COMMAND_PERMISSIONS_UPDATE" => {}
@ -291,23 +291,59 @@ impl Gateway {
let new_data: GuildEmojisUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap(); let new_data: GuildEmojisUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.emojis_update.update_data(new_data).await; self.events.lock().await.guild.emojis_update.update_data(new_data).await;
} }
"GUILD_STICKERS_UPDATE" => {} "GUILD_STICKERS_UPDATE" => {
"GUILD_INTEGRATIONS_UPDATE" => {} let new_data: GuildStickersUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
"GUILD_MEMBER_ADD" => {} self.events.lock().await.guild.stickers_update.update_data(new_data).await;
"GUILD_MEMBER_REMOVE" => {} }
"GUILD_MEMBER_UPDATE" => {} "GUILD_INTEGRATIONS_UPDATE" => {
"GUILD_MEMBERS_CHUNK" => {} let new_data: GuildIntegrationsUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
"GUILD_ROLE_CREATE" => {} self.events.lock().await.guild.integrations_update.update_data(new_data).await;
"GUILD_ROLE_UPDATE" => {} }
"GUILD_ROLE_DELETE" => {} "GUILD_MEMBER_ADD" => {
let new_data: GuildMemberAdd = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.member_add.update_data(new_data).await;
}
"GUILD_MEMBER_REMOVE" => {
let new_data: GuildMemberRemove = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.member_remove.update_data(new_data).await;
}
"GUILD_MEMBER_UPDATE" => {
let new_data: GuildMemberUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.member_update.update_data(new_data).await;
}
"GUILD_MEMBERS_CHUNK" => {
let new_data: GuildMembersChunk = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.members_chunk.update_data(new_data).await;
}
"GUILD_ROLE_CREATE" => {
let new_data: GuildRoleCreate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.role_create.update_data(new_data).await;
}
"GUILD_ROLE_UPDATE" => {
let new_data: GuildRoleUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.role_update.update_data(new_data).await;
}
"GUILD_ROLE_DELETE" => {
let new_data: GuildRoleDelete = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.guild.role_delete.update_data(new_data).await;
}
"GUILD_SCHEDULED_EVENT_CREATE" => {} "GUILD_SCHEDULED_EVENT_CREATE" => {}
"GUILD_SCHEDULED_EVENT_UPDATE" => {} "GUILD_SCHEDULED_EVENT_UPDATE" => {}
"GUILD_SCHEDULED_EVENT_DELETE" => {} "GUILD_SCHEDULED_EVENT_DELETE" => {}
"GUILD_SCHEDULED_EVENT_USER_ADD" => {} "GUILD_SCHEDULED_EVENT_USER_ADD" => {}
"GUILD_SCHEDULED_EVENT_USER_REMOVE" => {} "GUILD_SCHEDULED_EVENT_USER_REMOVE" => {}
"INTEGRATION_CREATE" => {} "INTEGRATION_CREATE" => {
"INTEGRATION_UPDATE" => {} let new_data: IntegrationCreate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
"INTEGRATION_DELETE" => {} self.events.lock().await.integration.create.update_data(new_data).await;
}
"INTEGRATION_UPDATE" => {
let new_data: IntegrationUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.integration.update.update_data(new_data).await;
}
"INTEGRATION_DELETE" => {
let new_data: IntegrationDelete = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.integration.delete.update_data(new_data).await;
}
"INTERACTION_CREATE" => {} "INTERACTION_CREATE" => {}
"INVITE_CREATE" => {} "INVITE_CREATE" => {}
"INVITE_DELETE" => {} "INVITE_DELETE" => {}
@ -354,8 +390,10 @@ impl Gateway {
"STAGE_INSTANCE_CREATE" => {} "STAGE_INSTANCE_CREATE" => {}
"STAGE_INSTANCE_UPDATE" => {} "STAGE_INSTANCE_UPDATE" => {}
"STAGE_INSTANCE_DELETE" => {} "STAGE_INSTANCE_DELETE" => {}
// Not documented in discord docs, I assume this isnt for bots / apps but is for users? "SESSIONS_REPLACE" => {
"SESSIONS_REPLACE" => {} let new_data: SessionsReplace = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.session.replace.update_data(new_data).await;
}
"TYPING_START" => { "TYPING_START" => {
let new_data: TypingStartEvent = serde_json::from_value(gateway_payload.d.unwrap()).unwrap(); let new_data: TypingStartEvent = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.user.typing_start_event.update_data(new_data).await; self.events.lock().await.user.typing_start_event.update_data(new_data).await;
@ -366,7 +404,10 @@ impl Gateway {
} }
"VOICE_STATE_UPDATE" => {} "VOICE_STATE_UPDATE" => {}
"VOICE_SERVER_UPDATE" => {} "VOICE_SERVER_UPDATE" => {}
"WEBHOOKS_UPDATE" => {} "WEBHOOKS_UPDATE" => {
let new_data: WebhooksUpdate = serde_json::from_value(gateway_payload.d.unwrap()).unwrap();
self.events.lock().await.webhooks.update.update_data(new_data).await;
}
_ => {panic!("Invalid gateway event ({})", &gateway_payload_t)} _ => {panic!("Invalid gateway event ({})", &gateway_payload_t)}
} }
} }
@ -553,21 +594,24 @@ mod events {
use super::*; use super::*;
#[derive(Default, Debug)] #[derive(Default, Debug)]
pub struct Events { pub struct Events {
pub ready: Ready, pub session: Session,
pub message: Message, pub message: Message,
pub user: User, pub user: User,
pub channel: Channel, pub channel: Channel,
pub thread: Thread, pub thread: Thread,
pub guild: Guild, pub guild: Guild,
pub integration: Integration,
pub call: Call, pub call: Call,
pub webhooks: Webhooks,
pub gateway_identify_payload: GatewayEvent<GatewayIdentifyPayload>, pub gateway_identify_payload: GatewayEvent<GatewayIdentifyPayload>,
pub gateway_resume: GatewayEvent<GatewayResume>, pub gateway_resume: GatewayEvent<GatewayResume>,
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
pub struct Ready { pub struct Session {
pub ready: GatewayEvent<GatewayReady>, pub ready: GatewayEvent<GatewayReady>,
pub ready_supplimental: GatewayEvent<GatewayReadySupplemental> pub ready_supplimental: GatewayEvent<GatewayReadySupplemental>,
pub replace: GatewayEvent<SessionsReplace>
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
@ -617,28 +661,40 @@ mod events {
pub ban_add: GatewayEvent<GuildBanAdd>, pub ban_add: GatewayEvent<GuildBanAdd>,
pub ban_remove: GatewayEvent<GuildBanRemove>, pub ban_remove: GatewayEvent<GuildBanRemove>,
pub emojis_update: GatewayEvent<GuildEmojisUpdate>, pub emojis_update: GatewayEvent<GuildEmojisUpdate>,
/*pub stickers_update: GatewayEvent<ThreadCreate>, pub stickers_update: GatewayEvent<GuildStickersUpdate>,
pub integrations_update: GatewayEvent<ThreadCreate>, pub integrations_update: GatewayEvent<GuildIntegrationsUpdate>,
pub member_add: GatewayEvent<ThreadCreate>, pub member_add: GatewayEvent<GuildMemberAdd>,
pub member_remove: GatewayEvent<ThreadCreate>, pub member_remove: GatewayEvent<GuildMemberRemove>,
pub member_update: GatewayEvent<ThreadCreate>, pub member_update: GatewayEvent<GuildMemberUpdate>,
pub members_chunk: GatewayEvent<ThreadCreate>, pub members_chunk: GatewayEvent<GuildMembersChunk>,
pub role_create: GatewayEvent<ThreadCreate>, pub role_create: GatewayEvent<GuildRoleCreate>,
pub role_update: GatewayEvent<ThreadCreate>, pub role_update: GatewayEvent<GuildRoleUpdate>,
pub role_delete: GatewayEvent<ThreadCreate>, pub role_delete: GatewayEvent<GuildRoleDelete>,
pub role_scheduled_event_create: GatewayEvent<ThreadCreate>, /*pub role_scheduled_event_create: GatewayEvent<ThreadCreate>,
pub role_scheduled_event_update: GatewayEvent<ThreadCreate>, pub role_scheduled_event_update: GatewayEvent<ThreadCreate>,
pub role_scheduled_event_delete: GatewayEvent<ThreadCreate>, pub role_scheduled_event_delete: GatewayEvent<ThreadCreate>,
pub role_scheduled_event_user_add: GatewayEvent<ThreadCreate>, pub role_scheduled_event_user_add: GatewayEvent<ThreadCreate>,
pub role_scheduled_event_user_remove: GatewayEvent<ThreadCreate>,*/ pub role_scheduled_event_user_remove: GatewayEvent<ThreadCreate>,*/
} }
#[derive(Default, Debug)]
pub struct Integration {
pub create: GatewayEvent<IntegrationCreate>,
pub update: GatewayEvent<IntegrationUpdate>,
pub delete: GatewayEvent<IntegrationDelete>
}
#[derive(Default, Debug)] #[derive(Default, Debug)]
pub struct Call { pub struct Call {
pub create: GatewayEvent<CallCreate>, pub create: GatewayEvent<CallCreate>,
pub update: GatewayEvent<CallUpdate>, pub update: GatewayEvent<CallUpdate>,
pub delete: GatewayEvent<CallDelete> pub delete: GatewayEvent<CallDelete>
} }
#[derive(Default, Debug)]
pub struct Webhooks {
pub update: GatewayEvent<WebhooksUpdate>,
}
} }
#[cfg(test)] #[cfg(test)]