X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=54b757631f7a0ac969bc6f604b8392746b650fd0;hp=7b5ab7c4922313466a8a5a421b8a0102132e4dd0;hb=d94bfdb410a902979226266c5f74b38c1c30380d;hpb=c77055a9e791c2addc0397bdaec4cc61f5695c70

diff --git a/answerscripts.c b/answerscripts.c
index 7b5ab7c..54b7576 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -40,7 +40,7 @@ typedef struct {
 
 int answerscripts_process_message_cb(answerscripts_job *job) {
 	int i;
-	char response[ANSWERSCRIPTS_LINE_LENGTH+1];
+	char response[ANSWERSCRIPTS_LINE_LENGTH+1]; response[0]='\0';
 	FILE *pipe = job->pipe;
 	PurpleConversation *conv = job->conv;
 
@@ -50,7 +50,7 @@ int answerscripts_process_message_cb(answerscripts_job *job) {
 		) return 1;
 
 		for(i=0;response[i];i++) if(response[i]=='\n') response[i]=0;
-		purple_conv_im_send(purple_conversation_get_im_data(conv), response);
+		if(response[0]!='\0') purple_conv_im_send(purple_conversation_get_im_data(conv), response);
 
 		if(!feof(pipe)) return 1;
 	}
@@ -61,11 +61,10 @@ 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: */
+	PurpleBuddy *buddy = purple_find_buddy(account, who);
 
 	//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
 
 	/* Here are prototypes of some functions interesting to implement github feature request #3
 
@@ -84,9 +83,12 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	const char * 	purple_group_get_name (PurpleGroup *group)
 	*/
 
+	//Get buddy group
+	const char *from_group = purple_group_get_name(purple_buddy_get_group(buddy)); //FIXME: returns "\x18" when user does not belong to some group
+
 	//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")
+	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);
@@ -107,6 +109,7 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	//Export variables to environment
 	setenv(ENV_PREFIX "MSG", message, 1);
 	setenv(ENV_PREFIX "FROM", who, 1);
+	setenv(ENV_PREFIX "FROM_GROUP", from_group, 1);
 	setenv(ENV_PREFIX "PROTOCOL", protocol_id, 1);
 	setenv(ENV_PREFIX "STATUS", status_id, 1);
 	setenv(ENV_PREFIX "STATUS_MSG", status_msg, 1);
@@ -114,6 +117,10 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	//Launch job on background
 	answerscripts_job *job = (answerscripts_job*) malloc(sizeof(answerscripts_job));
 	job->pipe = popen(hook_script, "r");
+	if(job->pipe == NULL) {
+		fprintf(stderr,"Can't execute %s\n", hook_script);
+		return;
+	}
 	job->conv = conv;
 
 	#ifndef __WIN32__