From ffaa9ee5d7e7c741a00d479734c630cece1e7664 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 21 Nov 2018 22:03:27 +0300 Subject: valid role, users & channels creation order --- protocols/Discord/src/guilds.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/Discord/src') diff --git a/protocols/Discord/src/guilds.cpp b/protocols/Discord/src/guilds.cpp index 0ed0b6c801..070b6e0ccf 100644 --- a/protocols/Discord/src/guilds.cpp +++ b/protocols/Discord/src/guilds.cpp @@ -130,20 +130,20 @@ void CDiscordProto::ProcessGuild(const JSONNode &p) pGuild->groupId = Clist_GroupCreate(Clist_GroupExists(m_wszDefaultGroup), pGuild->wszName); GCSessionInfoBase *si = Chat_NewSession(GCW_SERVER, m_szModuleName, pGuild->wszName, pGuild->wszName, pGuild); - Chat_Control(m_szModuleName, pGuild->wszName, WINDOW_HIDDEN); - Chat_Control(m_szModuleName, pGuild->wszName, SESSION_ONLINE); - BuildStatusList(pGuild, pGuild->wszName); - - for (auto &it : pGuild->arChatUsers) - AddGuildUser(pGuild, *it); - pGuild->pParentSi = (SESSION_INFO*)si; pGuild->hContact = si->hContact; setId(si->hContact, DB_KEY_CHANNELID, guildId); + Chat_Control(m_szModuleName, pGuild->wszName, WINDOW_HIDDEN); + Chat_Control(m_szModuleName, pGuild->wszName, SESSION_ONLINE); + const JSONNode &roles = p["roles"]; for (auto itr = roles.begin(); itr != roles.end(); ++itr) ProcessRole(pGuild, *itr); + BuildStatusList(pGuild, pGuild->wszName); + + for (auto &it : pGuild->arChatUsers) + AddGuildUser(pGuild, *it); const JSONNode &channels = p["channels"]; for (auto itc = channels.begin(); itc != channels.end(); ++itc) -- cgit v1.2.3