From 8bba5bfd2f666f5b6b9663945435d0b8aa8039c1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 7 Aug 2023 19:28:34 +0300 Subject: =?UTF-8?q?fixes=20#3626=20(NewStory:=20=D0=BD=D0=B5=D1=82=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D1=86?= =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D0=BE=D0=B2/=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=20=D1=87=D0=B0=D1=82=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/NewStory/src/history.h | 1 + plugins/NewStory/src/history_array.cpp | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/plugins/NewStory/src/history.h b/plugins/NewStory/src/history.h index 4fc1bd8220..d93cd6dd3c 100644 --- a/plugins/NewStory/src/history.h +++ b/plugins/NewStory/src/history.h @@ -1,6 +1,7 @@ #ifndef __history_h__ #define __history_h__ +#define EVENTTYPE_OTHER 12345 #define EVENTTYPE_STATUSCHANGE 25368 #define EVENTTYPE_JABBER_PRESENCE 2001 diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp index 6bdd4a74f2..6dc88046e3 100644 --- a/plugins/NewStory/src/history_array.cpp +++ b/plugins/NewStory/src/history_array.cpp @@ -318,9 +318,24 @@ void HistoryArray::addChatEvent(SESSION_INFO *si, LOGINFO *lin) p.hContact = si->hContact; p.wtext = wszText.Detach(); p.m_bLoaded = true; - p.dbe.eventType = EVENTTYPE_MESSAGE; p.dbe.timestamp = lin->time; + switch (lin->iType) { + case GC_EVENT_MESSAGE: + case GC_EVENT_TOPIC: + case GC_EVENT_INFORMATION: + p.dbe.eventType = EVENTTYPE_MESSAGE; + break; + + case GC_EVENT_SETCONTACTSTATUS: + p.dbe.eventType = EVENTTYPE_STATUSCHANGE; + break; + + default: + p.dbe.eventType = EVENTTYPE_OTHER; + break; + } + if (lin->ptszNick) { p.wszNick = strings.find(lin->ptszNick); if (p.wszNick == nullptr) { -- cgit v1.2.3