Add Advanced Tagging Detection

* "Advanced" actually means startsWith -> contains but we don't need to tell them that
* Also added databaselookup for getUsersPartiallyMatching
* Added config option enable_shortcut_use_database

Author: FireController1847

pom.xml

@@ -186,7 +186,7 @@
         <dependency>
             <groupId>com.visualfiredev</groupId>
             <artifactId>javabase</artifactId>
-            <version>0.0.3</version>
+            <version>0.1.0</version>
             <scope>compile</scope>
         </dependency>
 

src/main/java/com/firecontroller1847/truediscordlink/DiscordManager.java

@@ -1,10 +1,12 @@
 package com.firecontroller1847.truediscordlink;
 
+import com.firecontroller1847.truediscordlink.database.DbPlayer;
+import com.firecontroller1847.truediscordlink.listeners.discord.DiscordChatListener;
+import com.firecontroller1847.truediscordlink.listeners.discord.DiscordEditListener;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.vdurmont.emoji.EmojiParser;
-import com.firecontroller1847.truediscordlink.listeners.discord.DiscordChatListener;
-import com.firecontroller1847.truediscordlink.listeners.discord.DiscordEditListener;
+import com.visualfiredev.javabase.Database;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -495,6 +497,29 @@ private void modifyAddCheckMentions(AtomicReference<String> content, AtomicRefer
     }
 
     public static ArrayList<User> getUsersPartiallyMatching(Server server, String partialUsername, boolean firstOnly) {
+        TrueDiscordLink tdl = (TrueDiscordLink) TrueDiscordLink.getInstance();
+
+        // Check Database
+        if (tdl.getConfig().getBoolean("tagging.enable_shortcut_use_database")) {
+            Database database = tdl.getDatabaseManager().getDatabase();
+            if (database != null && database.isConnected()) {
+                try {
+                    ArrayList<DbPlayer> results = database.select(DbPlayer.getTableSchema(database), DbPlayer.class, "name LIKE ?", "%" + partialUsername + "%");
+                    if (results.size() > 0) {
+                        String did = results.get(0).getDiscordId();
+                        User user = tdl.getDiscordManager().getApi().getUserById(did).get();
+                        ArrayList<User> users = new ArrayList<>();
+                        users.add(user);
+                        return users;
+                    }
+                } catch (Exception e) {
+                    // Ignore and move on
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Check Discord
         Collection<User> users = server.getMembers();
         ArrayList<User> matchingUsers = new ArrayList<>();
         for (User user : users) {
@@ -508,7 +533,7 @@ public static ArrayList<User> getUsersPartiallyMatching(Server server, String pa
                 added = true;
 
             // Check for partial match
-            } else if (partialUsername.length() > 3 && (name.toLowerCase().startsWith(partialUsername.toLowerCase()) || nickname.toLowerCase().startsWith(partialUsername.toLowerCase()))) {
+            } else if (partialUsername.length() > 3 && (name.toLowerCase().contains(partialUsername.toLowerCase()) || nickname.toLowerCase().contains(partialUsername.toLowerCase()))) {
                 matchingUsers.add(user);
                 added = true;
 

src/main/java/com/firecontroller1847/truediscordlink/TrueDiscordLink.java

@@ -84,12 +84,19 @@ private void migrateConfigurations() throws IOException {
         boolean migrated = false;
 
         // v1.0.3 -> v1.0.4
-        if (!translations.contains("messages.to_mc_attachment_color")) {
+        if (!translations.contains("messages.to_mc_attachment_color", true)) {
             translations.set("messages.to_mc_attachment_color", "§9§n");
             this.getLogger().info("[en.yml] Added messages.to_mc_attachment_color");
             migrated = true;
         }
 
+        // v1.0.4 -> v1.1.0
+        if (!getConfig().contains("tagging.enable_shortcut_use_database", true)) {
+            getConfig().set("tagging.enable_shortcut_use_database", true);
+            this.getLogger().info("[config.yml] Added tagging.enable_shortcut_use_database");
+            migrated = true;
+        }
+
         // Save
         if (migrated) {
             this.saveConfig();

src/main/java/com/firecontroller1847/truediscordlink/commands/CommandLink.java

@@ -44,7 +44,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         // Check if user is in database
         try {
             ArrayList<DbPlayer> results;
-            results = database.select(DbPlayer.getTableSchema(database), "minecraft_uuid = '" + player.getUniqueId().toString() + "'", DbPlayer.class);
+            results = database.select(DbPlayer.getTableSchema(database), DbPlayer.class, "minecraft_uuid = ?", player.getUniqueId().toString());
 
             // Store dbPlayer
             DbPlayer dbPlayer;
@@ -57,7 +57,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 database.insert(dbPlayerNew);
 
                 // Re-fetch DbPlayer
-                dbPlayer = database.select(DbPlayer.getTableSchema(database), "minecraft_uuid = '" + player.getUniqueId().toString() + "'", DbPlayer.class).get(0);
+                dbPlayer = database.select(DbPlayer.getTableSchema(database), DbPlayer.class, "minecraft_uuid = ?", player.getUniqueId().toString()).get(0);
 
             // If we are in the database...
             } else {

src/main/java/com/firecontroller1847/truediscordlink/commands/CommandUnlink.java

@@ -39,7 +39,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 
         try {
             ArrayList<DbPlayer> results;
-            results = database.select(DbPlayer.getTableSchema(database), "minecraft_uuid = '" + player.getUniqueId().toString() + "'", DbPlayer.class);
+            results = database.select(DbPlayer.getTableSchema(database), DbPlayer.class, "minecraft_uuid = ?", player.getUniqueId().toString());
             if (results.size() == 0) {
                 player.sendMessage(plugin.getTranslation("linking.does_not_exist"));
                 return true;

src/main/java/com/firecontroller1847/truediscordlink/listeners/discord/DiscordChatListener.java

@@ -58,7 +58,7 @@ public void onMessageCreate(MessageCreateEvent event) {
                 try {
                     // Search for value in database
                     Database database = discordlink.getDatabaseManager().getDatabase();
-                    ArrayList<DbPlayer> results = database.select(DbPlayer.getTableSchema(database), "discord_id = '" + message.getAuthor().getIdAsString() + "'", DbPlayer.class);
+                    ArrayList<DbPlayer> results = database.select(DbPlayer.getTableSchema(database), DbPlayer.class, "discord_id = ?", message.getAuthor().getIdAsString());
                     if (results.size() == 0) {
                         message.getChannel().sendMessage(discordlink.getTranslation("linking.discord.no_request"));
                         return;

src/main/resources/config.yml

@@ -144,10 +144,15 @@ tagging:
   enable_user_tagging: true
 
   # Enables detection of attempted tags to convert them to proper Discord mentions. (Ex: @Fire -> <@112732946774962176>)
+  # Minimum of four characters.
   # If enable_user_tagging is enabled, you probably want this enabled to.
   # This only works if bot.enabled is set to true.
   enable_user_tagging_shortcut: true
 
+  # If the shortcut is enabled, whether or not to also attempt to find mentions by looking through the linked accounts database.
+  # For example, if a Minecraft username "ABCD" has linked their account, but their Discord username is "EEEE," typing "@ABCD" will tag "@EEEE."
+  enable_shortcut_use_database: true
+
   # Whether or not to allow Minecraft users to tag Discord roles
   enable_role_tagging: false