hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-03-24 23:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sidebar): prefer valid nickname over wxid

Browse Source
This commit is contained in:
tisonhuang
2026-03-01 16:54:02 +08:00
parent 96aa9d0813
commit 22c7048ef6
2 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electron/services/chatService.ts
View File

@@ -3250,11 +3250,13 @@ class ChatService {
if (!connectResult.success) return null
const result = await wcdbService.getContact(username)
if (!result.success || !result.contact) return null
const contact = result.contact as Record<string, any>
return {
username: result.contact.username || username,
alias: result.contact.alias || '',
remark: result.contact.remark || '',
nickName: result.contact.nickName || ''
username: String(contact.username || contact.user_name || contact.userName || username || ''),
alias: String(contact.alias || contact.Alias || ''),
remark: String(contact.remark || contact.Remark || ''),
// 兼容不同表结构字段，避免 nick_name 丢失导致侧边栏退化到 wxid。
nickName: String(contact.nickName || contact.nick_name || contact.nickname || contact.NickName || '')
}
} catch {
return null

55
src/components/Sidebar.tsx
View File

@@ -64,13 +64,6 @@ function Sidebar() {
useEffect(() => {
const loadCurrentUser = async () => {
const normalizeName = (value?: string | null): string | undefined => {
if (!value) return undefined
const trimmed = value.trim()
if (!trimmed || trimmed.toLowerCase() === 'self') return undefined
return trimmed
}
const patchUserProfile = (patch: Partial<SidebarUserProfile>, expectedWxid?: string) => {
setUserProfile(prev => {
if (expectedWxid && prev.wxid && prev.wxid !== expectedWxid) {
@@ -91,6 +84,32 @@ function Sidebar() {
try {
const wxid = await configService.getMyWxid()
const resolvedWxid = wxid || ''
const cleanedWxidMatch = resolvedWxid.match(/^(wxid_[^_]+)/i)
const cleanedWxid = cleanedWxidMatch?.[1] || resolvedWxid
const wxidCandidates = new Set<string>([
resolvedWxid.trim().toLowerCase(),
cleanedWxid.trim().toLowerCase()
].filter(Boolean))
const normalizeName = (value?: string | null): string | undefined => {
if (!value) return undefined
const trimmed = value.trim()
if (!trimmed) return undefined
const lowered = trimmed.toLowerCase()
if (lowered === 'self') return undefined
if (lowered.startsWith('wxid_')) return undefined
if (wxidCandidates.has(lowered)) return undefined
return trimmed
}
const pickFirstValidName = (...candidates: Array<string | null | undefined>): string | undefined => {
for (const candidate of candidates) {
const normalized = normalizeName(candidate)
if (normalized) return normalized
}
return undefined
}
const fallbackDisplayName = resolvedWxid || '未识别用户'
// 第一阶段：先把 wxid/名称打上，保证侧边栏第一时间可见。
@@ -105,20 +124,26 @@ function Sidebar() {
void (async () => {
try {
const myContact = await window.electronAPI.chat.getContact(resolvedWxid)
const fromContact =
normalizeName(myContact?.remark) ||
normalizeName(myContact?.nickName) ||
normalizeName(myContact?.alias)
const fromContact = pickFirstValidName(
myContact?.remark,
myContact?.nickName,
myContact?.alias
)
if (fromContact) {
patchUserProfile({ displayName: fromContact }, resolvedWxid)
return
}
const enrichedResult = await window.electronAPI.chat.enrichSessionsContactInfo([resolvedWxid, 'self'])
const enrichedDisplayName = normalizeName(enrichedResult.contacts?.[resolvedWxid]?.displayName)
const fallbackSelfName = normalizeName(enrichedResult.contacts?.self?.displayName)
const bestName = enrichedDisplayName || fallbackSelfName
const enrichTargets = Array.from(new Set([resolvedWxid, cleanedWxid, 'self'].filter(Boolean)))
const enrichedResult = await window.electronAPI.chat.enrichSessionsContactInfo(enrichTargets)
const enrichedDisplayName = pickFirstValidName(
enrichedResult.contacts?.[resolvedWxid]?.displayName,
enrichedResult.contacts?.[cleanedWxid]?.displayName,
enrichedResult.contacts?.self?.displayName,
myContact?.alias
)
const bestName = enrichedDisplayName
if (bestName) {
patchUserProfile({ displayName: bestName }, resolvedWxid)
}