libtransport.git Changeset - 1bf36dbf68fe

Changeset - 1bf36dbf68fe

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 9 years ago 2016-01-25 08:24:41
jkaluza@redhat.com

Allow setting main channel using Slack command

2 files changed with 27 insertions and 1 deletions:

spectrum/src/frontends/slack/SlackSession.cpp

spectrum_manager/src/APIServer.cpp

0 comments (0 inline, 0 general)

spectrum/src/frontends/slack/SlackSession.cpp

➞

Show inline comments

 	else if (args[1] == "register" && args.size() == 5) {
 		handleRegisterMessage(message, args, quiet);
+	}
 	else if (args[1] == "set_main_channel" && args.size() == 3) {
 		std::string slackChannel = SlackAPI::SlackObjectToPlainText(args[2], true);
 		m_storageBackend->setUser(m_uinfo);
 		int type = (int) TYPE_STRING;
 		m_storageBackend->getUserSetting(m_uinfo.id, "slack_channel", type, slackChannel);
 		Swift::Presence::ref presence = Swift::Presence::create();
 		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);
+	}
 	else if (args[1] == "list.rooms" && args.size() == 2) {
 		// .spectrum2 list.rooms
 		std::string rooms = "";
 				presence->addPayload(boost::shared_ptr<Swift::Payload>(new Swift::MUCPayload()));
 				m_component->getFrontend()->onPresenceReceived(presence);
+			}
 			else {
 				std::string msg;
 				msg =  "Hi, it seems you have enabled Spectrum 2 transport for your Team. As a Team owner, you should now configure it:\\n";
 				msg += "1. At first, create new channel in which you want this Spectrum 2 transport to send the messages, or choose the existing one.\\n";
 				msg += "2. Invite this Spectrum 2 bot into this channel.\\n";
 				msg += "3. Configure the transportation between 3rd-party network and this channel by executing following command in this chat:\\n";
 				msg += "```.spectrum2 set_main_channel #SlackChannel```\\n";
 				msg += "To get full list of available commands, executa `.spectrum2 help`\\n";
 				m_rtm->sendMessage(m_ownerChannel, msg);
+			}
+		}
+	}

spectrum_manager/src/APIServer.cpp

➞

Show inline comments

 	// the std::string stored out of BOOST_FOREACH scope, otherwise the
 	// const char * returned by c_str() would be invalid during send_json.
 	std::vector<std::string> statuses;
 	std::vector<std::string> usernames;
 	std::vector<std::string> list = show_list(m_config, false);
 	Document json;
 		int type = (int) TYPE_STRING;
 		m_storage->getUserSetting(info.id, id, type, username);
 		usernames.push_back(username);
 		instance.AddMember("registered", !username.empty(), json.GetAllocator());
-		instance.AddMember("username", username.c_str(), json.GetAllocator());
+		instance.AddMember("username", usernames.back().c_str(), json.GetAllocator());
 		instances.PushBack(instance, json.GetAllocator());
+	}

0 comments (0 inline, 0 general)