diff --git a/.gitignore b/.gitignore index bc52bc7..558de5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /live/ +/logs/ /target/ /avatars/ /backups/ diff --git a/pom.xml b/pom.xml index 8bb2cb6..67c31df 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ net.dv8tion JDA - 3.8.3_463 + 3.8.3_464 com.jagrosh diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java index ba6bf09..cc19d9e 100644 --- a/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java +++ b/src/main/java/com/jagrosh/vortex/commands/automod/WhitelistInvitesCmd.java @@ -75,7 +75,7 @@ } List currentWL = vortex.getDatabase().inviteWhitelist.readWhitelist(event.getGuild()); event.replySuccess("Whitelisted Guild IDs:\n" + (currentWL.isEmpty() ? "None" : - currentWL.stream().map(String::valueOf).collect(Collectors.joining(", ")))); + "`" + currentWL.stream().map(String::valueOf).collect(Collectors.joining("`, `")) + "`")); } private void handleAdd(CommandEvent event, String[] args) diff --git a/src/main/java/com/jagrosh/vortex/logging/URLResolver.java b/src/main/java/com/jagrosh/vortex/logging/URLResolver.java index 2fb2ad4..dd3f465 100644 --- a/src/main/java/com/jagrosh/vortex/logging/URLResolver.java +++ b/src/main/java/com/jagrosh/vortex/logging/URLResolver.java @@ -59,9 +59,9 @@ prefix = config.getString("url-resolver.prefix"); suffix = config.getString("url-resolver.suffix"); form = config.getString("url-resolver.form"); - request = new Request.Builder().url(config.getString("url-resolver.url")) - .header("Content-Type", "application/x-www-form-urlencoded") - .header(config.getString("url-resolver.key"), config.getString("url-resolver.value")); + request = new Request.Builder().url(config.getString("url-resolver.url")); + config.getConfig("url-resolver.headers").entrySet() + .forEach(entry -> request.addHeader(entry.getKey(), (String) entry.getValue().unwrapped())); } @Override