summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-12-04 14:43:57 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-12-04 14:43:57 +0300
commit934c8f4a7acb9090b80d424b32fccd41abff9a0c (patch)
tree7016f42723799cbd0a5d5ae277664efd33637d33
parent2eb61207710614d8181aca54abf7ecab58e04ba5 (diff)
more logs added for Jabber & Discord
-rw-r--r--protocols/Discord/src/dispatch.cpp1
-rwxr-xr-xprotocols/JabberG/src/jabber_proto.cpp4
-rwxr-xr-xprotocols/JabberG/src/jabber_thread.cpp5
3 files changed, 5 insertions, 5 deletions
diff --git a/protocols/Discord/src/dispatch.cpp b/protocols/Discord/src/dispatch.cpp
index a4ef8a175d..43b5233729 100644
--- a/protocols/Discord/src/dispatch.cpp
+++ b/protocols/Discord/src/dispatch.cpp
@@ -410,6 +410,7 @@ void CDiscordProto::OnCommandMessage(const JSONNode &pRoot, bool bIsNew)
pm->wszNick = pRoot["user"]["username"].as_mstring() + L"#" + pRoot["user"]["discriminator"].as_mstring();
pGuild->arChatUsers.insert(pm);
+ debugLogA("add missing user to chat: id=%lld, nick=%S", userId, pm->wszNick.c_str());
AddGuildUser(pGuild, *pm);
}
}
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 7a29dc6e91..68dde9068a 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1110,12 +1110,12 @@ int CJabberProto::SetApparentMode(MCONTACT hContact, int mode)
int CJabberProto::SetStatus(int iNewStatus)
{
+ debugLogA("PS_SETSTATUS(%d,%d) => %d", m_iStatus, m_iDesiredStatus, iNewStatus);
+
if (m_iDesiredStatus == iNewStatus)
return 0;
int oldStatus = m_iStatus;
-
- debugLogA("PS_SETSTATUS(%d)", iNewStatus);
m_iDesiredStatus = iNewStatus;
if (iNewStatus == ID_STATUS_OFFLINE) {
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index dc24c999bc..b34f867053 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -263,6 +263,7 @@ void CJabberProto::ServerThread(JABBER_CONN_DATA *pParam)
JLoginFailed(LOGINERR_BADUSERID);
LBL_FatalError:
+ debugLogA("m_iDesiredStatus reset to (%d,%d) => %d", m_iStatus, m_iDesiredStatus, ID_STATUS_OFFLINE);
int oldStatus = m_iStatus;
m_iDesiredStatus = m_iStatus = ID_STATUS_OFFLINE;
ProtoBroadcastAck(0, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
@@ -524,19 +525,17 @@ recvRest:
WindowList_Broadcast(m_hWindowList, WM_JABBER_CHECK_ONLINE, 0, 0);
// Set status to offline
+ debugLogA("m_iDesiredStatus reset to (%d,%d) => %d", m_iStatus, m_iDesiredStatus, ID_STATUS_OFFLINE);
int oldStatus = m_iStatus;
m_iDesiredStatus = m_iStatus = ID_STATUS_OFFLINE;
ProtoBroadcastAck(0, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
-
// Set all contacts to offline
if (!m_StrmMgmt.IsResumeIdPresent())
{
m_StrmMgmt.ResetState(); //fully reset strm_mgmt state
-// debugLogA("1"); //i think this log calls does not needed anymore ? //sss
for (auto &hContact : AccContacts())
SetContactOfflineStatus(hContact);
-// debugLogA("2");
}
mir_free(m_szJabberJID);