From 86909be300000a0ef8940531dbc1c1022ed3c33e Mon Sep 17 00:00:00 2001 From: ccd0 Date: Thu, 4 Apr 2019 00:13:37 -0700 Subject: [PATCH] Add siteID parameter to ThreadWatcher.update --- src/Monitoring/ThreadWatcher.coffee | 10 ++++------ src/Monitoring/Unread.coffee | 2 +- src/Monitoring/UnreadIndex.coffee | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee index 46ce54e8c..3ff5fe167 100644 --- a/src/Monitoring/ThreadWatcher.coffee +++ b/src/Monitoring/ThreadWatcher.coffee @@ -468,18 +468,16 @@ ThreadWatcher = ThreadWatcher.shortcut.classList.toggle className, !!$(".#{className}", ThreadWatcher.dialog) return - update: (boardID, threadID, newData) -> - siteID = Site.hostname - return if not (data = ThreadWatcher.db?.get {boardID, threadID}) + update: (siteID, boardID, threadID, newData) -> + return if not (data = ThreadWatcher.db?.get {siteID, boardID, threadID}) if newData.isDead and Conf['Auto Prune'] - ThreadWatcher.db.delete {boardID, threadID} + ThreadWatcher.db.delete {siteID, boardID, threadID} ThreadWatcher.refresh() return n = 0 n++ for key, val of newData when data[key] isnt val return unless n - return if not (data = ThreadWatcher.db.get {boardID, threadID}) - ThreadWatcher.db.extend {boardID, threadID, val: newData} + ThreadWatcher.db.extend {siteID, boardID, threadID, val: newData} if line = $ "#watched-threads > [data-site-i-d='#{siteID}'][data-full-i-d='#{boardID}.#{threadID}']", ThreadWatcher.dialog newLine = ThreadWatcher.makeLine siteID, boardID, threadID, data $.replace line, newLine diff --git a/src/Monitoring/Unread.coffee b/src/Monitoring/Unread.coffee index 4f86c96f9..2f39d0775 100644 --- a/src/Monitoring/Unread.coffee +++ b/src/Monitoring/Unread.coffee @@ -238,7 +238,7 @@ Unread = saveThreadWatcherCount: $.debounce 2 * $.SECOND, -> $.forceSync 'Remember Last Read Post' if Conf['Remember Last Read Post'] and (!Unread.thread.isDead or Unread.thread.isArchived) - ThreadWatcher.update Unread.thread.board.ID, Unread.thread.ID, + ThreadWatcher.update Site.hostname, Unread.thread.board.ID, Unread.thread.ID, isDead: Unread.thread.isDead unread: Unread.posts.size quotingYou: !!(if !Conf['Require OP Quote Link'] and QuoteYou.isYou(Unread.thread.OP) then Unread.posts.size else Unread.postsQuotingYou.size) diff --git a/src/Monitoring/UnreadIndex.coffee b/src/Monitoring/UnreadIndex.coffee index 05f0920d7..4d2878352 100644 --- a/src/Monitoring/UnreadIndex.coffee +++ b/src/Monitoring/UnreadIndex.coffee @@ -105,6 +105,6 @@ UnreadIndex = val: lastPost $.rm UnreadIndex.hr[thread.fullID] thread.nodes.root.classList.remove 'unread-thread' - ThreadWatcher.update thread.board.ID, thread.ID, + ThreadWatcher.update Site.hostname, thread.board.ID, thread.ID, unread: 0 quotingYou: false