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

Searches should match all keywords.

Browse Source
This commit is contained in:
Mayhem 2013-11-10 00:58:18 +01:00
parent a8209eaa89
commit dcdb530d19
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/General/Index.coffee
View File

@ -313,14 +313,16 @@ Index =
search: (keywords) -> search: (keywords) ->
found = [] found = []
for threadRoot, i in Index.sortedNodes by 2 for threadRoot, i in Index.sortedNodes by 2
{OP} = Get.threadFromRoot threadRoot if Index.searchMatch Get.threadFromRoot(threadRoot), keywords
text = []
for key in ['comment', 'subject', 'name', 'tripcode', 'email']
text.push OP.info[key] if key of OP.info
text.push OP.file.name if 'file' of OP
text = text.join(' ').toLowerCase()
for keyword in keywords
continue if -1 is text.indexOf keyword
found.push Index.sortedNodes[i], Index.sortedNodes[i + 1] found.push Index.sortedNodes[i], Index.sortedNodes[i + 1]
break
found found
searchMatch: (thread, keywords) ->
{info, file} = thread.OP
text = []
for key in ['comment', 'subject', 'name', 'tripcode', 'email']
text.push info[key] if key of info
text.push file.name if file
text = text.join(' ').toLowerCase()
for keyword in keywords
return false if -1 is text.indexOf keyword
return true