aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@vmiklos.hu>2013-01-16 21:26:58 +0100
committerMiklos Vajna <vmiklos@vmiklos.hu>2013-01-16 21:26:58 +0100
commit24871120bb05d3afe1f80218eef848aa1b94545e (patch)
tree804d3052aa8eb49b423f7e0160973a61b43aec32
parentd4b5e5b2d872ff6ce959c7de46ab8cd473129794 (diff)
skype_parse_chat: read MEMBERS, not ACTIVEMEMBERS
This makes /invite working again. No idea when this got broken, but I promise the next commit will add a tescase for it. Also, with this, other groupchat members will be already present in the gropuchat when we chain, finally solving the annoying fake joins presenting till now.
-rw-r--r--protocols/skype/skype.c4
-rw-r--r--protocols/skype/t/groupchat-invited-bitlbee.mock3
2 files changed, 3 insertions, 4 deletions
diff --git a/protocols/skype/skype.c b/protocols/skype/skype.c
index 57855ad0..8f0d9b1c 100644
--- a/protocols/skype/skype.c
+++ b/protocols/skype/skype.c
@@ -979,8 +979,8 @@ static void skype_parse_chat(struct im_connection *ic, char *line)
g_free(sd->adder);
sd->adder = NULL;
}
- } else if (!strncmp(info, "ACTIVEMEMBERS ", 14)) {
- info += 14;
+ } else if (!strncmp(info, "MEMBERS ", 8)) {
+ info += 8;
gc = bee_chat_by_title(ic->bee, ic, id);
/* Hack! We set ->data to TRUE
* while we're on the channel
diff --git a/protocols/skype/t/groupchat-invited-bitlbee.mock b/protocols/skype/t/groupchat-invited-bitlbee.mock
index 22af9ed3..f63b7d5c 100644
--- a/protocols/skype/t/groupchat-invited-bitlbee.mock
+++ b/protocols/skype/t/groupchat-invited-bitlbee.mock
@@ -5,5 +5,4 @@
<< PRIVMSG &bitlbee :account add skype alice foo
<< PRIVMSG &bitlbee :account skype on
>> JOIN :##cecil/$bob;4d8cc9965791
->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob @root
->> :cecil!cecil@skype.com JOIN :##cecil/$bob;4d8cc9965791
+>> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root