X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=44fa0c12ed20972d76c6ef6d6cfc369bd5051f3a;hp=f33741a8da9a61128d07befac31c0c5bf603693a;hb=8be8249a6d931dd8c89bebb2930cdfe721bba02a;hpb=73f7c2fffd59e46e1f1b47128e7133036f991099

diff --git a/answerscripts.c b/answerscripts.c
index f33741a..44fa0c1 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,15 +1,13 @@
 //#define __WIN32__
-#define PURPLE_PLUGINS
-
-/* Purple headers */
-#include <libpurple/debug.h>
-#include <libpurple/version.h>
-#include <libpurple/conversation.h>
-//#include <libpurple/log.h>
-#include <libpurple/plugin.h>
-//#include <libpurple/signals.h>
-#include <libpurple/util.h>
-#include <libpurple/notify.h>
+#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>
@@ -19,11 +17,16 @@
 	#include <fcntl.h>
 #endif
 
-#define ANSWERSCRIPT "answerscripts.exe"
-#define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
-#define ANSWERSCRIPTS_LINE_LENGTH 4096
+/* Purple plugin */
+#define PURPLE_PLUGINS
+#include <libpurple/debug.h>
+#include <libpurple/version.h>
+#include <libpurple/conversation.h>
+#include <libpurple/plugin.h>
+#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;
@@ -55,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;
@@ -75,17 +98,16 @@ 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();
 	purple_signal_connect(conv_handle, "received-im-msg", plugin, PURPLE_CALLBACK(received_im_msg_cb), NULL);
-	return 0;
+	return TRUE;
 }
 
 static gboolean plugin_unload(PurplePlugin * plugin) {
 	free(hook_script);
-	return 0;
+	return TRUE;
 }
 
 static PurplePluginInfo info = {
@@ -100,16 +122,17 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.1.1",
-	"Framework for hooking scripts to received messages for various libpurple clients",
-	"This plugin will call ~/.purple/" ANSWERSCRIPT " (or wherever purple_user_dir() points) "
-		"script (or any executable) for each single message called."
-		"Envinronment values PURPLE_MSG and PURPLE_FROM will be set to carry "
-		"informations about message text and sender so script can respond to that message. "
-		"Any text printed to STDOUT by the script will be sent back as answer to message. "
-		"Please see example scripts for more informations...",
+	"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() "
+		"for each single instant message received.\n"
+		"\n- Envinronment values PURPLE_MSG and PURPLE_FROM will be set to carry "
+		"informations about message text and sender so script can respond to that message."
+		"\n- Any text printed to STDOUT by the script will be sent back as answer to message."
+		"\n\nPlease see example scripts, documentation or source code for more informations...",
 	"Harvie <harvie@email.cz>",
-	"http://github.com/harvie",
+	"http://github.com/harvie/libpurple-core-answerscripts",
 
 	plugin_load,
 	plugin_unload,