Flush read time when switching feeds.

Author: samuelclay

apps/monitor/views/newsblur_trending.py

@@ -68,21 +68,21 @@ def get(self, request):
         data["unique_feeds_read"] = unique_feeds
 
         # Format aggregate metrics
-        formatted_data["total_read_seconds"] = (
-            f'{chart_name}{{metric="total_read_seconds"}} {data["total_read_seconds"]}'
-        )
-        formatted_data["total_story_reads"] = (
-            f'{chart_name}{{metric="total_story_reads"}} {data["total_story_reads"]}'
-        )
-        formatted_data["total_feed_reads"] = (
-            f'{chart_name}{{metric="total_feed_reads"}} {data["total_feed_reads"]}'
-        )
-        formatted_data["unique_stories_read"] = (
-            f'{chart_name}{{metric="unique_stories_read"}} {data["unique_stories_read"]}'
-        )
-        formatted_data["unique_feeds_read"] = (
-            f'{chart_name}{{metric="unique_feeds_read"}} {data["unique_feeds_read"]}'
-        )
+        formatted_data[
+            "total_read_seconds"
+        ] = f'{chart_name}{{metric="total_read_seconds"}} {data["total_read_seconds"]}'
+        formatted_data[
+            "total_story_reads"
+        ] = f'{chart_name}{{metric="total_story_reads"}} {data["total_story_reads"]}'
+        formatted_data[
+            "total_feed_reads"
+        ] = f'{chart_name}{{metric="total_feed_reads"}} {data["total_feed_reads"]}'
+        formatted_data[
+            "unique_stories_read"
+        ] = f'{chart_name}{{metric="unique_stories_read"}} {data["unique_stories_read"]}'
+        formatted_data[
+            "unique_feeds_read"
+        ] = f'{chart_name}{{metric="unique_feeds_read"}} {data["unique_feeds_read"]}'
 
         # Top stories for both 1-day and 7-day windows
         for days in [1, 7]:
@@ -212,9 +212,9 @@ def get(self, request):
                 avg_seconds = 0
 
             key = f"avg_seconds_per_reader_{days}d"
-            formatted_data[key] = (
-                f'{chart_name}{{metric="avg_seconds_per_reader",days="{days}"}} {avg_seconds:.1f}'
-            )
+            formatted_data[
+                key
+            ] = f'{chart_name}{{metric="avg_seconds_per_reader",days="{days}"}} {avg_seconds:.1f}'
 
         # Self-monitoring: track how long this endpoint takes to respond
         elapsed_ms = (time.time() - start_time) * 1000

apps/statistics/rtrending.py

@@ -301,14 +301,8 @@ def get_trending_stories_detailed(cls, days=7, limit=50):
             return []
 
         # Get the story hashes we care about
-        story_hashes = [
-            (sh.decode() if isinstance(sh, bytes) else sh)
-            for sh, _ in time_result
-        ]
-        time_map = {
-            (sh.decode() if isinstance(sh, bytes) else sh): int(score)
-            for sh, score in time_result
-        }
+        story_hashes = [(sh.decode() if isinstance(sh, bytes) else sh) for sh, _ in time_result]
+        time_map = {(sh.decode() if isinstance(sh, bytes) else sh): int(score) for sh, score in time_result}
 
         # Aggregate counts across days for these stories
         if len(count_keys) > 1:
@@ -342,13 +336,15 @@ def get_trending_stories_detailed(cls, days=7, limit=50):
             except (ValueError, IndexError):
                 feed_id = 0
 
-            results.append({
-                "story_hash": story_hash,
-                "feed_id": feed_id,
-                "total_seconds": total_seconds,
-                "reader_count": reader_count,
-                "avg_seconds_per_reader": total_seconds / reader_count if reader_count > 0 else 0,
-            })
+            results.append(
+                {
+                    "story_hash": story_hash,
+                    "feed_id": feed_id,
+                    "total_seconds": total_seconds,
+                    "reader_count": reader_count,
+                    "avg_seconds_per_reader": total_seconds / reader_count if reader_count > 0 else 0,
+                }
+            )
 
         return results
 
@@ -390,13 +386,9 @@ def get_trending_feeds_detailed(cls, days=7, limit=50):
         if not time_result:
             return []
 
-        feed_ids = [
-            (fid.decode() if isinstance(fid, bytes) else fid)
-            for fid, _ in time_result
-        ]
+        feed_ids = [(fid.decode() if isinstance(fid, bytes) else fid) for fid, _ in time_result]
         time_map = {
-            (fid.decode() if isinstance(fid, bytes) else fid): int(score)
-            for fid, score in time_result
+            (fid.decode() if isinstance(fid, bytes) else fid): int(score) for fid, score in time_result
         }
 
         # Aggregate counts
@@ -429,12 +421,14 @@ def get_trending_feeds_detailed(cls, days=7, limit=50):
             total_seconds = time_map.get(feed_id_str, 0)
             reader_count = count_map.get(feed_id_str, 0)
 
-            results.append({
-                "feed_id": feed_id,
-                "total_seconds": total_seconds,
-                "reader_count": reader_count,
-                "avg_seconds_per_reader": total_seconds / reader_count if reader_count > 0 else 0,
-            })
+            results.append(
+                {
+                    "feed_id": feed_id,
+                    "total_seconds": total_seconds,
+                    "reader_count": reader_count,
+                    "avg_seconds_per_reader": total_seconds / reader_count if reader_count > 0 else 0,
+                }
+            )
 
         return results
 

media/js/newsblur/common/assetmodel.js

@@ -208,6 +208,30 @@ NEWSBLUR.AssetModel = Backbone.Router.extend({
         }
     },
 
+    flush_read_times: function () {
+        // Send any queued read times to the server immediately (e.g., when switching feeds)
+        var self = this;
+        if (!NEWSBLUR.Globals.is_authenticated) return;
+        if (!this.queued_read_stories['read_times'] ||
+            _.isEmpty(this.queued_read_stories['read_times'])) return;
+
+        var data = {
+            read_times: JSON.stringify(this.queued_read_stories['read_times'])
+        };
+
+        // Clear read_times before sending to avoid duplicates
+        var read_times_to_send = this.queued_read_stories['read_times'];
+        this.queued_read_stories['read_times'] = {};
+
+        this.make_request('/reader/mark_story_hashes_as_read', data, null, function () {
+            // On error, restore queued read times to retry later
+            if (!self.queued_read_stories['read_times']) {
+                self.queued_read_stories['read_times'] = {};
+            }
+            _.extend(self.queued_read_stories['read_times'], read_times_to_send);
+        });
+    },
+
     mark_story_hash_as_read: function (story, callback, error_callback, data) {
         var self = this;
 

media/js/newsblur/reader/reader.js

@@ -1338,6 +1338,17 @@
                 }
             });
 
+            // Flush read time for the current story before resetting (for trending feeds feature)
+            if (NEWSBLUR.ReadTimeTracker && this.active_story) {
+                var story_hash = this.active_story.get('story_hash');
+                var read_time = NEWSBLUR.ReadTimeTracker.get_and_reset_read_time(story_hash);
+                if (read_time > 0) {
+                    NEWSBLUR.assets.queue_read_time(story_hash, read_time);
+                }
+                NEWSBLUR.ReadTimeTracker.stop_tracking();
+                NEWSBLUR.assets.flush_read_times();
+            }
+
             $.extend(this.flags, {
                 'scrolling_by_selecting_story_title': false,
                 'page_view_showing_feed_view': false,

utils/tlnb.py

@@ -45,7 +45,7 @@ def main(hostnames=None, roles=None, command=None, path=None):
     if not command:
         command = "tail -f"
 
-    if hostnames in ["app", "task", "push", "work"]:
+    if hostnames in ["app", "task", "push", "work", "staging"]:
         roles = hostnames
         hostnames = None