Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force an unconditional request for threads.json if we need a thread's page number.

Browse Source
This commit is contained in:
ccd0 2019-04-04 22:14:06 -07:00
parent dcdae5c9b5
commit c72f09feed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Monitoring/ThreadWatcher.coffee
View File

@ -254,14 +254,15 @@ ThreadWatcher =
deep = !(now - 2 * $.HOUR < (db.data.lastChecked2 or 0) <= now) deep = !(now - 2 * $.HOUR < (db.data.lastChecked2 or 0) <= now)
boards = ThreadWatcher.getAll(true) boards = ThreadWatcher.getAll(true)
for board in boards for board in boards
ThreadWatcher.fetchBoard board, false, deep ThreadWatcher.fetchBoard board, deep
db.setLastChecked() db.setLastChecked()
db.setLastChecked('lastChecked2') if deep db.setLastChecked('lastChecked2') if deep
if ThreadWatcher.fetched is ThreadWatcher.requests.length if ThreadWatcher.fetched is ThreadWatcher.requests.length
ThreadWatcher.clearRequests() ThreadWatcher.clearRequests()
fetchBoard: (board, force, deep) -> fetchBoard: (board, deep) ->
return unless board.some (thread) -> !thread.data.isDead return unless board.some (thread) -> !thread.data.isDead
force = Conf['Show Page'] and board.some((thread) -> !thread.data.page? and !thread.data.isDead and thread.data.last isnt -1)
{siteID, boardID} = board[0] {siteID, boardID} = board[0]
software = Conf['siteProperties'][siteID]?.software software = Conf['siteProperties'][siteID]?.software
urlF = if deep and software is 'tinyboard' then 'catalogJSON' else 'threadsListJSON' urlF = if deep and software is 'tinyboard' then 'catalogJSON' else 'threadsListJSON'
@ -550,7 +551,7 @@ ThreadWatcher =
ThreadWatcher.refresh() ThreadWatcher.refresh()
thread = {siteID: Site.hostname, boardID, threadID, data} thread = {siteID: Site.hostname, boardID, threadID, data}
if Conf['Show Page'] and !data.isDead if Conf['Show Page'] and !data.isDead
ThreadWatcher.fetchBoard [thread], true ThreadWatcher.fetchBoard [thread]
else if ThreadWatcher.unreadEnabled and Conf['Show Unread Count'] else if ThreadWatcher.unreadEnabled and Conf['Show Unread Count']
ThreadWatcher.fetchStatus thread, true ThreadWatcher.fetchStatus thread, true