ENV_PREFIX changed from "PURPLE_" to "ANSW_" as i expect that answerscripts may be...

[mirrors/libpurple-core-answerscripts.git] / answerscripts.c

diff --git a/answerscripts.c b/answerscripts.c
index 5d6830a1e05998f4fb799a7f1db55e43da6a4596..1bec4e6c446e3c4552be5bf153b702c43773d810 100755 (executable)
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,7 +1,13 @@
 //#define __WIN32__
-#define ANSWERSCRIPT "answerscripts.exe"
+#ifndef __WIN32__
+       #define ANSWERSCRIPT_EXT ""
+#else
+       #define ANSWERSCRIPT_EXT ".exe"
+#endif
+#define ANSWERSCRIPT "answerscripts" ANSWERSCRIPT_EXT
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
 #define ANSWERSCRIPTS_LINE_LENGTH 4096
+#define ENV_PREFIX "ANSW_"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +26,7 @@
 #include <libpurple/signals.h>
 #include <libpurple/util.h>
 
-char *buff = NULL;
+char *message = NULL;
 char *hook_script = NULL;
 char response[ANSWERSCRIPTS_LINE_LENGTH+1];
 int i;
@@ -52,14 +58,34 @@ int answerscripts_process_message_cb(answerscripts_job *job) {
 static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
        if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who); //* A workaround to avoid skipping of the first message as a result on NULL-conv: */
 
-       buff = purple_markup_strip_html(buffer);
-       //printf("\nHarvie received: %s: %s\n", who, buff); //debug
+       //Get message
+       message = purple_markup_strip_html(buffer);
+       //printf("\nHarvie received: %s: %s\n", who, message); //debug
        //purple_conv_im_send(purple_conversation_get_im_data(conv), ":-*"); //debug
 
-       setenv("PURPLE_FROM", who, 1);
-       setenv("PURPLE_MSG", buff, 1);
+       //Get status
+       PurpleStatus *status = purple_account_get_active_status(account);
+       PurpleStatusType *type = purple_status_get_type(status);
+
+       //Get status id
+       const char *status_id = NULL;
+       status_id = purple_primitive_get_id_from_type(purple_status_type_get_primitive(type));
 
+       //Get status message
+       const char *status_msg = NULL;
+       if (purple_status_type_get_attr(type, "message") != NULL) {
+               status_msg = purple_status_get_attr_string(status, "message");
+       } else {
+               status_msg = (char *) purple_savedstatus_get_message(purple_savedstatus_get_current());
+       }
+
+       //Export variables to environment
+       setenv(ENV_PREFIX "FROM", who, 1);
+       setenv(ENV_PREFIX "MSG", message, 1);
+       setenv(ENV_PREFIX "STATUS", status_id, 1);
+       setenv(ENV_PREFIX "STATUS_MSG", status_msg, 1);
 
+       //Launch job on background
        answerscripts_job *job = (answerscripts_job*) malloc(sizeof(answerscripts_job));
        job->pipe = popen(hook_script, "r");
        job->conv = conv;
@@ -72,7 +98,6 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
        purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);
 }
 
-
 static gboolean plugin_load(PurplePlugin * plugin) {
        asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);
        void *conv_handle = purple_conversations_get_handle();
@@ -97,7 +122,7 @@ static PurplePluginInfo info = {
 
        "core-answerscripts",
        "AnswerScripts",
-       "0.2.1",
+       "0.2.2",
        "Framework for hooking scripts to process received messages for libpurple clients",
        "This plugin will execute script ~/.purple/" ANSWERSCRIPT " "
                "or any other executable called  " ANSWERSCRIPT " and found in purple_user_dir() "