Changeset - 6dd386320050
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Jan Kaluza - 9 years ago 2016-02-08 16:00:17
jkaluza@redhat.com
Do no create Swift::JID with an empty node
2 files changed with 6 insertions and 6 deletions:
include/Swiften/Server/ServerFromClientSession.cpp
1
1
spectrum/src/frontends/slack/SlackSession.cpp
5
5
0 comments (0 inline, 0 general)
include/Swiften/Server/ServerFromClientSession.cpp
➞
Show inline comments
 
@@ -132,13 +132,13 @@ void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element)
 
			}
 
		}
 
	}
 
}
 

			




	
	
	
		
 
void ServerFromClientSession::handleStreamStart(const ProtocolHeader& incomingHeader) {

			




	
	
	
		
 
	setLocalJID(JID("", incomingHeader.getTo()));

			




	
	
	
		
 
	setLocalJID(JID(incomingHeader.getTo()));

			




	
	
	
		
 
	ProtocolHeader header;

			




	
	
	
		
 
	header.setFrom(incomingHeader.getTo());

			




	
	
	
		
 
	header.setID(id_);

			




	
	
	
		
 
	getXMPPLayer()->writeHeader(header);

			




	
	
	
		
 

			




	
	
	
		
 
	boost::shared_ptr<StreamFeatures> features(new StreamFeatures());

			




        

    


    
    

    

        

                

                    spectrum/src/frontends/slack/SlackSession.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -180,13 +180,13 @@ void SlackSession::handleJoinRoomCreated(const std::string &channelId, std::vect

			




	
	
	
		
 
	LOG4CXX_INFO(logger, m_uinfo.jid << ": Channel " << args[5] << " is created. Joining the room on legacy network.");

			




	
	
	
		
 

			




	
	
	
		
 
	m_jid2channel[to] = slackChannel;

			




	
	
	
		
 
	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<Swift::Payload>(new Swift::MUCPayload()));

			




	
	
	
		
 
	m_component->getFrontend()->onPresenceReceived(presence);

			




	
	
	
		
 

			




	
	
	
		
 
	m_onlineBuddiesTimer->start();

			




	
	
		
 
@@ -199,13 +199,13 @@ void SlackSession::handleJoinMessage(const std::string &message, std::vector<std

			




	
	
	
		
 

			




	
	
	
		
 
void SlackSession::handleSlackChannelCreated(const std::string &channelId) {

			




	
	
	
		
 
	m_slackChannel = 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<Swift::Payload>(new Swift::MUCPayload()));

			




	
	
	
		
 
	m_component->getFrontend()->onPresenceReceived(presence);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -217,13 +217,13 @@ void SlackSession::leaveRoom(const std::string &channel) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	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<Swift::Payload>(new Swift::MUCPayload()));

			




	
	
	
		
 
	m_component->getFrontend()->onPresenceReceived(presence);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -234,13 +234,13 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std::

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (!to.empty()) {

			




	
	
	
		
 
		boost::shared_ptr<Swift::Message> 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);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		// When changing the purpose, we do not want to spam to room with the info,

			




	
	
	
		
 
		// so remove the purpose message.

			




	
	
		
 
@@ -270,13 +270,13 @@ void SlackSession::handleMessageReceived(const std::string &channel, const std::

			




	
	
	
		
 
			if (s.getType() == Swift::StatusShow::None) {

			




	
	
	
		
 
				continue;

			




	
	
	
		
 
			}

			




	
	
	
		
 

			




	
	
	
		
 
			boost::shared_ptr<Swift::Message> 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);

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-10621
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support