pidgin/pidgin

Backport some patches from github.com/dequis/purple-facebook

2021-02-28, Gary Kramlich
0a69216b0b3f
Parents ffd6ed64643c
Children 1311bfd4c79a
Backport some patches from github.com/dequis/purple-facebook

Testing Done:
Compiled and connected successfully to facebook.

Reviewed at https://reviews.imfreedom.org/r/549/
2 files changed, 30 insertions(+), 7 deletions(-)
  • +29 -6
    libpurple/protocols/facebook/api.c
  • +1 -1
    libpurple/protocols/facebook/api.h
    • --- a/libpurple/protocols/facebook/api.c Sat Feb 27 18:25:32 2021 -0600
    +++ b/libpurple/protocols/facebook/api.c Sun Feb 28 21:46:06 2021 -0600
    @@ -1426,6 +1426,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;
    @@ -1455,10 +1472,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;
    @@ -1768,10 +1789,10 @@
    pres->active = i32 != 0;
    *press = g_slist_prepend(*press, pres);
    - fb_util_debug_info("Presence: %" FB_ID_FORMAT " (%d)",
    - i64, i32 != 0);
    -
    - while (id <= 5) {
    + fb_util_debug_info("Presence: %" FB_ID_FORMAT " (%d) id: %d",
    + i64, i32 != 0, id);
    +
    + while (id <= 6) {
    if (fb_thrift_read_isstop(thft)) {
    break;
    }
    @@ -1818,7 +1839,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
    --- a/libpurple/protocols/facebook/api.h Sat Feb 27 18:25:32 2021 -0600
    +++ b/libpurple/protocols/facebook/api.h Sun Feb 28 21:46:06 2021 -0600
    @@ -97,7 +97,7 @@
    * server started checking this.
    */
    -#define FB_ORCA_AGENT "[FBAN/Orca-Android;FBAV/109.0.0.17.70;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: