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

Don't use the IndexBuild event for hiding threads.

Browse Source
This commit is contained in:
Mayhem 2014-01-26 20:29:21 +01:00
parent 7623040593
commit 509156a956
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Filtering/ThreadHiding.coffee
View File

@ -4,7 +4,7 @@ ThreadHiding =
@db = new DataBoard 'hiddenThreads' @db = new DataBoard 'hiddenThreads'
@syncCatalog() @syncCatalog()
$.on d, 'IndexBuild', @onIndexBuild $.on d, 'IndexRefresh', @onIndexRefresh
Thread.callbacks.push Thread.callbacks.push
name: 'Thread Hiding' name: 'Thread Hiding'
cb: @node cb: @node
@ -15,8 +15,8 @@ ThreadHiding =
return unless Conf['Thread Hiding'] return unless Conf['Thread Hiding']
$.prepend @OP.nodes.root, ThreadHiding.makeButton @, 'hide' $.prepend @OP.nodes.root, ThreadHiding.makeButton @, 'hide'
onIndexBuild: ({detail: nodes}) -> onIndexRefresh: ->
for root, i in nodes by 2 for root, i in Index.nodes by 2
thread = Get.threadFromRoot root thread = Get.threadFromRoot root
continue unless thread.isHidden continue unless thread.isHidden
unless thread.stub unless thread.stub

2
src/General/Index.coffee
View File

@ -390,8 +390,8 @@ Index =
nodes = Index.sortedNodes nodes = Index.sortedNodes
$.rmAll Index.root $.rmAll Index.root
Index.buildReplies nodes if Conf['Show Replies'] and Conf['Index Mode'] isnt 'catalog' Index.buildReplies nodes if Conf['Show Replies'] and Conf['Index Mode'] isnt 'catalog'
$.event 'IndexBuild', nodes
$.add Index.root, nodes $.add Index.root, nodes
$.event 'IndexBuild', nodes
isSearching: false isSearching: false
clearSearch: -> clearSearch: ->

3
src/Monitoring/ThreadWatcher.coffee
View File

@ -72,9 +72,8 @@ ThreadWatcher =
else if Conf['Auto Watch Reply'] else if Conf['Auto Watch Reply']
ThreadWatcher.add board.threads[threadID] ThreadWatcher.add board.threads[threadID]
onIndexRefresh: -> onIndexRefresh: ->
{db} = ThreadWatcher
boardID = g.BOARD.ID boardID = g.BOARD.ID
for threadID, data of db.data.boards[boardID] when not data.isDead and threadID not of g.BOARD.threads for threadID, data of ThreadWatcher.db.data.boards[boardID] when not data.isDead and threadID not of g.BOARD.threads
if Conf['Auto Prune'] if Conf['Auto Prune']
ThreadWatcher.db.delete {boardID, threadID} ThreadWatcher.db.delete {boardID, threadID}
else else