diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp index 973444be..026d6d84 100644 --- a/libtransport/UserManager.cpp +++ b/libtransport/UserManager.cpp @@ -119,6 +119,7 @@ void UserManager::removeUser(User *user, bool onUserBehalf) { m_storageBackend->setUserOnline(user->getUserInfo().id, false); } + LOG4CXX_INFO(logger, user->getJID().toBare().toString() << ": Disconnecting user"); onUserDestroyed(user); delete user; #ifndef WIN32 diff --git a/libtransport/UserRegistration.cpp b/libtransport/UserRegistration.cpp index d7b326f5..02475505 100644 --- a/libtransport/UserRegistration.cpp +++ b/libtransport/UserRegistration.cpp @@ -66,15 +66,18 @@ bool UserRegistration::unregisterUser(const std::string &barejid) { // This user is not registered, nothing to do if (!registered) { + LOG4CXX_WARN(logger, "Tried to unregister already unregistered user " << barejid); return false; } + LOG4CXX_INFO(logger, "Unregistering user " << barejid); // Remove user from database m_storageBackend->removeUser(userInfo.id); // Disconnect the user User *user = m_userManager->getUser(barejid); if (user) { + LOG4CXX_INFO(logger, "Disconnecting user " << barejid); m_userManager->removeUser(user); } diff --git a/spectrum/src/frontends/slack/SlackUser.cpp b/spectrum/src/frontends/slack/SlackUser.cpp index bfad825d..2fece77f 100644 --- a/spectrum/src/frontends/slack/SlackUser.cpp +++ b/spectrum/src/frontends/slack/SlackUser.cpp @@ -67,7 +67,7 @@ void SlackUser::disconnectUser(const std::string &error, Swift::SpectrumErrorPay } m_session->handleDisconnected(); - m_session->sendMessageToAll("Maybe you have provided wrong 3rd-party network account information. In that case, you can use ```.spectrum2 register ...``` command again with corrected data. You can also try using ```.spectrum2 reconnect``` to reconnect."); + m_session->sendMessageToAll("Maybe you have provided wrong 3rd-party network account information."); static_cast(m_userManager)->moveTempSession(m_jid.toString(), m_session); m_session = NULL; } diff --git a/spectrum/src/frontends/slack/SlackUserRegistration.cpp b/spectrum/src/frontends/slack/SlackUserRegistration.cpp index 15b51273..c868de52 100644 --- a/spectrum/src/frontends/slack/SlackUserRegistration.cpp +++ b/spectrum/src/frontends/slack/SlackUserRegistration.cpp @@ -74,6 +74,13 @@ std::string SlackUserRegistration::createOAuth2URL(const std::vectorgetState()] = oauth2; m_authsData[oauth2->getState()] = args; + if (args.size() >= 3) { + LOG4CXX_INFO(logger, "Generating OAUth2 URL with slack_channel=" << args[0] << ", 3rd_party_account=" << args[1]); + } + else { + LOG4CXX_WARN(logger, "Generating OAUth2 URL with too few arguments"); + } + return url; } @@ -182,7 +189,7 @@ std::string SlackUserRegistration::handleOAuth2Code(const std::string &code, con value = access_token; m_storageBackend->getUserSetting(user.id, "access_token", type, value); - LOG4CXX_INFO(logger, "Registered Slack user " << user.jid); + LOG4CXX_INFO(logger, "Registered Slack user " << user.jid << ", slack_channel=" << slackChannel); if (oauth2) { m_auths.erase(state);