Changeset 54ca269 for skype

Timestamp:

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

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

fbb15f2

Parents:

89d6845

Message:

Initial support for reading buddy groups

What works: if you have a few buddies in <group>, then /j &<group> will
show just those buddies.

What does not:

• If you later move buddies using Skype UI, BitlBee is not yet notified.
• You cannot move buddies using /invite yet.

What won't work in the near future: only the first group of each buddy
is parsed.

File:

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

skype/skype.c

@@ -277 +277 @@
 }
 
+static char *skype_group_by_username(struct im_connection *ic, char *username)
+{
+        struct skype_data *sd = ic->proto_data;
+        int i, j;
+
+        /* NEEDSWORK: we just search for the first group of the user, multiple
+         * groups / user is not yet supported by BitlBee. */
+
+        for (i = 0; i < g_list_length(sd->groups); i++) {
+                struct skype_group *sg = g_list_nth_data(sd->groups, i);
+                for (j = 0; j < g_list_length(sg->users); j++) {
+                        if (!strcmp(g_list_nth_data(sg->users, j), username))
+                                return sg->name;
+                }
+        }
+        return NULL;
+}
+
 static void skype_parse_users(struct im_connection *ic, char *line)
 {
@@ -308 +326 @@
                                 return;
                 ptr = g_strdup_printf("%s@skype.com", user);
-                imcb_add_buddy(ic, ptr, NULL);
+                imcb_add_buddy(ic, ptr, skype_group_by_username(ic, user));
                 if (strcmp(status, "OFFLINE") && (strcmp(status, "SKYPEOUT") ||
                         !set_getbool(&ic->acc->set, "skypeout_offline")))
@@ -324 +342 @@
                 if (!strcmp(st, "3")) {
                         char *buf = g_strdup_printf("%s@skype.com", user);
-                        imcb_add_buddy(ic, buf, NULL);
+                        imcb_add_buddy(ic, buf, skype_group_by_username(ic, user));
                         g_free(buf);
                 }
@@ -771 +789 @@
 }
 
+/* Update the group of each user in this group */
+static void skype_group_users(struct im_connection *ic, struct skype_group *sg) {
+        int i;
+
+        for (i = 0; i < g_list_length(sg->users); i++) {
+                char *user = g_list_nth_data(sg->users, i);
+                char *buf = g_strdup_printf("%s@skype.com", user);
+                imcb_add_buddy(ic, buf, sg->name);
+                g_free(buf);
+        }
+}
+
 static void skype_parse_group(struct im_connection *ic, char *line)
 {
@@ -815 +845 @@
                         }
                         g_strfreev(users);
+                        skype_group_users(ic, sg);
                 } else
                         log_message(LOGLVL_ERROR, "No skype group with id %s. That's probably a bug.", id);
@@ -1040 +1071 @@
 
         /* This will download all buddies and groups. */
-        st = skype_printf(ic, "SEARCH FRIENDS\n");
-        skype_printf(ic, "SEARCH GROUPS CUSTOM\n");
+        st = skype_printf(ic, "SEARCH GROUPS CUSTOM\n");
+        skype_printf(ic, "SEARCH FRIENDS\n");
 
         skype_printf(ic, "SET USERSTATUS ONLINE\n");