@@ -46,6 +46,10 @@ ifdef LIBSIREN LIBSIREN_LIBS := -lm endif +ifdef PLUS_SOUNDS + override CFLAGS += -DRECEIVE_PLUS_SOUNDS +endif + # extra debugging override CFLAGS += -DPECAN_DEBUG_SLP Makefile @@ -12,6 +12,7 @@ Compared to Pidgin's official MSN plug-in: * Server-side storage for display names (private alias) * Support for handwritten messages (read-only) * Support for voice clips (receive-only) + * Support for Plus! sounds (receive-only) * Option to hide Plus! tags Other features: README @@ -41,6 +41,7 @@ struct MsnCmdProc MsnErrorCb error_handler; gpointer data; /**< Extra data, like the switchboard. */ + gpointer extra_data; /**< Extra data. */ guint cmd_count; struct MsnHistory *history; cmd/cmdproc_private.h @@ -1792,6 +1792,9 @@ init_plugin (PurplePlugin *plugin) option = purple_account_option_bool_new (_("Use user displays"), "use_userdisplay", TRUE); prpl_info.protocol_options = g_list_append (prpl_info.protocol_options, option); + + option = purple_account_option_bool_new (_("Don't show Messenger Plus! tags"), "hide_msgplus_tags", TRUE); + prpl_info.protocol_options = g_list_append (prpl_info.protocol_options, option); } purple_cmd_register ("nudge", "", PURPLE_CMD_P_PRPL, msn.c @@ -998,6 +998,89 @@ usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) /************************************************************************** * Message Handlers **************************************************************************/ + +static void +got_datacast_inform_user (MsnCmdProc *cmdproc, + const char *passport, + const char *str) +{ + PurpleAccount *account; + MsnSwitchBoard *swboard; + PecanContact *contact; + const char *friendly_name; + gchar *new_str; + + account = cmdproc->session->account; + swboard = cmdproc->data; + contact = pecan_contactlist_find_contact(cmdproc->session->contactlist, passport); + friendly_name = pecan_contact_get_friendly_name(contact); + if (!friendly_name) + friendly_name = passport; + + new_str = g_strdup_printf("%s %s", friendly_name, str); + + /* Grab the conv for this swboard. If there isn't one and it's an IM then create it, + otherwise the smileys won't work, this needs to be fixed. */ + if (!swboard->conv) + { + if (swboard->current_users > 1) + swboard->conv = purple_find_chat(account->gc, swboard->chat_id); + else + { + swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, + passport, account); + if (!swboard->conv) + swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport); + } + } + swboard->flag |= MSN_SB_FLAG_IM; + + purple_conversation_write(swboard->conv, NULL, new_str, PURPLE_MESSAGE_SYSTEM, time(NULL)); + + g_free (new_str); +} + +#if defined(RECEIVE_PLUS_SOUNDS) +static void +save_plus_sound_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, + const gchar *sound, size_t len, const gchar *error_message) +{ + FILE *f; + gchar *path; + gchar *str; + MsnCmdProc *cmdproc = user_data; + const char *passport = cmdproc->extra_data; + + if ((error_message != NULL) || (len == 0)) + return; + + if (purple_mkstemp(&path, TRUE)) + { + gchar *path_mp3 = g_strconcat (path, ".mp3", NULL); + + f = fopen (path_mp3, "wb"); + fwrite(sound, len, 1, f); + + str = g_strdup_printf (_("sent you a Messenger Plus! sound. Click <a href='file://%s'>here</a> to play it."), path_mp3); + got_datacast_inform_user (cmdproc, passport, str); + + fclose(f); + + g_free (path_mp3); + } + else + { + pecan_error ("couldn't create temporany file to store the received Plus! sound!\n"); + + str = g_strdup_printf (_("sent you a Messenger Plus! sound, but it cannot be played due to an error happened while storing the file.")); + got_datacast_inform_user (cmdproc, passport, str); + } + + g_free(str); + g_free(path); +} +#endif /* defined(RECEIVE_PLUS_SOUNDS) */ + static void plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) { @@ -1010,7 +1093,7 @@ plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) char *body_final; char *alias_backup = NULL; size_t body_len; - const char *passport; + char *passport; const char *value; gc = cmdproc->session->account->gc; @@ -1022,7 +1105,7 @@ plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) body_enc = g_markup_escape_text(body_str, -1); g_free(body_str); - passport = msg->remote_user; + passport = strdup (msg->remote_user); buddy = purple_find_buddy(purple_connection_get_account(gc), passport); @@ -1065,6 +1148,26 @@ plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) swboard->flag |= MSN_SB_FLAG_IM; +#if defined(RECEIVE_PLUS_SOUNDS) + const char *body_plus_sound = strstr (body_final, "[Messenger Plus! Sound] - Data{"); + + if (body_plus_sound && strlen (body_plus_sound) > 43) + { + char *plus_sound_link = calloc (48 + 12 + 1, 1); + + strcpy (plus_sound_link, "http://sounds.msgpluslive.net/esnd/snd/get?hash="); + strncat (plus_sound_link, body_plus_sound + 31, 12); + + cmdproc->extra_data = passport; + + purple_util_fetch_url (plus_sound_link, TRUE, NULL, FALSE, save_plus_sound_cb, cmdproc); + + free (plus_sound_link); + + return; + } +#endif /* defined(RECEIVE_PLUS_SOUNDS) */ + if (swboard->current_users > 1 || ((swboard->conv != NULL) && purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) @@ -1100,6 +1203,7 @@ plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) } g_free(body_final); + g_free(passport); } #if defined(PECAN_CVR) @@ -1186,44 +1290,6 @@ control_msg(MsnCmdProc *cmdproc, MsnMessage *msg) #if defined(PECAN_LIBSIREN) static void -got_datacast_inform_user (MsnCmdProc *cmdproc, - const char *passport, - const char *str) -{ - PurpleAccount *account; - MsnSwitchBoard *swboard; - PecanContact *contact; - const char *friendly_name; - - account = cmdproc->session->account; - swboard = cmdproc->data; - contact = pecan_contactlist_find_contact(cmdproc->session->contactlist, passport); - friendly_name = pecan_contact_get_friendly_name(contact); - if (!friendly_name) - friendly_name = passport; - - str = g_strdup_printf("%s %s", friendly_name, str); - - /* Grab the conv for this swboard. If there isn't one and it's an IM then create it, - otherwise the smileys won't work, this needs to be fixed. */ - if (!swboard->conv) - { - if (swboard->current_users > 1) - swboard->conv = purple_find_chat(account->gc, swboard->chat_id); - else - { - swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, - passport, account); - if (!swboard->conv) - swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport); - } - } - swboard->flag |= MSN_SB_FLAG_IM; - - purple_conversation_write(swboard->conv, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL)); -} - -static void got_voice_clip(MsnSlpCall *slpcall, const guchar *data, gsize size) { FILE *f; switchboard.c 5c10cb739adf2c848cce4218c6345cfcb4e312ae Devid Antonio Filoni devidfil@gmail.com http://github.com/felipec/msn-pecan/commit/8c5ee4fa625aa46027194fc9ce8199809fd0ab4b 8c5ee4fa625aa46027194fc9ce8199809fd0ab4b 2009-02-05T11:39:06-08:00 2009-02-05T09:08:27-08:00 Add support for receiving Plus! sounds. Patch for this by Thiago Silva and me. ceeb89e1cfd7590899a5d46c0ab442359c180dea Devid Antonio Filoni devidfil@gmail.com