X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=c2e4dd0acbc26aeebc3809383711b8c7022c26d8;hp=9bbdf05e1a6b9de34959e79ad204364527777053;hb=37436d76884506099c4b02b50876da45dbfbf2a8;hpb=51b656341b8c663b895288b243c9b1251171bbd9

diff --git a/answerscripts.c b/answerscripts.c
index 9bbdf05..c2e4dd0 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -7,11 +7,13 @@
 #define ANSWERSCRIPT "answerscripts" ANSWERSCRIPT_EXT
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
 #define ANSWERSCRIPTS_LINE_LENGTH 4096
-#define ENV_PREFIX "PURPLE_"
+#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>
@@ -63,6 +65,10 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *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);
@@ -80,8 +86,9 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	}
 
 	//Export variables to environment
-	setenv(ENV_PREFIX "FROM", who, 1);
 	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);
 
@@ -122,16 +129,21 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.2.2",
+	"0.3.1",
 	"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>",
+	"\nThis plugin will execute script \"~/.purple/" ANSWERSCRIPT "\" "
+		"(or any other executable called \"" ANSWERSCRIPT "\" and found in purple_user_dir()) "
+		"each time when instant message is received.\n"
+		"\n- Any text printed to STDOUT by this script will be sent back as answer to received message."
+		"\n- Following environment values will be set, so script can use them for responding:\n"
+		"\t- ANSW_MSG\n"
+		"\t- ANSW_FROM\n"
+		"\t- ANSW_PROTOCOL\n"
+		"\t- ANSW_STATUS\n"
+		"\t- ANSW_STATUS_MSG\n"
+		"\nPlease see sample scripts, documentation, website and source code for more informations...\n"
+		"\n(-; Peace ;-)\n",
+	"Tomas Mudrunka <harvie@email.cz>",
 	"http://github.com/harvie/libpurple-core-answerscripts",
 
 	plugin_load,