X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=answerscripts.c;h=e997d0d6b9316f2542ed182f1d7f07c391eefc99;hb=1c4a0e174495019ba2919beedf1baad1a3876889;hp=3e8b3ca45b246d76e64fa831fffa5f86c2153f38;hpb=9aaa5e2bd5251829ae0114cb3c35a6d38714bb17;p=mirrors%2Flibpurple-core-answerscripts.git

diff --git a/answerscripts.c b/answerscripts.c
index 3e8b3ca..e997d0d 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -62,6 +62,7 @@ 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);
+	PurplePresence *presence = purple_buddy_get_presence(buddy);
 
 	//Get message
 	message = purple_markup_strip_html(buffer);
@@ -87,10 +88,16 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	//Get status
 	PurpleStatus *status = purple_account_get_active_status(account);
 	PurpleStatusType *type = purple_status_get_type(status);
+	//remote
+	PurpleStatus *r_status = purple_presence_get_active_status(presence);
+	PurpleStatusType *r_status_type =	purple_status_get_type(r_status);
 
 	//Get status id
 	const char *status_id = NULL;
 	status_id = purple_primitive_get_id_from_type(purple_status_type_get_primitive(type));
+	//remote
+	const char *r_status_id = NULL;
+	r_status_id = purple_primitive_get_id_from_type(purple_status_type_get_primitive(r_status_type));
 
 	//Get status message
 	const char *status_msg = NULL;
@@ -99,6 +106,13 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	} else {
 		status_msg = (char *) 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");
+	} else {
+		r_status_msg = "";
+	}
 
 	//Export variables to environment
 	setenv(ENV_PREFIX "ACTION", "IM", 1);	//what happend: im, chat, show setting dialog, event, etc...
@@ -107,6 +121,8 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	setenv(ENV_PREFIX "R_NAME", who, 1);	//ID of remote user - "buddy"
 	setenv(ENV_PREFIX "R_GROUP", from_group, 1);	//group which contains that buddy OR empty string
 	setenv(ENV_PREFIX "R_ALIAS", remote_alias, 1);	//buddy's alias, server alias, contact alias, username OR empty string
+	setenv(ENV_PREFIX "R_STATUS", r_status_id, 1);	//unique ID of remote user's status. eg.: available, away,...
+	setenv(ENV_PREFIX "R_STATUS_MSG", r_status_msg, 1);	//status message set by your buddy
 	setenv(ENV_PREFIX "L_NAME", local_name, 1);	//ID of local user
 	setenv(ENV_PREFIX "L_ALIAS", local_alias, 1);	//Alias of local user OR empty string
 	setenv(ENV_PREFIX "L_STATUS", status_id, 1);	//unique ID of local user's status. eg.: available, away,...
@@ -183,8 +199,10 @@ static PurplePluginInfo info = {
 
 static void init_plugin(PurplePlugin * plugin) {
 	//Export static environment variables
-	setenv(ENV_PREFIX "L_AGENT", (char *) purple_core_get_ui(), 1);	//ID of IM client used with answerscripts
-	setenv(ENV_PREFIX "L_AGENT_VERSION", (char *) purple_core_get_version(), 1);	//Version of client
+	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() : "";
+	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
 }
 
 PURPLE_INIT_PLUGIN(autoanswer, init_plugin, info)