Reformat

Author: randomairborne

xpd-common/src/lib.rs

@@ -208,16 +208,7 @@ pub struct AuditLogEvent {
     pub kind: AuditLogEventKind,
 }
 
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Eq,
-    serde::Serialize,
-    serde::Deserialize,
-    FromRepr,
-)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize, FromRepr)]
 #[non_exhaustive]
 #[repr(i16)]
 pub enum AuditLogEventKind {

xpd-database/src/lib.rs

@@ -23,7 +23,9 @@ use twilight_model::id::{
     marker::{ChannelMarker, GenericMarker, GuildMarker, RoleMarker, UserMarker},
 };
 use util::{db_to_id, id_to_db};
-use xpd_common::{AuditLogEvent, AuditLogEventKind, GuildConfig, RoleReward, UserInGuild, UserStatus};
+use xpd_common::{
+    AuditLogEvent, AuditLogEventKind, GuildConfig, RoleReward, UserInGuild, UserStatus,
+};
 pub async fn guild_rewards<
     'a,
     D: DerefMut<Target = PgConnection> + Send,
@@ -253,12 +255,9 @@ pub async fn delete_audit_log_events_guild<
     guild: Id<GuildMarker>,
 ) -> Result<(), Error> {
     let mut conn = conn.acquire().await?;
-    query!(
-        "DELETE FROM audit_logs WHERE guild = $1",
-        id_to_db(guild)
-    )
-    .execute(conn.as_mut())
-    .await?;
+    query!("DELETE FROM audit_logs WHERE guild = $1", id_to_db(guild))
+        .execute(conn.as_mut())
+        .await?;
     Ok(())
 }
 
@@ -271,12 +270,9 @@ pub async fn delete_audit_log_events_user<
     target: Id<UserMarker>,
 ) -> Result<(), Error> {
     let mut conn = conn.acquire().await?;
-    query!(
-        "DELETE FROM audit_logs WHERE target = $1",
-        id_to_db(target)
-    )
-    .execute(conn.as_mut())
-    .await?;
+    query!("DELETE FROM audit_logs WHERE target = $1", id_to_db(target))
+        .execute(conn.as_mut())
+        .await?;
     Ok(())
 }
 
@@ -1098,7 +1094,7 @@ impl Display for Error {
             Self::Database(de) => write!(f, "{de}"),
             Self::Interpolation(ie) => write!(f, "{ie}"),
             Self::UnspecifiedDelete => f.write_str("No constraints specified to delete by."),
-            Self::UnknownAuditLogEventKind => f.write_str("Unknown audit log event kind")
+            Self::UnknownAuditLogEventKind => f.write_str("Unknown audit log event kind"),
         }
     }
 }

xpd-database/src/test.rs

@@ -62,7 +62,7 @@ async fn audit_log_multi(db: PgPool) -> Result<(), Box<dyn std::error::Error>> {
             timestamp: 50,
             previous: 100,
             delta: -100,
-            kind: AuditLogEventKind::Reset
+            kind: AuditLogEventKind::Reset,
         },
         AuditLogEvent {
             guild: Id::new(1),
@@ -71,7 +71,7 @@ async fn audit_log_multi(db: PgPool) -> Result<(), Box<dyn std::error::Error>> {
             timestamp: 591,
             previous: 15,
             delta: 50,
-            kind: AuditLogEventKind::Set
+            kind: AuditLogEventKind::Set,
         },
     ];
     for event in &original_events {
@@ -90,13 +90,13 @@ async fn audit_log_multi(db: PgPool) -> Result<(), Box<dyn std::error::Error>> {
 async fn audit_logs_deleted_guild(db: PgPool) -> Result<(), Box<dyn std::error::Error>> {
     let original_events = vec![
         AuditLogEvent {
-        guild: Id::new(1),
-        target: Id::new(2),
+            guild: Id::new(1),
+            target: Id::new(2),
             moderator: Id::new(3),
             timestamp: 50,
             previous: 100,
             delta: -100,
-            kind: AuditLogEventKind::AddSub
+            kind: AuditLogEventKind::AddSub,
         },
         AuditLogEvent {
             guild: Id::new(1),
@@ -105,7 +105,7 @@ async fn audit_logs_deleted_guild(db: PgPool) -> Result<(), Box<dyn std::error::
             timestamp: 591,
             previous: 15,
             delta: 50,
-            kind: AuditLogEventKind::AddSub
+            kind: AuditLogEventKind::AddSub,
         },
         AuditLogEvent {
             guild: Id::new(2),
@@ -114,7 +114,7 @@ async fn audit_logs_deleted_guild(db: PgPool) -> Result<(), Box<dyn std::error::
             timestamp: 595,
             previous: 100,
             delta: 50,
-            kind: AuditLogEventKind::Set
+            kind: AuditLogEventKind::Set,
         },
     ];
     for event in &original_events {

xpd-listener/src/audit_log.rs

@@ -79,7 +79,7 @@ async fn take_audit_log_action(
         timestamp: xpd_util::snowflake_to_timestamp(id),
         previous: old_xp,
         delta: -old_xp,
-        kind
+        kind,
     };
 
     xpd_database::add_audit_log_event(txn.as_mut(), audit_log_event).await?;

xpd-slash/src/experience.rs

@@ -78,7 +78,7 @@ async fn modify_user_xp(
         timestamp: snowflake_to_timestamp(audit.interaction),
         previous: xp + amount,
         delta: amount,
-        kind: AuditLogEventKind::AddSub
+        kind: AuditLogEventKind::AddSub,
     };
     xpd_database::add_audit_log_event(txn.as_mut(), audit_event).await?;
 
@@ -111,7 +111,7 @@ async fn reset_user_xp(
         timestamp: snowflake_to_timestamp(audit.interaction),
         previous: old_xp,
         delta: -old_xp,
-        kind: AuditLogEventKind::Reset
+        kind: AuditLogEventKind::Reset,
     };
     xpd_database::add_audit_log_event(txn.as_mut(), audit_event).await?;
 
@@ -142,7 +142,7 @@ async fn set_user_xp(
         timestamp: snowflake_to_timestamp(audit.interaction),
         previous: old_xp,
         delta: setpoint - old_xp,
-        kind: AuditLogEventKind::Set
+        kind: AuditLogEventKind::Set,
     };
     xpd_database::add_audit_log_event(txn.as_mut(), audit_event).await?;