Better handling of self-sent messages to bots

5 files changed, 34 insertions, 1 deletions

diff --git a/skypeweb/libskypeweb.c b/skypeweb/libskypeweb.c
index e130e9e..162b23b 100644
--- a/skypeweb/libskypeweb.c
+++ b/skypeweb/libskypeweb.c
@@ -425,6 +425,7 @@ skypeweb_close(PurpleConnection *pc)
 	g_free(sa->skype_token);

 	g_free(sa->registration_token);

 	g_free(sa->endpoint);

+	g_free(sa->primary_member_name);

 	g_free(sa->username);

 	g_free(sa);

 }

diff --git a/skypeweb/libskypeweb.h b/skypeweb/libskypeweb.h
index e87228f..381afc6 100644
--- a/skypeweb/libskypeweb.h
+++ b/skypeweb/libskypeweb.h
@@ -293,6 +293,7 @@ typedef void (*SkypeWebFunc)(SkypeWebAccount *swa);
 
 struct _SkypeWebAccount {
 	gchar *username;
+	gchar *primary_member_name;
 	
 	PurpleAccount *account;
 	PurpleConnection *pc;
diff --git a/skypeweb/skypeweb_contacts.c b/skypeweb/skypeweb_contacts.c
index 4686678..1b6e486 100644
--- a/skypeweb/skypeweb_contacts.c
+++ b/skypeweb/skypeweb_contacts.c
@@ -878,6 +878,8 @@ skypeweb_got_self_details(SkypeWebAccount *sa, JsonNode *node, gpointer user_dat
 	if (!PURPLE_CONNECTION_IS_CONNECTED(sa->pc)) {

 		skypeweb_do_all_the_things(sa);

 	}

+	

+	skypeweb_gather_self_properties(sa);

 }

 

 

diff --git a/skypeweb/skypeweb_messages.c b/skypeweb/skypeweb_messages.c
index e27e992..b827258 100644
--- a/skypeweb/skypeweb_messages.c
+++ b/skypeweb/skypeweb_messages.c
@@ -34,6 +34,12 @@ skypeweb_is_user_self(SkypeWebAccount *sa, const gchar *username) {
 		}

 	}

 	

+	if (sa->primary_member_name) {

+		if (g_str_equal(username, sa->primary_member_name)) {

+			return TRUE;

+		}

+	}

+	

 	return !g_ascii_strcasecmp(username, purple_account_get_username(sa->account));

 }

 

@@ -1158,6 +1164,7 @@ skypeweb_got_registration_token(PurpleUtilFetchUrlData *url_data, gpointer user_
 		g_free(expires);

 	}

 	

+	skypeweb_gather_self_properties(sa);	

 	skypeweb_subscribe(sa);

 }

 

@@ -1533,7 +1540,7 @@ skypeweb_initiate_chat(SkypeWebAccount *sa, const gchar *who)
 	g_free(id);

 	

 	contact = json_object_new();

-	id = g_strconcat("8:", sa->username, NULL);

+	id = g_strconcat(skypeweb_user_url_prefix(sa->username), sa->username, NULL);

 	json_object_set_string_member(contact, "id", id);

 	json_object_set_string_member(contact, "role", "Admin");

 	json_array_add_object_element(members, contact);

@@ -1603,3 +1610,23 @@ skypeweb_get_thread_url(SkypeWebAccount *sa, const gchar *thread)
 	

 	// {"Id":"MeMxigEAAAAxOTo5NDZkMjExMGQ4YmU0ZjQzODc3NjMxNDQ3ZTgxYWNmNkB0aHJlYWQuc2t5cGU","Blob":null,"JoinUrl":"https://join.skype.com/ALXsHZ2RFQnk","ThreadId":"19:946d2110d8be4f43877631447e81acf6@thread.skype"}

 }

+

+

+static void

+skypeweb_got_self_properties(SkypeWebAccount *sa, JsonNode *node, gpointer user_data)

+{

+	JsonObject *userobj;

+	if (node == NULL || json_node_get_node_type(node) != JSON_NODE_OBJECT)

+		return;

+	userobj = json_node_get_object(node);

+	

+	if (json_object_has_member(userobj, "primaryMemberName")) {

+		g_free(sa->primary_member_name); sa->primary_member_name = g_strdup(json_object_get_string_member(userobj, "primaryMemberName"));

+	}

+}

+

+void

+skypeweb_gather_self_properties(SkypeWebAccount *sa)

+{

+	skypeweb_post_or_get(sa, SKYPEWEB_METHOD_GET | SKYPEWEB_METHOD_SSL, sa->messages_host, "/v1/users/ME/properties", NULL, skypeweb_got_self_properties, NULL, TRUE);

+}
\ No newline at end of file
diff --git a/skypeweb/skypeweb_messages.h b/skypeweb/skypeweb_messages.h
index c4722d7..2042b3c 100644
--- a/skypeweb/skypeweb_messages.h
+++ b/skypeweb/skypeweb_messages.h
@@ -46,4 +46,6 @@ void skypeweb_get_all_conversations_since(SkypeWebAccount *sa, gint since);
 void skype_web_get_offline_history(SkypeWebAccount *sa);
 void skypeweb_mark_conv_seen(PurpleConversation *conv, PurpleConversationUpdateType type);
 
+void skypeweb_gather_self_properties(SkypeWebAccount *sa);
+
 #endif /* SKYPEWEB_MESSAGES_H */