From 36b7e671d18a3e9e1f4d4bebf2bb6414f00ef6ef Mon Sep 17 00:00:00 2001 From: Egg-03 <111327101+Egg-03@users.noreply.github.com> Date: Tue, 7 Oct 2025 21:28:34 +0530 Subject: [PATCH 1/2] refactor(api): upgrade JDA to v6 and align discord permissions This commit updates the JDA library to version 6.0.0, bringing the bot up to date with the latest Discord API changes. The PermissionResolver has been updated to reflect new permission names (e.g., USE_VAD) and include newly introduced permissions (e.g., PIN_MESSAGES). Benefits of this upgrade include improved compatibility with the latest Discord features and API specifications, ensuring the bot remains functional and can correctly interpret and display Discord permissions. The minor grammatical and formatting changes in AuditLogListener are incidental cleanups. --- pom.xml | 4 ++-- .../listeners/loglisteners/AuditLogListener.java | 4 ++-- .../java/org/papertrail/utilities/PermissionResolver.java | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c4cbf78d..61096067 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.egg.papertrail paper-trail-bot - 2.0.0 + 2.0.1 PaperTrail A simple bot for logging all user actions @@ -16,7 +16,7 @@ net.dv8tion JDA - 5.6.1 + 6.0.0 org.tinylog diff --git a/src/main/java/org/papertrail/listeners/loglisteners/AuditLogListener.java b/src/main/java/org/papertrail/listeners/loglisteners/AuditLogListener.java index 93705e76..9fd8acee 100644 --- a/src/main/java/org/papertrail/listeners/loglisteners/AuditLogListener.java +++ b/src/main/java/org/papertrail/listeners/loglisteners/AuditLogListener.java @@ -112,7 +112,7 @@ private void auditLogParser(GuildAuditLogEntryCreateEvent event, AuditLogEntry a case MEMBER_VOICE_KICK -> formatMemberVoiceKick(event, ale, channelIdToSendTo); case MEMBER_VOICE_MOVE -> formatMemberVoiceMove(event, ale, channelIdToSendTo); - // this seemingly don't trigger properly, or are unreliable + // these seemingly don't trigger properly, or are unreliable case MESSAGE_BULK_DELETE -> formatGeneric(event, ale, channelIdToSendTo); case MESSAGE_CREATE -> formatGeneric(event, ale, channelIdToSendTo); case MESSAGE_DELETE -> formatGeneric(event, ale, channelIdToSendTo); @@ -1980,7 +1980,7 @@ private void formatMessagePin(GuildAuditLogEntryCreateEvent event, AuditLogEntry eb.addField("Action Type", String.valueOf(ale.getType()), true); eb.addField("Target Type", String.valueOf(ale.getTargetType()), true); - + eb.setFooter("Audit Log Entry ID: "+ale.getId()); eb.setTimestamp(ale.getTimeCreated()); diff --git a/src/main/java/org/papertrail/utilities/PermissionResolver.java b/src/main/java/org/papertrail/utilities/PermissionResolver.java index 0481a989..c198ccf3 100644 --- a/src/main/java/org/papertrail/utilities/PermissionResolver.java +++ b/src/main/java/org/papertrail/utilities/PermissionResolver.java @@ -2,6 +2,9 @@ import java.util.Map; +/** + @see Discord Permissions + */ public class PermissionResolver { private static final Map PERMISSION_MAP = Map.ofEntries( @@ -30,7 +33,7 @@ public class PermissionResolver { Map.entry(1L << 22, "MUTE_MEMBERS"), Map.entry(1L << 23, "DEAFEN_MEMBERS"), Map.entry(1L << 24, "MOVE_MEMBERS"), - Map.entry(1L << 25, "USE_VOICE_ACTIVITY_DETECTION"), + Map.entry(1L << 25, "USE_VAD"), Map.entry(1L << 26, "CHANGE_NICKNAME"), Map.entry(1L << 27, "MANAGE_NICKNAMES"), Map.entry(1L << 28, "MANAGE_ROLES"), @@ -54,7 +57,8 @@ public class PermissionResolver { Map.entry(1L << 46, "SEND_VOICE_MESSAGES"), Map.entry(1L << 49, "SEND_POLLS"), - Map.entry(1L << 50, "USE_EXTERNAL_APPS") + Map.entry(1L << 50, "USE_EXTERNAL_APPS"), + Map.entry(1L << 51, "PIN_MESSAGES") ); private PermissionResolver() { From fa6a99340049f48eaccd126f5d2e722ce39367d7 Mon Sep 17 00:00:00 2001 From: Egg-03 <111327101+Egg-03@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:35:01 +0530 Subject: [PATCH 2/2] chore(api): bump project version and update github links The project version has been updated from `v2.0.0` to `v2.0.1`. GitHub link for author has been updated --- src/main/java/org/papertrail/version/AuthorInfo.java | 4 ++-- src/main/java/org/papertrail/version/ProjectInfo.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/papertrail/version/AuthorInfo.java b/src/main/java/org/papertrail/version/AuthorInfo.java index 1548fc30..b13c3b80 100644 --- a/src/main/java/org/papertrail/version/AuthorInfo.java +++ b/src/main/java/org/papertrail/version/AuthorInfo.java @@ -7,6 +7,6 @@ private AuthorInfo() { } public static final String AUTHOR_NAME="Egg-03"; - public static final String AUTHOR_LINK = "https://github.com/Egg-03"; - public static final String AUTHOR_AVATAR_URL="https://avatars.githubusercontent.com/Egg-03"; + public static final String AUTHOR_LINK = "https://github.com/eggy03"; + public static final String AUTHOR_AVATAR_URL="https://avatars.githubusercontent.com/eggy03"; } diff --git a/src/main/java/org/papertrail/version/ProjectInfo.java b/src/main/java/org/papertrail/version/ProjectInfo.java index b5bc3e21..369594fb 100644 --- a/src/main/java/org/papertrail/version/ProjectInfo.java +++ b/src/main/java/org/papertrail/version/ProjectInfo.java @@ -7,9 +7,9 @@ private ProjectInfo() { } public static final String APPNAME = "PaperTrail"; - public static final String VERSION = "v2.0.0"; - public static final String PROJECT_LINK = "https://github.com/Egg-03/PaperTrailBot"; - public static final String PROJECT_ISSUE_LINK="https://github.com/Egg-03/PaperTrailBot/issues"; + public static final String VERSION = "v2.0.1"; + public static final String PROJECT_LINK = "https://github.com/eggy03/PaperTrailBot"; + public static final String PROJECT_ISSUE_LINK="https://github.com/eggy03/PaperTrailBot/issues"; public static final String PRIVACY = "https://github.com/Egg-03/PaperTrailBot/blob/main/PRIVACY.md"; public static final String TERMS = "https://github.com/Egg-03/PaperTrailBot/blob/main/TERMS.md";