Use dedicated types for GuildId::audit_logs (#2623)

Fixes #2488
serenity-rs · Nov 26, 2023 · bc2a5b5 · bc2a5b5
1 parent 7454868
commit bc2a5b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/http/client.rs b/src/http/client.rs
@@ -2576,14 +2576,14 @@ impl Http {
     pub async fn get_audit_logs(
         &self,
         guild_id: GuildId,
-        action_type: Option<u8>,
+        action_type: Option<audit_log::Action>,
         user_id: Option<UserId>,
-        before: Option<u64>,
+        before: Option<AuditLogEntryId>,
         limit: Option<u8>,
     ) -> Result<AuditLogs> {
         let mut params = vec![];
         if let Some(action_type) = action_type {
-            params.push(("action_type", action_type.to_string()));
+            params.push(("action_type", action_type.num().to_string()));
         }
         if let Some(before) = before {
             params.push(("before", before.to_string()));

diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs
@@ -287,14 +287,12 @@ impl GuildId {
     pub async fn audit_logs(
         self,
         http: impl AsRef<Http>,
-        action_type: Option<u8>,
+        action_type: Option<audit_log::Action>,
         user_id: Option<UserId>,
         before: Option<AuditLogEntryId>,
         limit: Option<u8>,
     ) -> Result<AuditLogs> {
-        http.as_ref()
-            .get_audit_logs(self, action_type, user_id, before.map(AuditLogEntryId::get), limit)
-            .await
+        http.as_ref().get_audit_logs(self, action_type, user_id, before, limit).await
     }
 
     /// Gets all of the guild's channels over the REST API.

diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
@@ -590,7 +590,7 @@ impl Guild {
     pub async fn audit_logs(
         &self,
         http: impl AsRef<Http>,
-        action_type: Option<u8>,
+        action_type: Option<audit_log::Action>,
         user_id: Option<UserId>,
         before: Option<AuditLogEntryId>,
         limit: Option<u8>,

diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs
@@ -358,7 +358,7 @@ impl PartialGuild {
     pub async fn audit_logs(
         &self,
         http: impl AsRef<Http>,
-        action_type: Option<u8>,
+        action_type: Option<audit_log::Action>,
         user_id: Option<UserId>,
         before: Option<AuditLogEntryId>,
         limit: Option<u8>,