diff --git a/crates/delta/src/routes/push/subscribe.rs b/crates/delta/src/routes/push/subscribe.rs index 098c119d..30740449 100644 --- a/crates/delta/src/routes/push/subscribe.rs +++ b/crates/delta/src/routes/push/subscribe.rs @@ -22,7 +22,7 @@ pub async fn req( ) -> Result { session.subscription = Some(data.into_inner()); session - .save(&rauth) + .save(rauth) .await .map(|_| EmptyResponse) .map_err(|_| Error::DatabaseError { diff --git a/crates/delta/src/routes/push/unsubscribe.rs b/crates/delta/src/routes/push/unsubscribe.rs index 117173e6..440ace0f 100644 --- a/crates/delta/src/routes/push/unsubscribe.rs +++ b/crates/delta/src/routes/push/unsubscribe.rs @@ -13,7 +13,7 @@ use rocket::State; pub async fn req(rauth: &State, mut session: Session) -> Result { session.subscription = None; session - .save(&rauth) + .save(rauth) .await .map(|_| EmptyResponse) .map_err(|_| Error::DatabaseError { diff --git a/crates/quark/src/models/channels/channel.rs b/crates/quark/src/models/channels/channel.rs index a8fa3740..62b05db0 100644 --- a/crates/quark/src/models/channels/channel.rs +++ b/crates/quark/src/models/channels/channel.rs @@ -161,7 +161,7 @@ pub struct PartialChannel { } /// Optional fields on channel object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)] pub enum FieldsChannel { Description, Icon, diff --git a/crates/quark/src/models/servers/server.rs b/crates/quark/src/models/servers/server.rs index 2f3ce468..0df877b3 100644 --- a/crates/quark/src/models/servers/server.rs +++ b/crates/quark/src/models/servers/server.rs @@ -134,7 +134,7 @@ pub struct Server { } /// Optional fields on server object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)] pub enum FieldsServer { Description, Categories, @@ -144,7 +144,7 @@ pub enum FieldsServer { } /// Optional fields on server object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)] pub enum FieldsRole { Colour, } diff --git a/crates/quark/src/models/servers/server_member.rs b/crates/quark/src/models/servers/server_member.rs index 904ed690..23b802f3 100644 --- a/crates/quark/src/models/servers/server_member.rs +++ b/crates/quark/src/models/servers/server_member.rs @@ -42,7 +42,7 @@ pub struct Member { } /// Optional fields on server member object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)] pub enum FieldsMember { Nickname, Avatar, diff --git a/crates/quark/src/models/users/bot.rs b/crates/quark/src/models/users/bot.rs index fd438d98..9fccb30d 100644 --- a/crates/quark/src/models/users/bot.rs +++ b/crates/quark/src/models/users/bot.rs @@ -56,7 +56,7 @@ pub struct Bot { } /// Optional fields on bot object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq)] pub enum FieldsBot { Token, InteractionsURL, diff --git a/crates/quark/src/models/users/user.rs b/crates/quark/src/models/users/user.rs index db745a0b..185bf286 100644 --- a/crates/quark/src/models/users/user.rs +++ b/crates/quark/src/models/users/user.rs @@ -10,7 +10,7 @@ pub fn if_false(t: &bool) -> bool { } /// User's relationship with another user (or themselves) -#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)] pub enum RelationshipStatus { None, User, @@ -30,7 +30,7 @@ pub struct Relationship { } /// Presence status -#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq, Eq)] pub enum Presence { /// User is online Online, @@ -163,7 +163,7 @@ pub struct User { } /// Optional fields on user object -#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Clone)] +#[derive(Serialize, Deserialize, JsonSchema, Debug, PartialEq, Eq, Clone)] pub enum FieldsUser { Avatar, StatusText, diff --git a/crates/quark/src/presence/mod.rs b/crates/quark/src/presence/mod.rs index 301cd010..2f301f84 100644 --- a/crates/quark/src/presence/mod.rs +++ b/crates/quark/src/presence/mod.rs @@ -147,7 +147,7 @@ pub async fn presence_clear_region(region_id: Option<&str>) { // also send out any relevant events. for session in sessions { let parts = session.split(':').collect::>(); - if let (Some(user_id), Some(session_id)) = (parts.get(0), parts.get(1)) { + if let (Some(user_id), Some(session_id)) = (parts.first(), parts.get(1)) { if let Ok(session_id) = session_id.parse() { presence_delete_session_internal(user_id, session_id, true).await; } diff --git a/crates/quark/src/presence/operations.rs b/crates/quark/src/presence/operations.rs index 4431b2f4..b97b65c7 100644 --- a/crates/quark/src/presence/operations.rs +++ b/crates/quark/src/presence/operations.rs @@ -53,5 +53,5 @@ pub async fn __get_set_sessions(conn: &mut Conn, region_id: &str) -> Vec /// Delete region session set pub async fn __delete_set_sessions(conn: &mut Conn, region_id: &str) { - let _: () = conn.del(region_id).await.unwrap(); + conn.del::<_, ()>(region_id).await.unwrap(); }