1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- a/libpurple/protocols/facebook/api.c
+++ b/libpurple/protocols/facebook/api.c
@@ -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,8 +1865,8 @@
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 <= 6) {
if (fb_thrift_read_isstop(thft)) {
@@ -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
|
