libtransport.git Changeset - 47bc0f5ac52f

Changeset - 47bc0f5ac52f

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 10 years ago 2016-02-20 16:35:34
jkaluza@redhat.com

Support showing examples in web interface join room dialog

3 files changed with 57 insertions and 9 deletions:

spectrum/src/frontends/slack/SlackUserManager.cpp

spectrum_manager/src/APIServer.cpp

spectrum_manager/src/html/js/app.js

0 comments (0 inline, 0 general)

spectrum/src/frontends/slack/SlackUserManager.cpp

➞

Show inline comments

@@ @@ -7,48 +7,49 @@ @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "SlackUserManager.h"
 #include "SlackUserRegistration.h"
 #include "SlackFrontend.h"
 #include "SlackSession.h"
 #include "SlackUser.h"
 #include "transport/User.h"
 #include "transport/Transport.h"
 #include "transport/StorageBackend.h"
 #include "transport/Logging.h"
 #include "transport/Config.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 namespace Transport {
 DEFINE_LOGGER(logger, "SlackUserManager");
 SlackUserManager::SlackUserManager(Component *component, UserRegistry *userRegistry, StorageBackend *storageBackend) : UserManager(component, userRegistry, storageBackend) {
 	m_component = component;
 	m_storageBackend = storageBackend;
     m_userRegistration = new SlackUserRegistration(component, this, storageBackend);
 	onUserCreated.connect(boost::bind(&SlackUserManager::handleUserCreated, this, _1));
+}
 SlackUserManager::~SlackUserManager() {
     delete m_userRegistration;
+}
 void SlackUserManager::reconnectUser(const std::string &user) {
 #if HAVE_SWIFTEN_3
 	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;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 2) {
 			UserInfo uinfo;
 			if (!m_storageBackend->getUser(args[1], uinfo)) {
 				message->setBody("Error: Unknown user");
 				return true;
+			}
 			std::string rooms = "";
 			int type = (int) TYPE_STRING;
 			m_storageBackend->getUserSetting(uinfo.id, "rooms", type, rooms);
 			message->setBody(rooms);
 			return true;
+		}
+	}
 	else if (body.find("join_room_fields") == 0) {
 		std::string ret;
 		Config *cfg = m_component->getConfig();
 		ret += CONFIG_STRING_DEFAULTED(cfg, "service.join_room_nickname_label", "Nickname in 3rd-party room") + "\n";
 		std::string room_name = CONFIG_STRING_DEFAULTED(cfg, "service.join_room_room_label", "3rd-party room name");
 		if (room_name[0] == '%') {
 			room_name[0] = '#';
+		}
 		ret += room_name + "\n";
 		ret += CONFIG_STRING_DEFAULTED(cfg, "service.join_room_server_label", "3rd-party server") + "\n";
 		ret += "Slack Channel\n";
 		ret += CONFIG_STRING_DEFAULTED(cfg, "service.join_room_nickname_example", "BotNickname") + "\n";
 		room_name = CONFIG_STRING_DEFAULTED(cfg, "service.join_room_room_example", "3rd-party room name");
 		if (room_name[0] == '%') {
 			room_name[0] = '#';
+		}
 		ret += room_name + "\n";
 		ret += CONFIG_STRING_DEFAULTED(cfg, "service.join_room_server_example", "3rd.party.server.org") + "\n";
 		ret += "mychannel";
 		message->setBody(ret);
 		return true;
+	}
 	else if (body.find("join_room ") == 0) {
 		std::vector<std::string> args;
 		boost::split(args, body, boost::is_any_of(" "));
 		if (args.size() == 6) {
 			UserInfo uinfo;
 			if (!m_storageBackend->getUser(args[1], uinfo)) {
 				message->setBody("Error: Unknown user");
 				return true;
+			}
 			std::string rooms = "";
 			int type = (int) TYPE_STRING;
 			m_storageBackend->getUserSetting(uinfo.id, "rooms", type, rooms);
 			rooms += body + "\n";
 			m_storageBackend->updateUserSetting(uinfo.id, "rooms", rooms);
 			SlackUser *user = static_cast<SlackUser *>(getUser(args[1]));
 			if (user) {
 				user->getSession()->handleJoinMessage("", args, true);
+			}
 			message->setBody("Joined the room");
 			return true;
+		}
+	}

spectrum_manager/src/APIServer.cpp

➞

Show inline comments

 	UserInfo info;
 	m_storage->getUser(session->user, info);
 	std::string username = "";
 	int type = (int) TYPE_STRING;
 	m_storage->getUserSetting(info.id, instance, type, username);
 	if (username.empty()) {
 		send_ack(conn, true, "You are not registered to this Spectrum 2 instance.");
 		return;
+	}
 	std::string frontend_room = get_http_var(hm, "frontend_room");
 	std::string response = server->send_command(instance, "leave_room " + username + " " + frontend_room);
 	if (response.find("Left the room") == std::string::npos) {
 		send_ack(conn, true, response);
+	}
 	else {
 		send_ack(conn, false, response);
+	}
+}
 void APIServer::serve_instances_join_room_form(Server *server, Server::session *session, struct mg_connection *conn, struct http_message *hm) {
 	std::string uri(hm->uri.p, hm->uri.len);
 	std::string instance = uri.substr(uri.rfind("/") + 1);
 	// So far we support just Slack here. For XMPP, it is up to user to initiate the join room request.
 	Document json;
 	json.SetObject();
 	json.AddMember("error", 0, json.GetAllocator());
 	json.AddMember("name_label", "Nickname in 3rd-party room", json.GetAllocator());
 	json.AddMember("legacy_room_label", "3rd-party room name", json.GetAllocator());
 	json.AddMember("legacy_server_label", "3rd-party server", json.GetAllocator());
 	json.AddMember("frontend_room_label", "Slack channel", json.GetAllocator());
 	std::string response = server->send_command(instance, "join_room_fields");
 	std::vector<std::string> fields;
 	boost::split(fields, response, boost::is_any_of("\n"));
 	if (fields.size() != 8) {
 		fields.push_back("Nickname in 3rd-party room");
 		fields.push_back("3rd-party room name");
 		fields.push_back("3rd-party server");
 		fields.push_back("Slack Channel");
 		fields.push_back("BotNickname");
 		fields.push_back("room_name");
 		fields.push_back("3rd.party.server.org");
 		fields.push_back("mychannel");
+	}
 	json.AddMember("name_label", fields[0].c_str(), json.GetAllocator());
 	json.AddMember("legacy_room_label", fields[1].c_str(), json.GetAllocator());
 	json.AddMember("legacy_server_label", fields[2].c_str(), json.GetAllocator());
 	json.AddMember("frontend_room_label", fields[3].c_str(), json.GetAllocator());
 	json.AddMember("name_example", fields[4].c_str(), json.GetAllocator());
 	json.AddMember("legacy_room_example", fields[5].c_str(), json.GetAllocator());
 	json.AddMember("legacy_server_example", fields[6].c_str(), json.GetAllocator());
 	json.AddMember("frontend_room_example", fields[7].c_str(), json.GetAllocator());
 	send_json(conn, json);
+}
 void APIServer::serve_instances_register_form(Server *server, Server::session *session, struct mg_connection *conn, struct http_message *hm) {
 	std::string uri(hm->uri.p, hm->uri.len);
 	std::string instance = uri.substr(uri.rfind("/") + 1);
 	std::string response = server->send_command(instance, "registration_fields");
 	std::vector<std::string> fields;
 	boost::split(fields, response, boost::is_any_of("\n"));
 	if (fields.empty()) {
 		fields.push_back("Jabber ID");
 		fields.push_back("3rd-party network username");
 		fields.push_back("3rd-party network password");
+	}
 	Document json;
 	json.SetObject();
 	json.AddMember("error", 0, json.GetAllocator());
 	json.AddMember("username_label", fields[0].c_str(), json.GetAllocator());
 	json.AddMember("legacy_username_label", fields.size() >= 2 ? fields[1].c_str() : "", json.GetAllocator());
 	json.AddMember("password_label", fields.size() >= 3 ? fields[2].c_str() : "", json.GetAllocator());
 	send_json(conn, json);

spectrum_manager/src/html/js/app.js

➞

Show inline comments

@@ @@ -19,49 +19,49 @@ function show_instances() { @@
 		var admin = $.cookie("admin") == "1";
 		$.each(data.instances, function(i, instance) {
 			if (instance.running) {
 				if (admin) {
 					var command = instance.running ? "stop" : "start";
+				}
 				else {
 					var command = instance.registered ? "unregister" : "register";
 					if (instance.registered) {
 						instance.status += "<br/>Registered as " + instance.username;
+					}
+				}
+			}
 			else if (admin) {
 				var command = "start";
+			}
 			else {
 				var command = "";
+			}
 			var row = '<tr>'
 			row += '<td>' + instance.name + '</td>'
 			row += '<td>' + instance.status + '</td>'
 			if (command == 'register') {
-				row += '<td><a class="button_command" href="' + $.cookie("base_location") + 'instances/register.shtml?id=' + instance.id + '">' + command + '</a>' + '</td></tr>';
 				row += '<td><a href="' + $.cookie("base_location") + 'instances/register.shtml?id=' + instance.id + '">' + command + '</a>' + '</td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
+			}
 			else if (command == "") {
 				row += '<td></td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
+			}
 			else {
 				row += '<td>';
 				if (command == 'unregister' && instance.frontend == "slack") {
 					row += '<a href="' + $.cookie("base_location") + 'instances/join_room.shtml?id=' + instance.id + '">Join room</a> | ';
 					row += '<a href="' + $.cookie("base_location") + 'instances/list_rooms.shtml?id=' + instance.id + '">List joined rooms</a> | ';
+				}
 				row += '<a class="button_command" href="' + $.cookie("base_location") +  'api/v1/instances/' + command + '/' + instance.id + '">' + command + '</a>';
 				row += '</td></tr>';
 				$("#main_result  > tbody:last-child").append(row);
 				$(".button_command").click(function(e) {
 					e.preventDefault();
 					$(this).parent().empty().progressbar( {value: false} ).css('height', '1em');
 					var url = $(this).attr('href');
 					$.get(url, function(data) {
 						show_instances();
 					});
 				})
@@ @@ -131,52 +131,52 @@ function fill_instances_join_room_form() { @@
 	$("#instance").attr("value", query.id);
 	$(".button_command").click(function(e) {
 		e.preventDefault();
 		$(this).parent().empty().progressbar( {value: false} ).css('height', '1em');
 		var postdata ={
 			"name": $("#name").val(),
 			"legacy_room": $("#legacy_room").val(),
 			"legacy_server": $("#legacy_server").val(),
 			"frontend_room": $("#frontend_room").val()
 		};
 		$.post($.cookie("base_location") + "api/v1/instances/join_room/" + $("#instance").val(), postdata, function(data) {
 			window.location.replace("index.shtml");
 		});
 	})
 	$.get($.cookie("base_location") + "api/v1/instances/join_room_form/" + query.id, function(data) {
 		$("#name_desc").html(data.name_label + ":");
 		$("#legacy_room_desc").html(data.legacy_room_label + ":");
 		$("#legacy_server_desc").html(data.legacy_server_label + ":");
 		$("#frontend_room_desc").html(data.frontend_room_label + ":");
 		$("#name").attr("placeholder", data.name_label + ":");
 		$("#legacy_room").attr("placeholder", data.legacy_room_label + ":");
 		$("#legacy_server").attr("placeholder", data.legacy_server_label + ":");
 		$("#frontend_room").attr("placeholder", data.frontend_room_label + ":");
 		$("#name").attr("placeholder", data.name_example);
 		$("#legacy_room").attr("placeholder", data.legacy_room_example);
 		$("#legacy_server").attr("placeholder", data.legacy_server_example);
 		$("#frontend_room").attr("placeholder", data.frontend_room_example);
 	});
+}
 function fill_instances_register_form() {
 	var query = getQueryParams(document.location.search);
 	$("#instance").attr("value", query.id);
 	$(".button_command").click(function(e) {
 		e.preventDefault();
 		$(this).parent().empty().progressbar( {value: false} ).css('height', '1em');
 		var postdata ={
 			"jid": $("#jid").val(),
 			"uin": $("#uin").val(),
 			"password": $("#password").val()
 		};
 		$.post($.cookie("base_location") + "api/v1/instances/register/" + $("#instance").val(), postdata, function(data) {
 			if (data.oauth2_url) {
 				window.location.replace(data.oauth2_url);
+			}
 			else {
 				window.location.replace("index.shtml");
+			}

0 comments (0 inline, 0 general)