From 62291d6a8d4cd4f6aea86d73749ea7f59ad99bb8 Mon Sep 17 00:00:00 2001 From: dequis Date: Fri, 6 Jan 2017 16:14:00 -0300 Subject: Don't fail on groupchats with only two members including self Those are created by the "Marketplace" feature: http://newsroom.fb.com/news/2016/10/introducing-marketplace --- facebook/facebook-api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'facebook/facebook-api.c') diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c index 4a54e41..0ec8e07 100644 --- a/facebook/facebook-api.c +++ b/facebook/facebook-api.c @@ -2535,6 +2535,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root, FbId uid; FbJsonValues *values; gboolean haself = FALSE; + guint num_users = 0; GError *err = NULL; values = fb_json_values_new(root); @@ -2570,6 +2571,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root, while (fb_json_values_update(values, &err)) { str = fb_json_values_next_str(values, "0"); uid = FB_ID_FROM_STR(str); + num_users++; if (uid != priv->uid) { user = fb_api_user_dup(NULL, FALSE); @@ -2588,7 +2590,7 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root, return FALSE; } - if ((g_slist_length(thrd->users) < 2) || !haself) { + if (num_users < 2 || !haself) { fb_api_thread_reset(thrd, TRUE); g_object_unref(values); return FALSE; -- cgit v1.2.3 From 2707fa7895f33f3886616169073fc8b5fabfdd02 Mon Sep 17 00:00:00 2001 From: dequis Date: Sat, 7 Jan 2017 12:55:26 -0300 Subject: Don't disconnect when trying to join a chat after being kicked This replaces a subset of "Failed to parse thread information" (the ones that aren't really a problem parsing) with "You have been removed from this chat" appearing in the relevant chat window. --- facebook/facebook-api.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'facebook/facebook-api.c') diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c index 0ec8e07..184cb89 100644 --- a/facebook/facebook-api.c +++ b/facebook/facebook-api.c @@ -435,6 +435,23 @@ fb_api_class_init(FbApiClass *klass) G_TYPE_NONE, 1, FB_TYPE_ID); + /** + * FbApi::thread-kicked: + * @api: The #FbApi. + * @thrd: The #FbApiThread. + * + * Emitted upon the reply of a thread request when the user is no longer + * part of that thread. This is emitted as a result of #fb_api_thread(). + */ + g_signal_new("thread-kicked", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_ACTION, + 0, + NULL, NULL, + fb_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); + /** * FbApi::threads: * @api: The #FbApi. @@ -2591,7 +2608,6 @@ fb_api_thread_parse(FbApi *api, FbApiThread *thrd, JsonNode *root, } if (num_users < 2 || !haself) { - fb_api_thread_reset(thrd, TRUE); g_object_unref(values); return FALSE; } @@ -2626,8 +2642,12 @@ fb_api_cb_thread(FbHttpRequest *req, gpointer data) if (!fb_api_thread_parse(api, &thrd, node, &err)) { if (G_LIKELY(err == NULL)) { - fb_api_error(api, FB_API_ERROR_GENERAL, - "Failed to parse thread information"); + if (thrd.tid) { + g_signal_emit_by_name(api, "thread-kicked", &thrd); + } else { + fb_api_error(api, FB_API_ERROR_GENERAL, + "Failed to parse thread information"); + } } else { fb_api_error_emit(api, err); } -- cgit v1.2.3