From d6a6b5d2ac28750d02a241dc58ae0505571c8240 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 23 Mar 2019 20:21:15 -0700
Subject: [PATCH] Store Last-Modified dates so Thread Watcher can receive 304
 responses on first request.

---
 src/Monitoring/ThreadWatcher.coffee | 23 +++++++++++++++++++----
 src/classes/DataBoard.coffee        |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index af2e26b21..32cc80b47 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -10,8 +10,8 @@ ThreadWatcher =
       className: 'fa fa-eye'
 
     @db     = new DataBoard 'watchedThreads', @refresh, true
+    @dbLM   = new DataBoard 'watcherLastModified', null, true
     @dialog = UI.dialog 'thread-watcher', <%= readHTML('ThreadWatcher.html') %>
-
     @status = $ '#watcher-status', @dialog
     @list   = @dialog.lastElementChild
     @refreshButton = $ '.refresh', @dialog
@@ -41,6 +41,7 @@ ThreadWatcher =
 
     Header.addShortcut 'watcher', sc, 510
 
+    ThreadWatcher.initLastModified()
     ThreadWatcher.fetchAuto()
     $.on window, 'visibilitychange focus', -> $.queueTask ThreadWatcher.fetchAuto
 
@@ -207,6 +208,17 @@ ThreadWatcher =
         req.abort?()
     ThreadWatcher.clearRequests()
 
+  initLastModified: ->
+    lm = ($.lastModified['ThreadWatcher'] or= {})
+    for siteID, boards of ThreadWatcher.dbLM.data
+      for boardID, data of boards.boards
+        if ThreadWatcher.db.get {siteID, boardID}
+          for url, date of data
+            lm[url] = date
+        else
+          ThreadWatcher.dbLM.delete {siteID, boardID}
+    return
+
   fetchAuto: ->
     clearTimeout ThreadWatcher.timeout
     return unless Conf['Auto Update Thread Watcher']
@@ -247,10 +259,13 @@ ThreadWatcher =
     urlF = if deep and software is 'tinyboard' then 'catalogJSON' else 'threadsListJSON'
     url = SW[software]?.urls[urlF]?({siteID, boardID})
     return unless url
-    ThreadWatcher.fetch url, {siteID}, [board], ThreadWatcher.parseBoard
+    ThreadWatcher.fetch url, {siteID}, [board, url], ThreadWatcher.parseBoard
 
-  parseBoard: (board) ->
+  parseBoard: (board, url) ->
     return unless @status is 200
+    {siteID, boardID} = board[0]
+    lmDate = @getResponseHeader('Last-Modified')
+    ThreadWatcher.dbLM.extend {siteID, boardID, val: $.item(url, lmDate)}
     modified = {}
     replies  = {}
     try
@@ -259,7 +274,7 @@ ThreadWatcher =
           modified[item.no] = item.last_modified
           replies[item.no] = item.replies
     for thread in board
-      {siteID, boardID, threadID, data} = thread
+      {threadID, data} = thread
       if modified[threadID]
         if modified[threadID] is data.modified and (!replies[threadID]? or replies[threadID] is data.replies)
           continue
diff --git a/src/classes/DataBoard.coffee b/src/classes/DataBoard.coffee
index 4d23aae9c..dddee55fd 100644
--- a/src/classes/DataBoard.coffee
+++ b/src/classes/DataBoard.coffee
@@ -1,5 +1,5 @@
 class DataBoard
-  @keys = ['hiddenThreads', 'hiddenPosts', 'lastReadPosts', 'yourPosts', 'watchedThreads', 'customTitles']
+  @keys = ['hiddenThreads', 'hiddenPosts', 'lastReadPosts', 'yourPosts', 'watchedThreads', 'watcherLastModified', 'customTitles']
 
   constructor: (@key, sync, dontClean) ->
     @initData Conf[@key]
@@ -87,7 +87,7 @@ class DataBoard
 
   extend: ({siteID, boardID, threadID, postID, val, rm}, cb) ->
     @save =>
-      oldVal = @get {siteID, boardID, threadID, postID, val: {}}
+      oldVal = @get {siteID, boardID, threadID, postID, defaultValue: {}}
       delete oldVal[key] for key in rm or []
       $.extend oldVal, val
       @setUnsafe {siteID, boardID, threadID, postID, val: oldVal}