X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=3e629db9a4191d6e118556a35f0868d9de96069f;hp=d24e58f9ad1104465d35fafd1be9c22721fe4b05;hb=c8c87c89d514a480b7d815af78afe86d78d36c16;hpb=151174844b0a5f0686ad544bf52b0d86dad8d0e9

diff --git a/answerscripts.c b/answerscripts.c
index d24e58f..3e629db 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 //#define __WIN32__
 #ifndef __WIN32__
 	#define ANSWERSCRIPT_EXT ""
@@ -23,12 +24,18 @@
 
 /* Purple plugin */
 #define PURPLE_PLUGINS
-#include <libpurple/debug.h>
-#include <libpurple/version.h>
+#include <libpurple/account.h>
+#include <libpurple/blist.h>
 #include <libpurple/conversation.h>
+#include <libpurple/core.h>
+#include <libpurple/debug.h>
 #include <libpurple/plugin.h>
+#include <libpurple/savedstatuses.h>
 #include <libpurple/signals.h>
+#include <libpurple/status.h>
 #include <libpurple/util.h>
+#include <libpurple/value.h>
+#include <libpurple/version.h>
 
 char *message = NULL;
 char *hook_script = NULL;
@@ -38,6 +45,14 @@ typedef struct {
   PurpleConversation *conv;
 } answerscripts_job;
 
+const void *check_null(const void *pointer) {
+	if(pointer == NULL) {
+		fprintf(stderr, "NULL pointer detected in answerscripts!\n");
+		return "";
+	}
+	return pointer;
+}
+
 int answerscripts_process_message_cb(answerscripts_job *job) {
 	int i;
 	char response[ANSWERSCRIPTS_LINE_LENGTH+1]; response[0]='\0';
@@ -49,9 +64,14 @@ int answerscripts_process_message_cb(answerscripts_job *job) {
 			&& (errno == EWOULDBLOCK || errno == EAGAIN) //WARNING! Not compatible with windows :-(
 		) return 1;
 
-		for(i=0;response[i];i++) if(response[i]=='\n') response[i]=0;
-		if(response[0]!='\0') purple_conv_im_send(purple_conversation_get_im_data(conv), response);
-
+		for(i=0;response[i];i++) if(response[i]=='\n') response[i]='\0';
+		if(response[0]!='\0') {
+			if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
+				purple_conv_chat_send(purple_conversation_get_chat_data(conv), response);
+			} else {
+				purple_conv_im_send(purple_conversation_get_im_data(conv), response);
+			}
+		}
 		if(!feof(pipe)) return 1;
 	}
 	pclose(pipe);
@@ -89,6 +109,9 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	const char* local_alias = purple_account_get_alias(account);
 	if(local_alias == NULL) local_alias = local_name;
 
+	//Do not respond to messages sent by myself
+	if(strcmp(local_name, who) == 0) return;
+
 	//Was my nick said?
 	char *highlighted;
 	if(flags & PURPLE_MESSAGE_NICK || purple_utf8_has_word(buffer, local_name))
@@ -128,14 +151,14 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	//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");
+		status_msg = check_null(purple_status_get_attr_string(status, "message"));
 	} else {
-		status_msg = (char *) purple_savedstatus_get_message(purple_savedstatus_get_current());
+		status_msg = (char *) check_null(purple_savedstatus_get_message(purple_savedstatus_get_current()));
 	}
 	//remote
 	const char *r_status_msg = NULL;
 	if (purple_status_type_get_attr(r_status_type, "message") != NULL) {
-		r_status_msg = purple_status_get_attr_string(r_status, "message");
+		r_status_msg = check_null(purple_status_get_attr_string(r_status, "message"));
 	} else {
 		r_status_msg = "";
 	}
@@ -200,7 +223,7 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.5.2",
+	"0.5.4",
 	"Framework for hooking scripts to process received messages for libpurple clients",
 	"\nThis plugin will execute script \"~/.purple/" ANSWERSCRIPT "\" "
 		"(or any other executable called \"" ANSWERSCRIPT "\" and found in purple_user_dir()) "
@@ -228,12 +251,12 @@ static PurplePluginInfo info = {
 
 static void init_plugin(PurplePlugin * plugin) {
 	//Export static environment variables
-	#ifndef __x86_64__ //Workaround for x86_64 (where this causes problems for unknown reason)
-		const char * core_ui = purple_core_get_ui() != 0 ? (const char *) purple_core_get_ui() : "";
-		const char * core_version = purple_core_get_version() != 0 ? (const char *) purple_core_get_version() : "";
+	//#ifndef __x86_64__ //Workaround for x86_64 (where this causes problems for unknown reason)
+		const char * core_ui = check_null(purple_core_get_ui());
+		const char * core_version = check_null(purple_core_get_version());
 		setenv(ENV_PREFIX "L_AGENT", (char *) core_ui, 1);	//ID of IM client used with answerscripts
 		setenv(ENV_PREFIX "L_AGENT_VERSION", (char *) core_version, 1);	//Version of client
-	#endif
+	//#endif
 }
 
 PURPLE_INIT_PLUGIN(autoanswer, init_plugin, info)