comparison libpurple/protocols/myspace/myspace.c @ 17368:3720176bdac6

Pass postprocessing parameters inside MsimMessage * instead of in a new struct. (UNTESTED)

17367:05723949f75d

		purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("persist command failed"));
		return;
	}
}

typedef struct _POSTPROCESS_INFO
{
	MsimMessage *msg;
	gchar *username;
	gchar *uid_field_name;
	gchar *uid_before;
} POSTPROCESS_INFO;

/* Callback for msim_postprocess_outgoing() to add a uid field, after resolving username/email.  */
void msim_postprocess_outgoing_cb(MsimSession *session, MsimMessage *userinfo, gpointer data)
{
	gchar *body_str;
	GHashTable *body;
	gchar *uid;
	POSTPROCESS_INFO *pi;

	pi = (POSTPROCESS_INFO *)data;

	/* Obtain userid from userinfo message. */
	body_str = msim_msg_get_string(userinfo, "body");
	g_return_if_fail(body_str != NULL);
	body = msim_parse_body(body_str);

	uid = g_strdup(g_hash_table_lookup(body, "UserID"));
	g_hash_table_destroy(body);

	/* Insert into outgoing message. */
	pi->msg = msim_msg_insert_before(pi->msg, pi->uid_before,
			pi->uid_field_name, MSIM_TYPE_STRING, uid);

	/* Send */
	g_return_if_fail(msim_msg_send(session, pi->msg));

	g_free(pi);
}

/** Postprocess and send a message.
 *
 * @param session
 * @param msg Message to postprocess.
 * @param username Username to resolve.
 * @param uid_field_name Name of new field to add, containing uid of username.
 * @param uid_before Name of existing field to insert username field before.
 *
 * @return Postprocessed message.
 */
gboolean msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg, gchar *username, 
	gchar *uid_field_name, gchar *uid_before)
{
    PurpleBuddy *buddy;
	guint uid;
	POSTPROCESS_INFO* pi;

	pi = g_new0(POSTPROCESS_INFO, 1);

	pi->msg = msim_msg_clone(msg);
	pi->uid_before = uid_before;
	pi->uid_field_name = uid_field_name;
	pi->username = username;

	/* First, try the most obvious. If numeric userid is given, use that directly. */
    if (msim_is_userid(username))
    {
		uid = atol(username);

		if (!buddy || !uid)
		{
			purple_debug_info("msim", ">>> msim_postprocess_outgoing: couldn't find username %s in blist\n",
					username);
			msim_lookup_user(session, username, msim_postprocess_outgoing_cb, pi);
			return TRUE;		/* not sure of status yet - haven't sent! */
		}
	}
	
	/* Already have uid, insert it and send msg. */

17368:3720176bdac6

		purple_notify_error(NULL, NULL, _("Failed to add buddy"), _("persist command failed"));
		return;
	}
}

/* Callback for msim_postprocess_outgoing() to add a uid field, after resolving username/email.  */
void msim_postprocess_outgoing_cb(MsimSession *session, MsimMessage *userinfo, gpointer data)
{
	gchar *body_str;
	GHashTable *body;
	gchar *uid, *uid_field_name, *uid_before;
	MsimMessage *msg;

	msg = (MsimMessage *)data;

	msim_msg_dump("msim_postprocess_outgoing_cb() got msg=%s\n", msg);

	/* Obtain userid from userinfo message. */
	body_str = msim_msg_get_string(userinfo, "body");
	g_return_if_fail(body_str != NULL);
	body = msim_parse_body(body_str);

	uid = g_strdup(g_hash_table_lookup(body, "UserID"));
	g_hash_table_destroy(body);

	/* Insert into outgoing message. */
	uid_field_name = msim_msg_get_string(msg, "_uid_field_name");
	uid_before = msim_msg_get_string(msg, "_uid_before");

	msg = msim_msg_insert_before(msg, uid_field_name, uid_before, MSIM_TYPE_STRING, uid);

	g_free(uid_field_name);
	g_free(uid_before);

	/* Send */
	g_return_if_fail(msim_msg_send(session, msg));
}

/** Postprocess and send a message.
 *
 * @param session
 * @param msg Message to postprocess.
 * @param username Username to resolve. Assumed to be a static string (will not be freed or copied).
 * @param uid_field_name Name of new field to add, containing uid of username. Static string.
 * @param uid_before Name of existing field to insert username field before. Static string.
 *
 * @return Postprocessed message.
 */
gboolean msim_postprocess_outgoing(MsimSession *session, MsimMessage *msg, gchar *username, 
	gchar *uid_field_name, gchar *uid_before)
{
    PurpleBuddy *buddy;
	guint uid;

	/* Store information for msim_postprocess_outgoing_cb(). */
	purple_debug_info("msim", "msim_postprocess_outgoing(u=%s,ufn=%s,ub=%s)\n",
			username, uid_field_name, uid_before);
	msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username));
	msg = msim_msg_append(msg, "_uid_field_name", MSIM_TYPE_STRING, g_strdup(uid_field_name));
	msg = msim_msg_append(msg, "_uid_before", MSIM_TYPE_STRING, g_strdup(uid_before));

	/* First, try the most obvious. If numeric userid is given, use that directly. */
    if (msim_is_userid(username))
    {
		uid = atol(username);

		if (!buddy || !uid)
		{
			purple_debug_info("msim", ">>> msim_postprocess_outgoing: couldn't find username %s in blist\n",
					username);
			msim_lookup_user(session, username, msim_postprocess_outgoing_cb, msim_msg_clone(msg));
			return TRUE;		/* not sure of status yet - haven't sent! */
		}
	}
	
	/* Already have uid, insert it and send msg. */