fix: actually replace placeholders in certain place + fix some warnings

Author: ANutley

bukkit/src/main/java/me/anutley/dislink/bukkit/DisLinkBukkitLoader.java

@@ -27,8 +27,6 @@
 import me.anutley.dislink.common.DisLink;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.File;
-
 public class DisLinkBukkitLoader extends JavaPlugin {
     @Override
     public void onEnable() {

common/src/main/java/me/anutley/dislink/common/delivery/sender/MessageSender.java

@@ -143,7 +143,7 @@ public void execute() {
                 messages = getMessagesSplit(getPlaceholderReplacedMessage(messageSettingKey()), Strategy.ANYWHERE);
             }
 
-            if (StringUtil.isEmpty(message.getContentRaw()) && message.getEmbeds().size() == 0) { // only a file has been sent, needs slightly different logic
+            if (StringUtil.isEmpty(message.getContentRaw()) && message.getEmbeds().isEmpty()) { // only a file has been sent, needs slightly different logic
                 sendOnlyFiles(d);
                 return;
             }
@@ -212,7 +212,7 @@ private void sendOnlyFiles(D deliveryMethod) {
     private void editAttachments(M messageBuilder, D deliveryMethod, long messageId) {
         AtomicReference<Map<String, List<InputStream>>> attachments = new AtomicReference<>(new HashMap<>());
 
-        if (getAttachments().size() == 0) return;
+        if (getAttachments().isEmpty()) return;
 
         CompletableFuture.runAsync(() -> {
 
@@ -251,7 +251,7 @@ public AllowedMentionsBuilder getAllowedMentions() {
 
     protected List<MessageEmbed> getEmbeds() {
         if (disLink.settingsUtil().getBoolean(pairConfig, "ignore.embeds")) {
-            if (message.getEmbeds().size() > 0) {
+            if (!message.getEmbeds().isEmpty()) {
                 disLink.debug("Embeds in the original message were found, but are not being forwarded due to being ignored");
             }
             return null;
@@ -263,7 +263,7 @@ protected List<MessageEmbed> getEmbeds() {
     protected List<Message.Attachment> getAttachments() {
 
         if (disLink.settingsUtil().getBoolean(pairConfig, "ignore.attachments")) {
-            if (message.getAttachments().size() > 0) {
+            if (!message.getAttachments().isEmpty()) {
                 disLink.debug("Attachments in the original message were found, but are not being forwarded due to being ignored");
             }
             return Collections.emptyList();
@@ -309,10 +309,10 @@ protected String replaceDefaultMessagePlaceholders(String format) {
             }
         }
 
-        format = format.replaceAll("author_nickname", memberNull ? author.getName() : member.getEffectiveName())
-                .replaceAll("author_guild_avatar", memberNull ? author.getEffectiveAvatarUrl() : member.getEffectiveAvatarUrl())
-                .replaceAll("author_toprole_name", topRole == null ? "" : topRole.getName())
-                .replaceAll("author_toprole_mention", topRole == null ? "" : topRole.getAsMention());
+        format = format.replaceAll("%author_nickname%", memberNull ? author.getName() : member.getEffectiveName())
+                .replaceAll("%author_guild_avatar%", memberNull ? author.getEffectiveAvatarUrl() : member.getEffectiveAvatarUrl())
+                .replaceAll("%author_toprole_name%", topRole == null ? "" : topRole.getName())
+                .replaceAll("%author_toprole_mention%", topRole == null ? "" : topRole.getAsMention());
 
 
         format = replaceChannelPlaceholders(format, "origin", originChannel());

common/src/main/java/me/anutley/dislink/common/util/StringUtil.java

@@ -27,6 +27,6 @@
 public class StringUtil {
 
     public static boolean isEmpty(String string) {
-        return string == null || string.trim().equals("");
+        return string == null || string.trim().isEmpty();
     }
 }