Add support for reverse audit-log iteration (#2370)

discord-jda · Jan 11, 2023 · 83ae997 · 83ae997
1 parent e20f53a
commit 83ae997
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...net/dv8tion/jda/internal/requests/restaction/pagination/AuditLogPaginationActionImpl.java b/...net/dv8tion/jda/internal/requests/restaction/pagination/AuditLogPaginationActionImpl.java
@@ -84,7 +84,7 @@ public Guild getGuild()
     @Override
     public EnumSet<PaginationOrder> getSupportedOrders()
     {
-        return EnumSet.of(PaginationOrder.BACKWARD);
+        return EnumSet.of(PaginationOrder.BACKWARD, PaginationOrder.FORWARD);
     }
 
     @Override
@@ -135,17 +135,21 @@ protected void handleSuccess(Response response, Request<List<AuditLogEntry>> req
                 DataObject webhook = webhookMap.get(entry.getLong("target_id", 0));
                 AuditLogEntry result = builder.createAuditLogEntry((GuildImpl) guild, entry, user, webhook);
                 list.add(result);
-                if (this.useCache)
-                    this.cached.add(result);
-                this.last = result;
-                this.lastKey = last.getIdLong();
             }
             catch (ParsingException | NullPointerException e)
             {
                 LOG.warn("Encountered exception in AuditLogPagination", e);
             }
         }
 
+        if (!list.isEmpty())
+        {
+            if (this.useCache)
+                this.cached.addAll(list);
+            this.last = list.get(list.size() - 1);
+            this.lastKey = last.getIdLong();
+        }
+
         request.onSuccess(list);
     }