From e7bfa7d9faa1d4e328ca0727174cddc0ca0cd808 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 26 Nov 2018 18:26:28 +0300 Subject: Discord: fix for parsing links from unknown users in group chats --- protocols/Discord/src/dispatch.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'protocols/Discord/src') diff --git a/protocols/Discord/src/dispatch.cpp b/protocols/Discord/src/dispatch.cpp index 90457116c4..01eb1868a1 100644 --- a/protocols/Discord/src/dispatch.cpp +++ b/protocols/Discord/src/dispatch.cpp @@ -397,15 +397,17 @@ void CDiscordProto::OnCommandMessage(const JSONNode &pRoot, bool bIsNew) return; } - CDiscordGuildMember *pm = pGuild->FindUser(userId); - if (pm == nullptr) { - pm = new CDiscordGuildMember(userId); - pm->wszNick = pRoot["nick"].as_mstring(); - if (pm->wszNick.IsEmpty()) - pm->wszNick = pRoot["user"]["username"].as_mstring() + L"#" + pRoot["user"]["discriminator"].as_mstring(); - pGuild->arChatUsers.insert(pm); - - AddGuildUser(pGuild, *pm); + if (userId != 0) { + CDiscordGuildMember *pm = pGuild->FindUser(userId); + if (pm == nullptr) { + pm = new CDiscordGuildMember(userId); + pm->wszNick = pRoot["nick"].as_mstring(); + if (pm->wszNick.IsEmpty()) + pm->wszNick = pRoot["user"]["username"].as_mstring() + L"#" + pRoot["user"]["discriminator"].as_mstring(); + pGuild->arChatUsers.insert(pm); + + AddGuildUser(pGuild, *pm); + } } ParseSpecialChars(si, wszText); -- cgit v1.2.3