feed bug fixed

freedit-org · Apr 29, 2024 · c4b2fc1 · c4b2fc1
1 parent 0e8e98b
commit c4b2fc1
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/src/controller/feed.rs b/src/controller/feed.rs
@@ -291,7 +291,9 @@ pub(crate) async fn feed(
         let folder = if let Some(r) = feed_id_folder.get(&feed_id) {
             r.to_owned()
         } else {
-            "".to_owned()
+            active_folder
+                .clone()
+                .unwrap_or_else(|| "Default".to_owned())
         };
         let out_item = OutItem {
             item_id: i,
@@ -613,23 +615,24 @@ pub(super) async fn update(
         Ok(rss) => {
             for item in rss.items.into_iter().take(n) {
                 let source_item: SourceItem = item.try_into()?;
-
-                if item_links_tree.get(&source_item.link)?.is_none() {
-                    let item_id = incr_id(db, "items_count")?;
+                let item_id;
+                if let Some(v) = item_links_tree.get(&source_item.link)? {
+                    item_id = ivec_to_u32(&v);
+                } else {
+                    item_id = incr_id(db, "items_count")?;
                     let item = Item {
                         link: source_item.link,
                         title: clean_html(&source_item.title),
                         feed_title: clean_html(&rss.title),
                         updated: source_item.updated,
                         content: clean_html(&source_item.content),
                     };
-
                     item_links_tree.insert(&item.link, u32_to_ivec(item_id))?;
                     set_one(db, "items", item_id, &item)?;
-
-                    item_ids.push((item_id, item.updated));
                     tan_tree.insert(format!("item{}", item_id), &[])?;
-                }
+                };
+
+                item_ids.push((item_id, source_item.updated));
             }
 
             Feed {
@@ -641,22 +644,24 @@ pub(super) async fn update(
             Ok(atom) => {
                 for entry in atom.entries.into_iter().take(n) {
                     let source_item: SourceItem = entry.into();
-                    if item_links_tree.get(&source_item.link)?.is_none() {
-                        let item_id = incr_id(db, "items_count")?;
+                    let item_id;
+                    if let Some(v) = item_links_tree.get(&source_item.link)? {
+                        item_id = ivec_to_u32(&v);
+                    } else {
+                        item_id = incr_id(db, "items_count")?;
                         let item = Item {
                             link: source_item.link,
                             title: clean_html(&source_item.title),
                             feed_title: clean_html(&atom.title),
                             updated: source_item.updated,
                             content: clean_html(&source_item.content),
                         };
-
                         item_links_tree.insert(&item.link, u32_to_ivec(item_id))?;
                         set_one(db, "items", item_id, &item)?;
-
-                        item_ids.push((item_id, item.updated));
                         tan_tree.insert(format!("item{}", item_id), &[])?;
                     };
+
+                    item_ids.push((item_id, source_item.updated));
                 }
 
                 Feed {