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

Fix issues from https://github.com/ccd0/4chan-x/pull/2231#issuecomment-467247167 #2231

Browse Source
This commit is contained in:
ccd0 2019-03-18 21:54:02 -07:00
parent 28a46edcf3
commit 24f1458a73
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Filtering/Filter.coffee
View File

@ -162,20 +162,8 @@ Filter =
if hl if hl
@highlights = hl @highlights = hl
$.addClass @nodes.root, hl... $.addClass @nodes.root, hl...
if noti if noti and Unread.posts and (@ID > Unread.lastReadPost) and not QuoteYou.isYou(@)
if Header.areNotificationsEnabled Unread.openNotification @, ' triggered a notification filter'
if not (Unread.posts is null)
if (@ID > Unread.lastReadPost) and not QuoteYou.isYou(@)
notif = new Notification "#{@info.nameBlock} triggered a notification filter",
body: @commentDisplay()
icon: Favicon.logo
notif.onclick = ->
Header.scrollToIfNeeded @nodes.bottom, true
window.focus()
notif.onshow = ->
setTimeout ->
notif.close()
, 7 * $.SECOND
isHidden: (post) -> isHidden: (post) ->
!!Filter.test(post).hide !!Filter.test(post).hide

4
src/Monitoring/Unread.coffee
View File

@ -124,9 +124,9 @@ Unread =
Unread.openNotification post Unread.openNotification post
return return
openNotification: (post) -> openNotification: (post, predicate=' replied to you') ->
return unless Header.areNotificationsEnabled return unless Header.areNotificationsEnabled
notif = new Notification "#{post.info.nameBlock} replied to you", notif = new Notification "#{post.info.nameBlock}#{predicate}",
body: post.commentDisplay() body: post.commentDisplay()
icon: Favicon.logo icon: Favicon.logo
notif.onclick = -> notif.onclick = ->