ElvUI默认支持表情和链接图标，安装ElvUI不再提供此项显示

- 更新版本号到1.0.2
CvCn · Aug 9, 2024 · c135472 · c135472
1 parent 6944c82
commit c135472
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 12 deletions.
diff --git a/Icon.lua b/Icon.lua
@@ -180,10 +180,17 @@ ReplaceIconString(text)
     return newText
 end
 
-function ICON:IconFilter(msg)
+function ICON:EmojiFilter(msg)
     if not msg or msg == '' then return '' end
     local re = msg
     re = gsub(re, "%{.-%}", ReplaceEmote)
+    return re
+end
+
+
+function ICON:IconFilter(msg)
+    if not msg or msg == '' then return '' end
+    local re = msg
     re = gsub(re, "%|H.-%]%|h", ReplaceIconString)
     return re
 end
diff --git a/InIt.lua b/InIt.lua
@@ -4,11 +4,13 @@ local M = {}
 local U = {}
 local D = {}
 local L = {}
+local E = 'DEV'
 T[1] = W
 T[2] = M
 T[3] = U
 T[4] = D
 T[5] = _G
 T[6] = L
+T[7] = E
 T.N = N
 _G['INPUTINPUT'] = T
diff --git a/InputInput.toc b/InputInput.toc
@@ -4,7 +4,8 @@
 ## Title: InputInput
 ## Notes:
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/InputInput_Cata.toc b/InputInput_Cata.toc
@@ -3,7 +3,8 @@
 ## Title: InputInput
 ## Notes: 
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/InputInput_Classic.toc b/InputInput_Classic.toc
@@ -3,7 +3,8 @@
 ## Title: InputInput
 ## Notes:
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/InputInput_Mainline.toc b/InputInput_Mainline.toc
@@ -4,7 +4,8 @@
 ## Title: InputInput
 ## Notes: 
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/InputInput_Vanilla.toc b/InputInput_Vanilla.toc
@@ -3,7 +3,8 @@
 ## Title: InputInput
 ## Notes:
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/InputInput_Wrath.toc b/InputInput_Wrath.toc
@@ -3,7 +3,8 @@
 ## Title: InputInput
 ## Notes:
 ## Author: York
-## Version: 1.0.1
+## Version: 1.0.2
+## X-Date: 2024-08-09
 
 ## X-Category: Interface Enhancements
 ## X-Curse-Project-ID: 1076615

diff --git a/Main.lua b/Main.lua
@@ -1,4 +1,4 @@
-local W, M, U, D, G, L = unpack((select(2, ...)))
+local W, M, U, D, G, L, E = unpack((select(2, ...)))
 local MAIN = {}
 M.MAIN = MAIN
 
@@ -467,7 +467,10 @@ function Chat(editBox, chatType, backdropFrame2, channel_name)
 	local c_h = 0
 	for k = 0, 4 do
 		local msg = msg_list[#msg_list - k]
-		msg = M.ICON:IconFilter(msg)
+		msg = M.ICON:EmojiFilter(msg)
+		if ElvUI == nil then
+			msg = M.ICON:IconFilter(msg)
+		end
 		msg = U:BTagFilter(msg)
 
 		-- if msg and #msg > 0 then chat_h = chat_h + 1 end
@@ -805,7 +808,7 @@ frame:SetScript("OnEvent", function(self_f, event, ...)
 					return
 				end
 
-				if language and #language > 0 then
+				if language and #language > 0 and sender and #sender > 0 then
 					if UnitFactionGroup('player') ~= UnitFactionGroup(sender) then
 						msg = '[' .. language .. ']' .. msg
 					end

diff --git a/Unit.lua b/Unit.lua
@@ -1,4 +1,4 @@
-local W, M, U, D, G = unpack((select(2, ...)))
+local W, M, U, D, G, L, E = unpack((select(2, ...)))
 
 -- 获取当前时间戳和毫秒数
 function U:GetFormattedTimestamp()
@@ -131,7 +131,7 @@ end
 function U:ReplacePlainTextUsingFind(text, pattern, replacement)
     local result = ""
     local searchFrom = 1
-    local startPos, endPos = text:find(pattern, searchFrom, true)  -- true 表示纯文本匹配
+    local startPos, endPos = text:find(pattern, searchFrom, true) -- true 表示纯文本匹配
 
     while startPos do
         -- 拼接结果字符串
@@ -146,6 +146,7 @@ function U:ReplacePlainTextUsingFind(text, pattern, replacement)
 end
 
 function U:SaveLog(key, value)
+    if E ~= 'DEV' then return end
     local log = D:ReadDB('LOG__', {})
     local thisKey = log[key] or {}
     tinsert(thisKey, {