Skip to content

Added multilevel support in roomlist #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Added multilevel support in roomlist #202

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51ae2f6
Added multi tree support in roomlist
fank Jun 1, 2017
7448af9
Removed debug stuff
fank Jun 3, 2017
1b10776
Removed debug stuff
fank Jun 3, 2017
90d7690
Merge remote-tracking branch 'upstream/master' into fk_multi_tree
fank Jun 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 58 additions & 18 deletions backends/libpurple/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,8 @@ class SpectrumNetworkPlugin : public NetworkPlugin {
else if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL) {
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());
}
}
Expand Down Expand Up @@ -1859,19 +1860,27 @@ static void RoomlistProgress(PurpleRoomlist *list, gboolean in_progress)
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);
}
Expand All @@ -1881,33 +1890,64 @@ static void RoomlistProgress(PurpleRoomlist *list, gboolean in_progress)
std::list<std::string> m_topics;
for (rooms = list->rooms; rooms != NULL; rooms = rooms->next) {
PurpleRoomlistRoom *room = (PurpleRoomlistRoom *)rooms->data;
np->m_rooms[np->m_accounts[list->account]].push_back(room->name);

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);
}

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 = "";
Expand Down Expand Up @@ -2299,10 +2339,10 @@ int main(int argc, char **argv) {
purple_timeout_add_seconds_wrapped(30, pingTimeout, NULL);

np = new SpectrumNetworkPlugin();
bool libev = CONFIG_STRING_DEFAULTED(config, "service.eventloop", "") == "libev";

GMainLoop *m_loop;
#ifdef WITH_LIBEVENT
bool libev = CONFIG_STRING_DEFAULTED(config, "service.eventloop", "") == "libev";
if (!libev) {
m_loop = g_main_loop_new(NULL, FALSE);
}
Expand Down