From ebf83d38be5ad294e3ed47bc33f947cee7b1a92f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 9 Sep 2024 20:50:24 +0300 Subject: =?UTF-8?q?fixes=20#4617=20(=D0=9F=D0=BE=D0=B4=D1=81=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20(highlight)=20=D0=BD=D0=B5=20=D1=81=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=8B=20(reply))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/TabSRMM/src/muchighlight.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/plugins/TabSRMM/src/muchighlight.cpp b/plugins/TabSRMM/src/muchighlight.cpp index 8bc2dea134..0e34837673 100644 --- a/plugins/TabSRMM/src/muchighlight.cpp +++ b/plugins/TabSRMM/src/muchighlight.cpp @@ -164,11 +164,28 @@ skip_textpatterns: // optionally, match the nickname against the list of nicks to highlight if ((m_iMode & MATCH_NICKNAME) && (dwFlags & MATCH_NICKNAME) && pgce->pszNick.w && m_iNickPatterns > 0) { + DBEVENTINFO dbei = {}; + if (pgce->hEvent) + db_event_get(pgce->hEvent, &dbei); + for (UINT i = 0; i < m_iNickPatterns && !nResult; i++) { if (pgce->pszNick.w) - nResult = wildcmpw(pgce->pszNick.w, m_NickPatterns[i]) ? MATCH_NICKNAME : 0; + if (wildcmpw(pgce->pszNick.w, m_NickPatterns[i])) { + nResult = MATCH_NICKNAME; + break; + } + + if (dbei.szReplyId) + if (wildcmpw(_A2T(dbei.szReplyId), m_NickPatterns[i])) { + nResult = MATCH_NICKNAME; + break; + } + if ((m_iMode & MATCH_UIN) && pgce->pszUserInfo.w) - nResult = wildcmpw(pgce->pszUserInfo.w, m_NickPatterns[i]) ? MATCH_NICKNAME : 0; + if (wildcmpw(pgce->pszUserInfo.w, m_NickPatterns[i])) { + nResult = MATCH_NICKNAME; + break; + } } } -- cgit v1.2.3