From edc2a137a40ed2eb47bd520427d12238f4866e1d Mon Sep 17 00:00:00 2001 From: dequis Date: Mon, 26 Jun 2017 03:57:17 -0300 Subject: Delete upstreamed patches --- patches/08-user-agent.patch | 27 ---------------------- patches/09-thread-query-hash.patch | 11 --------- patches/10-mqtt-agent.patch | 35 ----------------------------- patches/11-fix-thread-list-query.patch | 40 --------------------------------- patches/12-http-agent.patch | 41 ---------------------------------- patches/13-content-type.patch | 10 --------- patches/14-sync-seq-error.patch | 26 --------------------- 7 files changed, 190 deletions(-) delete mode 100644 patches/08-user-agent.patch delete mode 100644 patches/09-thread-query-hash.patch delete mode 100644 patches/10-mqtt-agent.patch delete mode 100644 patches/11-fix-thread-list-query.patch delete mode 100644 patches/12-http-agent.patch delete mode 100644 patches/13-content-type.patch delete mode 100644 patches/14-sync-seq-error.patch diff --git a/patches/08-user-agent.patch b/patches/08-user-agent.patch deleted file mode 100644 index d46f344..0000000 --- a/patches/08-user-agent.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/libpurple/protocols/facebook/api.h 2016-11-21 09:56:02.734212775 -0300 -+++ b/libpurple/protocols/facebook/api.h 2016-11-21 10:14:38.808696834 -0300 -@@ -91,6 +91,13 @@ - #define FB_API_SECRET "374e60f8b9bb6b8cbb30f78030438895" - - /** -+ * FB_API_AGENT: -+ * -+ * The HTTP User-Agent header. -+ */ -+#define FB_API_AGENT "Facebook plugin / Purple / 0.9" -+ -+/** - * FB_API_URL_ATTACH: - * - * The URL for attachment URL requests. ---- a/libpurple/protocols/facebook/api.c 2016-11-21 09:56:02.734212775 -0300 -+++ b/libpurple/protocols/facebook/api.c 2016-11-21 10:15:05.214906611 -0300 -@@ -762,6 +762,8 @@ - g_free(data); - } - -+ purple_http_request_header_set(req, "User-Agent", FB_API_AGENT); -+ - data = fb_http_params_close(params, NULL); - purple_http_request_set_contents(req, data, -1); - ret = purple_http_request(priv->gc, req, callback, api); diff --git a/patches/09-thread-query-hash.patch b/patches/09-thread-query-hash.patch deleted file mode 100644 index c69befc..0000000 --- a/patches/09-thread-query-hash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libpurple/protocols/facebook/api.h 2017-03-29 06:14:14.773605683 -0300 -+++ b/libpurple/protocols/facebook/api.h 2017-03-29 06:13:43.207565647 -0300 -@@ -260,7 +260,7 @@ - * 17: profile_pic_medium_size - * 18: profile_pic_small_size - */ --#define FB_API_QUERY_THREADS 10153919752026729 -+#define FB_API_QUERY_THREADS 10155268192741729 - - /** - * FB_API_QUERY_XMA: diff --git a/patches/10-mqtt-agent.patch b/patches/10-mqtt-agent.patch deleted file mode 100644 index 2d028af..0000000 --- a/patches/10-mqtt-agent.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/libpurple/protocols/facebook/api.c 2017-03-29 09:51:52.990185503 -0300 -+++ b/libpurple/protocols/facebook/api.c 2017-03-29 09:53:37.107663870 -0300 -@@ -885,7 +885,7 @@ - - /* Write the information string */ - fb_thrift_write_field(thft, FB_THRIFT_TYPE_STRING, 2, 1); -- fb_thrift_write_str(thft, ""); -+ fb_thrift_write_str(thft, FB_API_MQTT_AGENT); - - /* Write the UNKNOWN ("cp"?) */ - fb_thrift_write_field(thft, FB_THRIFT_TYPE_I64, 3, 2); ---- a/libpurple/protocols/facebook/api.h 2017-03-29 09:51:52.990185503 -0300 -+++ b/libpurple/protocols/facebook/api.h 2017-03-29 09:54:02.357053584 -0300 -@@ -98,6 +98,21 @@ - #define FB_API_AGENT "Facebook plugin / Purple / 0.9" - - /** -+ * FB_API_MQTT_AGENT -+ * -+ * The client information string sent in the MQTT CONNECT message -+ * -+ * We announce ourselves as compatible with Orca-Android 38.0 since that's the -+ * closest version to the last major protocol update. Some parts use older -+ * features, some parts use newer ones. -+ * -+ * Fun fact: this version sends old-style MQIsdp CONNECT messages for the first -+ * connection, with JSON payloads instead of compressed thrift. -+ */ -+ -+#define FB_API_MQTT_AGENT FB_API_AGENT " [FBAN/Orca-Android;FBAV/38.0.0.22.155;FBBV/14477681]" -+ -+/** - * FB_API_URL_ATTACH: - * - * The URL for attachment URL requests. diff --git a/patches/11-fix-thread-list-query.patch b/patches/11-fix-thread-list-query.patch deleted file mode 100644 index 32ce76f..0000000 --- a/patches/11-fix-thread-list-query.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/libpurple/protocols/facebook/api.c 2017-03-29 09:55:50.024456518 -0300 -+++ b/libpurple/protocols/facebook/api.c 2017-03-29 09:59:36.546399711 -0300 -@@ -802,6 +802,7 @@ - case FB_API_QUERY_THREAD: - name = "ThreadQuery"; - break; -+ case FB_API_QUERY_SEQ_ID: - case FB_API_QUERY_THREADS: - name = "ThreadListQuery"; - break; -@@ -1089,7 +1090,7 @@ - if (priv->sid == 0) { - bldr = fb_json_bldr_new(JSON_NODE_OBJECT); - fb_json_bldr_add_str(bldr, "1", "0"); -- fb_api_http_query(api, FB_API_QUERY_THREADS, bldr, -+ fb_api_http_query(api, FB_API_QUERY_SEQ_ID, bldr, - fb_api_cb_seqid); - } else { - fb_api_connect_queue(api); ---- a/libpurple/protocols/facebook/api.h 2017-03-29 09:55:50.024456518 -0300 -+++ b/libpurple/protocols/facebook/api.h 2017-03-29 09:57:34.278827392 -0300 -@@ -275,7 +275,17 @@ - * 17: profile_pic_medium_size - * 18: profile_pic_small_size - */ --#define FB_API_QUERY_THREADS 10155268192741729 -+#define FB_API_QUERY_THREADS 10153919752026729 -+ -+/** -+ * FB_API_QUERY_SEQ_ID: -+ * -+ * A variant of ThreadListQuery with sequence ID -+ * -+ * TODO: parameters. -+ */ -+ -+#define FB_API_QUERY_SEQ_ID 10155268192741729 - - /** - * FB_API_QUERY_XMA: diff --git a/patches/12-http-agent.patch b/patches/12-http-agent.patch deleted file mode 100644 index a03da6e..0000000 --- a/patches/12-http-agent.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/libpurple/protocols/facebook/api.h 2017-03-30 02:23:36.028335349 -0300 -+++ b/libpurple/protocols/facebook/api.h 2017-03-30 02:24:46.796992132 -0300 -@@ -91,11 +91,28 @@ - #define FB_API_SECRET "374e60f8b9bb6b8cbb30f78030438895" - - /** -+ * FB_ORCA_AGENT -+ * -+ * The part of the user agent that looks like the official client, since the -+ * server started checking this. -+ * -+ * We announce ourselves as compatible with Orca-Android 38.0 since that's the -+ * closest version to the last major protocol update. Some parts use older -+ * features, some parts use newer ones. -+ * -+ * Fun fact: this version sends old-style MQIsdp CONNECT messages for the first -+ * connection, with JSON payloads instead of compressed thrift. -+ * -+ */ -+ -+#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/109.0.0.17.70;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" -+#define FB_API_AGENT "Facebook plugin / Purple / 0.9.4 " FB_ORCA_AGENT - - /** - * FB_API_MQTT_AGENT -@@ -110,7 +127,7 @@ - * connection, with JSON payloads instead of compressed thrift. - */ - --#define FB_API_MQTT_AGENT FB_API_AGENT " [FBAN/Orca-Android;FBAV/38.0.0.22.155;FBBV/14477681]" -+#define FB_API_MQTT_AGENT FB_API_AGENT - - /** - * FB_API_URL_ATTACH: diff --git a/patches/13-content-type.patch b/patches/13-content-type.patch deleted file mode 100644 index 88133ed..0000000 --- a/patches/13-content-type.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libpurple/protocols/facebook/api.c 2017-06-08 13:50:51.660801537 -0300 -+++ b/libpurple/protocols/facebook/api.c 2017-06-08 13:50:48.960852585 -0300 -@@ -763,6 +763,7 @@ - } - - purple_http_request_header_set(req, "User-Agent", FB_API_AGENT); -+ purple_http_request_header_set(req, "Content-Type", "application/x-www-form-urlencoded; charset=utf-8"); - - data = fb_http_params_close(params, NULL); - purple_http_request_set_contents(req, data, -1); diff --git a/patches/14-sync-seq-error.patch b/patches/14-sync-seq-error.patch deleted file mode 100644 index 70be5a6..0000000 --- a/patches/14-sync-seq-error.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libpurple/protocols/facebook/api.c 2017-06-08 15:02:12.965124587 -0300 -+++ b/libpurple/protocols/facebook/api.c 2017-06-08 15:14:32.217748548 -0300 -@@ -1033,7 +1033,7 @@ - } - - values = fb_json_values_new(root); -- fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, -+ fb_json_values_add(values, FB_JSON_TYPE_STR, FALSE, - "$.viewer.message_threads.sync_sequence_id"); - fb_json_values_add(values, FB_JSON_TYPE_INT, TRUE, - "$.viewer.message_threads.unread_count"); -@@ -1049,7 +1049,13 @@ - priv->sid = g_ascii_strtoll(str, NULL, 10); - priv->unread = fb_json_values_next_int(values, 0); - -- fb_api_connect_queue(api); -+ if (priv->sid == 0) { -+ fb_api_error(api, FB_API_ERROR_GENERAL, -+ _("Failed to get sync_sequence_id")); -+ } else { -+ fb_api_connect_queue(api); -+ } -+ - g_object_unref(values); - json_node_free(root); - } -- cgit v1.2.3