🐛Change the order of dictionary judgments

Fix ucchyocean#231
mofucraft · Dec 18, 2022 · 5f412e9 · 5f412e9
1 parent 4733dea
commit 5f412e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/com/github/ucchyocean/lc3/channel/JapanizeConvertTask.java b/src/main/java/com/github/ucchyocean/lc3/channel/JapanizeConvertTask.java
@@ -15,9 +15,11 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Japanize変換を実行して、実行後に発言を行うタスク
@@ -65,7 +67,7 @@ public void run() {
     public boolean runSync() {
 
         // 変換対象外のキーワード
-        HashMap<String, String> keywordMap = new HashMap<String, String>();
+        HashMap<String, String> keywordMap = new LinkedHashMap<>();
         ArrayList<String> keywords = new ArrayList<String>();
         if (LunaChat.getConfig().isJapanizeIgnorePlayerName()) {
             keywords.addAll(LunaChat.getPlugin().getOnlinePlayerNames());
@@ -87,7 +89,9 @@ public boolean runSync() {
                 keywordMap.put(key, keyword);
             }
         }
-        for (String dickey : dictionary.keySet()) {
+        for (String dickey : dictionary.entrySet().stream()
+                .sorted((e1, e2) -> e2.getKey().length() - e1.getKey().length())
+                .collect(Collectors.toMap(k -> k.getKey(), v -> v.getValue(), (v1, v2) -> v1, LinkedHashMap::new)).keySet()) {
             if (keywordLocked.contains(dickey)) {
                 index++;
                 String key = "＜" + makeMultibytesDigit(index) + "＞";

diff --git a/src/main/java/com/github/ucchyocean/lc3/japanize/Japanizer.java b/src/main/java/com/github/ucchyocean/lc3/japanize/Japanizer.java
@@ -6,7 +6,9 @@
 package com.github.ucchyocean.lc3.japanize;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * ローマ字表記を漢字変換して返すユーティリティ
@@ -37,10 +39,12 @@ public static String japanize(String org, JapanizeType type,
         String deletedURL = org.replaceAll(REGEX_URL, " ");
 
         // キーワードをロック
-        HashMap<String, String> keywordMap = new HashMap<String, String>();
+        HashMap<String, String> keywordMap = new LinkedHashMap<>();
         int index = 0;
         String keywordLocked = deletedURL;
-        for (String dickey : dictionary.keySet()) {
+        for (String dickey : dictionary.entrySet().stream()
+                .sorted((e1, e2) -> e2.getKey().length() - e1.getKey().length())
+                .collect(Collectors.toMap(k -> k.getKey(), v -> v.getValue(), (v1, v2) -> v1, LinkedHashMap::new)).keySet()) {
             if (keywordLocked.contains(dickey)) {
                 index++;
                 String key = "＜" + makeMultibytesDigit(index) + "＞";