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

make filter error messages more helpful

Browse Source
This commit is contained in:
ccd0 2014-10-04 14:01:41 -07:00
parent 571c3f45db
commit 82b60ca025
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Filtering/Filter.coffee
View File

@ -8,14 +8,14 @@ Filter =
for key of Config.filter for key of Config.filter
@filters[key] = [] @filters[key] = []
for filter in Conf[key].split '\n' for line in Conf[key].split '\n'
continue if filter[0] is '#' continue if line[0] is '#'
unless regexp = filter.match /\/(.+)\/(\w*)/ unless regexp = line.match /\/(.+)\/(\w*)/
continue continue
# Don't mix up filter flags with the regular expression. # Don't mix up filter flags with the regular expression.
filter = filter.replace regexp[0], '' filter = line.replace regexp[0], ''
# Do not add this filter to the list if it's not a global one # Do not add this filter to the list if it's not a global one
# and it's not specifically applicable to the current board. # and it's not specifically applicable to the current board.
@ -33,7 +33,13 @@ Filter =
regexp = RegExp regexp[1], regexp[2] regexp = RegExp regexp[1], regexp[2]
catch err catch err
# I warned you, bro. # I warned you, bro.
new Notice 'warning', err.message, 60 new Notice 'warning', [
$.tn "Invalid #{key} filter:"
$.el 'br'
$.tn line
$.el 'br'
$.tn err.message
], 60
continue continue
# Filter OPs along with their threads, replies only, or both. # Filter OPs along with their threads, replies only, or both.