Changeset 64bed24 for protocols/skype/skype.c

Timestamp:

2015-10-13T05:05:22Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b1ae59

Parents:

fdc6d84

Message:

skype: create groupchat as soon as a message is received

Before this commit, the bee_chat_by_title() call just failed when
receiving a message in a groupchat we didn't know about, which is
probably something skype broke in their api at some point.

I'm fixing this since apparently the only way to access p2p based chats
is through the official skype desktop client (they won't be supported
through msnp24 or skypeweb. It's broken in mobile clients already), so
this plugin is probably the best way to access those.

This breaks the 'msg' test - now all chats are groupchats and there's no
way to tell them apart.

However, in reality, private messages aren't delivered at all over the
api, or at least I never managed to get them working. Probably if you
talk with someone who has a very old patched skype client.

File:

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

protocols/skype/skype.c

@@ -323 +323 @@
 }
 
+static struct groupchat *skype_chat_get_or_create(struct im_connection *ic, char *id)
+{
+        struct skype_data *sd = ic->proto_data;
+        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, id);
+
+        if (!gc) {
+                gc = imcb_chat_new(ic, id);
+                imcb_chat_name_hint(gc, id);
+                imcb_chat_add_buddy(gc, sd->username);
+
+                skype_printf(ic, "GET CHAT %s ADDER\n", id);
+                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_printf(ic, "GET CHAT %s ACTIVEMEMBERS\n", id);
+        }
+
+        return gc;
+}
+
 static void skype_parse_users(struct im_connection *ic, char *line)
 {
@@ -687 +705 @@
                 info += 9;
                 if (sd->handle && sd->body && sd->type) {
-                        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, info);
+                        struct groupchat *gc = skype_chat_get_or_create(ic, info);
                         int i;
                         for (i = 0; i < g_list_length(sd->body); i++) {
@@ -1025 +1043 @@
         }
         if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
-                gc = bee_chat_by_title(ic->bee, ic, id);
-                if (!gc) {
-                        gc = imcb_chat_new(ic, id);
-                        imcb_chat_name_hint(gc, id);
-                }
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_chat_get_or_create(ic, id);
         } else if (!strcmp(info, "STATUS DIALOG") && sd->groupchat_with) {
-                gc = imcb_chat_new(ic, id);
-                imcb_chat_name_hint(gc, id);
+                gc = skype_chat_get_or_create(ic, id);
                 /* According to the docs this
                  * is necessary. However it
@@ -1045 +1056 @@
                            sd->groupchat_with);
                 imcb_chat_add_buddy(gc, buf);
-                imcb_chat_add_buddy(gc, sd->username);
                 g_free(sd->groupchat_with);
                 sd->groupchat_with = NULL;
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
         } else if (!strcmp(info, "STATUS UNSUBSCRIBED")) {
                 gc = bee_chat_by_title(ic->bee, ic, id);