Feufochmar
/
apmail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a check when parsing timeline. Change error messages.

This commit is contained in:
Feufochmar 2020-04-01 17:40:43 +02:00
parent 5e5f498328
commit 682f0f4767
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/timeline.js
View File

@ -41,11 +41,11 @@ Timeline.prototype = {
this.next = answer.next
this.parseActivities(answer.orderedItems, token, callback)
} else {
callback(false, 'Timeline: unexpected answer from server')
callback(false, 'Unexpected answer from server when fetching activity collection.')
console.log(answer)
}
} else if (request.readyState == 4) {
callback(false, 'Timeline: server error')
callback(false, 'Server error (' + request.status + ') when fetching activity collection.')
}
}.bind(this)
request.open('GET', url, true)
@ -57,6 +57,12 @@ Timeline.prototype = {
request.send()
},
parseActivities: function(raw_activities, token, callback) {
// raw_activities must be an array
if (!Array.isArray(raw_activities)) {
console.log(raw_activities)
callback(false, 'Unexpected format for activity collection.')
return
}
// Get the next activity
const raw_act = raw_activities.shift()
if (raw_act && typeof raw_act === 'string') {