From 6dd3863200503e014ce5109fa4e09ae095583c1c Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 8 Feb 2016 16:00:17 +0100 Subject: [PATCH] Do no create Swift::JID with an empty node --- include/Swiften/Server/ServerFromClientSession.cpp | 2 +- spectrum/src/frontends/slack/SlackSession.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Swiften/Server/ServerFromClientSession.cpp b/include/Swiften/Server/ServerFromClientSession.cpp index c1e667ff..49138fb9 100644 --- a/include/Swiften/Server/ServerFromClientSession.cpp +++ b/include/Swiften/Server/ServerFromClientSession.cpp @@ -135,7 +135,7 @@ void ServerFromClientSession::handleElement(boost::shared_ptr element) } void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHeader) { - setLocalJID(JID("", incomingHeader.getTo())); + setLocalJID(JID(incomingHeader.getTo())); ProtocolHeader header; header.setFrom(incomingHeader.getTo()); header.setID(id_); diff --git a/spectrum/src/frontends/slack/SlackSession.cpp b/spectrum/src/frontends/slack/SlackSession.cpp index d6767ff4..f5b8c541 100644 --- a/spectrum/src/frontends/slack/SlackSession.cpp +++ b/spectrum/src/frontends/slack/SlackSession.cpp @@ -183,7 +183,7 @@ void SlackSession::handleJoinRoomCreated(const std::string &channelId, std::vect m_channel2jid[slackChannel] = to; Swift::Presence::ref presence = Swift::Presence::create(); - presence->setFrom(Swift::JID("", m_uinfo.jid, "default")); + presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(Swift::JID(to + "/" + name)); presence->setType(Swift::Presence::Available); presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); @@ -202,7 +202,7 @@ void SlackSession::handleSlackChannelCreated(const std::string &channelId) { LOG4CXX_INFO(logger, m_uinfo.jid << ": Main Slack Channel created, connecting the legacy network"); Swift::Presence::ref presence = Swift::Presence::create(); - presence->setFrom(Swift::JID("", m_uinfo.jid, "default")); + presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(m_component->getJID()); presence->setType(Swift::Presence::Available); presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); @@ -220,7 +220,7 @@ void SlackSession::leaveRoom(const std::string &channel) { LOG4CXX_INFO(logger, m_uinfo.jid << ": Leaving the legacy network room " << to); Swift::Presence::ref presence = Swift::Presence::create(); - presence->setFrom(Swift::JID("", m_uinfo.jid, "default")); + presence->setFrom(Swift::JID(m_uinfo.jid + "/default")); presence->setTo(Swift::JID(to + "/" + m_uinfo.uin)); presence->setType(Swift::Presence::Unavailable); presence->addPayload(boost::shared_ptr(new Swift::MUCPayload())); @@ -237,7 +237,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std:: boost::shared_ptr msg(new Swift::Message()); msg->setType(Swift::Message::Groupchat); msg->setTo(to); - msg->setFrom(Swift::JID("", m_uinfo.jid, "default")); + msg->setFrom(Swift::JID(m_uinfo.jid + "/default")); msg->setBody("<" + m_idManager->getName(user) + "> " + message); m_component->getFrontend()->onMessageReceived(msg); } @@ -273,7 +273,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std:: boost::shared_ptr msg(new Swift::Message()); msg->setTo(b->getJID()); - msg->setFrom(Swift::JID("", m_uinfo.jid, "default")); + msg->setFrom(Swift::JID(m_uinfo.jid + "/default")); msg->setBody("<" + m_idManager->getName(user) + "> " + message); m_component->getFrontend()->onMessageReceived(msg); }