diff libpurple/protocols/qq/group_im.c @ 23753:5f454b975a99

2008.08.10 - csyfek <csyfek(at)gmail.com> * Commit to Pidgin 2008.08.06 - ccpaging <ecc_hy(at)hotmail.com> * Rename names of variables, Group, to Room * Functions of group_network merged into qq_network and qq_process * Canceled managing glist of group packet, add sub_cmdd and room_id to transaction * Fixed error of demo group: If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet. 2008.08.04 - ccpaging <ecc_hy(at)hotmail.com> * Use new crypt/decrypt functions * Rename crypt.c/h to qq_crypt.c/h * Clean code of decrypt functions * Fixed decryption failure 2008.08.04 - csyfek <csyfek(at)gmail.com> * Update AUTHORS

--- a/libpurple/protocols/qq/group_im.c	Sat Aug 09 23:23:48 2008 +0000
+++ b/libpurple/protocols/qq/group_im.c	Sun Aug 10 04:32:14 2008 +0000
@@ -36,15 +36,16 @@
 #include "group_internal.h"
 #include "group_info.h"
 #include "group_im.h"
-#include "group_network.h"
 #include "group_opt.h"
 #include "im.h"
+#include "header_info.h"
 #include "packet_parse.h"
+#include "qq_network.h"
 #include "utils.h"
 
 typedef struct _qq_recv_group_im {
-	guint32 external_group_id;
-	guint8 group_type;
+	guint32 ext_id;
+	guint8 type8;
 	guint32 member_uid;
 	guint16 msg_seq;
 	time_t send_time;
@@ -68,12 +69,10 @@
 	purple_debug_info("QQ_MESG", "Send qun mesg filterd: %s\n", msg_filtered);
 	msg_len = strlen(msg_filtered);
 
-	data_len = 7 + msg_len + QQ_SEND_IM_AFTER_MSG_LEN;
+	data_len = 2 + msg_len + QQ_SEND_IM_AFTER_MSG_LEN;
 	raw_data = g_newa(guint8, data_len);
 
 	bytes = 0;
-	bytes += qq_put8(raw_data + bytes, QQ_GROUP_CMD_SEND_MSG);
-	bytes += qq_put32(raw_data + bytes, group->internal_group_id);
 	bytes += qq_put16(raw_data + bytes, msg_len + QQ_SEND_IM_AFTER_MSG_LEN);
 	bytes += qq_putdata(raw_data + bytes, (guint8 *) msg_filtered, msg_len);
 	send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
@@ -84,7 +83,7 @@
 	g_free(msg_filtered);
 
 	if (bytes == data_len)	/* create OK */
-		qq_send_group_cmd(gc, group, raw_data, data_len);
+		qq_send_room_cmd(gc, QQ_ROOM_CMD_SEND_MSG, group->id, raw_data, data_len);
 	else
 		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
 				"Fail creating group_im packet, expect %d bytes, build %d bytes\n", data_len, bytes);
@@ -99,33 +98,33 @@
 }
 
 /* receive an application to join the group */
-void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, user_uid;
-	guint8 group_type;
+	guint32 ext_id, user_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg, *reason;
 	group_member_opt *g;
 	gchar *nombre;
 	gint bytes = 0;
 
-	g_return_if_fail(internal_group_id > 0 && data != NULL && len > 0);
+	g_return_if_fail(id > 0 && data != NULL && len > 0);
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&user_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && user_uid > 0);
+	g_return_if_fail(ext_id > 0 && user_uid > 0);
 
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
-	msg = g_strdup_printf(_("User %d requested to join group %d"), user_uid, external_group_id);
+	msg = g_strdup_printf(_("User %d requested to join group %d"), user_uid, ext_id);
 	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
 
 	g = g_new0(group_member_opt, 1);
 	g->gc = gc;
-	g->internal_group_id = internal_group_id;
+	g->id = id;
 	g->member = user_uid;
 
 	nombre = uid_to_purple_name(user_uid);
@@ -150,10 +149,10 @@
 }
 
 /* the request to join a group is rejected */
-void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, admin_uid;
-	guint8 group_type;
+	guint32 ext_id, admin_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg, *reason;
 	qq_group *group;
 	gint bytes = 0;
@@ -162,21 +161,21 @@
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&admin_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && admin_uid > 0);
+	g_return_if_fail(ext_id > 0 && admin_uid > 0);
 
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been rejected by admin %d"), external_group_id, admin_uid);
+		(_("Your request to join group %d has been rejected by admin %d"), ext_id, admin_uid);
 	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, reason);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
 		qq_group_refresh(gc, group);
@@ -188,10 +187,10 @@
 }
 
 /* the request to join a group is approved */
-void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, admin_uid;
-	guint8 group_type;
+	guint32 ext_id, admin_uid;
+	guint8 type8;
 	gchar *reason_utf8, *msg;
 	qq_group *group;
 	gint bytes = 0;
@@ -200,20 +199,20 @@
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&admin_uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && admin_uid > 0);
+	g_return_if_fail(ext_id > 0 && admin_uid > 0);
 	/* it is also a "无" here, so do not display */
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been approved by admin %d"), external_group_id, admin_uid);
+		(_("Your request to join group %d has been approved by admin %d"), ext_id, admin_uid);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, NULL);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
@@ -224,10 +223,10 @@
 }
 
 /* process the packet when removed from a group */
-void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, uid;
-	guint8 group_type;
+	guint32 ext_id, uid;
+	guint8 type8;
 	gchar *msg;
 	qq_group *group;
 	gint bytes = 0;
@@ -236,16 +235,16 @@
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && uid > 0);
+	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have left group \"%d\""), uid, external_group_id);
+	msg = g_strdup_printf(_("You [%d] have left group \"%d\""), uid, ext_id);
 	purple_notify_info(gc, _("QQ Qun Operation"), msg, NULL);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
 		qq_group_refresh(gc, group);
@@ -255,10 +254,10 @@
 }
 
 /* process the packet when added to a group */
-void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 internal_group_id, PurpleConnection *gc)
+void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
-	guint32 external_group_id, uid;
-	guint8 group_type;
+	guint32 ext_id, uid;
+	guint8 type8;
 	qq_group *group;
 	gchar *msg;
 	gint bytes = 0;
@@ -267,24 +266,24 @@
 
 	/* FIXME: check length here */
 
-	bytes += qq_get32(&external_group_id, data + bytes);
-	bytes += qq_get8(&group_type, data + bytes);
+	bytes += qq_get32(&ext_id, data + bytes);
+	bytes += qq_get8(&type8, data + bytes);
 	bytes += qq_get32(&uid, data + bytes);
 
-	g_return_if_fail(external_group_id > 0 && uid > 0);
+	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have been added to group \"%d\""), uid, external_group_id);
+	msg = g_strdup_printf(_("You [%d] have been added to group \"%d\""), uid, ext_id);
 	purple_notify_info(gc, _("QQ Qun Operation"), msg, _("This group has been added to your buddy list"));
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
 	} else {		/* no such group, try to create a dummy first, and then update */
-		group = qq_group_create_internal_record(gc, internal_group_id, external_group_id, NULL);
+		group = qq_group_create_internal_record(gc, id, ext_id, NULL);
 		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
 		qq_group_refresh(gc, group);
-		qq_send_cmd_group_get_group_info(gc, group);
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 		/* the return of this cmd will automatically update the group in blist */
 	}
 
@@ -292,7 +291,7 @@
 }
 
 /* recv an IM from a group chat */
-void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 internal_group_id, PurpleConnection *gc, guint16 im_type)
+void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type)
 {
 	gchar *msg_with_purple_smiley, *msg_utf8_encoded, *im_src_name;
 	guint16 unknown;
@@ -315,11 +314,11 @@
 
 	im_group = g_newa(qq_recv_group_im, 1);
 
-	bytes += qq_get32(&(im_group->external_group_id), data + bytes);
-	bytes += qq_get8(&(im_group->group_type), data + bytes);
+	bytes += qq_get32(&(im_group->ext_id), data + bytes);
+	bytes += qq_get8(&(im_group->type8), data + bytes);
 
 	if(QQ_RECV_IM_TEMP_QUN_IM == im_type) {
-		bytes += qq_get32(&(internal_group_id), data + bytes);
+		bytes += qq_get32(&(id), data + bytes);
 	}
 
 	bytes += qq_get32(&(im_group->member_uid), bytes + data);
@@ -372,13 +371,13 @@
 	else
 		msg_utf8_encoded = qq_to_utf8(msg_with_purple_smiley, QQ_CHARSET_DEFAULT);
 
-	group = qq_group_find_by_id(gc, internal_group_id, QQ_INTERNAL_ID);
+	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));
 	if (conv == NULL && purple_prefs_get_bool("/plugins/prpl/qq/prompt_group_msg_on_recv")) {
 		/* New conv should open, get group info*/
-		qq_send_cmd_group_get_group_info(gc, group);
+		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 		
 		serv_got_joined_chat(gc, qd->channel++, group->group_name_utf8);
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));