Compare commits

..

No commits in common. "30424f7d397ac90a55428aa178277250031da550" and "d7882b029144f268a4201ba712cceb74148aec79" have entirely different histories.

2 changed files with 6 additions and 7 deletions

View File

@ -106,15 +106,15 @@ pub async fn poll_feed(
let now = Utc::now(); let now = Utc::now();
let last_checked = now - feed.last_checked_time; let last_checked = now - feed.last_checked_time;
info!("Feed {} last checked: {}", feed_id, last_checked); info!("Feed {} last checked: {}", feed_id, last_checked);
let entries = if last_checked < POLLING_INTERVAL {
if last_checked > POLLING_INTERVAL { info!("Reading entries from database for feed {}", feed_id);
read_entries(&feed_id, &mut **db).await?
} else {
info!("Fetching new entries for feed {}", feed_id); info!("Fetching new entries for feed {}", feed_id);
let entries = crate::poll_utils::fetch_new_entries(&url).await?; let entries = crate::poll_utils::fetch_new_entries(&url).await?;
update_entry_db(&entries, &feed_id, &mut **db).await?; update_entry_db(&entries, &feed_id, &mut **db).await?;
} entries
};
info!("Reading entries from database for feed {}", feed_id);
let entries = read_entries(&feed_id, &mut db).await?;
let count = entries.len(); let count = entries.len();
let unread_count = entries.iter().filter(|e| e.marked_read.is_none()).count(); let unread_count = entries.iter().filter(|e| e.marked_read.is_none()).count();

View File

@ -151,7 +151,6 @@ function openFeed(feed) {
// Create unread count element // Create unread count element
const unreadCount = document.createElement('span'); const unreadCount = document.createElement('span');
unreadCount.className = 'feed-unread-count'; unreadCount.className = 'feed-unread-count';
unreadCount.title = 'Unread entry count';
if (feed.unread_count > 0) { if (feed.unread_count > 0) {
unreadCount.textContent = feed.unread_count; unreadCount.textContent = feed.unread_count;
unreadCount.style.display = 'inline'; unreadCount.style.display = 'inline';