Changeset - 7ba8909d719f
Parent rev.
Child rev.
[Not reviewed]
0 9 0
Jan Kaluza - 9 years ago 2016-02-15 12:21:04
jkaluza@redhat.com
Use value_or instead of get_value_or
9 files changed with 16 insertions and 16 deletions:
libtransport/AdminInterface.cpp
2
2
libtransport/NetworkPluginServer.cpp
3
3
libtransport/UserManager.cpp
1
1
spectrum/src/frontends/slack/SlackSession.cpp
1
1
spectrum/src/frontends/slack/SlackUserManager.cpp
1
1
tests/libtransport/conversationmanager.cpp
1
1
tests/libtransport/user.cpp
2
2
tests/libtransport/usermanager.cpp
2
2
tests/libtransport/userregistration.cpp
3
3
0 comments (0 inline, 0 general)
libtransport/AdminInterface.cpp
➞
Show inline comments
 
@@ -61,13 +61,13 @@ AdminInterface::AdminInterface(Component *component, UserManager *userManager, N
 

			




	
	
	
		
 
AdminInterface::~AdminInterface() {

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void AdminInterface::handleQuery(Swift::Message::ref message) {

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	std::string msg = message->getBody().value_or("");

			




	
	
	
		
 
	std::string msg = message->getBody().get_value_or("");

			




	
	
	
		
 
#else

			




	
	
	
		
 
	std::string msg = message->getBody();

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	LOG4CXX_INFO(logger, "Message from admin received: '" << msg << "'");

			




	
	
	
		
 
	message->setTo(message->getFrom());

			




	
	
	
		
 
	message->setFrom(m_component->getJID());

			




	
	
		
 
@@ -387,13 +387,13 @@ void AdminInterface::handleMessageReceived(Swift::Message::ref message) {

			




	
	
	
		
 
	    return;

			




	
	
	
		
 
	

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	// Ignore empty messages

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	if (message->getBody().value_or("").empty()) {

			




	
	
	
		
 
	if (message->getBody().get_value_or("").empty()) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




	
	
	
		
 
#else

			




	
	
	
		
 
	if (message->getBody().empty()) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    libtransport/NetworkPluginServer.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -968,13 +968,13 @@ void NetworkPluginServer::handleQueryPayload(Backend *b, const std::string &data

			




	
	
	
		
 
	boost::shared_ptr<Swift::Message> msg(new Swift::Message());

			




	
	
	
		
 
	msg->setBody(payload.config());

			




	
	
	
		
 
	m_adminInterface->handleQuery(msg);

			




	
	
	
		
 

			




	
	
	
		
 
	pbnetwork::BackendConfig response;

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	response.set_config(msg->getBody().value_or(""));

			




	
	
	
		
 
	response.set_config(msg->getBody().get_value_or(""));

			




	
	
	
		
 
#else

			




	
	
	
		
 
	response.set_config(msg->getBody());

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
	std::string message;

			




	
	
	
		
 
	response.SerializeToString(&message);

			




	
	
		
 
@@ -1694,13 +1694,13 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost

			




	
	
	
		
 
	boost::shared_ptr<Swift::AttentionPayload> attentionPayload = msg->getPayload<Swift::AttentionPayload>();

			




	
	
	
		
 
	if (attentionPayload) {

			




	
	
	
		
 
		pbnetwork::ConversationMessage m;

			




	
	
	
		
 
		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());

			




	
	
	
		
 
		m.set_buddyname(conv->getLegacyName());

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
		m.set_message(msg->getBody().value_or(""));

			




	
	
	
		
 
		m.set_message(msg->getBody().get_value_or(""));

			




	
	
	
		
 
#else

			




	
	
	
		
 
		m.set_message(msg->getBody());

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
		std::string message;

			




	
	
	
		
 
		m.SerializeToString(&message);

			




	
	
		
 
@@ -1734,13 +1734,13 @@ void NetworkPluginServer::handleMessageReceived(NetworkConversation *conv, boost

			




	
	
	
		
 
	if (xhtmlPayload) {

			




	
	
	
		
 
		xhtml = xhtmlPayload->getBody();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// Send normal message

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	std::string body = msg->getBody().value_or("");

			




	
	
	
		
 
	std::string body = msg->getBody().get_value_or("");

			




	
	
	
		
 
#else

			




	
	
	
		
 
	std::string body = msg->getBody();

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	if (!body.empty() || !xhtml.empty()) {

			




	
	
	
		
 
		pbnetwork::ConversationMessage m;

			




	
	
	
		
 
		m.set_username(conv->getConversationManager()->getUser()->getJID().toBare());

			




        

    


    
    

    

        

                

                    libtransport/UserManager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -372,13 +372,13 @@ void UserManager::handleMessageReceived(Swift::Message::ref message) {

			




	
	
	
		
 
	boost::shared_ptr<Swift::ChatState> statePayload = message->getPayload<Swift::ChatState>();

			




	
	
	
		
 
	if (!statePayload) {

			




	
	
	
		
 
		messageToBackendSent();

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	std::string body = message->getBody().value_or("");

			




	
	
	
		
 
	std::string body = message->getBody().get_value_or("");

			




	
	
	
		
 
#else

			




	
	
	
		
 
	std::string body = message->getBody();

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	if (body.empty() && !statePayload && message->getSubject().empty()) {

			




	
	
	
		
 
		return;

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    spectrum/src/frontends/slack/SlackSession.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -148,13 +148,13 @@ void SlackSession::sendMessage(boost::shared_ptr<Swift::Message> message) {

			




	
	
	
		
 
			from = b->getAlias() + " (" + from + ")";

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	LOG4CXX_INFO(logger, m_uinfo.jid << "Sending message to Slack channel " << channel << " from " << from);

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	std::string body = message->getBody().value_or("");

			




	
	
	
		
 
	std::string body = message->getBody().get_value_or("");

			




	
	
	
		
 
#else

			




	
	
	
		
 
	std::string body = message->getBody();

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	m_rtm->getAPI()->sendMessage(from, channel, body);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    spectrum/src/frontends/slack/SlackUserManager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -107,13 +107,13 @@ void SlackUserManager::handleUserCreated(User *user) {

			




	
	
	
		
 
	LOG4CXX_INFO(logger, "handleUserCreated");

			




	
	
	
		
 
	static_cast<SlackUser *>(user)->getSession()->handleConnected();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool SlackUserManager::handleAdminMessage(Swift::Message::ref message) {

			




	
	
	
		
 
#if HAVE_SWIFTEN_3

			




	
	
	
		
 
	std::string body = message->getBody().value_or("");

			




	
	
	
		
 
	std::string body = message->getBody().get_value_or("");

			




	
	
	
		
 
#else

			




	
	
	
		
 
	std::string body = message->getBody();

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
	if (body.find("list_rooms") == 0) {

			




	
	
	
		
 
		std::vector<std::string> args;

			




        

    


    
    

    

        

                

                    tests/libtransport/conversationmanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,13 +11,13 @@

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
#if !HAVE_SWIFTEN_3

			




	
	
	
		
 
#define value_or(X) substr()

			




	
	
	
		
 
#define get_value_or(X) substr()

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
class ConversationManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(ConversationManagerTest);

			




	
	
	
		
 
	CPPUNIT_TEST(conversationSize);

			




	
	
	
		
 
	CPPUNIT_TEST(handleNormalMessages);

			




        

    


    
    

    

        

                

                    tests/libtransport/user.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,13 +10,13 @@

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
#if !HAVE_SWIFTEN_3

			




	
	
	
		
 
#define value_or(X) substr()

			




	
	
	
		
 
#define get_value_or(X) substr()

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(UserTest);

			




	
	
	
		
 
	CPPUNIT_TEST(sendCurrentPresence);

			




	
	
	
		
 
    CPPUNIT_TEST(handlePresence);

			




	
	
		
 
@@ -428,13 +428,13 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		CPPUNIT_ASSERT(streamEnded);

			




	
	
	
		
 
		user = userManager->getUser("user@localhost");

			




	
	
	
		
 
		CPPUNIT_ASSERT(!user);

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(2, (int) received.size());

			




	
	
	
		
 
		Swift::Message *m = dynamic_cast<Swift::Message *>(getStanza(received[0]));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().value_or(""));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), m->getBody().get_value_or(""));

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::StreamError *>(received[1].get()));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Connection error"), dynamic_cast<Swift::StreamError *>(received[1].get())->getText());

			




	
	
	
		
 

			




	
	
	
		
 
		disconnected = true;

			




	
	
	
		
 
	}

			




        

    


    
    

    

        

                

                    tests/libtransport/usermanager.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,13 +10,13 @@

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
#if !HAVE_SWIFTEN_3

			




	
	
	
		
 
#define value_or(X) substr()

			




	
	
	
		
 
#define get_value_or(X) substr()

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(UserManagerTest);

			




	
	
	
		
 
	CPPUNIT_TEST(connectUser);

			




	
	
	
		
 
	CPPUNIT_TEST(connectTwoResources);

			




	
	
		
 
@@ -78,13 +78,13 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());

			




	
	
	
		
 
		userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password"));

			




	
	
	
		
 
		loop->processEvents();

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(3, (int) received.size());

			




	
	
	
		
 
		CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("Ahoj"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().get_value_or(""));

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("user@localhost/resource"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getTo().toString());

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(std::string("localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getFrom().toString());

			




	
	
	
		
 

			




	
	
	
		
 
		CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount());

			




	
	
	
		
 
		CPPUNIT_ASSERT(streamEnded);

			




	
	
	
		
 
		std::istringstream ifs2("service.server_mode = 1\nservice.jid_escaping=1\nservice.jid=localhost\nservice.more_resources=1\n");

			




        

    


    
    

    

        

                

                    tests/libtransport/userregistration.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,13 +10,13 @@

			




	
	
	
		
 
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"

			




	
	
	
		
 
#include "basictest.h"

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
#if !HAVE_SWIFTEN_3

			




	
	
	
		
 
#define value_or(X) substr()

			




	
	
	
		
 
#define get_value_or(X) substr()

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest {

			




	
	
	
		
 
	CPPUNIT_TEST_SUITE(UserRegistrationTest);

			




	
	
	
		
 
	CPPUNIT_TEST(getForm);

			




	
	
	
		
 
	CPPUNIT_TEST(getFormRegistered);

			




	
	
		
 
@@ -201,13 +201,13 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest

			




	
	
	
		
 
			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Set, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());

			




	
	
	
		
 
			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::RosterPayload>());

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("localhost"), getStanza(received[0])->getPayload<Swift::RosterPayload>()->getItems()[0].getJID().toString());

			




	
	
	
		
 

			




	
	
	
		
 
			CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("registered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("registered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().get_value_or(""));

			




	
	
	
		
 

			




	
	
	
		
 
			UserInfo user;

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(true, storage->getUser("user@localhost", user));

			




	
	
	
		
 

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("legacyname"), user.uin);

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("password"), user.password);

			




	
	
		
 
@@ -239,13 +239,13 @@ class UserRegistrationTest : public CPPUNIT_NS :: TestFixture, public BasicTest

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(2, (int) received.size());

			




	
	
	
		
 
			CPPUNIT_ASSERT(dynamic_cast<Swift::IQ *>(getStanza(received[0])));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(Swift::IQ::Set, dynamic_cast<Swift::IQ *>(getStanza(received[0]))->getType());

			




	
	
	
		
 
			CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::RosterPayload>());

			




	
	
	
		
 

			




	
	
	
		
 
			CPPUNIT_ASSERT(dynamic_cast<Swift::Message *>(getStanza(received[1])));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("unregistered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().value_or(""));

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(std::string("unregistered: user@localhost"), dynamic_cast<Swift::Message *>(getStanza(received[1]))->getBody().get_value_or(""));

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
			UserInfo user;

			




	
	
	
		
 
			CPPUNIT_ASSERT_EQUAL(false, storage->getUser("user@localhost", user));

			




	
	
	
		
 
		}

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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