Render emoji in text, do not show notification count for cache sync, lazy load 4chan board

2 files changed, 136 insertions, 136 deletions

diff --git a/src/plugins/Fourchan.cpp b/src/plugins/Fourchan.cpp
index d042a2a..2c62ba1 100644
--- a/src/plugins/Fourchan.cpp
+++ b/src/plugins/Fourchan.cpp
@@ -135,139 +135,7 @@ namespace QuickMedia {
     }
 
     PluginResult FourchanBoardsPage::submit(const std::string &title, const std::string &url, std::vector<Tab> &result_tabs) {
-        Json::Value json_root;
-        DownloadResult result = download_json(json_root, fourchan_url + url + "/catalog.json", {}, true);
-        if(result != DownloadResult::OK) return download_result_to_plugin_result(result);
-
-        if(!json_root.isArray())
-            return PluginResult::ERR;
-
-        BodyItems result_items;
-
-        for(const Json::Value &page_data : json_root) {
-            if(!page_data.isObject())
-                continue;
-
-            const Json::Value &threads = page_data["threads"];
-            if(!threads.isArray())
-                continue;
-
-            for(const Json::Value &thread : threads) {
-                if(!thread.isObject())
-                    continue;
-
-                const Json::Value &sub = thread["sub"];
-                const char *sub_begin = "";
-                const char *sub_end = sub_begin;
-                sub.getString(&sub_begin, &sub_end);
-
-                const Json::Value &com = thread["com"];
-                const char *comment_begin = "";
-                const char *comment_end = comment_begin;
-                com.getString(&comment_begin, &comment_end);
-
-                const Json::Value &thread_num = thread["no"];
-                if(!thread_num.isNumeric())
-                    continue;
-
-                std::string title_text;
-                extract_comment_pieces(sub_begin, sub_end - sub_begin,
-                    [&title_text](const CommentPiece &cp) {
-                        switch(cp.type) {
-                            case CommentPiece::Type::TEXT:
-                                title_text.append(cp.text.data, cp.text.size);
-                                break;
-                            case CommentPiece::Type::QUOTE:
-                                title_text += '>';
-                                title_text.append(cp.text.data, cp.text.size);
-                                //comment_text += '\n';
-                                break;
-                            case CommentPiece::Type::QUOTELINK: {
-                                title_text.append(cp.text.data, cp.text.size);
-                                break;
-                            }
-                            case CommentPiece::Type::LINE_CONTINUE: {
-                                if(!title_text.empty() && title_text.back() == '\n') {
-                                    title_text.pop_back();
-                                }
-                                break;
-                            }
-                        }
-                    }
-                );
-                if(!title_text.empty() && title_text.back() == '\n')
-                    title_text.back() = ' ';
-                html_unescape_sequences(title_text);
-
-                std::string comment_text;
-                extract_comment_pieces(comment_begin, comment_end - comment_begin,
-                    [&comment_text](const CommentPiece &cp) {
-                        switch(cp.type) {
-                            case CommentPiece::Type::TEXT:
-                                comment_text.append(cp.text.data, cp.text.size);
-                                break;
-                            case CommentPiece::Type::QUOTE:
-                                comment_text += '>';
-                                comment_text.append(cp.text.data, cp.text.size);
-                                //comment_text += '\n';
-                                break;
-                            case CommentPiece::Type::QUOTELINK: {
-                                comment_text.append(cp.text.data, cp.text.size);
-                                break;
-                            }
-                            case CommentPiece::Type::LINE_CONTINUE: {
-                                if(!comment_text.empty() && comment_text.back() == '\n') {
-                                    comment_text.pop_back();
-                                }
-                                break;
-                            }
-                        }
-                    }
-                );
-                html_unescape_sequences(comment_text);
-                // TODO: Do the same when wrapping is implemented
-                // TODO: Remove this
-                int num_lines = 0;
-                for(size_t i = 0; i < comment_text.size(); ++i) {
-                    if(comment_text[i] == '\n') {
-                        ++num_lines;
-                        if(num_lines == 6) {
-                            comment_text = comment_text.substr(0, i) + " (...)";
-                            break;
-                        }
-                    }
-                }
-                auto body_item = BodyItem::create(std::move(comment_text));
-                body_item->set_author(std::move(title_text));
-                body_item->url = std::to_string(thread_num.asInt64());
-
-                const Json::Value &ext = thread["ext"];
-                const Json::Value &tim = thread["tim"];
-                if(tim.isNumeric() && ext.isString()) {
-                    std::string ext_str = ext.asString();
-                    if(ext_str == ".png" || ext_str == ".jpg" || ext_str == ".jpeg" || ext_str == ".webm" || ext_str == ".mp4" || ext_str == ".gif") {
-                    } else {
-                        fprintf(stderr, "TODO: Support file extension: %s\n", ext_str.c_str());
-                    }
-                    // "s" means small, that's the url 4chan uses for thumbnails.
-                    // thumbnails always has .jpg extension even if they are gifs or webm.
-                    body_item->thumbnail_url = fourchan_image_url + url + "/" + std::to_string(tim.asInt64()) + "s.jpg";
-
-                    sf::Vector2i thumbnail_size(64, 64);
-                    const Json::Value &tn_w = thread["tn_w"];
-                    const Json::Value &tn_h = thread["tn_h"];
-                    if(tn_w.isNumeric() && tn_h.isNumeric())
-                        thumbnail_size = sf::Vector2i(tn_w.asInt() * 0.5, tn_h.asInt() * 0.5);
-                    body_item->thumbnail_size = std::move(thumbnail_size);
-                }
-                
-                result_items.push_back(std::move(body_item));
-            }
-        }
-
-        auto body = create_body();
-        body->items = std::move(result_items);
-        result_tabs.push_back(Tab{std::move(body), std::make_unique<FourchanThreadListPage>(program, title, url), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
+        result_tabs.push_back(Tab{create_body(), std::make_unique<FourchanThreadListPage>(program, title, url), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
         return PluginResult::OK;
     }
 
@@ -462,6 +330,138 @@ namespace QuickMedia {
         return PluginResult::OK;
     }
 
+    PluginResult FourchanThreadListPage::lazy_fetch(BodyItems &result_items) {
+        Json::Value json_root;
+        DownloadResult result = download_json(json_root, fourchan_url + board_id + "/catalog.json?s=Index", {}, true);
+        if(result != DownloadResult::OK) return download_result_to_plugin_result(result);
+
+        if(!json_root.isArray())
+            return PluginResult::ERR;
+
+        for(const Json::Value &page_data : json_root) {
+            if(!page_data.isObject())
+                continue;
+
+            const Json::Value &threads = page_data["threads"];
+            if(!threads.isArray())
+                continue;
+
+            for(const Json::Value &thread : threads) {
+                if(!thread.isObject())
+                    continue;
+
+                const Json::Value &sub = thread["sub"];
+                const char *sub_begin = "";
+                const char *sub_end = sub_begin;
+                sub.getString(&sub_begin, &sub_end);
+
+                const Json::Value &com = thread["com"];
+                const char *comment_begin = "";
+                const char *comment_end = comment_begin;
+                com.getString(&comment_begin, &comment_end);
+
+                const Json::Value &thread_num = thread["no"];
+                if(!thread_num.isNumeric())
+                    continue;
+
+                std::string title_text;
+                extract_comment_pieces(sub_begin, sub_end - sub_begin,
+                    [&title_text](const CommentPiece &cp) {
+                        switch(cp.type) {
+                            case CommentPiece::Type::TEXT:
+                                title_text.append(cp.text.data, cp.text.size);
+                                break;
+                            case CommentPiece::Type::QUOTE:
+                                title_text += '>';
+                                title_text.append(cp.text.data, cp.text.size);
+                                //comment_text += '\n';
+                                break;
+                            case CommentPiece::Type::QUOTELINK: {
+                                title_text.append(cp.text.data, cp.text.size);
+                                break;
+                            }
+                            case CommentPiece::Type::LINE_CONTINUE: {
+                                if(!title_text.empty() && title_text.back() == '\n') {
+                                    title_text.pop_back();
+                                }
+                                break;
+                            }
+                        }
+                    }
+                );
+                if(!title_text.empty() && title_text.back() == '\n')
+                    title_text.back() = ' ';
+                html_unescape_sequences(title_text);
+
+                std::string comment_text;
+                extract_comment_pieces(comment_begin, comment_end - comment_begin,
+                    [&comment_text](const CommentPiece &cp) {
+                        switch(cp.type) {
+                            case CommentPiece::Type::TEXT:
+                                comment_text.append(cp.text.data, cp.text.size);
+                                break;
+                            case CommentPiece::Type::QUOTE:
+                                comment_text += '>';
+                                comment_text.append(cp.text.data, cp.text.size);
+                                //comment_text += '\n';
+                                break;
+                            case CommentPiece::Type::QUOTELINK: {
+                                comment_text.append(cp.text.data, cp.text.size);
+                                break;
+                            }
+                            case CommentPiece::Type::LINE_CONTINUE: {
+                                if(!comment_text.empty() && comment_text.back() == '\n') {
+                                    comment_text.pop_back();
+                                }
+                                break;
+                            }
+                        }
+                    }
+                );
+                html_unescape_sequences(comment_text);
+                // TODO: Do the same when wrapping is implemented
+                // TODO: Remove this
+                int num_lines = 0;
+                for(size_t i = 0; i < comment_text.size(); ++i) {
+                    if(comment_text[i] == '\n') {
+                        ++num_lines;
+                        if(num_lines == 6) {
+                            comment_text = comment_text.substr(0, i) + " (...)";
+                            break;
+                        }
+                    }
+                }
+                auto body_item = BodyItem::create(std::move(comment_text));
+                body_item->set_author(std::move(title_text));
+                body_item->url = std::to_string(thread_num.asInt64());
+
+                const Json::Value &ext = thread["ext"];
+                const Json::Value &tim = thread["tim"];
+                if(tim.isNumeric() && ext.isString()) {
+                    std::string ext_str = ext.asString();
+                    if(ext_str == ".png" || ext_str == ".jpg" || ext_str == ".jpeg" || ext_str == ".webm" || ext_str == ".mp4" || ext_str == ".gif") {
+                    } else {
+                        fprintf(stderr, "TODO: Support file extension: %s\n", ext_str.c_str());
+                    }
+                    // "s" means small, that's the url 4chan uses for thumbnails.
+                    // thumbnails always has .jpg extension even if they are gifs or webm.
+                    body_item->thumbnail_url = fourchan_image_url + board_id + "/" + std::to_string(tim.asInt64()) + "s.jpg";
+
+                    sf::Vector2i thumbnail_size(64, 64);
+                    const Json::Value &tn_w = thread["tn_w"];
+                    const Json::Value &tn_h = thread["tn_h"];
+                    if(tn_w.isNumeric() && tn_h.isNumeric())
+                        thumbnail_size = sf::Vector2i(tn_w.asInt() * 0.5, tn_h.asInt() * 0.5);
+                    body_item->thumbnail_size = std::move(thumbnail_size);
+                }
+                
+                result_items.push_back(std::move(body_item));
+            }
+        }
+
+        return PluginResult::OK;
+    }
+
     PluginResult FourchanThreadPage::login(const std::string &token, const std::string &pin, std::string &response_msg) {
         response_msg.clear();
 
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 1d0e1df..6dabad9 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -455,7 +455,7 @@ namespace QuickMedia {
         });
     }
 
-    void MatrixQuickMedia::update_room_description(RoomData *room, Messages &new_messages, bool is_initial_sync) {        
+    void MatrixQuickMedia::update_room_description(RoomData *room, Messages &new_messages, bool is_initial_sync, bool sync_is_cache) {
         time_t read_marker_message_timestamp = 0;
         std::shared_ptr<UserInfo> me = matrix->get_me(room);
         if(me) {
@@ -485,7 +485,7 @@ namespace QuickMedia {
         if(!room_body_item)
             return;
 
-        if(last_unread_message) {
+        if(last_unread_message && !sync_is_cache) {
             std::string room_desc = "Unread: " + matrix->message_get_author_displayname(last_unread_message) + ": " + extract_first_line_elipses(last_unread_message->body, 150);
             int unread_notification_count = room->unread_notification_count;
             if(unread_notification_count > 0)
@@ -523,7 +523,7 @@ namespace QuickMedia {
                 }
             }
 
-            update_room_description(room, messages, is_initial_sync);
+            update_room_description(room, messages, is_initial_sync, it.second.sync_is_cache);
         }
         pending_room_messages.clear();
     }