X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=answerscripts.c;h=2003ca8500ea42b9a249b12a5a2a1b9e7cbc452b;hb=ca489436ae23ea28bbd7656635cf20761292fd26;hp=8c85ab3afc40b8bb99309e52b3095fe957379c0a;hpb=058e63ec1e2b22037e6d245b7f8b29268cbe2f27;p=mirrors%2Flibpurple-core-answerscripts.git

diff --git a/answerscripts.c b/answerscripts.c
index 8c85ab3..2003ca8 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -25,7 +25,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,14 +57,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("PURPLE_FROM", who, 1);
+	setenv("PURPLE_MSG", message, 1);
+	setenv("PURPLE_STATUS", status_id, 1);
+	setenv("PURPLE_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;
@@ -77,7 +97,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();