diff options
| author | Brendan Long <self@brendanlong.com> | 2019-05-24 22:21:02 +0300 |
|---|---|---|
| committer | Brendan Long <self@brendanlong.com> | 2019-05-24 22:33:52 +0300 |
| commit | 500fa52f52947a8e5c10e00d6bb1c7a2dcf5ba98 (patch) | |
| tree | b64e52485130e8978e2e4588eda8bdfaae6fa899 | |
| parent | ef4a9c618c287af7ea87f6eba14a9e0b2cedc7ee (diff) | |
Don't assume Feedly values are non-null
Feedly's API sometimes returns null for summary, content, title, etc.
Weirdly enough, it can even return null for `unread`, despite it not being
marked as optional in the docs.
Fixes #894
| -rw-r--r-- | plugins/backend/feedly/feedlyAPI.vala | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/plugins/backend/feedly/feedlyAPI.vala b/plugins/backend/feedly/feedlyAPI.vala index 7c2db7e3..c0929666 100644 --- a/plugins/backend/feedly/feedlyAPI.vala +++ b/plugins/backend/feedly/feedlyAPI.vala @@ -403,13 +403,17 @@ public class FeedReader.FeedlyAPI : Object { { Json.Object object = array.get_object_element(i); string id = object.get_string_member("id"); - string title = object.get_string_member("title"); - string? author = object.get_string_member("author"); - string summaryContent = object.has_member("summary") ? object.get_object_member("summary").get_string_member("content") : null; - string content = object.has_member("content") ? object.get_object_member("content").get_string_member("content") : summaryContent; - bool unread = object.get_boolean_member("unread"); - string url = object.has_member("alternate") ? object.get_array_member("alternate").get_object_element(0).get_string_member("href") : null; - string feedID = object.get_object_member("origin").get_string_member("streamId"); + string? title = object.has_member("title") ? object.get_string_member("title") : null; + string? author = object.has_member("author") ? object.get_string_member("author") : null; + var summary = object.has_member("summary") ? object.get_object_member("summary") : null; + string? summaryContent = summary != null && summary.has_member("content") ? summary.get_string_member("content") : null; + var content_obj = object.has_member("content") ? object.get_object_member("content") : null; + string? content = content_obj != null && content_obj.has_member("content") ? content_obj.get_string_member("content") : summaryContent; + bool unread = object.has_member("unread") ? object.get_boolean_member("unread") : false; + var alternate = object.has_member("alternate") ? object.get_array_member("alternate") : null; + var first_alternate = alternate != null && alternate.get_length() >= 1 ? alternate.get_object_element(0) : null; + string url = first_alternate != null && first_alternate.has_member("href") ? first_alternate.get_string_member("href") : null; + string feedID = object.has_member("origin") ? object.get_object_member("origin").get_string_member("streamId") : null; DateTime date = new DateTime.now_local(); if(object.has_member("updated") && object.get_int_member("updated") > 0) |