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

Merge commit '5631d2877dbc10fe46e1c151b98a351ce3ec4428'

Browse Source
This commit is contained in:
ccd0 2019-08-04 12:48:57 -07:00
commit 37cf4271ad
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/General/Index.coffee
View File

@ -721,7 +721,8 @@ Index =
thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1) thread.setPage(Index.threadPosition[ID] // Index.threadsNumPerPage + 1)
else else
obj = Index.parsedThreads[ID] obj = Index.parsedThreads[ID]
OP = new Post g.SITE.Build.post(obj), thread, g.BOARD opRoot = g.SITE.Build.post(obj)
OP = new Post opRoot, thread, g.BOARD
OP.filterResults = obj.filterResults OP.filterResults = obj.filterResults
newPosts.push OP newPosts.push OP
@ -733,6 +734,7 @@ Index =
errors.push errors.push
message: "Parsing of Thread No.#{thread} failed. Thread will be skipped." message: "Parsing of Thread No.#{thread} failed. Thread will be skipped."
error: err error: err
html: opRoot?.outerHTML
Main.handleErrors errors if errors Main.handleErrors errors if errors
if withReplies if withReplies
@ -763,6 +765,7 @@ Index =
errors.push errors.push
message: "Parsing of Post No.#{data.no} failed. Post will be skipped." message: "Parsing of Post No.#{data.no} failed. Post will be skipped."
error: err error: err
html: node?.outerHTML
$.add thread.nodes.root, nodes $.add thread.nodes.root, nodes
Main.handleErrors errors if errors Main.handleErrors errors if errors

6
src/main/Main.coffee
View File

@ -382,6 +382,7 @@ Main =
errors.push errors.push
message: "Parsing of Post No.#{postRoot.id.match(/\d+/)} failed. Post will be skipped." message: "Parsing of Post No.#{postRoot.id.match(/\d+/)} failed. Post will be skipped."
error: err error: err
html: postRoot.outerHTML
return return
addThreads: (records) -> addThreads: (records) ->
@ -458,6 +459,7 @@ Main =
errors.push errors.push
message: "Parsing of Catalog Thread No.#{(threadRoot.dataset.id or threadRoot.id).match(/\d+/)} failed. Thread will be skipped." message: "Parsing of Catalog Thread No.#{(threadRoot.dataset.id or threadRoot.id).match(/\d+/)} failed. Thread will be skipped."
error: err error: err
html: threadRoot.outerHTML
return return
addCatalogThreads: (records) -> addCatalogThreads: (records) ->
@ -560,9 +562,11 @@ Main =
[Please describe the steps needed to reproduce this error.] [Please describe the steps needed to reproduce this error.]
Script: <%= meta.name %> <%= meta.fork %> v#{g.VERSION} #{$.platform} Script: <%= meta.name %> <%= meta.fork %> v#{g.VERSION} #{$.platform}
User agent: #{navigator.userAgent}
URL: #{location.href} URL: #{location.href}
User agent: #{navigator.userAgent}
""" """
if $.platform is 'userscript' and (info = if GM? then GM.info else (if GM_info? then GM_info))
addDetails "Userscript manager: #{info.scriptHandler} #{info.version}"
addDetails '\n' + data.error addDetails '\n' + data.error
addDetails data.error.stack.replace(data.error.toString(), '').trim() if data.error.stack addDetails data.error.stack.replace(data.error.toString(), '').trim() if data.error.stack
addDetails '\n`' + data.html + '`' if data.html addDetails '\n`' + data.html + '`' if data.html