import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
import { MetaService } from '@ngx-meta/core'
-import { NotificationsService } from 'angular2-notifications'
+import { Notifier, ServerService } from '@app/core'
import { forkJoin, Subscription } from 'rxjs'
// FIXME: something weird with our path definition in tsconfig and typings
// @ts-ignore
import 'videojs-hotkeys'
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import * as WebTorrent from 'webtorrent'
-import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
+import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
import '../../../assets/player/peertube-videojs-plugin'
import { AuthService, ConfirmService } from '../../core'
import { RestExtractor, VideoBlacklistService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
import { VideoService } from '../../shared/video/video.service'
-import { MarkdownService } from '../shared'
import { VideoDownloadComponent } from './modal/video-download.component'
import { VideoReportComponent } from './modal/video-report.component'
import { VideoShareComponent } from './modal/video-share.component'
import { VideoBlacklistComponent } from './modal/video-blacklist.component'
import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
import { addContextMenu, getVideojsOptions, loadLocaleInVideoJS } from '../../../assets/player/peertube-player'
-import { ServerService } from '@app/core'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { environment } from '../../../environments/environment'
import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
import { VideoCaptionService } from '@app/shared/video-caption'
+import { MarkdownService } from '@app/shared/renderer'
@Component({
selector: 'my-video-watch',
private authService: AuthService,
private serverService: ServerService,
private restExtractor: RestExtractor,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private markdownService: MarkdownService,
private zone: NgZone,
private redirectService: RedirectService,
error => {
this.descriptionLoading = false
- this.notificationsService.error(this.i18n('Error'), error.message)
+ this.notifier.error(error.message)
}
)
}
this.videoBlacklistService.removeVideoFromBlacklist(this.video.id).subscribe(
() => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name })
- )
+ this.notifier.success(this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name }))
this.video.blacklisted = false
this.video.blacklistedReason = null
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
this.videoService.removeVideo(this.video.id)
.subscribe(
- status => {
- this.notificationsService.success(
- this.i18n('Success'),
- this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name })
- )
+ () => {
+ this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name }))
// Go back to the video-list.
this.redirectService.redirectToHomepage()
},
- error => this.notificationsService.error(this.i18n('Error'), error.message)
+ error => this.notifier.error(error.message)
)
}
return
}
- this.notificationsService.error(this.i18n('Error'), errorMessage)
+ this.notifier.error(errorMessage)
}
private checkUserRating () {
}
},
- err => this.notificationsService.error(this.i18n('Error'), err.message)
+ err => this.notifier.error(err.message)
)
}
this.remoteServerDown = false
let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
- // Don't start the video if we are at the end
+ // If we are at the end of the video, reset the timer
if (this.video.duration - startTime <= 1) startTime = 0
if (this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())) {
this.userRating = nextRating
},
- (err: { message: string }) => this.notificationsService.error(this.i18n('Error'), err.message)
+ (err: { message: string }) => this.notifier.error(err.message)
)
}