stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do no create Swift::JID with an empty node

Browse source
This commit is contained in:
Jan Kaluza 2016-02-08 16:00:17 +01:00
parent 18410fbf85
commit 6dd3863200
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Swiften/Server/ServerFromClientSession.cpp
View file

@ -135,7 +135,7 @@ void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element)
} }
void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHeader) { void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHeader) {
setLocalJID(JID("", incomingHeader.getTo())); setLocalJID(JID(incomingHeader.getTo()));
ProtocolHeader header; ProtocolHeader header;
header.setFrom(incomingHeader.getTo()); header.setFrom(incomingHeader.getTo());
header.setID(id_); header.setID(id_);

10
spectrum/src/frontends/slack/SlackSession.cpp
View file

@ -183,7 +183,7 @@ void SlackSession::handleJoinRoomCreated(const std::string &channelId, std::vect
m_channel2jid[slackChannel] = to; m_channel2jid[slackChannel] = to;
Swift::Presence::ref presence = Swift::Presence::create(); 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->setTo(Swift::JID(to + "/" + name));
presence->setType(Swift::Presence::Available); presence->setType(Swift::Presence::Available);
presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload())); presence->addPayload(boost::shared_ptr<Swift::Payload>(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"); LOG4CXX_INFO(logger, m_uinfo.jid << ": Main Slack Channel created, connecting the legacy network");
Swift::Presence::ref presence = Swift::Presence::create(); 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->setTo(m_component->getJID());
presence->setType(Swift::Presence::Available); presence->setType(Swift::Presence::Available);
presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload())); presence->addPayload(boost::shared_ptr<Swift::Payload>(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); LOG4CXX_INFO(logger, m_uinfo.jid << ": Leaving the legacy network room " << to);
Swift::Presence::ref presence = Swift::Presence::create(); 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->setTo(Swift::JID(to + "/" + m_uinfo.uin));
presence->setType(Swift::Presence::Unavailable); presence->setType(Swift::Presence::Unavailable);
presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload())); presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload()));
@ -237,7 +237,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std::
boost::shared_ptr<Swift::Message> msg(new Swift::Message()); boost::shared_ptr<Swift::Message> msg(new Swift::Message());
msg->setType(Swift::Message::Groupchat); msg->setType(Swift::Message::Groupchat);
msg->setTo(to); 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); msg->setBody("<" + m_idManager->getName(user) + "> " + message);
m_component->getFrontend()->onMessageReceived(msg); m_component->getFrontend()->onMessageReceived(msg);
} }
@ -273,7 +273,7 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std::
boost::shared_ptr<Swift::Message> msg(new Swift::Message()); boost::shared_ptr<Swift::Message> msg(new Swift::Message());
msg->setTo(b->getJID()); 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); msg->setBody("<" + m_idManager->getName(user) + "> " + message);
m_component->getFrontend()->onMessageReceived(msg); m_component->getFrontend()->onMessageReceived(msg);
} }