Changeset 46e9822 for skype

Timestamp:

2011-01-03T02:47:40Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

46641bf

Parents:

a5e6aa1

Message:

Make /invite work for existing groups

File:

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

skype/skype.c

@@ -291 +291 @@
                                 return sg->name;
                 }
+        }
+        return NULL;
+}
+
+static struct skype_group *skype_group_by_name(struct im_connection *ic, char *name)
+{
+        struct skype_data *sd = ic->proto_data;
+        int i;
+
+        for (i = 0; i < g_list_length(sd->groups); i++) {
+                struct skype_group *sg = g_list_nth_data(sd->groups, i);
+                if (!strcmp(sg->name, name))
+                        return sg;
         }
         return NULL;
@@ -998 +1011 @@
 }
 
+static void skype_parse_alter_group(struct im_connection *ic, char *line)
+{
+        char *id = line + strlen("ALTER GROUP");
+
+        if (!++id)
+                return;
+
+        char *info = strchr(id, ' ');
+
+        if (!info)
+                return;
+        *info = '\0';
+        info++;
+
+        if (!strncmp(info, "ADDUSER ", 8)) {
+                struct skype_group *sg = skype_group_by_id(ic, atoi(id));
+
+                info += 8;
+                if (sg) {
+                        char *buf = g_strdup_printf("%s@skype.com", info);
+                        sg->users = g_list_append(sg->users, g_strdup(info));
+                        imcb_add_buddy(ic, buf, sg->name);
+                        g_free(buf);
+                } else
+                        log_message(LOGLVL_ERROR,
+                                "No skype group with id %s. That's probably a bug.", id);
+        }
+}
+
 typedef void (*skype_parser)(struct im_connection *ic, char *line);
 
@@ -1024 +1066 @@
                 { "CHATS ", skype_parse_chats },
                 { "GROUPS ", skype_parse_groups },
+                { "ALTER GROUP ", skype_parse_alter_group },
         };
 
@@ -1270 +1313 @@
         char *nick, *ptr;
 
-        /* Unused parameter */
-        group = group;
-
         nick = g_strdup(who);
         ptr = strchr(nick, '@');
         if (ptr)
                 *ptr = '\0';
-        skype_printf(ic, "SET USER %s BUDDYSTATUS 2 Please authorize me\n",
-                nick);
-        g_free(nick);
+
+        if (!group) {
+                skype_printf(ic, "SET USER %s BUDDYSTATUS 2 Please authorize me\n",
+                                nick);
+                g_free(nick);
+        } else {
+                struct skype_group *sg = skype_group_by_name(ic, group);
+
+                if (!sg) {
+                        // TODO
+                        /* No such group, we need to create it, then have to
+                         * add the user once it's created. */
+                        //skype_printf(ic, "CREATE GROUP %s", group);
+                } else {
+                        skype_printf(ic, "ALTER GROUP %d ADDUSER %s", sg->id, nick);
+                }
+        }
 }