Changeset 89d6845

Timestamp:

2011-01-02T02:32:38Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

54ca269

Parents:

8b8d1bed

Message:

Parse the user list of each group

File:

• skype/skype.c (modified) (6 diffs)

skype/skype.c

@@ -2 +2 @@
  *  skype.c - Skype plugin for BitlBee
  *
- *  Copyright (c) 2007, 2008, 2009, 2010 by Miklos Vajna <vmiklos@frugalware.org>
+ *  Copyright (c) 2007, 2008, 2009, 2010, 2011 by Miklos Vajna <vmiklos@frugalware.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -108 +108 @@
         /* If this is just an update of an already received message. */
         int is_edit;
+        /* List of struct skype_group* */
+        GList *groups;
 };
 
@@ -119 +121 @@
         /* This is also used for call IDs for simplicity */
         char *handle;
+};
+
+struct skype_group {
+        int id;
+        char *name;
+        GList *users;
 };
 
@@ -736 +744 @@
 }
 
+static struct skype_group *skype_group_by_id(struct im_connection *ic, int id) {
+        struct skype_data *sd = ic->proto_data;
+        int i;
+
+        for (i = 0; i < g_list_length(sd->groups); i++) {
+                struct skype_group *sg = (struct skype_group *)g_list_nth_data(sd->groups, i);
+
+                if (sg->id == id)
+                        return sg;
+        }
+        return NULL;
+}
+
+static void skype_group_free(struct skype_group* sg, gboolean usersonly) {
+        int i;
+        
+        for (i = 0; i < g_list_length(sg->users); i++) {
+                char *user = g_list_nth_data(sg->users, i);
+                g_free(user);
+        }
+        sg->users = NULL;
+        if (usersonly)
+                return;
+        g_free(sg->name);
+        g_free(sg);
+}
+
+static void skype_parse_group(struct im_connection *ic, char *line)
+{
+        struct skype_data *sd = ic->proto_data;
+        char *id = strchr(line, ' ');
+
+        if (!++id)
+                return;
+
+        char *info = strchr(id, ' ');
+
+        if (!info)
+                return;
+        *info = '\0';
+        info++;
+
+        if (!strncmp(info, "DISPLAYNAME ", 12)) {
+                info += 12;
+
+                /* Name given for a group ID: try to update it or insert a new
+                 * one if not found */
+                struct skype_group *sg = skype_group_by_id(ic, atoi(id));
+                if (sg) {
+                        g_free(sg->name);
+                        sg->name = g_strdup(info);
+                } else {
+                        sg = g_new0(struct skype_group, 1);
+                        sg->id = atoi(id);
+                        sg->name = g_strdup(info);
+                        sd->groups = g_list_append(sd->groups, sg);
+                }
+        } else if (!strncmp(info, "USERS ", 6)) {
+                struct skype_group *sg = skype_group_by_id(ic, atoi(id));
+
+                if (sg) {
+                        char **i;
+                        char **users = g_strsplit(info + 6, ", ", 0);
+
+                        skype_group_free(sg, TRUE);
+                        i = users;
+                        while (*i) {
+                                sg->users = g_list_append(sg->users, g_strdup(*i));
+                                i++;
+                        }
+                        g_strfreev(users);
+                } else
+                        log_message(LOGLVL_ERROR, "No skype group with id %s. That's probably a bug.", id);
+        }
+}
+
 static void skype_parse_chat(struct im_connection *ic, char *line)
 {
@@ -893 +977 @@
                 { "FILETRANSFER ", skype_parse_filetransfer },
                 { "CHAT ", skype_parse_chat },
+                { "GROUP ", skype_parse_group },
                 { "PASSWORD ", skype_parse_password },
                 { "PROFILE PSTN_BALANCE ", skype_parse_profile },
@@ -1007 +1092 @@
 {
         struct skype_data *sd = ic->proto_data;
+        int i;
 
         skype_printf(ic, "SET USERSTATUS OFFLINE\n");
 
+        for (i = 0; i < g_list_length(sd->groups); i++) {
+                struct skype_group *sg = (struct skype_group *)g_list_nth_data(sd->groups, i);
+                skype_group_free(sg, FALSE);
+        }
         g_free(sd->username);
         g_free(sd->handle);