hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-04-25 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复chatlab推送携带wxid

Browse Source
This commit is contained in:
xuncha
2026-04-25 14:11:41 +08:00
parent 17c13c2455
commit 7bb5b4f834
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electron/services/httpService.ts
View File

@@ -2045,6 +2045,12 @@ class HttpService {
* 获取消息内容 * 获取消息内容
*/ */
private getMessageContent(msg: Message): string | null { private getMessageContent(msg: Message): string | null {
const normalizeTextContent = (value: string | null | undefined): string | null => {
const text = String(value || '')
if (!text) return null
return text.replace(/^[\s]*([a-zA-Z0-9_@-]+):(?!\/\/)(?:\s*(?:\r?\n|<br\s*\/?>)\s*|\s*)/i, '').trim()
}
if (msg.localType === 49) { if (msg.localType === 49) {
return this.getType49Content(msg) return this.getType49Content(msg)
} }
@@ -2057,7 +2063,7 @@ class HttpService {
// 根据类型返回占位符 // 根据类型返回占位符
switch (msg.localType) { switch (msg.localType) {
case 1: case 1:
return msg.rawContent || null return normalizeTextContent(msg.parsedContent || msg.rawContent)
case 3: case 3:
return '[图片]' return '[图片]'
case 34: case 34:
@@ -2073,7 +2079,7 @@ class HttpService {
case 49: case 49:
return this.getType49Content(msg) return this.getType49Content(msg)
default: default:
return msg.rawContent || null return normalizeTextContent(msg.parsedContent || msg.rawContent) || null
} }
} }

10
electron/services/messagePushService.ts
View File

@@ -1325,13 +1325,19 @@ class MessagePushService {
} }
private getMessageDisplayContent(message: Message): string | null { private getMessageDisplayContent(message: Message): string | null {
const normalizeTextContent = (value: string | null | undefined): string | null => {
const text = String(value || '')
if (!text) return null
return text.replace(/^[\s]*([a-zA-Z0-9_@-]+):(?!\/\/)(?:\s*(?:\r?\n|<br\s*\/?>)\s*|\s*)/i, '').trim()
}
const cleanOfficialPrefix = (value: string | null): string | null => { const cleanOfficialPrefix = (value: string | null): string | null => {
if (!value) return value if (!value) return value
return value.replace(/^\s*\[视频号\]\s*/u, '').trim() || value return value.replace(/^\s*\[视频号\]\s*/u, '').trim() || value
} }
switch (Number(message.localType || 0)) { switch (Number(message.localType || 0)) {
case 1: case 1:
return cleanOfficialPrefix(message.rawContent || null) return cleanOfficialPrefix(normalizeTextContent(message.parsedContent || message.rawContent))
case 3: case 3:
return '[图片]' return '[图片]'
case 34: case 34:
@@ -1347,7 +1353,7 @@ class MessagePushService {
case 49: case 49:
return cleanOfficialPrefix(message.linkTitle || message.fileName || '[消息]') return cleanOfficialPrefix(message.linkTitle || message.fileName || '[消息]')
default: default:
return cleanOfficialPrefix(message.parsedContent || message.rawContent || null) return cleanOfficialPrefix(normalizeTextContent(message.parsedContent || message.rawContent) || null)
} }
} }