Expose more Audit Log Data

beemobot · Oct 21, 2023 · 924e10b · 924e10b
1 parent 95df3b1
commit 924e10b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/javacord-api/src/main/java/org/javacord/api/entity/auditlog/AuditLogChangeType.java b/javacord-api/src/main/java/org/javacord/api/entity/auditlog/AuditLogChangeType.java
@@ -83,6 +83,7 @@ public enum AuditLogChangeType implements Nameable {
     DEAF("deaf"),
     MUTE("mute"),
     NICK("nick"),
+    COMMUNICATION_DISABLED_UNTIL("communication_disabled_until"),
 
     // integration
     ENABLE_EMOTICONS("enable_emoticons"),

diff --git a/javacord-api/src/main/java/org/javacord/api/entity/auditlog/AuditLogEntry.java b/javacord-api/src/main/java/org/javacord/api/entity/auditlog/AuditLogEntry.java
@@ -19,6 +19,13 @@ public interface AuditLogEntry extends DiscordEntity {
      */
     AuditLog getAuditLog();
 
+    /**
+     * Gets the id of the user who made the changes.
+     *
+     * @return The id of the user who made the changes.
+     */
+    long getUserId();
+
     /**
      * Gets the user who made the changes.
      *

diff --git a/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java b/javacord-core/src/main/java/org/javacord/core/entity/auditlog/AuditLogEntryImpl.java
@@ -26,6 +26,7 @@
 import java.awt.Color;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -222,6 +223,13 @@ public AuditLogEntryImpl(AuditLog auditLog, JsonNode data) {
                             change = new AuditLogChangeImpl<>(AuditLogChangeType.UNKNOWN, oldValue, newValue);
                         }
                         break;
+                    case COMMUNICATION_DISABLED_UNTIL:
+                        change = new AuditLogChangeImpl<>(
+                                type,
+                                oldValue != null ? OffsetDateTime.parse(oldValue.asText()).toInstant() : null,
+                                newValue != null ? OffsetDateTime.parse(newValue.asText()).toInstant() : null
+                        );
+                        break;
                     case TYPE:
                         // TODO Find a good way to both handle integers (channel type) and strings
                         change = new AuditLogChangeImpl<>(type, oldValue, newValue);
@@ -273,6 +281,11 @@ public AuditLog getAuditLog() {
         return auditLog;
     }
 
+    @Override
+    public long getUserId() {
+        return userId;
+    }
+
     @Override
     public CompletableFuture<User> getUser() {
         return getApi().getUserById(userId);