Yahoo server-side aliases patch from John Moody. Fixes #1653 Thanks!

6 files changed, 303 insertions, 1 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 1621c61b83..68a33ad2b8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -246,6 +246,7 @@ Arkadiusz Miskiewicz
 Andrew Molloy
 Michael Monreal
 Benjamin Moody
+John Moody
 Tim Mooney
 Sergio Moretto
 Christian Muise
diff --git a/ChangeLog b/ChangeLog
index 6faa5370bf..ab234ab8f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ version 2.1.1 (??/??/????):
 	libpurple:
 	* Added an account action to open your inbox in the yahoo prpl.
 	* Added support for Unicode status messages in Yahoo.
+	* Server-stored aliases for Yahoo. (John Moody)
 
 version 2.1.0 (07/28/2007):
 	libpurple:
diff --git a/libpurple/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am
index 63c020daa9..5d831a7afa 100644
--- a/libpurple/protocols/yahoo/Makefile.am
+++ b/libpurple/protocols/yahoo/Makefile.am
@@ -9,6 +9,8 @@ YAHOOSOURCES = \
 	yahoo.h \
 	yahoochat.h \
 	yahoochat.c \
+	yahoo_aliases.c \
+	yahoo_alisaes.h \
 	yahoo_auth.c \
 	yahoo_auth.h \
 	yahoo_crypt.h \
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index bb82e7fc12..8b3596bd49 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -41,6 +41,7 @@
 
 #include "yahoo.h"
 #include "yahoochat.h"
+#include "yahoo_aliases.h"
 #include "yahoo_auth.h"
 #include "yahoo_crypt.h"
 #include "yahoo_doodle.h"
@@ -712,6 +713,8 @@ static void yahoo_process_list(PurpleConnection *gc, struct yahoo_packet *pkt)
 		yd->tmp_serv_plist = NULL;
 
 	}
+	/* Now that we've got the list, request aliases */
+	yahoo_fetch_aliases(gc);
 }
 
 static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -4102,7 +4105,7 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL, /* register_user */
 	NULL, /* get_cb_info */
 	NULL, /* get_cb_away */
-	NULL, /* alias_buddy */
+	yahoo_update_alias, /* alias_buddy */
 	yahoo_change_buddys_group,
 	yahoo_rename_group,
 	NULL, /* buddy_free */
diff --git a/libpurple/protocols/yahoo/yahoo_aliases.c b/libpurple/protocols/yahoo/yahoo_aliases.c
new file mode 100644
index 0000000000..349a03db04
--- /dev/null
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c
@@ -0,0 +1,245 @@
+/*

+ * purple

+ *

+ * Purple is the legal property of its developers, whose names are too numerous

+ * to list here.  Please refer to the COPYRIGHT file distributed with this

+ * source distribution.

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ *

+ */

+

+

+#include "internal.h"

+

+#include "account.h"

+#include "accountopt.h"

+#include "blist.h"

+#include "debug.h"

+#include "util.h"

+#include "version.h"

+#include "yahoo.h"

+#include "yahoo_aliases.h"

+#include "yahoo_packet.h"

+

+/* I hate hardcoding this stuff, but Yahoo never sends us anything to use.  Someone in the know may be able to tweak this URL */

+#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=8.1.0.249&useutf8=1&legenc=codepage-1252"

+#define YAHOO_ALIAS_UPDATE_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252"

+

+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);

+

+/**

+ * Stuff we want passed to the callback function

+ */

+struct callback_data {

+	PurpleConnection *gc;

+	const char *id;

+};

+

+

+/**************************************************************************

+ * Alias Fetch Functions

+ **************************************************************************/

+

+static void

+yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,const gchar *url_text, size_t len, const gchar *error_message)

+{

+	if (len == 0) {

+		purple_debug_info("yahoo","No Aliases to process\n");

+	} else {

+		const char *yid, *full_name, *nick_name, *alias, *id, *fn, *ln, *nn;

+		struct callback_data *cb = user_data;

+		PurpleBuddy *b = NULL;

+		xmlnode *item, *contacts;

+

+		/* Put our web response into a xmlnode for easy management */

+		contacts = xmlnode_from_str(url_text, -1);

+

+		if (contacts == NULL) {

+			purple_debug_error("yahoo_aliases","Badly formed XML\n");

+			return;

+		}

+		purple_debug_info("yahoo", "Fetched %i bytes of alias data\n", len);

+

+		/* Loop around and around and around until we have gone through all the received aliases  */

+		for(item = xmlnode_get_child(contacts, "ct"); item; item = xmlnode_get_next_twin(item)) {

+			/* Yahoo replies with two types of contact (ct) record, we are only interested in the alias ones */

+			if ((yid = xmlnode_get_attrib(item, "yi"))) {

+		                /* Grab all the bits of information we can */

+				fn = xmlnode_get_attrib(item,"fn");

+				ln = xmlnode_get_attrib(item,"ln");

+				nn = xmlnode_get_attrib(item,"nn");

+				id = xmlnode_get_attrib(item,"id");

+

+		                /* Yahoo stores first and last names separately, lets put them together into a full name */

+				full_name = g_strstrip(g_strdup_printf("%s %s", (fn != NULL ? fn : "") , (ln != NULL ? ln : "")));

+				nick_name = (nn != NULL ? g_strstrip(g_strdup_printf("%s", nn)) : NULL);

+

+				if (nick_name != NULL)

+					alias = nick_name;   /* If we have a nickname from Yahoo, let's use it */

+				else if (strlen(full_name) != 0)

+					alias = full_name;  /* If no Yahoo nickname, we can use the full_name created above */

+				else

+					alias = NULL;  /* No nickname, first name or last name, then you get no alias !!  */

+

+				/*  Find the local buddy that matches */

+				b = purple_find_buddy(cb->gc->account, yid);

+

+				/*  If we don't find a matching buddy, ignore the alias !!  */

+				if (b != NULL) {

+					/* Create an object that we can attach to the buddies proto_data pointer */

+					struct YahooUser *yu;

+					yu = g_new0(struct YahooUser, 1);

+					yu->id = g_strdup(id);

+					yu->firstname = g_strdup(fn);

+					yu->lastname = g_strdup(ln);

+					yu->nickname = g_strdup(nn);

+					b->proto_data=yu;

+

+					/* Finally, if we received an alias, we better update the buddy list */

+					if (alias != NULL) {

+						serv_got_alias(cb->gc, yid, alias);

+						purple_debug_info("yahoo","Fetched alias '%s' (%s)\n",alias,id);

+					} else if (g_strcasecmp((alias!=NULL?alias:""),(b->alias!=NULL?b->alias:"")) != 0) {

+					/* Or if we have an alias that Yahoo doesn't, send it up */

+						yahoo_update_alias(cb->gc, yid, b->alias);

+						purple_debug_info("yahoo","Sent alias '%s'\n", b->alias);

+					}

+				} else {

+					purple_debug_info("yahoo", "Bizarre, received alias for %s, but they are not on your list...\n", yid);

+				}

+			}

+		}

+		xmlnode_free(contacts);

+		g_free(cb);

+	}

+}

+

+void

+yahoo_fetch_aliases(PurpleConnection *gc)

+{

+	struct yahoo_data *yd = gc->proto_data;

+	struct callback_data *cb;

+	char *url, *request, *webpage, *webaddress, *strtmp;

+	int inttmp;

+

+	/* Using callback_data so I have access to gc in the callback function */

+	cb = g_new0(struct callback_data, 1);

+	cb->gc = gc;

+

+	/*  Build all the info to make the web request */

+	url = g_strdup(YAHOO_ALIAS_FETCH_URL);

+	purple_url_parse(url, &webaddress, &inttmp, &webpage, &strtmp, &strtmp);

+	request = g_strdup_printf("GET /%s HTTP/1.1\r\n"

+				 "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"

+				 "Cookie: T=%s; Y=%s\r\n"

+				 "Host: %s\r\n"

+				 "Cache-Control: no-cache\r\n\r\n",

+				 webpage, yd->cookie_t,yd->cookie_y, webaddress);

+

+	/* We have a URL and some header information, let's connect and get some aliases  */

+	purple_util_fetch_url_request(url, FALSE, NULL, TRUE, request, FALSE, yahoo_fetch_aliases_cb, cb);

+

+	g_free(url);

+	g_free(request);

+}

+

+/**************************************************************************

+ * Alias Update Functions

+ **************************************************************************/

+

+static void

+yahoo_update_alias_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,const gchar *url_text, size_t len, const gchar *error_message)

+{

+	xmlnode *node, *result;

+	struct callback_data *cb = user_data;

+

+	result = xmlnode_from_str(url_text, -1);

+

+	purple_debug_info("yahoo", "ID: %s, Return data: %s\n",cb->id, url_text);

+

+	if (result == NULL) {

+		purple_debug_error("yahoo","Alias update faild: Badly formed response\n");

+		return;

+	}

+

+	if ((node = xmlnode_get_child(result, "ct"))) {

+		if (g_ascii_strncasecmp(xmlnode_get_attrib(node, "id"), cb->id, strlen(cb->id))==0)

+			purple_debug_info("yahoo", "Alias update succeeded\n");

+		else

+			purple_debug_error("yahoo", "Alias update failed (Contact record return mismatch)\n");

+	} else {

+		purple_debug_info("yahoo", "Alias update failed (No contact record returned)\n");

+	}

+

+	g_free(cb);

+	xmlnode_free(result);

+}

+

+void

+yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)

+{

+	struct yahoo_data *yd;

+	struct YahooUser *yu;

+	char *content, *url, *request, *webpage, *webaddress, *strtmp;

+	int inttmp;

+	struct callback_data *cb;

+	PurpleBuddy *buddy;

+   

+	g_return_if_fail(alias!= NULL);

+	g_return_if_fail(who!=NULL);

+	g_return_if_fail(gc!=NULL);

+

+	purple_debug_info("yahoo", "Sending '%s' as new alias for user '%s'.\n",alias, who);

+

+	buddy = purple_find_buddy(gc->account, who);

+	if (buddy->proto_data == NULL) {

+		purple_debug_info("yahoo", "Missing proto_data (get_yahoo_aliases must have failed), bailing out\n");

+		return;

+	}

+

+	yd = gc->proto_data;

+	yu = buddy->proto_data;

+

+	/* Using callback_data so I have access to gc in the callback function */

+	cb = g_new0(struct callback_data, 1);

+	cb->id = g_strdup(yu->id);

+

+	/*  Build all the info to make the web request */

+	url = g_strdup(YAHOO_ALIAS_UPDATE_URL);

+	purple_url_parse(url, &webaddress, &inttmp, &webpage, &strtmp, &strtmp);

+

+	content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"1\">\n"

+				  "<ct e=\"1\"  yi='%s' id='%s' nn='%s' pr='0' />\n</ab>\r\n",

+				  gc->account->username, who, yu->id, g_markup_escape_text(alias, strlen(alias)));

+

+	request = g_strdup_printf("POST /%s HTTP/1.1\r\n"

+				  "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"

+				  "Cookie: T=%s; Y=%s\r\n"

+				  "Host: %s\r\n"

+				  "Content-Length: %i\r\n"

+				  "Cache-Control: no-cache\r\n\r\n"

+				  "%s",

+				  webpage, yd->cookie_t,yd->cookie_y, webaddress,

+			 	  strlen(content), content);

+

+	/* We have a URL and some header information, let's connect and update the alias  */

+	purple_util_fetch_url_request(url, FALSE, NULL, TRUE, request, FALSE, yahoo_update_alias_cb, cb);

+

+	g_free(content);

+	g_free(url);

+	g_free(request);

+}

+

diff --git a/libpurple/protocols/yahoo/yahoo_aliases.h b/libpurple/protocols/yahoo/yahoo_aliases.h
new file mode 100644
index 0000000000..f754c3b440
--- /dev/null
+++ b/libpurple/protocols/yahoo/yahoo_aliases.h
@@ -0,0 +1,50 @@
+/*

+ * purple

+ *

+ * Purple is the legal property of its developers, whose names are too numerous

+ * to list here.  Please refer to the COPYRIGHT file distributed with this

+ * source distribution.

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ *

+ */

+

+

+#include "internal.h"

+

+#include "account.h"

+#include "accountopt.h"

+#include "blist.h"

+#include "debug.h"

+#include "util.h"

+#include "version.h"

+#include "yahoo.h"

+#include "yahoo_packet.h"

+

+

+/**

+ * The additional protocol specific info attached to each buddy.  We need

+ * to store the unique numeric id number to allow us to push alias changes.

+ */

+struct YahooUser

+{

+    const char *id;             /* The yahoo accountid for this buddy (not YahooID but numeric value) */

+    char *firstname;            /* Storing this information for no real reason, just because */

+    char *lastname;             /* Storing this information for no real reason, just because */

+    char *nickname;             /* Storing this information for no real reason, just because */

+};

+

+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);

+void yahoo_fetch_aliases(PurpleConnection *gc);