tanjianbin/lzwcai-terminal-worktool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(wechat): 添加会话存在性验证以避免无效操作

Browse Source 
在发送消息、图片和文件前，先验证目标会话是否存在于当前会话列表中
通过数字正则匹配处理会话标题中的数字差异，提高匹配准确性
当会话不存在或无法获取列表时，提前返回错误信息，避免不必要的后续操作
This commit is contained in:
tanjianbin
2026-03-24 19:47:36 +08:00
parent a097854394
commit fc4ffcdc5b
1 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
View File

@@ -44,6 +44,23 @@ object WeworkOperationImpl {
goHome()
return false
}
// 验证titleList是否在当前会话列表中存在
val currentRoomList = WeworkRoomUtil.getRoomTitle(print = false)
if (currentRoomList.isEmpty()) {
LogUtils.d("无法获取当前会话列表")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "无法获取当前会话列表，请确保在微信首页", startTime, listOf(), titleList)
return false
}
val notFoundList = titleList.filter { title ->
currentRoomList.none { it == title || it.replace(Constant.digitalRegex, "") == title || title.replace(Constant.digitalRegex, "") == it }
}
if (notFoundList.isNotEmpty()) {
LogUtils.d("以下会话不存在: ${notFoundList.joinToString()}")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "会话不存在: ${notFoundList.joinToString()}", startTime, listOf(), titleList)
return false
}
val successList = arrayListOf<String>()
val failList = arrayListOf<String>()
for (title in LinkedHashSet(titleList)) {
@@ -107,6 +124,23 @@ object WeworkOperationImpl {
goHome()
return false
}
// 验证titleList是否在当前会话列表中存在
val currentRoomList = WeworkRoomUtil.getRoomTitle(print = false)
if (currentRoomList.isEmpty()) {
LogUtils.d("无法获取当前会话列表")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "无法获取当前会话列表，请确保在微信首页", startTime, listOf(), titleList)
return false
}
val notFoundList = titleList.filter { title ->
currentRoomList.none { it == title || it.replace(Constant.digitalRegex, "") == title || title.replace(Constant.digitalRegex, "") == it }
}
if (notFoundList.isNotEmpty()) {
LogUtils.d("以下会话不存在: ${notFoundList.joinToString()}")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "会话不存在: ${notFoundList.joinToString()}", startTime, listOf(), titleList)
return false
}
val successList = arrayListOf<String>()
val failList = arrayListOf<String>()
for (title in LinkedHashSet(titleList)) {
@@ -182,6 +216,23 @@ object WeworkOperationImpl {
extraText: String? = null
): Boolean {
val startTime = System.currentTimeMillis()
// 验证titleList是否在当前会话列表中存在
val currentRoomList = WeworkRoomUtil.getRoomTitle(print = false)
if (currentRoomList.isEmpty()) {
LogUtils.d("无法获取当前会话列表")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "无法获取当前会话列表，请确保在微信首页", startTime, listOf(), titleList)
return false
}
val notFoundList = titleList.filter { title ->
currentRoomList.none { it == title || it.replace(Constant.digitalRegex, "") == title || title.replace(Constant.digitalRegex, "") == it }
}
if (notFoundList.isNotEmpty()) {
LogUtils.d("以下会话不存在: ${notFoundList.joinToString()}")
uploadCommandResult(message, ExecCallbackBean.ERROR_SEND_MESSAGE, "会话不存在: ${notFoundList.joinToString()}", startTime, listOf(), titleList)
return false
}
for (title in LinkedHashSet(titleList)) {
if (WeworkRoomUtil.intoRoom(title) || WeworkRoomUtil.intoRoom(title, fastIn = false)) {
if (!receivedName.isNullOrEmpty()) {