[patch] purple-facebook-0.9.6-1a6711f.patch

purple-facebook-0.9.6-1a6711f.patch (text/plain), 3.79 KB, created by Balint SZENTE on 2021-06-06 15:27:32 UTC

diff '--color=auto' -urN purple-facebook-0.9.6.orig/configure.ac purple-facebook-0.9.6/configure.ac
--- purple-facebook-0.9.6.orig/configure.ac	2019-01-13 15:56:16.000000000 +0200
+++ purple-facebook-0.9.6/configure.ac	2021-06-06 18:05:51.149613683 +0300
@@ -17,7 +17,7 @@
 
 AC_INIT(
     [purple-facebook],
-    [0.9.6],
+    m4_esyscmd_s([cat RELEASE_VERSION]),
     [https://github.com/dequis/purple-facebook/issues],
     [purple-facebook],
     [https://github.com/dequis/purple-facebook],
diff '--color=auto' -urN purple-facebook-0.9.6.orig/pidgin/libpurple/protocols/facebook/api.c purple-facebook-0.9.6/pidgin/libpurple/protocols/facebook/api.c
--- purple-facebook-0.9.6.orig/pidgin/libpurple/protocols/facebook/api.c	2019-01-13 16:19:45.000000000 +0200
+++ purple-facebook-0.9.6/pidgin/libpurple/protocols/facebook/api.c	2021-06-06 18:09:55.673628090 +0300
@@ -1502,6 +1502,23 @@
 fb_api_cb_publish_ms_event(FbApi *api, JsonNode *root, GSList *events, FbApiEventType type, GError **error);
 
 static void
+fb_api_cb_publish_mst(FbThrift *thft, GError **error)
+{
+	if (fb_thrift_read_isstop(thft)) {
+		FB_API_TCHK(fb_thrift_read_stop(thft));
+	} else {
+		FbThriftType type;
+		gint16 id;
+
+		FB_API_TCHK(fb_thrift_read_field(thft, &type, &id, 0));
+		FB_API_TCHK(type == FB_THRIFT_TYPE_STRING);
+		// FB_API_TCHK(id == 2);
+		FB_API_TCHK(fb_thrift_read_str(thft, NULL));
+		FB_API_TCHK(fb_thrift_read_stop(thft));
+	}
+}
+
+static void
 fb_api_cb_publish_ms(FbApi *api, GByteArray *pload)
 {
 	const gchar *data;
@@ -1531,10 +1548,14 @@
 
 	/* Read identifier string (for Facebook employees) */
 	thft = fb_thrift_new(pload, 0);
-	fb_thrift_read_str(thft, NULL);
+	fb_api_cb_publish_mst(thft, &err);
 	size = fb_thrift_get_pos(thft);
 	g_object_unref(thft);
 
+	FB_API_ERROR_EMIT(api, err,
+		return;
+	);
+
 	g_return_if_fail(size < pload->len);
 	data = (gchar *) pload->data + size;
 	size = pload->len - size;
@@ -1844,10 +1865,10 @@
 		pres->active = i32 != 0;
 		*press = g_slist_prepend(*press, pres);
 
-		fb_util_debug_info("Presence: %" FB_ID_FORMAT " (%d)",
-		                   i64, i32 != 0);
+		fb_util_debug_info("Presence: %" FB_ID_FORMAT " (%d) id: %d",
+		                   i64, i32 != 0, id);
 
-		while (id <= 5) {
+		while (id <= 6) {
 			if (fb_thrift_read_isstop(thft)) {
 				break;
 			}
@@ -1894,7 +1915,9 @@
 	}
 
 	/* Read the field stop */
-	FB_API_TCHK(fb_thrift_read_stop(thft));
+	if (fb_thrift_read_isstop(thft)) {
+		FB_API_TCHK(fb_thrift_read_stop(thft));
+	}
 }
 
 static void
diff '--color=auto' -urN purple-facebook-0.9.6.orig/pidgin/libpurple/protocols/facebook/api.h purple-facebook-0.9.6/pidgin/libpurple/protocols/facebook/api.h
--- purple-facebook-0.9.6.orig/pidgin/libpurple/protocols/facebook/api.h	2019-01-13 16:19:45.000000000 +0200
+++ purple-facebook-0.9.6/pidgin/libpurple/protocols/facebook/api.h	2021-06-06 18:10:03.193628533 +0300
@@ -104,14 +104,14 @@
  * server started checking this.
  */
 
-#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/192.0.0.31.101;FBPN/com.facebook.orca;FBLC/en_US;FBBV/52182662]"
+#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/537.0.0.31.101;FBPN/com.facebook.orca;FBLC/en_US;FBBV/52182662]"
 
 /**
  * FB_API_AGENT:
  *
  * The HTTP User-Agent header.
  */
-#define FB_API_AGENT  "Facebook plugin / Purple / 0.9.6 " FB_ORCA_AGENT
+#define FB_API_AGENT  "Facebook plugin / Purple / " PACKAGE_VERSION " " FB_ORCA_AGENT
 
 /**
  * FB_API_MQTT_AGENT
diff '--color=auto' -urN purple-facebook-0.9.6.orig/update.sh purple-facebook-0.9.6/update.sh
--- purple-facebook-0.9.6.orig/update.sh	2019-01-13 15:37:48.000000000 +0200
+++ purple-facebook-0.9.6/update.sh	2021-06-06 18:05:51.149613683 +0300
@@ -2,7 +2,7 @@
 
 set -e
 
-URL="https://bitbucket.org/pidgin/main"
+URL="https://keep.imfreedom.org/pidgin/pidgin"
 HASHG=$(_TMP_=$(type hg 2>&1); echo $?)
 
 if test "$HASHG" != "0"; then