Improved documentation ;o)

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

diff --git a/answerscripts.c b/answerscripts.c
index 2f8d9ba53c6a1e38879292bbbb913d52455f0761..c26d37bc9cafaa8009c46f936e21cc37a517b3a4 100755 (executable)
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -7,10 +7,13 @@
 #define ANSWERSCRIPT "answerscripts" ANSWERSCRIPT_EXT
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
 #define ANSWERSCRIPTS_LINE_LENGTH 4096
+#define ENV_PREFIX "ANSW_"
+#define PROTOCOL_PREFIX "prpl-"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 
 #ifndef __WIN32__
        #include <fcntl.h>
@@ -25,7 +28,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;
@@ -57,10 +60,15 @@ 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
 
+       //Get protocol ID
+       const char *protocol_id = purple_account_get_protocol_id(account);
+       if(!strncmp(protocol_id,PROTOCOL_PREFIX,strlen(PROTOCOL_PREFIX))) protocol_id += strlen(PROTOCOL_PREFIX); //trim out protocol prefix (eg.: "prpl-irc" => "irc")
+
        //Get status
        PurpleStatus *status = purple_account_get_active_status(account);
        PurpleStatusType *type = purple_status_get_type(status);
@@ -77,11 +85,14 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
                status_msg = (char *) purple_savedstatus_get_message(purple_savedstatus_get_current());
        }
 
-       setenv("PURPLE_FROM", who, 1);
-       setenv("PURPLE_MSG", buff, 1);
-       setenv("PURPLE_STATUS", status_id, 1);
-       setenv("PURPLE_STATUS_MSG", status_msg, 1);
+       //Export variables to environment
+       setenv(ENV_PREFIX "MSG", message, 1);
+       setenv(ENV_PREFIX "FROM", who, 1);
+       setenv(ENV_PREFIX "PROTOCOL", protocol_id, 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;
@@ -94,7 +105,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();
@@ -119,7 +129,7 @@ static PurplePluginInfo info = {
 
        "core-answerscripts",
        "AnswerScripts",
-       "0.2.2",
+       "0.3.0",
        "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() "