OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't crash on error in notification popup

pull/1830/head
Chocobozzz 2019-02-14 10:07:25 +01:00
parent e1fa026675
commit 9b69bfc076
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
client/src/app/shared/users/user-notification.model.ts
View File

@ -63,73 +63,79 @@ export class UserNotification implements UserNotificationServer {
this.type = hash.type
this.read = hash.read
this.video = hash.video
if (this.video) this.setAvatarUrl(this.video.channel)
// We assume that some fields exist
// To prevent a notification popup crash in case of bug, wrap it inside a try/catch
try {
this.video = hash.video
if (this.video) this.setAvatarUrl(this.video.channel)
this.videoImport = hash.videoImport
this.videoImport = hash.videoImport
this.comment = hash.comment
if (this.comment) this.setAvatarUrl(this.comment.account)
this.comment = hash.comment
if (this.comment) this.setAvatarUrl(this.comment.account)
this.videoAbuse = hash.videoAbuse
this.videoAbuse = hash.videoAbuse
this.videoBlacklist = hash.videoBlacklist
this.videoBlacklist = hash.videoBlacklist
this.account = hash.account
if (this.account) this.setAvatarUrl(this.account)
this.account = hash.account
if (this.account) this.setAvatarUrl(this.account)
this.actorFollow = hash.actorFollow
if (this.actorFollow) this.setAvatarUrl(this.actorFollow.follower)
this.actorFollow = hash.actorFollow
if (this.actorFollow) this.setAvatarUrl(this.actorFollow.follower)
this.createdAt = hash.createdAt
this.updatedAt = hash.updatedAt
this.createdAt = hash.createdAt
this.updatedAt = hash.updatedAt
switch (this.type) {
case UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION:
this.videoUrl = this.buildVideoUrl(this.video)
break
switch (this.type) {
case UserNotificationType.NEW_VIDEO_FROM_SUBSCRIPTION:
this.videoUrl = this.buildVideoUrl(this.video)
break
case UserNotificationType.UNBLACKLIST_ON_MY_VIDEO:
this.videoUrl = this.buildVideoUrl(this.video)
break
case UserNotificationType.UNBLACKLIST_ON_MY_VIDEO:
this.videoUrl = this.buildVideoUrl(this.video)
break
case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO:
case UserNotificationType.COMMENT_MENTION:
this.accountUrl = this.buildAccountUrl(this.comment.account)
this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ]
break
case UserNotificationType.NEW_COMMENT_ON_MY_VIDEO:
case UserNotificationType.COMMENT_MENTION:
this.accountUrl = this.buildAccountUrl(this.comment.account)
this.commentUrl = [ this.buildVideoUrl(this.comment.video), { threadId: this.comment.threadId } ]
break
case UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS:
this.videoAbuseUrl = '/admin/moderation/video-abuses/list'
this.videoUrl = this.buildVideoUrl(this.videoAbuse.video)
break
case UserNotificationType.NEW_VIDEO_ABUSE_FOR_MODERATORS:
this.videoAbuseUrl = '/admin/moderation/video-abuses/list'
this.videoUrl = this.buildVideoUrl(this.videoAbuse.video)
break
case UserNotificationType.BLACKLIST_ON_MY_VIDEO:
this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video)
break
case UserNotificationType.BLACKLIST_ON_MY_VIDEO:
this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video)
break
case UserNotificationType.MY_VIDEO_PUBLISHED:
this.videoUrl = this.buildVideoUrl(this.video)
break
case UserNotificationType.MY_VIDEO_PUBLISHED:
this.videoUrl = this.buildVideoUrl(this.video)
break
case UserNotificationType.MY_VIDEO_IMPORT_SUCCESS:
this.videoImportUrl = this.buildVideoImportUrl()
this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
this.videoUrl = this.buildVideoUrl(this.videoImport.video)
break
case UserNotificationType.MY_VIDEO_IMPORT_SUCCESS:
this.videoImportUrl = this.buildVideoImportUrl()
this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
this.videoUrl = this.buildVideoUrl(this.videoImport.video)
break
case UserNotificationType.MY_VIDEO_IMPORT_ERROR:
this.videoImportUrl = this.buildVideoImportUrl()
this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
break
case UserNotificationType.MY_VIDEO_IMPORT_ERROR:
this.videoImportUrl = this.buildVideoImportUrl()
this.videoImportIdentifier = this.buildVideoImportIdentifier(this.videoImport)
break
case UserNotificationType.NEW_USER_REGISTRATION:
this.accountUrl = this.buildAccountUrl(this.account)
break
case UserNotificationType.NEW_USER_REGISTRATION:
this.accountUrl = this.buildAccountUrl(this.account)
break
case UserNotificationType.NEW_FOLLOW:
this.accountUrl = this.buildAccountUrl(this.actorFollow.follower)
break
case UserNotificationType.NEW_FOLLOW:
this.accountUrl = this.buildAccountUrl(this.actorFollow.follower)
break
}
} catch (err) {
console.error(err)
}
}