Merge pull request #87 from kozabrada123/main

Update chorus to 0.19.0

Author: kozabrada123

Cargo.toml

@@ -59,7 +59,7 @@ sentry = { version = "0.34.0", default-features = false, features = [
 clap = { version = "4.5.26", features = ["derive"] }
 chorus = { features = [
     "backend",
-], default-features = false, version = "0.18.0" }
+], default-features = false, version = "0.19.0" }
 serde_path_to_error = "0.1.16"
 percent-encoding = "2.3.1"
 hex = "0.4.3"

src/api/routes/channels/messages/id/reactions.rs

@@ -166,12 +166,10 @@ pub async fn get_reaction(
 
     let Some(reaction) = message.reactions.as_ref().and_then(|reactions| {
         reactions.iter().find(|r| {
-            if let Some(id) = emoji.id {
-                r.emoji.id == id
-            } else if let Some(name) = &r.emoji.name {
-                emoji.name.eq(name)
+            if emoji.id.is_some() && r.emoji.id.is_some() {
+                emoji.id == r.emoji.id
             } else {
-                false
+                emoji.name.eq(&r.emoji.name)
             }
         })
     }) else {

src/api/routes/guilds/id/bans.rs

@@ -5,8 +5,8 @@
  */
 
 use chorus::types::{
-    jwt::Claims, GuildBanBulkCreateSchema, GuildBanCreateSchema, GuildBansQuery,
-    GuildBansSearchQuery, Snowflake,
+    jwt::Claims, BulkGuildBanSchema, GetGuildBansQuery, GuildBanCreateSchema, GuildBansSearchQuery,
+    Snowflake,
 };
 use poem::{
     handler,
@@ -26,7 +26,7 @@ pub async fn get_bans(
     Data(db): Data<&PgPool>,
     Data(claims): Data<&Claims>,
     Path(guild_id): Path<Snowflake>,
-    Query(query): Query<GuildBansQuery>,
+    Query(query): Query<GetGuildBansQuery>,
 ) -> poem::Result<impl IntoResponse> {
     let mut bans =
         GuildBan::get_by_guild(db, guild_id, query.before, query.after, query.limit).await?;
@@ -95,7 +95,7 @@ pub async fn bulk_ban(
     Data(db): Data<&PgPool>,
     Data(claims): Data<&Claims>,
     Path(guild_id): Path<Snowflake>,
-    Json(payload): Json<GuildBanBulkCreateSchema>,
+    Json(payload): Json<BulkGuildBanSchema>,
 ) -> poem::Result<impl IntoResponse> {
     let guild = Guild::get_by_id(db, guild_id)
         .await?

src/api/routes/guilds/id/members/id/mod.rs

@@ -74,7 +74,7 @@ pub async fn modify_member(
         .await?
         .ok_or(Error::Guild(GuildError::MemberNotFound))?;
 
-    if let Some(nick) = payload.nick {
+    if let Some(nick) = payload.nickname {
         if !authed_member
             .permissions
             .has_permission(PermissionFlags::MANAGE_NICKNAMES)

src/api/routes/guilds/id/members/id/nick.rs

@@ -38,7 +38,7 @@ pub async fn change_nickname(
             .permissions
             .has_permission(PermissionFlags::CHANGE_NICKNAME)
     {
-        authed_member.nick = payload.nick;
+        authed_member.nick = payload.nickname;
     } else if authed_member
         .permissions
         .has_permission(PermissionFlags::MANAGE_NICKNAMES)
@@ -48,7 +48,7 @@ pub async fn change_nickname(
             .get_member(db, snowflake)
             .await?
             .ok_or(Error::Guild(GuildError::MemberNotFound))?;
-        authed_member.nick = payload.nick;
+        authed_member.nick = payload.nickname;
     } else {
         return Err(Error::Guild(GuildError::InsufficientPermissions).into());
     }

src/database/entities/message.rs

@@ -308,11 +308,10 @@ impl Message {
         if let Some(reactions) = self.reactions.as_mut() {
             let orig_len = reactions.len();
             reactions.retain(|r| {
-                if let Some(snowflake) = emoji.id {
-                    r.emoji.id != snowflake
+                if emoji.id.is_some() && r.emoji.id.is_some() {
+                    r.emoji.id != emoji.id
                 } else {
-                    // TODO: Bad practice, do this without cloning
-                    r.emoji.name.clone().unwrap_or_default().ne(&emoji.name)
+                    r.emoji.name.ne(&emoji.name)
                 }
             });
             if orig_len == reactions.len() {
@@ -364,11 +363,10 @@ impl Message {
     pub fn get_reaction(&self, emoji: &PartialEmoji) -> Option<&Reaction> {
         if let Some(reactions) = &self.reactions {
             reactions.iter().find(|r| {
-                if let Some(snowflake) = emoji.id {
-                    r.emoji.id == snowflake
+                if emoji.id.is_some() && r.emoji.id.is_some() {
+                    r.emoji.id == emoji.id
                 } else {
-                    // TODO: Bad practice, do this without cloning
-                    r.emoji.name.clone().unwrap_or_default() == emoji.name
+                    r.emoji.name == emoji.name
                 }
             })
         } else {
@@ -379,11 +377,10 @@ impl Message {
     pub fn get_reaction_mut(&mut self, emoji: &PartialEmoji) -> Option<&mut Reaction> {
         if let Some(reactions) = self.reactions.as_mut() {
             reactions.iter_mut().find(|r| {
-                if let Some(snowflake) = emoji.id {
-                    r.emoji.id == snowflake
+                if emoji.id.is_some() && r.emoji.id.is_some() {
+                    r.emoji.id == emoji.id
                 } else {
-                    // TODO: Bad practice, do this without cloning
-                    r.emoji.name.clone().unwrap_or_default() == emoji.name
+                    r.emoji.name == emoji.name
                 }
             })
         } else {

src/gateway/ready.rs

@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 
-use chorus::types::{ClientInfo, GatewayReady, ReadState, Session, Snowflake, UserNote};
+use chorus::types::{
+    ClientInfo, GatewayReady, ReadState, Session, Snowflake, UserNote, VersionedReadStateOrEntries,
+};
 use serde_json::json;
 use sqlx::PgPool;
 
@@ -73,11 +75,12 @@ pub async fn create_ready(user_id: Snowflake, db: &PgPool) -> Result<GatewayRead
         private_channels,
         notes,
         sessions: Some([session].into()),
-        read_state: ReadState {
+        // Note: Discord.com now just sends Entries, while Spacebar sends VersionedReadState
+        read_state: VersionedReadStateOrEntries::Versioned(ReadState {
             entries: Default::default(),
             partial: false,
             version: 0,
-        },
+        }),
         ..Default::default()
     };
     log::debug!(target: "symfonia::gateway::ready::create_ready", "Created READY json payload: {:#?}", json!(ready));