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

Fix lint & tests

pull/2356/head
Chocobozzz 2019-12-18 16:38:39 +01:00
parent 09033f7aa3
commit 2a5518a667
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/videos/+video-watch/video-watch.component.ts
View File

@ -147,7 +147,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.queryParamsSub = this.route.queryParams.subscribe(async queryParams => {
const videoId = queryParams[ 'videoId' ]
if (videoId) await this.loadVideo(videoId)
if (videoId) this.loadVideo(videoId)
const start = queryParams[ 'start' ]
if (this.player && start) this.player.currentTime(parseInt(start, 10))

14
server/models/account/user.ts
View File

@ -583,16 +583,18 @@ export class UserModel extends Model<UserModel> {
}
canGetVideo (video: MVideoFullLight) {
if (video.privacy === VideoPrivacy.INTERNAL) return true
if (video.privacy === VideoPrivacy.PRIVATE) {
return video.VideoChannel && video.VideoChannel.Account.userId === this.id
}
const videoUserId = video.VideoChannel.Account.userId
if (video.isBlacklisted()) {
return this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
}
if (video.privacy === VideoPrivacy.PRIVATE) {
return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
}
if (video.privacy === VideoPrivacy.INTERNAL) return true
return false
}