libtransport.git Changeset - d7527b44b290

Changeset - d7527b44b290

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Florian Kinder - 7 years ago 2018-12-01 10:25:47
florian.kinder@fankserver.com

Added multi tree support in roomlist

1 file changed with 61 insertions and 21 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -791,18 +791,21 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 			PurpleConnection *gc = purple_account_get_connection_wrapped(account);
 			GHashTable *comps = NULL;
 			std::string roomName = LegacyNameToName(account, room);
 			// Check if the PurpleChat is not stored in buddy list
 			PurpleChat *chat = purple_blist_find_chat_wrapped(account, roomName.c_str());
 			if (chat) {
 				LOG4CXX_INFO(logger, "CHAT FOUND");
 				comps = purple_chat_get_components_wrapped(chat);
+			}
 			else if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL) {
 				LOG4CXX_INFO(logger, "CHAT NOT FOUND");
 				if (CONFIG_STRING(config, "service.protocol") == "prpl-jabber") {
 					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, (roomName + "/" + nickname).c_str());
 				} else {
+				}
 				else {
 					comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, roomName.c_str());
+				}
+			}
 			if (CONFIG_STRING(config, "service.protocol") != "prpl-jabber") {
                                np->handleParticipantChanged(np->m_accounts[account], nickname, room, 0, pbnetwork::STATUS_ONLINE);
 static void conv_present(PurpleConversation *conv) {
 	if (purple_conversation_get_type_wrapped(conv) == PURPLE_CONV_TYPE_CHAT) {
 		LOG4CXX_INFO(logger, "Conversation presented");
 		conv_chat_add_users(conv, PURPLE_CONV_CHAT_WRAPPED(conv)->in_room, TRUE);
 		const char *topic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT_WRAPPED(conv));
 		LOG4CXX_INFO(logger, "topic: " << topic);
 		if (topic && *topic != '\0') {
 			conv_chat_topic_changed(conv, topic, PURPLE_CONV_CHAT_WRAPPED(conv)->who);
+		}
 		else {
 			LOG4CXX_INFO(logger, "Conversation created with an empty topic");
+		}
+{
 	if (!in_progress) {
 		GList *fields = purple_roomlist_get_fields(list);
 		GList *field;
 		int topicId = -1;
 		int usersId = -1;
 		int descriptionId = -1;
 		int roomId = -1;
 		int id = 0;
 		for (field = fields; field != NULL; field = field->next, id++) {
 			PurpleRoomlistField *f = (PurpleRoomlistField *) field->data;
 			if (!f || !f->name) {
 				continue;
+			}
 			std::string fstring = f->name;
 			if (fstring == "topic") {
 			if (fstring == "id") {
 				roomId = id;
+			}
 			else if (fstring == "topic" || fstring == "name") {
 				topicId = id;
+			}
 			else if (fstring == "users") {
 				usersId = id;
+			}
 			else if (fstring == "type") {
 				descriptionId = id;
+			}
 			else {
 				LOG4CXX_INFO(logger, "Uknown RoomList field " << fstring);
+			}
+		}
 		GList *rooms;
 		std::list<std::string> m_topics;
 		PurplePlugin *plugin = purple_find_prpl_wrapped(purple_account_get_protocol_id_wrapped(list->account));
 		PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 		for (rooms = list->rooms; rooms != NULL; rooms = rooms->next) {
 			PurpleRoomlistRoom *room = (PurpleRoomlistRoom *)rooms->data;
 			if (room->type == PURPLE_ROOMLIST_ROOMTYPE_CATEGORY) continue;
 			std::string roomId = prpl_info && prpl_info->roomlist_room_serialize ?
 				prpl_info->roomlist_room_serialize(room)
 				: room->name;
 			np->m_rooms[np->m_accounts[list->account]].push_back(roomId);
 			std::string roomIdentifier = room->name;
 			if (roomId != -1) {
 				char *roomIdField = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), roomId);
 				if (roomIdField) {
 					roomIdentifier = std::string(roomIdField);
+				}
+			}
 			np->m_rooms[np->m_accounts[list->account]].push_back(roomIdentifier);
 			std::string roomName = "";
 			int nestedLevel = 0;
 			PurpleRoomlistRoom *parentRoom = purple_roomlist_room_get_parent(room);
 			while (parentRoom != NULL) {
 				nestedLevel++;
 				parentRoom = purple_roomlist_room_get_parent(parentRoom);
+			}
 			LOG4CXX_INFO(logger, "nestedLevel " << nestedLevel);
 			if (nestedLevel > 0) {
 				std::string roomNamePrefix = std::string(nestedLevel, '-');
 				if (roomNamePrefix != "") {
 					roomNamePrefix = roomNamePrefix + "> ";
+				}
 				roomName = roomNamePrefix;
+			}
 			if (topicId == -1) {
-				m_topics.push_back(room->name);
+				roomName += room->name;
+			}
 			else {
 				char *topic = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), topicId);
 				if (topic) {
-					m_topics.push_back(topic);
+					roomName += topic;
+				}
 				else {
 					if (usersId) {
 						char *users = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), usersId);
 						if (users) {
 							m_topics.push_back(users);
+						}
 						else {
 							LOG4CXX_WARN(logger, "RoomList topic and users is NULL");
 							m_topics.push_back(room->name);
+						}
 				else if (usersId) {
 					char *users = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), usersId);
 					if (users) {
 						roomName += users;
+					}
 					else {
 						LOG4CXX_WARN(logger, "RoomList topic is NULL");
 						m_topics.push_back(room->name);
 						LOG4CXX_WARN(logger, "RoomList topic and users is NULL");
 						roomName += room->name;
+					}
+				}
 				else {
 					LOG4CXX_WARN(logger, "RoomList topic is NULL");
 					roomName += room->name;
+				}
+			}
 			if (descriptionId != -1) {
 				char *description = (char *) g_list_nth_data(purple_roomlist_room_get_fields(room), descriptionId);
 				if (description) {
 					roomName += " (" + std::string(description) + ")";
+				}
+			}
 			m_topics.push_back(roomName);
+		}
 		std::string user = "";
 		if (list->account) {
 			user = np->m_accounts[list->account];
+		}

0 comments (0 inline, 0 general)